Commit graph

5,066 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
8ef930a0a9 Fix init variable when enter in the screen (remove caching) 2018-09-27 11:56:21 +02:00
Jean-Baptiste Dominguez
dd61e72bcf Fix go back anyway 2018-09-26 21:42:35 +02:00
Jean-Baptiste Dominguez
6c0cf4d622 Add a link to shapeshift in case it doesn't work 2018-09-26 21:35:30 +02:00
Jean-Baptiste Dominguez
8f67fde60b Fix - init wallet list 2018-09-26 21:02:03 +02:00
Jean-Baptiste Dominguez
621c60a2ce Set thirdParty on the sendflow 2018-09-26 20:15:25 +02:00
Jean-Baptiste Dominguez
7a78eb1261
Merge branch 'wallet/sprint/21' into wallet/task/546 2018-09-26 15:35:00 +02:00
Jean-Baptiste Dominguez
4f7004f5a3 Set variables before enter in the screen. (Fix lost after merging) 2018-09-26 15:31:48 +02:00
Jean-Baptiste Dominguez
390f8b2427 Solved conflicts 2018-09-26 15:09:14 +02:00
Jean-Baptiste Dominguez
b9a4e11e69
Merge pull request #361 from Bitcoin-com/wallet/task/500
500 - Now handles URIs beginning with 'bch:'.
2018-09-26 12:01:55 +02:00
Brendon Duncan
eacf207b2c Merge with origin. 2018-09-26 16:33:01 +12:00
Brendon Duncan
a426a5abc0 Now handles URIs that begin with 'bch:'. 2018-09-26 16:27:47 +12:00
Brendon Duncan
a9b84f3942 IIFE to reduce conflicts for merging. 2018-09-26 15:39:12 +12:00
Brendon Duncan
6bf0de9974 Remove debug logging and other cleanup. 2018-09-26 15:31:29 +12:00
Brendon Duncan
5b7eb57d76 Fix for sending ShapeShift transaction to Shapeshift deposit address, rather than own wallet. 2018-09-26 15:12:37 +12:00
Brendon Duncan
c657cc5bfb Naming anonymous functions for easier debugging. 2018-09-26 15:11:35 +12:00
Jean-Baptiste Dominguez
fac91ff4f3 Merge branch 'wallet/task/546' of https://github.com/Bitcoin-com/Wallet into wallet/task/546 2018-09-25 16:48:57 +02:00
Jean-Baptiste Dominguez
b5cd9faca7 Shapeshift, return address should be verified with the coin out 2018-09-25 16:48:42 +02:00
Sebastiaan Pasma
fb41fca601
Also apply fix to addLatestTransactions function 2018-09-24 17:13:28 +02:00
Jean-Baptiste Dominguez
8039ea26da Merge branch 'wallet/task/593' of https://github.com/Bitcoin-com/Wallet into wallet/task/593 2018-09-24 16:54:53 +02:00
Jean-Baptiste Dominguez
5401bf9a09 Fix the case where the cache is empty 2018-09-24 16:54:40 +02:00
Jean-Baptiste Dominguez
9f904bb098
Merge pull request #358 from Bitcoin-com/wallet/sprint/21
android fix
2018-09-24 12:32:56 +02:00
Jean-Baptiste Dominguez
37596c3a25
Merge pull request #355 from Bitcoin-com/wallet/task/595
595 - Get Android build working again
2018-09-24 12:29:24 +02:00
Jean-Baptiste Dominguez
dbe920a67b
Merge pull request #357 from Bitcoin-com/wallet/task/546
546 - Bugfix for crashing when scanning BitPay invoice URL
2018-09-24 11:47:16 +02:00
Brendon Duncan
d2178d670f Fix identification of BitPay. 2018-09-23 21:05:26 -07:00
Brendon Duncan
8f8027d573 Reverse out bugfix. 2018-09-23 20:56:15 -07:00
Brendon Duncan
babdc8a13b Restored production setting for page size. 2018-09-23 20:14:42 -07:00
Brendon Duncan
6452a0c7f4 Handling JSON exception. 2018-09-23 13:06:36 -07:00
Brendon Duncan
1b0541a7b5 Return error from Shapeshift when pairs are unavailable. 2018-09-22 22:22:06 -07:00
Brendon Duncan
c661798cd1 Android Debug and release builds work when Gradle 3.3 is in PATH. 2018-09-22 17:45:19 -07:00
Brendon Duncan
a5a1d3edb6 Remove debug logging. 2018-09-22 11:07:24 -07:00
Brendon Duncan
0ba4db83e0 Handling confirmation updates correctly for early transactions. 2018-09-22 11:03:26 -07:00
Brendon Duncan
ff40317d87 Merged fix for wallet transaction history. 2018-09-21 16:45:46 -07:00
Brendon Duncan
2e1cc9fa87 Showing cached history first when entering Wallet Details screen. 2018-09-21 16:43:27 -07:00
Brendon Duncan
cecad4a072 Merged 575. 2018-09-21 14:58:39 -07:00
Brendon Duncan
61c91d518a Merge branch 'wallet/sprint/21'. 2018-09-21 14:50:47 -07:00
Brendon Duncan
a17c3518c3 Manual merge from Sprint 22 for 575. 2018-09-21 14:38:28 -07:00
Brendon Duncan
6554b385cb
Merge pull request #345 from Bitcoin-com/wallet/task/591
591 - Wallet balance directive fails to get fiat balance sometimes
2018-09-21 12:53:46 -07:00
Brendon Duncan
c0912c5f17 IIFE for reviewController to make merging easier. 2018-09-21 12:31:55 -07:00
Brendon Duncan
e7eac1ee16
Merge pull request #335 from Bitcoin-com/wallet/task/586
Bug - 586 - Reconnect WebSocket when connection is failing or lost.
2018-09-21 11:35:27 -07:00
Brendon Duncan
46413fa6aa
Merge pull request #346 from Bitcoin-com/wallet/task/593
Bug - 593 - Update confirmations on cached transactions
2018-09-21 11:29:30 -07:00
Brendon Duncan
fb2802f392
Merge pull request #347 from Bitcoin-com/wallet/task/546
546 - Fix modal & shapeshift
2018-09-21 11:26:08 -07:00
Brendon Duncan
ea51e035ab Fixed updating of confirmations of cached transactions. Cache now properly cleared on first fetch from Wallet Details screen. 2018-09-21 03:56:51 -07:00
Brendon Duncan
0c8d145f73 Check validity of cachedStatus. 2018-09-21 02:54:06 -07:00
Jean-Baptiste Dominguez
a8e5c212f0 Fix : Check if the status could be set before checking the balance. 2018-09-21 11:41:20 +02:00
Jean-Baptiste Dominguez
4250a98718 walletStatus worst case, IIFE for both controllers. 2018-09-21 11:31:27 +02:00
Brendon Duncan
a3614566e3 Reconnecting socket based on CloseEvent.code. 2018-09-21 02:27:34 -07:00
Jean-Baptiste Dominguez
5cb3d7521d Fix modal 2018-09-21 10:23:02 +02:00
Sebastiaan Pasma
3cad7d7ad8
Update confirmations on cached transactions 2018-09-20 15:58:42 +02:00
Brendon Duncan
4d6aeb4f91 Renamed directive and replaced old variable references with new ones. 2018-09-18 15:26:30 -07:00
Brendon Duncan
7b6efaa1db Clear memo before entering Review screen. 2018-09-17 21:26:21 -07:00