Jean-Baptiste Dominguez
|
9bdd44a483
|
Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537
|
2018-08-09 15:09:52 +09:00 |
|
Jean-Baptiste Dominguez
|
c68b1e77f6
|
clean controller and remove old firebase event
|
2018-08-09 15:09:43 +09:00 |
|
Brendon Duncan
|
cbf66a2176
|
Fix for formatting amounts on Android 4.4.
|
2018-08-09 17:54:20 +12:00 |
|
Jean-Baptiste Dominguez
|
a964b2d967
|
Merge branch 'wallet/task/537' of https://github.com/Bitcoin-com/Wallet into wallet/task/537
|
2018-08-09 13:15:29 +09:00 |
|
Jean-Baptiste Dominguez
|
77f6210076
|
Fix pop state on the send flow
|
2018-08-09 13:15:21 +09:00 |
|
Jean-Baptiste Dominguez
|
0ea97fc1c6
|
Fix state pop on the send flow
|
2018-08-09 13:14:44 +09:00 |
|
Brendon Duncan
|
7ce562ec64
|
Fix for Shapeshift now appearing again on Review Transaction screen.
|
2018-08-09 16:11:29 +12:00 |
|
Jean-Baptiste Dominguez
|
a490f0ce1f
|
dead code
|
2018-08-09 13:06:52 +09: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 |
|
Jean-Baptiste Dominguez
|
e183643298
|
Remove from the route the stateparams, adapt some controllers in the new sendflowservice
|
2018-08-09 12:35:39 +09:00 |
|
Brendon Duncan
|
188ddcba58
|
Review transation copying state at startup so it doesn't contaminate the sendFlowController.
|
2018-08-09 13:25:06 +12:00 |
|
Brendon Duncan
|
0410182d4f
|
Incoming data working with sendFlowService.
|
2018-08-09 13:24:13 +12:00 |
|
Brendon Duncan
|
a2dff98c63
|
Back button on Review Transaction screen works with sendFlowService.
|
2018-08-09 13:12:44 +12:00 |
|
Brendon Duncan
|
b426209efb
|
Fix for clearing current state only.
|
2018-08-09 13:06:50 +12:00 |
|
Brendon Duncan
|
bf9b467bfe
|
Renamed sendFlowService functions to be more consistent.
|
2018-08-09 13:01:48 +12:00 |
|
Brendon Duncan
|
be0c18244e
|
Review Transaction screen now displaying BCH addresses in cashaddr format.
|
2018-08-09 12:12:29 +12:00 |
|
Brendon Duncan
|
408d46e4d3
|
Hid the from wallet in the send screen for now, because it requires other layout changes to fit everything in, especially on small screens.
|
2018-08-09 11:43:20 +12:00 |
|
Brendon Duncan
|
1d025cbf35
|
Fixes for Android 4.4
|
2018-08-09 11:42:25 +12:00 |
|
Brendon Duncan
|
be2bc4cddb
|
Showing From wallet in send tab.
|
2018-08-09 11:13:12 +12:00 |
|
Brendon Duncan
|
dff0d51ef3
|
Refactored sendFlowService and cleared its state before entering the send tab.
|
2018-08-09 11:10:26 +12:00 |
|
Brendon Duncan
|
e7ce86fb99
|
Merged fix for undefined currency.
|
2018-08-09 10:47:54 +12:00 |
|
Brendon Duncan
|
58d99231ae
|
Handle undefined currency.
|
2018-08-09 10:46:07 +12:00 |
|
Brendon Duncan
|
eb500c0549
|
Updated decimal formatting.
|
2018-08-09 10:42:58 +12:00 |
|
Brendon Duncan
|
cb398a0f50
|
Merged cleanup for formated amount.
# Conflicts:
# src/js/directives/formattedAmount.js
|
2018-08-09 07:58:24 +12:00 |
|
Brendon Duncan
|
1c3b113222
|
Removed unused config service.
|
2018-08-09 07:49:13 +12:00 |
|
Brendon Duncan
|
d81f194f87
|
Fix for when an amount changes from having a separate currency value, to the currency being one string with the amount.
|
2018-08-09 07:35:47 +12:00 |
|
Sebastiaan Pasma
|
02e8e0fbf0
|
clear send flow on home and wallet details
|
2018-08-08 17:29:28 +02:00 |
|
Sebastiaan Pasma
|
2206102715
|
sendflow service integrated into flow
|
2018-08-08 17:27:15 +02:00 |
|
Sebastiaan Pasma
|
f7ecdb2f2f
|
sendflow service integrated into flow
|
2018-08-08 17:10:47 +02:00 |
|
Sebastiaan Pasma
|
8229d51fdd
|
sendflow service
|
2018-08-08 16:35:49 +02: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 |
|
Jean-Baptiste Dominguez
|
51921a1a1d
|
Fix shapeshift flow go back available
|
2018-08-08 22:32:18 +09: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 |
|
Brendon Duncan
|
7e9cfa77c4
|
Now correctly derives currency from value.
|
2018-08-08 20:25:17 +12:00 |
|
Jean-Baptiste Dominguez
|
b4e36e93cb
|
Fix double loading in the review screen for shapeshift
|
2018-08-08 17:11:16 +09:00 |
|
Jean-Baptiste Dominguez
|
644b3e6113
|
height space in the bottom (wallet selection & review)
|
2018-08-08 16:24:47 +09:00 |
|
Jean-Baptiste Dominguez
|
158c571ce1
|
Merge branch 'wallet/sprint/20' into wallet/task/514
|
2018-08-08 16:10:51 +09:00 |
|
Jean-Baptiste Dominguez
|
ab13478f79
|
Add shapeshift service item
|
2018-08-08 16:03:34 +09:00 |
|
Brendon Duncan
|
ae6dcea81a
|
Fix for getting Shapeshift working.
|
2018-08-08 18:58:26 +12:00 |
|
Brendon Duncan
|
3d9b24575b
|
In Review Transaction screen, the note is now visible above the fees.
|
2018-08-08 18:57:55 +12:00 |
|
Jean-Baptiste Dominguez
|
6981a5af9f
|
show only when it is ready
|
2018-08-08 15:52:20 +09:00 |
|
Brendon Duncan
|
a5862bd6c4
|
Merge.
|
2018-08-08 18:23:46 +12:00 |
|
Brendon Duncan
|
fcb4d4b004
|
Text is now visible on Send and Receive buttons in Wallet Details screen when activated.
|
2018-08-08 18:22:43 +12:00 |
|
Brendon Duncan
|
86a9e9fe92
|
Merge for alignment and size of Receive and Send buttons.
|
2018-08-08 16:34:14 +12:00 |
|
Brendon Duncan
|
939263c385
|
Alignment and size of Receive and Send buttons on the Home tab matches the Wallet Details tab: equal spacing.
|
2018-08-08 16:30:57 +12:00 |
|
Brendon Duncan
|
5d3e11b7bb
|
Fixed alignment of buttons in Wallet Details on wide screens..
|
2018-08-08 16:10:58 +12:00 |
|
Brendon Duncan
|
da88ddbd40
|
ShapeshiftService fix for app startup.
|
2018-08-08 15:36:18 +12:00 |
|
Jean-Baptiste Dominguez
|
037c00ec9e
|
Merge branch 'wallet/sprint/20' into wallet/task/514
|
2018-08-08 11:23:35 +09:00 |
|
Jean-Baptiste Dominguez
|
7f0946b390
|
Merge branch 'wallet/sprint/20' into wallet/task/441
|
2018-08-08 10:56:26 +09:00 |
|