Commit graph

1,589 commits

Author SHA1 Message Date
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
2cec6a476b
Merge pull request #294 from Bitcoin-com/wallet/task/556
Improvement - 556 - Make "Share the Wallet App" translatable
2018-09-04 14:33:15 +09:00
Jean-Baptiste Dominguez
911247e463
Merge branch 'wallet/sprint/21' into wallet/task/501 2018-09-04 14:31:22 +09:00
Jean-Baptiste Dominguez
ddd867092c Refactor incomingData 2018-08-31 18:37:04 +09:00
Sebastiaan Pasma
d65e4401dd
Update popup 2018-08-30 14:10:46 +02:00
Brendon Duncan
918451f3da Scanning or pasting ordinary URL gives the option to open it in a browser. 2018-08-30 19:56:18 +12:00
Sebastiaan Pasma
2c2c21bcdf
Update notifications now able to parse "rc"'s and also show release notes from GitHub. 2018-08-27 14:06:10 +02:00
Brendon Duncan
39bcb9daae Tweak strings to match translations. 2018-08-23 16:21:15 +12:00
Sebastiaan Pasma
ed998e9036
Make "Share the Wallet App" translatable 2018-08-22 16:27:30 +02:00
Brendon Duncan
bb92f5ec1b Merged updated sprint/21. 2018-08-20 11:31:49 +12:00
Brendon Duncan
b3e34483b6 Show my address button. 2018-08-17 11:59:27 +12:00
Brendon Duncan
aa75ba18d6 Removed old content. 2018-08-17 11:45:43 +12:00
Brendon Duncan
c280adbb06 Merged view for transaction sharing fix. 2018-08-15 12:33:10 +12:00
Brendon Duncan
8dd573624d View change for previous fix. 2018-08-15 12:31:03 +12:00
Sebastiaan Pasma
99d8de02da
Show pasted address instead of always cashaddr format on bch 2018-08-14 15:53:18 +02:00
Brendon Duncan
197ee9eeeb Fix for the Custom Amount screen now following the price display setting. 2018-08-14 17:24:17 +12:00
Jean-Baptiste Dominguez
24033f4615
Merge branch 'wallet/sprint/20' into wallet/task/514 2018-08-14 11:41:31 +09:00
Jean-Baptiste Dominguez
947c2d324f Upgrade text 2018-08-14 11:38:24 +09:00
Brendon Duncan
4e2c06f69d Changed "Bitcoin" to "Bitcoin Core" on the Sweep Paper Wallet screen and made other strings translatable. 2018-08-14 12:24:10 +12: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
c54cb55c51 Custom amount crypto decimal 2018-08-13 14:44:07 +09:00
Jean-Baptiste Dominguez
52e1b5e811 Manage the currency state 2018-08-13 14:13:49 +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
Brendon Duncan
38b2d84f2e Merged error handling for wallet-balance. 2018-08-10 16:23:39 +12:00
Brendon Duncan
3ff0f50a7b Added quotes. 2018-08-10 16:20:26 +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
Brendon Duncan
18c8f4cf07 formatted-amount for transaction proposals and wallet activity. 2018-08-10 14:17:42 +12:00
Jean-Baptiste Dominguez
a34bd614fa
Merge pull request #258 from Bitcoin-com/wallet/task/427
crypto decimal
2018-08-10 10:57:20 +09:00
Brendon Duncan
cb9feb99ce Merge wallet-balance that includes formatted-amount 2018-08-10 13:56:48 +12:00
Jean-Baptiste Dominguez
b70bd804dc crypto decimal 2018-08-10 10:56:01 +09:00
Brendon Duncan
82c0746ff8 wallet-balance directive uses formatted-amount. 2018-08-10 13:48:59 +12:00
Jean-Baptiste Dominguez
82ede65363 New decimal on the review screen 2018-08-10 10:43:54 +09:00
Brendon Duncan
355ed27b87 wallet balance directive displaying fiat balance from wallet status. 2018-08-10 13:04:44 +12:00
Brendon Duncan
afb3a1d49f wallet-balance directive displaying basic crypto balance. 2018-08-10 12:46:00 +12:00
Sebastiaan Pasma
577756fd44
button color + Time ago fix 2018-08-09 17:14:05 +02:00
Sebastiaan Pasma
ee0042b6e7
sendMax bugfix when returning to previous screen 2018-08-09 13:39:27 +02:00
Brendon Duncan
ac8cdcf5be Android 4.4 fix for Amount screen, removal of  . 2018-08-09 18:59:03 +12:00
Jean-Baptiste Dominguez
647e126169 Fix style css for the from wallet & activate the from wallet in the send tab 2018-08-09 12:49:35 +09:00
Brendon Duncan
a2dff98c63 Back button on Review Transaction screen works with sendFlowService. 2018-08-09 13:12:44 +12:00
Brendon Duncan
dff0d51ef3 Refactored sendFlowService and cleared its state before entering the send tab. 2018-08-09 11:10:26 +12:00
Jean-Baptiste Dominguez
73b18b16b6
Merge pull request #249 from Bitcoin-com/wallet/task/514
Wallet/task/514
2018-08-08 22:34:44 +09:00
Sebastiaan Pasma
753d2aea69
remove bottom menu on wallet selector + remove swipe back feature on review screen 2018-08-08 15:31:36 +02:00
Brendon Duncan
69e8c62f5c Fix for when an amount changes from having a separate currency value, to the currency being one string with the amount. 2018-08-08 22:00:07 +12:00
Brendon Duncan
b8de811fbe Merged fancy decimals.
# Conflicts:
#	www/views/walletDetails.html
2018-08-08 20:42:49 +12:00