aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-01-13 03:48:18 +0800
committerAlexander Tseung <alextsg@users.noreply.github.com>2018-01-13 03:48:18 +0800
commit5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f (patch)
treef354a007d35321ad7bc54564d2ae40e8f152176f /ui/app/reducers
parentb72610fb534580e607c6934e938c50d58ba05350 (diff)
downloadtangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar
tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.gz
tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.bz2
tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.lz
tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.xz
tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.tar.zst
tangerine-wallet-browser-5c1dcf3e9bdb317dd8b42aadb18657eb4bfa2e0f.zip
[NewUI-flat] New deposit ether modal UI. (#2642)
* New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/app.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 3a4fb536d..e96dea0be 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -58,6 +58,7 @@ function reduceApp (state, action) {
isLoading: false,
// Used to display error text
warning: null,
+ buyView: {},
}, state.appState)
switch (action.type) {
@@ -591,8 +592,8 @@ function reduceApp (state, action) {
marketinfo: action.value.marketinfo,
coinOptions: action.value.coinOptions,
},
- buyAddress: appState.buyView.buyAddress,
- amount: appState.buyView.amount,
+ buyAddress: action.value.buyAddress || appState.buyView.buyAddress,
+ amount: appState.buyView.amount || 0,
},
})