Commit graph

12,272 commits

Author SHA1 Message Date
Sebastiaan Pasma
31d33ba656
Shape shift track 2018-08-01 11:53:58 +02:00
Sebastiaan Pasma
5372ba3dac
Merge remote-tracking branch 'origin/wallet/task/439' into wallet/task/514
# Conflicts:
#	src/js/controllers/amount.js
2018-08-01 11:16:59 +02:00
Sebastiaan Pasma
42d77903e1
Third Party Service integration (Shapeshift) (CSS + translations + wallet selector + routes) 2018-07-31 17:21:56 +02:00
Sebastiaan Pasma
281b969fc3
Shapeshift refactor / Empty case / CSS 2018-07-31 15:03:20 +02:00
Brendon Duncan
0cba978d65 Replaced old amount screen. 2018-07-31 20:25:21 +12:00
Brendon Duncan
02f7bcc281 Not using amount directive. Removed safety area below All Available Funds button. 2018-07-31 20:18:27 +12:00
Brendon Duncan
97aa7c415e Merged fix for amount directive. 2018-07-31 19:51:19 +12:00
Sam Cheng Hung
8dc1e06048 Removes dummy values on home tab 2018-07-31 15:46:12 +08:00
Sam Cheng Hung
5a0c1417d4 Prevents reassignment of bound attribute size-equal 2018-07-31 15:44:59 +08:00
Brendon Duncan
778cbfbab0 Should have been part of merge for amount directive. 2018-07-31 19:16:11 +12:00
Brendon Duncan
2353109adf Bugfix for font for insufficient funds warning. 2018-07-31 17:59:26 +12:00
Brendon Duncan
2987d17e11 Merged amount directive. 2018-07-31 13:28:16 +12:00
Brendon Duncan
71a31ce399 Available funds now accurately reflects the primary currency choice. 2018-07-31 13:25:56 +12:00
Brendon Duncan
0fdd478ae4 Fixed up bold fonts. 2018-07-31 12:47:03 +12:00
Sebastiaan Pasma
9b27cb50e2
Merge remote-tracking branch 'origin/wallet/task/466' into wallet/task/454 2018-07-30 22:17:56 +02:00
Sam Cheng Hung
e0ef42b09a Removes dummy text 2018-07-30 17:47:05 +08:00
Sam Cheng Hung
da536a3f5b Fixes default value of size-equal 2018-07-30 17:45:26 +08:00
Sam Cheng Hung
f4b0b46067 Adds size-equal and capitalizes currency text 2018-07-30 17:33:38 +08:00
Sam Cheng Hung
7fb2792a1a Adds size-equal class to amount directive 2018-07-30 16:56:27 +08:00
Sam Cheng Hung
e1d65bc557 Adds amount directive 2018-07-30 16:49:57 +08:00
Brendon Duncan
7669ab2479 Transitioning from the Shapeshift screen. 2018-07-30 19:28:30 +12:00
Brendon Duncan
f0ccee8a0a Refining the display of available funds. 2018-07-30 18:28:27 +12:00
Brendon Duncan
d5666c9d29 Ported changes from 459. 2018-07-28 20:24:29 -07:00
Brendon Duncan
b5a2e890a5 Merge wallet/task/459 into wallet/task/439. 2018-07-28 19:30:36 -07:00
Brendon Duncan
9781f90f2b Warning colour for insufficient funds. 2018-07-28 19:20:12 -07:00
Brendon Duncan
72a5b3cabd Primary ("Next") button. 2018-07-28 17:18:52 -07:00
Brendon Duncan
0ba1ea1f42 Use All Available Funds button. 2018-07-28 15:36:23 -07:00
Brendon Duncan
81e9f527ff Route for send amount. 2018-07-28 13:04:04 -07:00
Brendon Duncan
f65b632273 Available funds appearance in normal case. 2018-07-26 13:22:03 -07:00
Brendon Duncan
8fd0b76a44 Change Currency button appearance. 2018-07-26 13:09:16 -07:00
Brendon Duncan
507fb21862 Available funds. 2018-07-25 18:46:42 -07:00
Brendon Duncan
91daae9f7a Improved amount card layout. Darker background under card. 2018-07-25 18:19:21 -07:00
Brendon Duncan
e539f0e713 Space around amount, and added "Not Enough Funds" warning. 2018-07-25 17:32:07 -07:00
Brendon Duncan
decd0a123e Buttons on keypad have correct colour in new Enter Amount screen. 2018-07-25 16:43:45 -07:00
Sebastiaan Pasma
aff0dd3183
fixes for other cases, address to address + contacts + thirdParty stub 2018-07-25 17:25:38 +02:00
Sebastiaan Pasma
79d6b4d7ad
confirm screen: display address + back button logic in origin/destination screens 2018-07-25 16:05:07 +02:00
Sebastiaan Pasma
b88329fbb3
removed unused vars + changes for wallet to wallet transfer 2018-07-25 15:07:15 +02:00
Sebastiaan Pasma
4093e2ba71
refactored the sendFlowController 2018-07-25 11:26:33 +02:00
Brendon Duncan
91dac0f54c Refactored Enter Amount controller to follow latest Angular 1 guidelines. 2018-07-24 12:37:51 -07:00
Sebastiaan Pasma
fd4adbfb57
wallet to wallet case worked out. Also fixed routes and some css 2018-07-24 14:24:22 +02:00
Brendon Duncan
7dd1d4048b Correction of typo in last commit. 2018-07-23 12:18:06 -07:00
Brendon Duncan
ac91282c13 Indicative change for view. 2018-07-23 12:02:04 -07:00
Sebastiaan Pasma
3604ee3c3c
routes, renames and flow 2018-07-23 16:58:32 +02:00
Sebastiaan Pasma
7aecd2306f
comments & show wallets 2018-07-23 14:48:25 +02:00
Sebastiaan Pasma
893dbe5c6f
"has no funds" case 2018-07-23 14:20:46 +02:00
Brendon Duncan
da853bcbf6 Placeholders for buttons. 2018-07-20 18:15:25 +12:00
Sebastiaan Pasma
c3cded5cb0
wallet to wallet (sub)title 2018-07-19 15:50:09 +02:00
Brendon Duncan
0a96ae0dbe Added $scope.isRequestingSpecifcAmount. 2018-07-19 17:06:53 +12:00
Brendon Duncan
0076ff26e6 Currency of available funds changes when the currency of the amount is changed. 2018-07-19 16:24:24 +12:00
Brendon Duncan
19bec8a09a Fixed update of available funds text. 2018-07-19 15:34:53 +12:00