anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Commit graph

  • 8e73e4c16d Merge branch 'develop' master A R Hansen 2018-10-12 12:50:54 +02:00
  • 06f1f4df91 - ll - develop A R Hansen 2018-10-12 12:48:15 +02:00
  • 70f520ea43 adding instructions A R Hansen 2018-10-12 12:46:09 +02:00
  • f1d2b00b2b set up my own bitcore server and changed the url. for some reason Bitcoin.com's server won't accept 0 fee txs. A R Hansen 2018-10-12 11:53:16 +02:00
  • 4e524a7500 Not needed. A R Hansen 2018-10-08 02:16:43 +02:00
  • c0a14fe11c Merge ZeroFeeTxs A R Hansen 2018-10-08 02:01:15 +02:00
  • d47393f160 .. A R Hansen 2018-10-08 02:00:36 +02:00
  • 898b7d03fe 0 fee transaction feature added. A R Hansen 2018-10-08 01:55:55 +02:00
  • 81f4c05f48
         Change UI after balance change wallet/task/488 Sebastiaan Pasma 2018-10-04 14:36:08 +02:00
  • b19704e633
         Text change Mining Pool + template.pot change wallet/task/535 Sebastiaan Pasma 2018-10-04 11:40:48 +02:00
  • dbe2766de3 Cleaning up, and the balance is no longer checked after the first change. Brendon Duncan 2018-10-04 21:13:04 +13:00
  • 6e344ea8c0 Detecting when balance has updated. Brendon Duncan 2018-10-04 20:52:22 +13:00
  • 8e9104f6f2 Resource file for Android FCM icon. wallet/task/473 Brendon Duncan 2018-10-04 12:54:28 +13:00
  • 3665ad6764 Adding missing parts to Android build scripts. Brendon Duncan 2018-10-04 12:52:20 +13:00
  • 3f359f033e
         openWalletSettings-function + refactor of addresses-route.. Removed unused paths. wallet/task/497 Sebastiaan Pasma 2018-10-02 15:48:50 +02:00
  • 9b7827236c
         remove unused goBack function Sebastiaan Pasma 2018-10-02 15:02:04 +02:00
  • 2cbf6ef50e
         Removed some unused previous situation code. Sebastiaan Pasma 2018-10-02 15:00:11 +02:00
  • fc5f6cfa65
         Remove wallet preferences from App Settings and change the route to be able to use inside wallet Details (within tab-home) Sebastiaan Pasma 2018-10-02 14:55:31 +02:00
  • 5896dac9b7
         Merge branch 'wallet/sprint/21' into wallet/task/497 Sebastiaan Pasma 2018-10-02 14:38:04 +02:00
  • 26674447e1
         Merge remote-tracking branch 'origin/wallet/sprint/22' into wallet/task/497 Sebastiaan Pasma 2018-10-02 14:37:51 +02:00
  • 30b23d0358
         Merge pull request #369 from Bitcoin-com/wallet/dev 5.1-rc5 wallet/release/5.1-rc5 wallet/prod Jean-Baptiste Dominguez 2018-09-28 00:44:39 +02:00
  • db58b70ca1
         Update appConfig.json wallet/dev Jean-Baptiste Dominguez 2018-09-28 00:35:51 +02:00
  • 5ef94dd9c1
         Merge pull request #368 from Bitcoin-com/wallet/sprint/21 Jean-Baptiste Dominguez 2018-09-28 00:35:13 +02:00
  • 21f89a2f62
         Merge pull request #367 from Bitcoin-com/wallet/task/546 wallet/sprint/21 Jean-Baptiste Dominguez 2018-09-28 00:32:47 +02:00
  • 9a94bc2f49
         Address without prefix not working bug fix. wallet/task/546 Sebastiaan Pasma 2018-09-27 13:31:48 +02:00
  • 8ef930a0a9 Fix init variable when enter in the screen (remove caching) Jean-Baptiste Dominguez 2018-09-27 11:56:21 +02:00
  • 63693362c4
         Merge pull request #366 from Bitcoin-com/wallet/dev wallet/release/5.1-rc4 Jean-Baptiste Dominguez 2018-09-26 21:47:03 +02:00
  • e14ab5dab3
         Update appConfig.json Jean-Baptiste Dominguez 2018-09-26 21:46:07 +02:00
  • 77de49ca89
         Merge pull request #365 from Bitcoin-com/wallet/sprint/21 Jean-Baptiste Dominguez 2018-09-26 21:44:39 +02:00
  • 464ed67ed5
         Merge pull request #364 from Bitcoin-com/wallet/task/546 Jean-Baptiste Dominguez 2018-09-26 21:44:12 +02:00
  • dd61e72bcf Fix go back anyway Jean-Baptiste Dominguez 2018-09-26 21:42:35 +02:00
  • 6c0cf4d622 Add a link to shapeshift in case it doesn't work Jean-Baptiste Dominguez 2018-09-26 21:35:30 +02:00
  • b0283cee18
         Merge pull request #363 from Bitcoin-com/wallet/task/546 Jean-Baptiste Dominguez 2018-09-26 21:07:22 +02:00
  • 8f67fde60b Fix - init wallet list Jean-Baptiste Dominguez 2018-09-26 21:02:03 +02:00
  • 621c60a2ce Set thirdParty on the sendflow Jean-Baptiste Dominguez 2018-09-26 20:15:25 +02:00
  • 7a78eb1261
         Merge branch 'wallet/sprint/21' into wallet/task/546 Jean-Baptiste Dominguez 2018-09-26 15:35:00 +02:00
  • 4f7004f5a3 Set variables before enter in the screen. (Fix lost after merging) Jean-Baptiste Dominguez 2018-09-26 15:31:48 +02:00
  • 390f8b2427 Solved conflicts Jean-Baptiste Dominguez 2018-09-26 15:09:14 +02:00
  • 4692e0d91d Unit test case for 2 items in cache and that being all of the transactions. wallet/task/593 Brendon Duncan 2018-09-26 22:38:29 +12:00
  • 9cfc05dedd Unit test cases to cover confirmations increasing, and insufficient overlap. Brendon Duncan 2018-09-26 22:05:31 +12:00
  • b9a4e11e69
         Merge pull request #361 from Bitcoin-com/wallet/task/500 Jean-Baptiste Dominguez 2018-09-26 12:01:55 +02:00
  • 5825ff26b8 A few more test cases. Brendon Duncan 2018-09-26 21:50:42 +12:00
  • 2d0e5c5f79 Started on unit tests for wallet history. Brendon Duncan 2018-09-26 18:24:24 +12:00
  • d68870f743 Bugfix for getting wallet history when cache is empty, while still enforcing overlap in transactions when cache contains transactions, to ensure no transactions are missed. Brendon Duncan 2018-09-26 18:03:14 +12:00
  • eacf207b2c Merge with origin. wallet/task/500 Brendon Duncan 2018-09-26 16:33:01 +12:00
  • a426a5abc0 Now handles URIs that begin with 'bch:'. Brendon Duncan 2018-09-26 16:27:47 +12:00
  • a9b84f3942 IIFE to reduce conflicts for merging. Brendon Duncan 2018-09-26 15:39:12 +12:00
  • 6bf0de9974 Remove debug logging and other cleanup. Brendon Duncan 2018-09-26 15:31:29 +12:00
  • 5b7eb57d76 Fix for sending ShapeShift transaction to Shapeshift deposit address, rather than own wallet. Brendon Duncan 2018-09-26 15:12:37 +12:00
  • c657cc5bfb Naming anonymous functions for easier debugging. Brendon Duncan 2018-09-26 15:11:35 +12:00
  • fac91ff4f3 Merge branch 'wallet/task/546' of https://github.com/Bitcoin-com/Wallet into wallet/task/546 Jean-Baptiste Dominguez 2018-09-25 16:48:57 +02:00
  • b5cd9faca7 Shapeshift, return address should be verified with the coin out Jean-Baptiste Dominguez 2018-09-25 16:48:42 +02:00
  • c3043e6824
         Merge remote-tracking branch 'origin/wallet/prod' into wallet/prod 5.1-rc3 wallet/release/5.1-rc3 Sebastiaan Pasma 2018-09-24 17:54:11 +02:00
  • f0d020f538
         config version update Sebastiaan Pasma 2018-09-24 17:49:37 +02:00
  • d410acbba2
         Merge remote-tracking branch 'origin/wallet/sprint/21' into wallet/dev Sebastiaan Pasma 2018-09-24 17:45:38 +02:00
  • acacb5660b
         Merge pull request #359 from Bitcoin-com/wallet/task/593 Sebastiaan Pasma 2018-09-24 17:25:15 +02:00
  • fb41fca601
         Also apply fix to addLatestTransactions function Sebastiaan Pasma 2018-09-24 17:13:28 +02:00
  • 8039ea26da Merge branch 'wallet/task/593' of https://github.com/Bitcoin-com/Wallet into wallet/task/593 Jean-Baptiste Dominguez 2018-09-24 16:54:53 +02:00
  • 5401bf9a09 Fix the case where the cache is empty Jean-Baptiste Dominguez 2018-09-24 16:54:40 +02:00
  • 0598a07af7
         Merge pull request #354 from Bitcoin-com/wallet/task/593 Sebastiaan Pasma 2018-09-24 14:06:02 +02:00
  • 9f904bb098
         Merge pull request #358 from Bitcoin-com/wallet/sprint/21 Jean-Baptiste Dominguez 2018-09-24 12:32:56 +02:00
  • 37596c3a25
         Merge pull request #355 from Bitcoin-com/wallet/task/595 Jean-Baptiste Dominguez 2018-09-24 12:29:24 +02:00
  • dbe920a67b
         Merge pull request #357 from Bitcoin-com/wallet/task/546 Jean-Baptiste Dominguez 2018-09-24 11:47:16 +02:00
  • d2178d670f Fix identification of BitPay. Brendon Duncan 2018-09-23 21:05:26 -07:00
  • 8f8027d573 Reverse out bugfix. Brendon Duncan 2018-09-23 20:56:15 -07:00
  • babdc8a13b Restored production setting for page size. Brendon Duncan 2018-09-23 20:14:42 -07:00
  • 6452a0c7f4 Handling JSON exception. Brendon Duncan 2018-09-23 13:06:36 -07:00
  • 1b0541a7b5 Return error from Shapeshift when pairs are unavailable. Brendon Duncan 2018-09-22 22:22:06 -07:00
  • c661798cd1 Android Debug and release builds work when Gradle 3.3 is in PATH. wallet/task/595 Brendon Duncan 2018-09-22 17:45:19 -07:00
  • a5a1d3edb6 Remove debug logging. Brendon Duncan 2018-09-22 11:07:24 -07:00
  • 0ba4db83e0 Handling confirmation updates correctly for early transactions. Brendon Duncan 2018-09-22 11:03:26 -07:00
  • 10b9b0c5c9
         Merge pull request #353 from Bitcoin-com/wallet/dev 5.1-rc2 wallet/release/5.1-rc2 Jean-Baptiste Dominguez 2018-09-22 12:01:47 +02:00
  • 9e01303f37
         Fix erase from a merge Jean-Baptiste Dominguez 2018-09-22 12:00:58 +02:00
  • e3a82a1118
         Reactivate shapeshift Jean-Baptiste Dominguez 2018-09-22 12:00:10 +02:00
  • ef8e7ac501
         Fix RC version Jean-Baptiste Dominguez 2018-09-22 11:59:18 +02:00
  • 3b0b85f234
         Merge pull request #352 from Bitcoin-com/wallet/prod Jean-Baptiste Dominguez 2018-09-22 11:58:39 +02:00
  • 5d1ed16ab5
         Merge pull request #348 from Bitcoin-com/master Jean-Baptiste Dominguez 2018-09-22 11:01:14 +02:00
  • 49a6711970
         Merge branch 'wallet/prod' into master Jean-Baptiste Dominguez 2018-09-22 10:59:24 +02:00
  • d72a71d920 RC version. wallet/sprint/22 Brendon Duncan 2018-09-21 17:21:59 -07:00
  • 4d623d51d7 Merged sprint 21. Brendon Duncan 2018-09-21 17:16:18 -07:00
  • ff40317d87 Merged fix for wallet transaction history. Brendon Duncan 2018-09-21 16:45:46 -07:00
  • 2e1cc9fa87 Showing cached history first when entering Wallet Details screen. Brendon Duncan 2018-09-21 16:43:27 -07:00
  • cecad4a072 Merged 575. Brendon Duncan 2018-09-21 14:58:39 -07:00
  • 61c91d518a Merge branch 'wallet/sprint/21'. Brendon Duncan 2018-09-21 14:50:47 -07:00
  • a17c3518c3 Manual merge from Sprint 22 for 575. Brendon Duncan 2018-09-21 14:38:28 -07:00
  • 6554b385cb
         Merge pull request #345 from Bitcoin-com/wallet/task/591 Brendon Duncan 2018-09-21 12:53:46 -07:00
  • c0912c5f17 IIFE for reviewController to make merging easier. Brendon Duncan 2018-09-21 12:31:55 -07:00
  • e7eac1ee16
         Merge pull request #335 from Bitcoin-com/wallet/task/586 Brendon Duncan 2018-09-21 11:35:27 -07:00
  • 46413fa6aa
         Merge pull request #346 from Bitcoin-com/wallet/task/593 Brendon Duncan 2018-09-21 11:29:30 -07:00
  • fb2802f392
         Merge pull request #347 from Bitcoin-com/wallet/task/546 Brendon Duncan 2018-09-21 11:26:08 -07:00
  • ea51e035ab Fixed updating of confirmations of cached transactions. Cache now properly cleared on first fetch from Wallet Details screen. Brendon Duncan 2018-09-21 03:56:51 -07:00
  • 8e1ffbb008 Fix new format wallet/task/557 Jean-Baptiste Dominguez 2018-09-21 12:00:21 +02:00
  • 0c8d145f73 Check validity of cachedStatus. wallet/task/575 Brendon Duncan 2018-09-21 02:54:06 -07:00
  • 977d03429d
         Merge pull request #343 from Bitcoin-com/wallet/task/590 Jean-Baptiste Dominguez 2018-09-21 11:47:28 +02:00
  • a8e5c212f0 Fix : Check if the status could be set before checking the balance. Jean-Baptiste Dominguez 2018-09-21 11:41:20 +02:00
  • 4250a98718 walletStatus worst case, IIFE for both controllers. Jean-Baptiste Dominguez 2018-09-21 11:31:27 +02:00
  • a3614566e3 Reconnecting socket based on CloseEvent.code. wallet/task/586 Brendon Duncan 2018-09-21 02:27:34 -07:00
  • 5cb3d7521d Fix modal Jean-Baptiste Dominguez 2018-09-21 10:23:02 +02:00
  • 3cad7d7ad8
         Update confirmations on cached transactions Sebastiaan Pasma 2018-09-20 15:58:42 +02:00
  • 33df5044d5
         Hardware back button support Sebastiaan Pasma 2018-09-19 11:37:46 +02:00