Commit graph

64 commits

Author SHA1 Message Date
Brendon Duncan
a17c3518c3 Manual merge from Sprint 22 for 575. 2018-09-21 14:38:28 -07:00
Brendon Duncan
c0912c5f17 IIFE for reviewController to make merging easier. 2018-09-21 12:31:55 -07:00
Brendon Duncan
7b6efaa1db Clear memo before entering Review screen. 2018-09-17 21:26:21 -07:00
Jean-Baptiste Dominguez
b6f63706f3 Resolution conflicts 2018-09-06 18:21:04 +09:00
Jean-Baptiste Dominguez
98e6e8ac75 Recommendation #brendon :) 2018-09-06 15:17:37 +09:00
Jean-Baptiste Dominguez
fa8ce4779f async series with shapeshift & fee calculation 2018-09-05 15:32:47 +09:00
Jean-Baptiste Dominguez
f7cde7a071 clean up, migrate to no-fix amount 2018-09-05 12:45:20 +09:00
Jean-Baptiste Dominguez
c553b51817 clean up 2018-09-05 11:02:10 +09:00
Jean-Baptiste Dominguez
8322453edf clean send flow state when transaction sent 2018-09-04 11:24:25 +09:00
Brendon Duncan
4315d16f73 The Enter Amount screen now correctly sets the amount when sendMax() is called when available funds exceed the max limit. 2018-09-04 12:52:54 +12:00
Jean-Baptiste Dominguez
162fd685e5 second step enhancement 2018-08-29 17:28:07 +09:00
Sebastiaan Pasma
99d8de02da
Show pasted address instead of always cashaddr format on bch 2018-08-14 15:53:18 +02:00
Brendon Duncan
05e204dec8 Changed the review controller to allow the transaction to be shared, once successful. 2018-08-14 16:58:13 +12:00
Sebastiaan Pasma
1dad3ab3fd
Many translation fixes. Missing translations in template.pot and added some in views 2018-08-13 13:48:41 +02:00
Brendon Duncan
5445ddbecd Fix for wallet selection header when in Shapeshift flow. Also fixed a coin already present bug that occurred in subsequent Shapeshift flows. 2018-08-13 10:00:39 +12:00
Jean-Baptiste Dominguez
4c9ff1b28b Handle error in the review screen 2018-08-10 11:11:53 +09:00
Sebastiaan Pasma
ee0042b6e7
sendMax bugfix when returning to previous screen 2018-08-09 13:39:27 +02:00
Jean-Baptiste Dominguez
a964b2d967 Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537 2018-08-09 13:15:29 +09:00
Jean-Baptiste Dominguez
0ea97fc1c6 Fix state pop on the send flow 2018-08-09 13:14:44 +09:00
Brendon Duncan
7ce562ec64 Fix for Shapeshift now appearing again on Review Transaction screen. 2018-08-09 16:11:29 +12:00
Brendon Duncan
188ddcba58 Review transation copying state at startup so it doesn't contaminate the sendFlowController. 2018-08-09 13:25:06 +12:00
Brendon Duncan
a2dff98c63 Back button on Review Transaction screen works with sendFlowService. 2018-08-09 13:12:44 +12:00
Brendon Duncan
be0c18244e Review Transaction screen now displaying BCH addresses in cashaddr format. 2018-08-09 12:12:29 +12:00
Sebastiaan Pasma
f7ecdb2f2f
sendflow service integrated into flow 2018-08-08 17:10:47 +02: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
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
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
f1f8f6e0f5 Tidied up third party data from BIP70 Payment Protocol. 2018-08-06 20:31:06 +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