Commit graph

12,358 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
a295c03b2e Merge branch 'wallet/task/514' of https://github.com/Bitcoin-com/Wallet into wallet/task/514 2018-08-07 17:37:32 +09:00
Jean-Baptiste Dominguez
485039223f egifter template 2018-08-07 17:37:23 +09:00
Sebastiaan Pasma
52ca7bafd7
Merge remote-tracking branch 'origin/wallet/task/514' into wallet/task/514 2018-08-07 09:54:43 +02:00
Sebastiaan Pasma
83b1977a6f
Shapeshift controller useless functions removed 2018-08-07 09:47:37 +02:00
Jean-Baptiste Dominguez
37614f0811 Change to svg for egifter 2018-08-07 16:45:58 +09:00
Jean-Baptiste Dominguez
1aa31b6935 egifter template, waiting the logo in svg. 2018-08-07 16:36:33 +09:00
Jean-Baptiste Dominguez
d26a96500b eGifter incomingData 2018-08-07 15:30:28 +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
59d1704673 Fix for display of fee when not for a BIP70 invoice. 2018-08-07 17:34:28 +12:00
Jean-Baptiste Dominguez
886204d8b0 incomingData time for bch 2018-08-07 14:34:02 +09:00
Jean-Baptiste Dominguez
a9711c2575 Fix incomingData, expires different depending on btc or bch (bitpay...) 2018-08-07 14:02:53 +09:00
Jean-Baptiste Dominguez
37402e45af Merge branch 'wallet/task/514' of https://github.com/Bitcoin-com/Wallet into wallet/task/514 2018-08-07 13:57:06 +09:00
Jean-Baptiste Dominguez
c800e8efe5 incomingData, bip70 & bitpay 2018-08-07 13:56:56 +09: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
09f627ea51 Suggested by merchant. 2018-08-07 11:27:05 +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
3652419b0d Fix double id 2018-08-06 22:21:40 +09:00
Jean-Baptiste Dominguez
bb3b00ae8d Fix incomingData toAddress, mistake 2018-08-06 22:20:51 +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
Sam Cheng Hung
671b46da41 Changes address component name to address-frame 2018-08-03 15:33:25 +08: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
Sam Cheng Hung
f96610a66b Removes border and background from Paste Address button for send tab page 2018-08-03 13:35:05 +08:00
Brendon Duncan
e649da69ef In WalletService, createAddress now terminated properly, preventing double callback. 2018-08-03 17:11:47 +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