aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-04-30 06:53:29 +0800
committerDan Finlay <dan@danfinlay.com>2016-04-30 08:02:36 +0800
commit988165224b41c1eb3fe1b639b5801204936000e1 (patch)
tree2ee46ca24e9aa6ee399a45192ed0a46c59dd6a13 /ui/app/reducers
parent8421c97db21af0bc616fa6c0671f6f1a3b60b815 (diff)
downloadtangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.tar
tangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.tar.gz
tangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.tar.bz2
tangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.tar.lz
tangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.tar.xz
tangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.tar.zst
tangerine-wallet-browser-988165224b41c1eb3fe1b639b5801204936000e1.zip
Fix outdated transitions
Fixes #151 - Cancelling or completing a tx now goes back to account detail view. - Restoring a vault now does not select an unloaded account, shows account list. - Account list now never selects an item only uses the cells as buttons.
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/app.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 143a67527..57cdccbac 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -199,12 +199,11 @@ function reduceApp(state, action) {
} else {
return extend(appState, {
transForward: false,
+ warning: null,
currentView: {
- name: 'accounts',
- context: 0,
+ name: 'accountDetail',
+ context: appState.currentView.context,
},
- transForward: false,
- warning: null,
})
}