Commit graph

12,886 commits

Author SHA1 Message Date
Sebastiaan Pasma
fc5f6cfa65
Remove wallet preferences from App Settings and change the route to be able to use inside wallet Details (within tab-home) 2018-10-02 14:55:31 +02:00
Sebastiaan Pasma
5896dac9b7
Merge branch 'wallet/sprint/21' into wallet/task/497 2018-10-02 14:38:04 +02:00
Sebastiaan Pasma
26674447e1
Merge remote-tracking branch 'origin/wallet/sprint/22' into wallet/task/497 2018-10-02 14:37:51 +02:00
Sebastiaan Pasma
0598a07af7
Merge pull request #354 from Bitcoin-com/wallet/task/593
593 - Bugfix for Confirmation-changes not applied to unconfirmed transactions
2018-09-24 14:06:02 +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
d72a71d920 RC version. 2018-09-21 17:21:59 -07:00
Brendon Duncan
4d623d51d7 Merged sprint 21. 2018-09-21 17:16:18 -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
977d03429d
Merge pull request #343 from Bitcoin-com/wallet/task/590
590 - The Personal Note field is not cleared between transactions.
2018-09-21 11:47:28 +02: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
Sebastiaan Pasma
33df5044d5
Hardware back button support 2018-09-19 11:37:46 +02:00
Sebastiaan Pasma
f8a65c4932
Merge branch 'wallet/sprint/22' into wallet/task/497 2018-09-19 11:20:52 +02:00
Brendon Duncan
4d6aeb4f91 Renamed directive and replaced old variable references with new ones. 2018-09-18 15:26:30 -07:00
Sebastiaan Pasma
276bce8bc4
disable animation 2018-09-18 15:19:06 +02:00
Sebastiaan Pasma
78e4942fd6
Merge pull request #339 from Bitcoin-com/wallet/task/589
589 - Fix mobile build scripts
2018-09-18 13:51:54 +02:00
Brendon Duncan
7b6efaa1db Clear memo before entering Review screen. 2018-09-17 21:26:21 -07:00
Sebastiaan Pasma
daf39c2407
Merge remote-tracking branch 'origin/wallet/sprint/22' into wallet/task/497 2018-09-17 13:41:52 +02:00
Brendon Duncan
ebc32a2d85 Added 'default' to mobile debug build configs. 2018-09-16 21:04:41 -07:00
Brendon Duncan
e02368ea3c Incremented version for release candidate. 2018-09-15 18:05:39 +12:00
Brendon Duncan
92c1b4b346 Merged translations from sprint. 2018-09-15 18:02:00 +12:00
Brendon Duncan
8bf31f97d8 Updated translations from Crowdin. 2018-09-15 18:00:34 +12:00
Brendon Duncan
f3902ba3f0 Merged sprint to get fix for Wallet Details transaction list. 2018-09-15 17:32:55 +12:00
Brendon Duncan
6aa7ee2bbb
Merge pull request #338 from Bitcoin-com/wallet/task/588
588 - Transaction list in Wallet Details disappearing and reappearing
2018-09-15 17:29:56 +12:00
Brendon Duncan
ac82b51848 Takes into account size of current transaction list when determining if overlap in transactions is enough to assume all have been retrieved. 2018-09-15 14:45:39 +12:00
Sebastiaan Pasma
1615db9890
Wallet Settings button in Wallet Details 2018-09-13 14:49:06 +02:00