Commit graph

12,574 commits

Author SHA1 Message Date
Brendon Duncan
14724ea6f6 Merged formatting of some amounts. 2018-08-10 14:30:53 +12:00
Brendon Duncan
4dd334087b Removed formatted amount from the entry of the Amount screen as it was causing a bug. 2018-08-10 14:24:41 +12:00
Jean-Baptiste Dominguez
e0c4155ef1
Merge pull request #260 from Bitcoin-com/wallet/task/537
Add tracking shapeshift
2018-08-10 11:22:46 +09:00
Jean-Baptiste Dominguez
0410ad1491 Add tracking shapeshift 2018-08-10 11:21:29 +09:00
Brendon Duncan
18c8f4cf07 formatted-amount for transaction proposals and wallet activity. 2018-08-10 14:17:42 +12:00
Jean-Baptiste Dominguez
40676d8032
Merge pull request #259 from Bitcoin-com/wallet/task/537
Handle error in the review screen
2018-08-10 11:13:19 +09:00
Jean-Baptiste Dominguez
4c9ff1b28b Handle error in the review screen 2018-08-10 11:11:53 +09:00
Jean-Baptiste Dominguez
a34bd614fa
Merge pull request #258 from Bitcoin-com/wallet/task/427
crypto decimal
2018-08-10 10:57:20 +09:00
Brendon Duncan
cb9feb99ce Merge wallet-balance that includes formatted-amount 2018-08-10 13:56:48 +12:00
Jean-Baptiste Dominguez
b70bd804dc crypto decimal 2018-08-10 10:56:01 +09:00
Brendon Duncan
82c0746ff8 wallet-balance directive uses formatted-amount. 2018-08-10 13:48:59 +12:00
Jean-Baptiste Dominguez
1f07e8ec57
Merge pull request #257 from Bitcoin-com/wallet/task/427
Wallet/task/427
2018-08-10 10:44:49 +09:00
Jean-Baptiste Dominguez
82ede65363 New decimal on the review screen 2018-08-10 10:43:54 +09:00
Jean-Baptiste Dominguez
39e515d3c5
Merge pull request #256 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-10 10:39:42 +09:00
Jean-Baptiste Dominguez
bd32a7c08a
Merge pull request #255 from Bitcoin-com/wallet/task/537
Wallet/task/537
2018-08-10 10:26:14 +09:00
Brendon Duncan
d7285a72e4 wallet-balance directive retrieves alternative amount when needed. 2018-08-10 13:26:12 +12:00
Brendon Duncan
355ed27b87 wallet balance directive displaying fiat balance from wallet status. 2018-08-10 13:04:44 +12:00
Brendon Duncan
afb3a1d49f wallet-balance directive displaying basic crypto balance. 2018-08-10 12:46:00 +12:00
Brendon Duncan
678ad516ee Merge sprint/20. 2018-08-10 12:19:13 +12:00
Sebastiaan Pasma
577756fd44
button color + Time ago fix 2018-08-09 17:14:05 +02:00
Jean-Baptiste Dominguez
06a56cab4d
Merge pull request #254 from Bitcoin-com/wallet/task/427
Fix decimal
2018-08-09 23:30:23 +09:00
Jean-Baptiste Dominguez
bc9e1710c2
Merge branch 'wallet/sprint/20' into wallet/task/427 2018-08-09 23:30:12 +09:00
Jean-Baptiste Dominguez
2408753e91 Fix decimal 2018-08-09 23:28:59 +09:00
Sebastiaan Pasma
8b19f599b6
Merge remote-tracking branch 'origin/wallet/task/537' into wallet/sprint/20 2018-08-09 13:46:34 +02:00
Sebastiaan Pasma
ee0042b6e7
sendMax bugfix when returning to previous screen 2018-08-09 13:39:27 +02:00
Sebastiaan Pasma
25965f6268
shapeshift moved to default services and communities fix 2018-08-09 10:17:29 +02:00
Sebastiaan Pasma
420305cf01
shapeshift moved to default services and communities fix 2018-08-09 10:16:45 +02:00
Jean-Baptiste Dominguez
fb8d2efe12
Merge pull request #253 from Bitcoin-com/wallet/task/537
Wallet/task/537
2018-08-09 16:42:21 +09:00
Jean-Baptiste Dominguez
b46b01471a
Merge pull request #252 from Bitcoin-com/wallet/dev
Wallet/dev
2018-08-09 16:19:39 +09:00
Brendon Duncan
0ec0e5c945 Merged latest. 2018-08-09 18:59:46 +12:00
Brendon Duncan
ac8cdcf5be Android 4.4 fix for Amount screen, removal of  . 2018-08-09 18:59:03 +12:00
Brendon Duncan
de33fe5868 Refactored formattedAmount. 2018-08-09 18:58:21 +12:00
Jean-Baptiste Dominguez
c8d7e88f81
Merge branch 'wallet/sprint/20' into wallet/dev 2018-08-09 15:52:48 +09:00
Jean-Baptiste Dominguez
0c15a83782
Merge pull request #250 from Bitcoin-com/wallet/task/537
Wallet/task/537
2018-08-09 15:41:29 +09:00
Jean-Baptiste Dominguez
3bb446cdee
Merge branch 'wallet/sprint/20' into wallet/task/537 2018-08-09 15:41:17 +09:00
Jean-Baptiste Dominguez
4cf68076a0 remove comment on bitanalytics 2018-08-09 15:35:31 +09:00
Jean-Baptiste Dominguez
9076ad2098 add update wallet 2018-08-09 15:35:03 +09:00
Jean-Baptiste Dominguez
b742eadd4e clean and remove bug home 2018-08-09 15:13:29 +09:00
Jean-Baptiste Dominguez
9bdd44a483 Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537 2018-08-09 15:09:52 +09:00
Jean-Baptiste Dominguez
c68b1e77f6 clean controller and remove old firebase event 2018-08-09 15:09:43 +09:00
Brendon Duncan
cbf66a2176 Fix for formatting amounts on Android 4.4. 2018-08-09 17:54:20 +12:00
Jean-Baptiste Dominguez
a964b2d967 Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537 2018-08-09 13:15:29 +09:00
Jean-Baptiste Dominguez
77f6210076 Fix pop state on the send flow 2018-08-09 13:15:21 +09:00
Jean-Baptiste Dominguez
0ea97fc1c6 Fix state pop on the send flow 2018-08-09 13:14:44 +09:00
Brendon Duncan
7ce562ec64 Fix for Shapeshift now appearing again on Review Transaction screen. 2018-08-09 16:11:29 +12:00
Jean-Baptiste Dominguez
a490f0ce1f dead code 2018-08-09 13:06:52 +09:00
Jean-Baptiste Dominguez
647e126169 Fix style css for the from wallet & activate the from wallet in the send tab 2018-08-09 12:49:35 +09:00
Jean-Baptiste Dominguez
e183643298 Remove from the route the stateparams, adapt some controllers in the new sendflowservice 2018-08-09 12:35:39 +09:00
Brendon Duncan
188ddcba58 Review transation copying state at startup so it doesn't contaminate the sendFlowController. 2018-08-09 13:25:06 +12:00
Brendon Duncan
0410182d4f Incoming data working with sendFlowService. 2018-08-09 13:24:13 +12:00