Sebastiaan Pasma
|
5123ba9007
|
template.pot fix
|
2018-08-13 15:33:48 +02:00 |
|
Sebastiaan Pasma
|
f6a99f7f47
|
Merge branch 'wallet/sprint/20' into wallet/dev
|
2018-08-13 15:31:01 +02:00 |
|
Sebastiaan Pasma
|
14406f6bc4
|
template.pot fix
|
2018-08-13 15:28:22 +02:00 |
|
Sebastiaan Pasma
|
d2a1461a26
|
Merge remote-tracking branch 'origin/wallet/dev' into wallet/dev
|
2018-08-13 14:13:55 +02:00 |
|
Sebastiaan Pasma
|
f51542874b
|
small fix: minus before alternative currency
|
2018-08-13 14:12:36 +02:00 |
|
Sebastiaan Pasma
|
1dad3ab3fd
|
Many translation fixes. Missing translations in template.pot and added some in views
|
2018-08-13 13:48:41 +02:00 |
|
Jean-Baptiste Dominguez
|
1c38298bbf
|
Merge pull request #274 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
|
2018-08-13 16:15:03 +09:00 |
|
Jean-Baptiste Dominguez
|
a1abf54b4a
|
Merge pull request #273 from Bitcoin-com/wallet/task/428
Wallet/task/428
|
2018-08-13 16:14:32 +09:00 |
|
Jean-Baptiste Dominguez
|
30230304b6
|
Fix height header
|
2018-08-13 16:13:29 +09:00 |
|
Jean-Baptiste Dominguez
|
f93797efc0
|
Merge pull request #272 from Bitcoin-com/wallet/sprint/20
Wallet/sprint/20
|
2018-08-13 16:10:29 +09:00 |
|
Jean-Baptiste Dominguez
|
9c999d0cd6
|
Update appConfig.json
|
2018-08-13 15:35:26 +09:00 |
|
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 |
|