diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-13 05:41:03 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-13 05:41:03 +0800 |
commit | 71a308d98b541b05ffabf8f63085e3cbd8bf61b7 (patch) | |
tree | 5f360e4a65a0768817913e99840e3705439432e2 /ui/app/reducers | |
parent | 0f4bfcb02e3a04f044a571e01a4977dae2afec8e (diff) | |
parent | bdcee058dc278c46c828f376476f121417481385 (diff) | |
download | tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.gz tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.zst tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.zip |
Merge branch 'uat' into cb-388
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 5 |
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, }, }) |