Commit graph

1,450 commits

Author SHA1 Message Date
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
Sebastiaan Pasma
e4c5da0d44
thirdParty fix 2018-08-10 12:07:24 +02:00
Sebastiaan Pasma
8b19f599b6
Merge remote-tracking branch 'origin/wallet/task/537' into wallet/sprint/20 2018-08-09 13:46:34 +02:00
Sebastiaan Pasma
420305cf01
shapeshift moved to default services and communities fix 2018-08-09 10:16:45 +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
c68b1e77f6 clean controller and remove old firebase event 2018-08-09 15:09:43 +09:00
Jean-Baptiste Dominguez
e183643298 Remove from the route the stateparams, adapt some controllers in the new sendflowservice 2018-08-09 12:35:39 +09:00
Brendon Duncan
0410182d4f Incoming data working with sendFlowService. 2018-08-09 13:24:13 +12:00
Brendon Duncan
b426209efb Fix for clearing current state only. 2018-08-09 13:06:50 +12:00
Brendon Duncan
bf9b467bfe Renamed sendFlowService functions to be more consistent. 2018-08-09 13:01:48 +12:00
Brendon Duncan
1d025cbf35 Fixes for Android 4.4 2018-08-09 11:42:25 +12:00
Brendon Duncan
dff0d51ef3 Refactored sendFlowService and cleared its state before entering the send tab. 2018-08-09 11:10:26 +12:00
Sebastiaan Pasma
2206102715
sendflow service integrated into flow 2018-08-08 17:27:15 +02:00
Sebastiaan Pasma
f7ecdb2f2f
sendflow service integrated into flow 2018-08-08 17:10:47 +02:00
Sebastiaan Pasma
8229d51fdd
sendflow service 2018-08-08 16:35:49 +02:00
Jean-Baptiste Dominguez
ab13478f79 Add shapeshift service item 2018-08-08 16:03:34 +09:00
Brendon Duncan
ae6dcea81a Fix for getting Shapeshift working. 2018-08-08 18:58:26 +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
7f0946b390
Merge branch 'wallet/sprint/20' into wallet/task/441 2018-08-08 10:56:26 +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
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
9420b63728 Fix shapeshift, remove the cancelTx. Remove the timer with the getStatus 2018-08-07 20:11:21 +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
d26a96500b eGifter incomingData 2018-08-07 15:30:28 +09:00
Brendon Duncan
9b4b3996ae Merge. Also invoice name from third party data. 2018-08-07 17:58:35 +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
c800e8efe5 incomingData, bip70 & bitpay 2018-08-07 13:56:56 +09:00
Brendon Duncan
d183077a20 Countdown timer for BIP70 invoices. 2018-08-07 09:39:48 +12: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
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
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
cebe9507f1
Make the "to"-address field work in new style + BTC transactions fix 2018-08-03 13:13:29 +02:00
Brendon Duncan
e649da69ef In WalletService, createAddress now terminated properly, preventing double callback. 2018-08-03 17:11:47 +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
Jean-Baptiste Dominguez
9c8ec7d3a2 Fix tx history 2018-08-03 01:17:01 +09:00
Jean-Baptiste Dominguez
66c9cefb0c Fix the tx history 2018-08-03 01:15:54 +09:00
Sebastiaan Pasma
01dd774fae
thirdParty updates + shapeshift screens + merged with review transaction 2018-08-02 15:15:23 +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