anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity
12,886 commits 154 branches 37 tags 83 MiB
Commit graph

3,222 commits

Author SHA1 Message Date
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
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
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
a17c3518c3 Manual merge from Sprint 22 for 575. 2018-09-21 14:38:28 -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
Brendon Duncan
7b6efaa1db Clear memo before entering Review screen. 2018-09-17 21:26:21 -07:00
Sebastiaan Pasma
e6d8ddb360
 		update wallets in the promise callback 2018-09-13 09:54:53 +02:00
Sebastiaan Pasma
eb3067d369
 		Use cachedStatus when available and a fix for the review controller 2018-09-13 09:47:45 +02:00
Sebastiaan Pasma
908dcbf968
 		Add the received wallet status to the wallet API object 2018-09-12 16:50:26 +02:00
Sebastiaan Pasma
6692812d55
 		Websocket reconnect (and close old connection on leave) 2018-09-12 15:09:21 +02:00
Sebastiaan Pasma
ad4aa76902
 		Empty origin wallet screen bug 2018-09-11 14:55:22 +02:00
Jean-Baptiste Dominguez
230b6e2228 Merge 2018-09-07 01:41:13 +09:00
Jean-Baptiste Dominguez
9c0b54a7ce
 		Merge pull request #326 from Bitcoin-com/wallet/task/562 
Bug - 562 - No notification when a new release version is available (Mac OSX github)
 2018-09-06 22:12:45 +09:00
Jean-Baptiste Dominguez
6a8f8ca33b Fix to send the amount if shapeshift case 2018-09-06 20:29:50 +09:00
Jean-Baptiste Dominguez
176f0c3141 Fix to provide an amount (canSendMax was never set to false when shapeshift) 2018-09-06 20:16:25 +09:00
Jean-Baptiste Dominguez
b6f63706f3 Resolution conflicts 2018-09-06 18:21:04 +09:00
Jean-Baptiste Dominguez
b0178c0673
 		Merge pull request #327 from Bitcoin-com/wallet/task/567 
Improvement - 567 - Stuttering animation when scrolling transaction history.
 2018-09-06 17:16:53 +09:00
Jean-Baptiste Dominguez
688f2b97bc
 		Merge pull request #324 from Bitcoin-com/wallet/task/546 
546 - revamp shapeshift service
 2018-09-06 17:13:05 +09:00
Jean-Baptiste Dominguez
98e6e8ac75 Recommendation #brendon :) 2018-09-06 15:17:37 +09:00
Brendon Duncan
3de34dbf15 Renaming to follow new convention. 2018-09-06 11:34:00 +12:00
Brendon Duncan
394317bc46 Better default error message for Shapeshift error. 2018-09-06 11:27:48 +12:00
Sebastiaan Pasma
22e1c397d0
 		Removed duplicate android header + refactored animation to use CSS animations instead of javascript calculated animations 2018-09-05 16:19:31 +02:00
Sebastiaan Pasma
74a9fe9691
 		Merge branch 'wallet/sprint/21' into wallet/task/567 2018-09-05 14:11:51 +02:00
Sebastiaan Pasma
70663492eb
 		Merge branch 'wallet/sprint/21' into wallet/task/562 
# Conflicts:
#	src/js/controllers/tab-home.controller.js
 2018-09-05 14:07:23 +02:00
Jean-Baptiste Dominguez
2d6a1528c1 handle errors properly 2018-09-05 17:23:09 +09:00
Jean-Baptiste Dominguez
fa8ce4779f async series with shapeshift & fee calculation 2018-09-05 15:32:47 +09:00
Brendon Duncan
d01baa6060 Better handling of Shapeshift error. 2018-09-05 18:16:01 +12:00
Jean-Baptiste Dominguez
f7cde7a071 clean up, migrate to no-fix amount 2018-09-05 12:45:20 +09:00
Jean-Baptiste Dominguez
c553b51817 clean up 2018-09-05 11:02:10 +09:00
Sebastiaan Pasma
001cd82afb
 		getMarketData can return an error 2018-09-04 17:52:53 +02:00
Sebastiaan Pasma
793bfee6a2
 		Changed wallet details transition behaviour 2018-09-04 16:36:05 +02:00
Brendon Duncan
6c8a1cfd5a Bugfix for using cached status in Enter Amount screen. 2018-09-04 20:48:16 +12:00
Brendon Duncan
3ab535a36b Improved handling of available funds below min amount. 2018-09-04 19:47:50 +12:00
Jean-Baptiste Dominguez
ce3fcacac3
 		Merge pull request #308 from Bitcoin-com/wallet/task/490 
Bug - 490 - Korean Won isn't automatically selected when phone is in Korean (fiat currency)
 2018-09-04 15:27:32 +09:00
Jean-Baptiste Dominguez
cf1dc66b59 renaming files 2018-09-04 11:56:13 +09:00
Jean-Baptiste Dominguez
23659b0cd4 Rename files reviewed 2018-09-04 11:35:01 +09:00