Commit graph

12,451 commits

Author SHA1 Message Date
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
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
Jean-Baptiste Dominguez
73b18b16b6
Merge pull request #249 from Bitcoin-com/wallet/task/514
Wallet/task/514
2018-08-08 22:34:44 +09:00
Jean-Baptiste Dominguez
04f77c1daa Merge branch 'wallet/task/514' of https://github.com/Bitcoin-com/Wallet into wallet/task/514 2018-08-08 22:32:31 +09:00
Jean-Baptiste Dominguez
51921a1a1d Fix shapeshift flow go back available 2018-08-08 22:32:18 +09:00
Sebastiaan Pasma
753d2aea69
remove bottom menu on wallet selector + remove swipe back feature on review screen 2018-08-08 15:31:36 +02:00
Brendon Duncan
69e8c62f5c Fix for when an amount changes from having a separate currency value, to the currency being one string with the amount. 2018-08-08 22:00:07 +12:00
Brendon Duncan
b8de811fbe Merged fancy decimals.
# Conflicts:
#	www/views/walletDetails.html
2018-08-08 20:42:49 +12:00
Brendon Duncan
7e9cfa77c4 Now correctly derives currency from value. 2018-08-08 20:25:17 +12:00
Jean-Baptiste Dominguez
da964e5a9b
Merge pull request #248 from Bitcoin-com/wallet/task/514
Wallet/task/514
2018-08-08 17:17:51 +09:00
Jean-Baptiste Dominguez
b4e36e93cb Fix double loading in the review screen for shapeshift 2018-08-08 17:11:16 +09:00
Jean-Baptiste Dominguez
60028c44bb remove the header for shapeshift in the amount view 2018-08-08 16:59:00 +09:00
Jean-Baptiste Dominguez
5ee9d4d284
Merge pull request #247 from Bitcoin-com/wallet/task/514
height space in the bottom (wallet selection & review)
2018-08-08 16:25:31 +09:00
Jean-Baptiste Dominguez
644b3e6113 height space in the bottom (wallet selection & review) 2018-08-08 16:24:47 +09:00
Jean-Baptiste Dominguez
14c87892bc
Merge pull request #246 from Bitcoin-com/wallet/task/514
Wallet/task/514
2018-08-08 16:10:58 +09:00
Jean-Baptiste Dominguez
158c571ce1
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-08 16:10:51 +09:00
Jean-Baptiste Dominguez
ab13478f79 Add shapeshift service item 2018-08-08 16:03:34 +09:00
Brendon Duncan
ae6dcea81a Fix for getting Shapeshift working. 2018-08-08 18:58:26 +12:00
Brendon Duncan
3d9b24575b In Review Transaction screen, the note is now visible above the fees. 2018-08-08 18:57:55 +12:00
Jean-Baptiste Dominguez
6981a5af9f show only when it is ready 2018-08-08 15:52:20 +09:00
Brendon Duncan
86a9e9fe92 Merge for alignment and size of Receive and Send buttons. 2018-08-08 16:34:14 +12:00
Brendon Duncan
939263c385 Alignment and size of Receive and Send buttons on the Home tab matches the Wallet Details tab: equal spacing. 2018-08-08 16:30:57 +12:00
Brendon Duncan
5d3e11b7bb Fixed alignment of buttons in Wallet Details on wide screens.. 2018-08-08 16:10:58 +12:00
Brendon Duncan
da88ddbd40 ShapeshiftService fix for app startup. 2018-08-08 15:36:18 +12:00
Jean-Baptiste Dominguez
a1250be73d
Merge pull request #243 from Bitcoin-com/wallet/task/514
Wallet/task/514
2018-08-08 11:23:48 +09:00
Jean-Baptiste Dominguez
037c00ec9e
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-08 11:23:35 +09:00
Jean-Baptiste Dominguez
1c71e961b9
Merge pull request #232 from Bitcoin-com/wallet/task/423
Small improvement - 423 - Only change button color if it contains an address, not on all content
2018-08-08 10:57:10 +09:00
Jean-Baptiste Dominguez
5048bc135b
Merge pull request #224 from Bitcoin-com/wallet/task/441
441 - Translatable strings for the "Home" tab
2018-08-08 10:56:35 +09:00
Jean-Baptiste Dominguez
7f0946b390
Merge branch 'wallet/sprint/20' into wallet/task/441 2018-08-08 10:56:26 +09:00
Jean-Baptiste Dominguez
06ffa4c233
Merge pull request #226 from Bitcoin-com/wallet/task/442
442 - Missing "Price Display" translation
2018-08-08 10:54:21 +09:00
Jean-Baptiste Dominguez
b4bf0c314f
Merge pull request #230 from Bitcoin-com/wallet/task/508
508 - Fix the QRCode scan.
2018-08-08 10:54:09 +09:00
Jean-Baptiste Dominguez
ecad91d328
Merge pull request #237 from Bitcoin-com/wallet/task/439
439 - Enter Amount screen modifications
2018-08-08 10:53:59 +09:00
Jean-Baptiste Dominguez
f20f5ae648
Merge pull request #236 from Bitcoin-com/wallet/task/428
Improvement - 428 - Send/Receive buttons
2018-08-08 10:53:48 +09:00
Jean-Baptiste Dominguez
75843c68ff
Merge pull request #231 from Bitcoin-com/wallet/task/505
505 - BitAnalytics 0.2.1 with GA
2018-08-08 10:53:01 +09:00
Jean-Baptiste Dominguez
699d1dddf2
Merge pull request #220 from Bitcoin-com/wallet/task/426
Improvement - 426 - New Payment Sent screen
2018-08-08 10:51:51 +09:00
Jean-Baptiste Dominguez
8ac6094c22
Merge pull request #227 from Bitcoin-com/wallet/task/414
Improvement - 414 - "Custom amount" QR screen to include the price in big letters
2018-08-08 10:51:39 +09:00
Jean-Baptiste Dominguez
e52fb462dd
Merge pull request #228 from Bitcoin-com/wallet/task/484
484 - Android: Remove permission for Microphone use
2018-08-08 10:51:01 +09:00
Brendon Duncan
43adcc3806 More selective display of balances Wallet Details screen when fiat balance isn't available. 2018-08-08 13:38:43 +12:00
Brendon Duncan
820c1a3933 Wallet details does not display any balance text if it does not have balance yet. 2018-08-08 13:31:02 +12:00