Commit graph

3,084 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
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
07ac4e7738 Show memo for shapeshift 2018-08-07 20:50:56 +09:00
Jean-Baptiste Dominguez
af90c53e50 Add memo expended 2018-08-07 20:14:48 +09:00
Jean-Baptiste Dominguez
9420b63728 Fix shapeshift, remove the cancelTx. Remove the timer with the getStatus 2018-08-07 20:11:21 +09:00
Jean-Baptiste Dominguez
e6389567e0 Merge branch 'wallet/task/514' of https://github.com/Bitcoin-com/Wallet into wallet/task/514 2018-08-07 15:02:43 +09:00
Jean-Baptiste Dominguez
91487cf74c shapeshift add the toAddress in the tx. Sending works. 2018-08-07 15:02:29 +09:00
Brendon Duncan
9b4b3996ae Merge. Also invoice name from third party data. 2018-08-07 17:58:35 +12:00
Brendon Duncan
db7eee984b Error handling for Shapeshift, and UI for destination wallet. 2018-08-07 14:48:43 +12:00
Brendon Duncan
6c46ec2bca Fix for some changes which broke Shapeshift flow. 2018-08-07 14:23:53 +12:00
Brendon Duncan
6dfbbb15d4 Added showSendMaxWarning(). 2018-08-07 12:16:59 +12:00
Brendon Duncan
38852d32d4 Sending BIP70 payments. 2018-08-07 11:59:36 +12:00
Brendon Duncan
7d1fff424a Streamlined display of memo. 2018-08-07 11:34:35 +12:00
Brendon Duncan
e29f97eddf Payment request expiration. 2018-08-07 11:07:19 +12:00
Brendon Duncan
d183077a20 Countdown timer for BIP70 invoices. 2018-08-07 09:39:48 +12:00
Sebastiaan Pasma
5b6f48e6a2
Check min max on shapeshift flow 2018-08-06 18:11:37 +02:00
Sebastiaan Pasma
caafec4625
shapeshift controller 2018-08-06 18:06:10 +02:00
Jean-Baptiste Dominguez
470868ade9 Review screen, cleaning in the same time 2018-08-06 23:19:46 +09: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
Brendon Duncan
9273fb6407 Merge. 2018-08-06 21:46:09 +12:00
Brendon Duncan
cea77e910f One step closer to getting send max working. 2018-08-06 21:46:03 +12:00
Sebastiaan Pasma
ec354bd340
header css 2018-08-06 11:25:29 +02:00
Brendon Duncan
731cfebc8a Fixed destination coin for Shapeshift. 2018-08-06 20:39:59 +12:00
Brendon Duncan
f1f8f6e0f5 Tidied up third party data from BIP70 Payment Protocol. 2018-08-06 20:31:06 +12:00
Brendon Duncan
b0e46f18a1 The Origin screen can now display payment requests properly. 2018-08-06 16:45:00 +12:00
Brendon Duncan
4203a449d9 Displaying requested amount in origin screen. 2018-08-06 13:39:03 +12:00
Brendon Duncan
fb4bc1563c Starting to integrate BIP70 payment protocol into new send flow. 2018-08-06 12:04:14 +12:00
Sebastiaan Pasma
d7fabc3642
header + default colors 2018-08-03 14:28:56 +02:00
Sebastiaan Pasma
cebe9507f1
Make the "to"-address field work in new style + BTC transactions fix 2018-08-03 13:13:29 +02:00
Brendon Duncan
8148ad66b4 Payments to contacts now work. 2018-08-03 20:11:14 +12:00
Brendon Duncan
2f62092fd8 Payment sent message is displayed. 2018-08-03 19:59:25 +12:00
Brendon Duncan
5973b30551 Sends wallet to wallet transaction with sound. 2018-08-03 19:14:33 +12:00
Brendon Duncan
3ca95d6d40 Wallet to wallet transaction sent successfully. The UI for it is still incomplete. 2018-08-03 17:56:46 +12:00
Brendon Duncan
6626663a31 Displays error when transaction amount too low. Reinstated warning colour for transactions with high fees. 2018-08-03 10:41:21 +12:00
Brendon Duncan
f758668395 Title on wallet-to-wallet destination screen. 2018-08-03 08:48:24 +12:00
Sebastiaan Pasma
eef84b25f8
update to txp creation. merged and refactored many features from confirm.js 2018-08-02 18:30:35 +02: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
Brendon Duncan
aeb6efcdd0 UI for sending to contact. 2018-08-02 19:51:50 +12:00
Brendon Duncan
e525b2e8ad UI for destination as wallet. 2018-08-02 18:14:54 +12:00
Brendon Duncan
1590a295da Bugfix for ShapeShift warnings. 2018-08-02 17:10:58 +12:00
Brendon Duncan
dc41aa6044 Warning messages for ShapeShift amounts. 2018-08-02 16:40:00 +12:00