Jean-Baptiste Dominguez
|
77de49ca89
|
Merge pull request #365 from Bitcoin-com/wallet/sprint/21
Wallet/sprint/21
|
2018-09-26 21:44:39 +02:00 |
|
Jean-Baptiste Dominguez
|
464ed67ed5
|
Merge pull request #364 from Bitcoin-com/wallet/task/546
546 - Handle shapeshift error
|
2018-09-26 21:44:12 +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
|
b0283cee18
|
Merge pull request #363 from Bitcoin-com/wallet/task/546
546 - Fixes lost after the merge + fix send flow
|
2018-09-26 21:07:22 +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
|
f0d020f538
|
config version update
|
2018-09-24 17:49:37 +02:00 |
|
Sebastiaan Pasma
|
d410acbba2
|
Merge remote-tracking branch 'origin/wallet/sprint/21' into wallet/dev
|
2018-09-24 17:45:38 +02:00 |
|
Sebastiaan Pasma
|
acacb5660b
|
Merge pull request #359 from Bitcoin-com/wallet/task/593
593 - Fix when the cache is empty
|
2018-09-24 17:25:15 +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 |
|
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 |
|
Jean-Baptiste Dominguez
|
9e01303f37
|
Fix erase from a merge
|
2018-09-22 12:00:58 +02:00 |
|
Jean-Baptiste Dominguez
|
e3a82a1118
|
Reactivate shapeshift
|
2018-09-22 12:00:10 +02:00 |
|
Jean-Baptiste Dominguez
|
ef8e7ac501
|
Fix RC version
|
2018-09-22 11:59:18 +02:00 |
|
Jean-Baptiste Dominguez
|
3b0b85f234
|
Merge pull request #352 from Bitcoin-com/wallet/prod
Wallet/prod
|
2018-09-22 11:58:39 +02:00 |
|
Jean-Baptiste Dominguez
|
5d1ed16ab5
|
Merge pull request #348 from Bitcoin-com/master
Merge the hotfixes
|
2018-09-22 11:01:14 +02:00 |
|
Jean-Baptiste Dominguez
|
49a6711970
|
Merge branch 'wallet/prod' into master
|
2018-09-22 10:59:24 +02: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 |
|