Commit graph

12,920 commits

Author SHA1 Message Date
Jean-Baptiste Dominguez
57ce93ccb8 fix parenthesis 2018-09-06 18:28:27 +09:00
Jean-Baptiste Dominguez
b6f63706f3 Resolution conflicts 2018-09-06 18:21:04 +09:00
Brendon Duncan
b0fba31040 Fix fee display on Android 4.4 KitKat. 2018-09-06 20:18:31 +12: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
b2e22647e2
Merge pull request #293 from Bitcoin-com/wallet/task/555
555 - Include version number in Android apk filename.
2018-09-06 17:16:27 +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
Brendon Duncan
c79ca6d1af More specific Shapeshift error handling. 2018-09-06 18:34:59 +12:00
Jean-Baptiste Dominguez
71e530f535 Unify the translation service 2018-09-06 15:31:22 +09:00
Jean-Baptiste Dominguez
a397e83cf0 error case without .message 2018-09-06 15:24:16 +09:00
Jean-Baptiste Dominguez
1905be6f14
Merge branch 'wallet/sprint/21' into wallet/task/555 2018-09-06 15:19:34 +09:00
Jean-Baptiste Dominguez
98e6e8ac75 Recommendation #brendon :) 2018-09-06 15:17:37 +09:00
Brendon Duncan
0d8812509d Updated readme. 2018-09-06 15:45:20 +12: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
f52b2e7f09
Better fix for KitKat 4.4 2018-09-05 16:44:33 +02:00
Sebastiaan Pasma
525afac92e
scss var name change 2018-09-05 16:36:53 +02: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
Sebastiaan Pasma
477a9b6995
Android KitKat (4.4) fixes 2018-09-05 14:03:01 +02:00
Jean-Baptiste Dominguez
2d6a1528c1 handle errors properly 2018-09-05 17:23:09 +09:00
Jean-Baptiste Dominguez
3b6bb1fcdd ionicModal using for all devices 2018-09-05 16:10:21 +09:00
Jean-Baptiste Dominguez
2a607d245d using ionicModal for all devices 2018-09-05 16:10:05 +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
Brendon Duncan
ce02025991 Merge for building pkg. 5.0-hotfix1 2018-09-05 18:03:49 +12:00
Brendon Duncan
d2715016b5 Merge for building pkg. 2018-09-05 18:00:45 +12:00
Jean-Baptiste Dominguez
2c398bbe03 Fix amount check 2018-09-05 14:51:06 +09:00
Jean-Baptiste Dominguez
9128d3ebe2 Migrate to our new standard for services 2018-09-05 14:43:16 +09:00
Jean-Baptiste Dominguez
887270bfa9 clean ";" 2018-09-05 14:42:27 +09:00
Jean-Baptiste Dominguez
f7cde7a071 clean up, migrate to no-fix amount 2018-09-05 12:45:20 +09:00
Brendon Duncan
3afbdf73d3
Merge pull request #323 from Bitcoin-com/wallet/hotfix/578
578 - Shapeshift item on home tab now links to the Shapeshift website.
2018-09-05 15:30:09 +12:00
Brendon Duncan
00e4f8ac39 Hotfix version. 2018-09-05 15:28:10 +12:00
Jean-Baptiste Dominguez
5e034e7b8b clean up 2018-09-05 11:37:29 +09:00
Jean-Baptiste Dominguez
c553b51817 clean up 2018-09-05 11:02:10 +09:00
Jean-Baptiste Dominguez
c40eabf807 Clean shapeshift service and add the correct callback 2018-09-05 10:59:09 +09:00
Jean-Baptiste Dominguez
9ff9e2ea91 tab missing 2018-09-05 10:30:06 +09:00
Jean-Baptiste Dominguez
5c5558fbd4 remove final 2018-09-05 10:28:01 +09:00
Brendon Duncan
8c62bc445a Shapeshift item on home tab now goes to the Shapeshift website. 2018-09-05 12:37:39 +12:00
Brendon Duncan
ba2fa1f26e Fixed start:ios and put Grunt tasks in alphabetical order to make it easier to find definitions. 2018-09-05 10:33:47 +12:00
Brendon Duncan
8dedc04fe8 Edited obsolete comment. 2018-09-05 10:03:00 +12:00
Brendon Duncan
ea23b26795 Removed duplicate logging for Android, and created start:android-log. 2018-09-05 09:56:19 +12:00
Brendon Duncan
2121655249 Grouping scripts in alphabetical order so it is easier to find things, and know what is there. 2018-09-05 09:48:42 +12: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
8b505141d7 renaming, clean up 2018-09-04 16:45:52 +09:00
Jean-Baptiste Dominguez
d934a9241a Organize the package.json and grunt file. Some optimizations and renaming. 2018-09-04 15:54:24 +09: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