Commit graph

944 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
037c00ec9e
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-08 11:23:35 +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
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
1aa31b6935 egifter template, waiting the logo in svg. 2018-08-07 16:36:33 +09:00
Brendon Duncan
59d1704673 Fix for display of fee when not for a BIP70 invoice. 2018-08-07 17:34:28 +12:00
Brendon Duncan
09f627ea51 Suggested by merchant. 2018-08-07 11:27:05 +12:00
Jean-Baptiste Dominguez
59b9167ff0 Merge 2018-08-06 22:17:15 +09:00
Jean-Baptiste Dominguez
cc213956d0 header bitpay on the wallet selector, incoming data fix, clean a bit 2018-08-06 22:12:33 +09:00
Sebastiaan Pasma
ec354bd340
header css 2018-08-06 11:25:29 +02:00
Sebastiaan Pasma
d7fabc3642
header + default colors 2018-08-03 14:28:56 +02:00
Sam Cheng Hung
671b46da41 Changes address component name to address-frame 2018-08-03 15:33:25 +08:00
Sam Cheng Hung
f96610a66b Removes border and background from Paste Address button for send tab page 2018-08-03 13:35:05 +08:00
Sebastiaan Pasma
f49e8725e8
Translations additions + some (s)css + review transaction changes 2018-08-02 16:05:12 +02:00
Sebastiaan Pasma
aacc80ea21
shapeshift flow 2018-08-02 15:42:35 +02:00
Sebastiaan Pasma
01dd774fae
thirdParty updates + shapeshift screens + merged with review transaction 2018-08-02 15:15:23 +02:00
Sebastiaan Pasma
391201471d
Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514
# Conflicts:
#	i18n/po/template.pot
#	src/js/controllers/amount.js
#	www/css/main.css
2018-08-02 15:12:40 +02:00
Sebastiaan Pasma
5372ba3dac
Merge remote-tracking branch 'origin/wallet/task/439' into wallet/task/514
# Conflicts:
#	src/js/controllers/amount.js
2018-08-01 11:16:59 +02:00
Sebastiaan Pasma
42d77903e1
Third Party Service integration (Shapeshift) (CSS + translations + wallet selector + routes) 2018-07-31 17:21:56 +02:00
Sebastiaan Pasma
281b969fc3
Shapeshift refactor / Empty case / CSS 2018-07-31 15:03:20 +02:00
Brendon Duncan
0cba978d65 Replaced old amount screen. 2018-07-31 20:25:21 +12:00
Brendon Duncan
02f7bcc281 Not using amount directive. Removed safety area below All Available Funds button. 2018-07-31 20:18:27 +12:00
Brendon Duncan
778cbfbab0 Should have been part of merge for amount directive. 2018-07-31 19:16:11 +12:00
Brendon Duncan
2353109adf Bugfix for font for insufficient funds warning. 2018-07-31 17:59:26 +12:00
Brendon Duncan
2987d17e11 Merged amount directive. 2018-07-31 13:28:16 +12:00
Brendon Duncan
0fdd478ae4 Fixed up bold fonts. 2018-07-31 12:47:03 +12:00
Sebastiaan Pasma
734153ec5b
more fixes on the send/receive on Android & iOS / removed some unused code 2018-07-30 15:17:15 +02:00
Sam Cheng Hung
343fde08f3 Merges amount directive 2018-07-30 17:35:15 +08:00
Sam Cheng Hung
f4b0b46067 Adds size-equal and capitalizes currency text 2018-07-30 17:33:38 +08:00
Sam Cheng Hung
7fb2792a1a Adds size-equal class to amount directive 2018-07-30 16:56:27 +08:00
Sam Cheng Hung
e1d65bc557 Adds amount directive 2018-07-30 16:49:57 +08:00
Sam Cheng Hung
2b96293c80 Move amount directive to a separate branch 2018-07-30 16:40:16 +08:00
Sebastiaan Pasma
3732d21728
send/receive iPhoneX fixes 2018-07-30 09:37:14 +02:00
Brendon Duncan
f0ccee8a0a Refining the display of available funds. 2018-07-30 18:28:27 +12:00
Brendon Duncan
9781f90f2b Warning colour for insufficient funds. 2018-07-28 19:20:12 -07:00
Brendon Duncan
72a5b3cabd Primary ("Next") button. 2018-07-28 17:18:52 -07:00
Brendon Duncan
0ba1ea1f42 Use All Available Funds button. 2018-07-28 15:36:23 -07:00
Sam Cheng Hung
47de79cc64 Adds support for 0, 2, 3 and 8 decimal places and locale commas and decimals 2018-07-27 17:03:09 +08:00
Sam Cheng Hung
69b2fac8e5 Updates amount font size 2018-07-27 12:29:34 +08:00
Brendon Duncan
f65b632273 Available funds appearance in normal case. 2018-07-26 13:22:03 -07:00
Brendon Duncan
8fd0b76a44 Change Currency button appearance. 2018-07-26 13:09:16 -07:00
Sebastiaan Pasma
b2ed16bf21
mobile support for send/receive buttons and some refactors to fix the navigation flow. 2018-07-26 19:38:29 +02:00
Sebastiaan Pasma
d87c2e65f7
Wallet buttons max width + Receive in viewing wallet. 2018-07-26 15:04:42 +02:00
Sam Cheng Hung
2492a405a1 Adds fee-summary bar, adds amount directive, adds support for fee-summary overlapping with content on scrollable small screens 2018-07-26 14:29:53 +08:00
Brendon Duncan
507fb21862 Available funds. 2018-07-25 18:46:42 -07:00
Brendon Duncan
91daae9f7a Improved amount card layout. Darker background under card. 2018-07-25 18:19:21 -07:00
Brendon Duncan
e539f0e713 Space around amount, and added "Not Enough Funds" warning. 2018-07-25 17:32:07 -07:00
Brendon Duncan
decd0a123e Buttons on keypad have correct colour in new Enter Amount screen. 2018-07-25 16:43:45 -07:00
Sebastiaan Pasma
fd4adbfb57
wallet to wallet case worked out. Also fixed routes and some css 2018-07-24 14:24:22 +02:00
Sam Cheng Hung
4b18e4b1c3 Adds expand-content component, update various UI measurements 2018-07-24 15:27:21 +08:00