diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-16 09:16:41 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-16 09:16:41 +0800 |
| commit | dcda841f4d33f96a5620b2458decd94339d5ee52 (patch) | |
| tree | 07cce20fe4474c2424026703a4482b2867eb5beb /ui/app/reducers/app.js | |
| parent | bc33c88ae53fbc08e75db025888d5bc3bcfe236d (diff) | |
| parent | a5e45820cc7359491d1d7b06a5358d99b9c97305 (diff) | |
| download | tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.gz tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.bz2 tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.lz tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.xz tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.tar.zst tangerine-wallet-browser-dcda841f4d33f96a5620b2458decd94339d5ee52.zip | |
Merge branch 'master' into tx-viz
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 8eb6ec4d4..c2ac099a6 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -240,7 +240,7 @@ function reduceApp (state, action) { name: 'confTx', context: 0, }, - transForward: true, + transForward: action.transForward, warning: null, }) @@ -408,7 +408,7 @@ function reduceApp (state, action) { transForward: true, currentView: { name: 'buyEth', - context: appState.currentView.context, + context: appState.currentView.name, }, buyView: { subview: 'buyForm', |