Commit graph

972 commits

Author SHA1 Message Date
Sebastiaan Pasma
525afac92e
scss var name change 2018-09-05 16:36:53 +02:00
Sebastiaan Pasma
22e1c397d0
Removed duplicate android header + refactored animation to use CSS animations instead of javascript calculated animations 2018-09-05 16:19:31 +02:00
Sebastiaan Pasma
74a9fe9691
Merge branch 'wallet/sprint/21' into wallet/task/567 2018-09-05 14:11:51 +02:00
Sebastiaan Pasma
793bfee6a2
Changed wallet details transition behaviour 2018-09-04 16:36:05 +02:00
Jean-Baptiste Dominguez
57efbc3c63
Merge pull request #319 from Bitcoin-com/wallet/task/566
Bug - 566 - Fees hidden on iPhone X
2018-09-04 14:14:41 +09:00
Sebastiaan Pasma
383d811067
Multi-line buttons fix 2018-09-03 14:44:09 +02:00
Sebastiaan Pasma
b1bf269ca2
Review transaction screen: iPhone X fee summary display fix 2018-09-03 11:54:15 +02:00
Sebastiaan Pasma
99d8de02da
Show pasted address instead of always cashaddr format on bch 2018-08-14 15:53:18 +02:00
Brendon Duncan
0b71daf04d Removed previous fix as it is superceded by a better one. 2018-08-13 16:51:38 +12:00
Brendon Duncan
5da475f1ee Merged sprint/20. 2018-08-13 15:55:57 +12:00
Brendon Duncan
84fd483f19 Fix for removing dark portion of Review Transaction screen below personal note. 2018-08-13 10:47:00 +12:00
Brendon Duncan
d88d3365ad Fix for long amounts on iPhone 5 / SE. Fix for buttons below amounts on iPhone 5 / SE. 2018-08-10 19:09:55 +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
c8d7e88f81
Merge branch 'wallet/sprint/20' into wallet/dev 2018-08-09 15:52:48 +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
Brendon Duncan
b8de811fbe Merged fancy decimals.
# Conflicts:
#	www/views/walletDetails.html
2018-08-08 20:42:49 +12:00
Jean-Baptiste Dominguez
644b3e6113 height space in the bottom (wallet selection & review) 2018-08-08 16:24:47 +09:00
Jean-Baptiste Dominguez
158c571ce1
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-08 16:10:51 +09:00
Brendon Duncan
3d9b24575b In Review Transaction screen, the note is now visible above the fees. 2018-08-08 18:57:55 +12:00
Brendon Duncan
a5862bd6c4 Merge. 2018-08-08 18:23:46 +12:00
Brendon Duncan
fcb4d4b004 Text is now visible on Send and Receive buttons in Wallet Details screen when activated. 2018-08-08 18:22:43 +12: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
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
Sebastiaan Pasma
9f418583ab
formatted amount controller update + css + renames + included in views 2018-08-07 16:11:47 +02: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
a952edfe69
border-radius fix 2018-07-31 17:40:58 +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