Commit graph

12,503 commits

Author SHA1 Message Date
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
Brendon Duncan
a2dff98c63 Back button on Review Transaction screen works with sendFlowService. 2018-08-09 13:12:44 +12:00
Brendon Duncan
b426209efb Fix for clearing current state only. 2018-08-09 13:06:50 +12:00
Brendon Duncan
bf9b467bfe Renamed sendFlowService functions to be more consistent. 2018-08-09 13:01:48 +12:00
Brendon Duncan
be0c18244e Review Transaction screen now displaying BCH addresses in cashaddr format. 2018-08-09 12:12:29 +12:00
Brendon Duncan
408d46e4d3 Hid the from wallet in the send screen for now, because it requires other layout changes to fit everything in, especially on small screens. 2018-08-09 11:43:20 +12:00
Brendon Duncan
1d025cbf35 Fixes for Android 4.4 2018-08-09 11:42:25 +12:00
Brendon Duncan
be2bc4cddb Showing From wallet in send tab. 2018-08-09 11:13:12 +12:00
Brendon Duncan
dff0d51ef3 Refactored sendFlowService and cleared its state before entering the send tab. 2018-08-09 11:10:26 +12:00
Brendon Duncan
e7ce86fb99 Merged fix for undefined currency. 2018-08-09 10:47:54 +12:00
Brendon Duncan
58d99231ae Handle undefined currency. 2018-08-09 10:46:07 +12:00
Brendon Duncan
eb500c0549 Updated decimal formatting. 2018-08-09 10:42:58 +12:00
Brendon Duncan
cb398a0f50 Merged cleanup for formated amount.
# Conflicts:
#	src/js/directives/formattedAmount.js
2018-08-09 07:58:24 +12:00
Brendon Duncan
1c3b113222 Removed unused config service. 2018-08-09 07:49:13 +12:00
Brendon Duncan
d81f194f87 Fix for when an amount changes from having a separate currency value, to the currency being one string with the amount. 2018-08-09 07:35:47 +12:00
Sebastiaan Pasma
02e8e0fbf0
clear send flow on home and wallet details 2018-08-08 17:29:28 +02:00
Sebastiaan Pasma
2206102715
sendflow service integrated into flow 2018-08-08 17:27:15 +02:00
Sebastiaan Pasma
f7ecdb2f2f
sendflow service integrated into flow 2018-08-08 17:10:47 +02:00
Sebastiaan Pasma
8229d51fdd
sendflow service 2018-08-08 16:35:49 +02:00