Commit graph

12,631 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
b25879b251
Merge pull request #268 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
2018-08-13 15:33:24 +09:00
Jean-Baptiste Dominguez
e27aa9a612
Merge pull request #267 from Bitcoin-com/wallet/task/427
Custom amount crypto decimal
2018-08-13 14:45:18 +09:00
Jean-Baptiste Dominguez
c54cb55c51 Custom amount crypto decimal 2018-08-13 14:44:07 +09:00
Jean-Baptiste Dominguez
08ff6f2a6c
Merge pull request #266 from Bitcoin-com/wallet/task/427
Manage the currency state
2018-08-13 14:14:34 +09:00
Jean-Baptiste Dominguez
52e1b5e811 Manage the currency state 2018-08-13 14:13:49 +09:00
Brendon Duncan
b7d2c3e05c Merged fixes to Wallet Details. 2018-08-13 17:00:32 +12:00
Brendon Duncan
0b71daf04d Removed previous fix as it is superceded by a better one. 2018-08-13 16:51:38 +12:00
Brendon Duncan
6de4f2ecda Enlarged Wallet Details header to fit Receive and Send buttons without covering the unlocked balance. 2018-08-13 16:45:46 +12:00
Jean-Baptiste Dominguez
803653135f
Merge pull request #265 from Bitcoin-com/wallet/task/427
Fix formatted amount.
2018-08-13 13:37:28 +09:00
Jean-Baptiste Dominguez
430f4644eb Fix formatted amount. 2018-08-13 13:32:20 +09:00
Brendon Duncan
5da475f1ee Merged sprint/20. 2018-08-13 15:55:57 +12:00
Brendon Duncan
a29a41b647 Removed console.log(). 2018-08-13 15:48:20 +12:00
Brendon Duncan
098d454b8b Fixed formatting of numbers in the thousands. 2018-08-13 15:43:20 +12:00
Brendon Duncan
9d918a694c Merged fixes.
# Conflicts:
#	src/js/controllers/walletSelectorController.js
2018-08-13 14:36:59 +12:00
Brendon Duncan
80c9d682b5 Fix in formatted-amount of display of subcent fees in transactions details page. 2018-08-13 11:23:15 +12:00
Brendon Duncan
84fd483f19 Fix for removing dark portion of Review Transaction screen below personal note. 2018-08-13 10:47:00 +12:00
Brendon Duncan
5445ddbecd Fix for wallet selection header when in Shapeshift flow. Also fixed a coin already present bug that occurred in subsequent Shapeshift flows. 2018-08-13 10:00:39 +12:00
Sebastiaan Pasma
4dd1c6f40b
Merge remote-tracking branch 'origin/wallet/task/537' into wallet/sprint/20 2018-08-10 15:11:10 +02:00
Sebastiaan Pasma
d28ba24e1c
receive specific amount fix to use sendFlowService 2018-08-10 15:10:44 +02:00
Sebastiaan Pasma
f86ab3faec
revert code cleanup 2018-08-10 12:42:28 +02:00
Sebastiaan Pasma
f69b72b24f
Merge remote-tracking branch 'origin/wallet/sprint/20' into wallet/sprint/20 2018-08-10 12:12:45 +02:00
Sebastiaan Pasma
0339d6e85e
Merge remote-tracking branch 'origin/wallet/task/537' into wallet/sprint/20 2018-08-10 12:12:37 +02:00
Sebastiaan Pasma
335ef9defd
Merge remote-tracking branch 'origin/wallet/task/537' into wallet/task/537 2018-08-10 12:12:20 +02:00
Jean-Baptiste Dominguez
3cf577fcfb
Merge pull request #263 from Bitcoin-com/wallet/task/537
Cleaning code
2018-08-10 19:11:22 +09:00
Sebastiaan Pasma
e4c5da0d44
thirdParty fix 2018-08-10 12:07:24 +02:00
Jean-Baptiste Dominguez
949cbc7697 Cleaning code 2018-08-10 19:04:53 +09:00
Jean-Baptiste Dominguez
4cba8e1298
Merge pull request #262 from Bitcoin-com/wallet/task/537
Wallet/task/537
2018-08-10 18:44:51 +09:00
Jean-Baptiste Dominguez
daf9bb5356 Notify to reload home tab 2018-08-10 18:43:28 +09:00
Jean-Baptiste Dominguez
5185c6ee3c Fix amount 2018-08-10 18:41:47 +09:00
Jean-Baptiste Dominguez
81126a9d04 Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537 2018-08-10 17:47:32 +09:00
Jean-Baptiste Dominguez
3365a61d62 invalidate cache 2018-08-10 17:47:21 +09:00
Sebastiaan Pasma
dd75f581e7
move stateParams and fromWallet outside of the clipboar function 2018-08-10 10:47:16 +02:00
Jean-Baptiste Dominguez
b292f57b02
Merge pull request #261 from Bitcoin-com/wallet/task/537
Wallet/task/537
2018-08-10 17:21:13 +09:00
Jean-Baptiste Dominguez
9e28c4ec45 Fix bug send max with thirdparty (Shapeshift) 2018-08-10 17:20:04 +09:00
Jean-Baptiste Dominguez
3d3aa25d5b Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537 2018-08-10 17:13:29 +09:00
Brendon Duncan
9e11835000 Equal sized digits on Wallet Details alternative balance. 2018-08-10 19:45:43 +12:00
Brendon Duncan
c2bcae3537 Merged fixes for iPhone 5 / SE.
# Conflicts:
#	www/views/amount.html
2018-08-10 19:16:04 +12:00
Brendon Duncan
d88d3365ad Fix for long amounts on iPhone 5 / SE. Fix for buttons below amounts on iPhone 5 / SE. 2018-08-10 19:09:55 +12:00
Brendon Duncan
38d2c6a3c6 Merge fix for wallet-balance for non-stringifyable wallet. 2018-08-10 17:16:50 +12:00
Brendon Duncan
812ed5f1cd wallet-balance workaround for wallet not being stringify-able, and hence not being interpolatable, and hence not being able to pass it to the directive. 2018-08-10 17:13:24 +12:00
Jean-Baptiste Dominguez
ee84235d3a Top bar message 2018-08-10 14:05:46 +09:00
Brendon Duncan
38b2d84f2e Merged error handling for wallet-balance. 2018-08-10 16:23:39 +12:00
Brendon Duncan
e6105ef552 Merge. 2018-08-10 16:20:53 +12:00
Brendon Duncan
3ff0f50a7b Added quotes. 2018-08-10 16:20:26 +12:00
Brendon Duncan
8d404f1908 Handle null wallet. 2018-08-10 16:19:24 +12:00
Brendon Duncan
14724ea6f6 Merged formatting of some amounts. 2018-08-10 14:30:53 +12:00
Brendon Duncan
4dd334087b Removed formatted amount from the entry of the Amount screen as it was causing a bug. 2018-08-10 14:24:41 +12:00
Jean-Baptiste Dominguez
e0c4155ef1
Merge pull request #260 from Bitcoin-com/wallet/task/537
Add tracking shapeshift
2018-08-10 11:22:46 +09:00
Jean-Baptiste Dominguez
0410ad1491 Add tracking shapeshift 2018-08-10 11:21:29 +09:00
Brendon Duncan
18c8f4cf07 formatted-amount for transaction proposals and wallet activity. 2018-08-10 14:17:42 +12:00