aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-05-12 13:21:10 +0800
committerDan Finlay <dan@danfinlay.com>2016-05-12 13:21:10 +0800
commit29facfe4d6194fe519c906983682a655f8fb6406 (patch)
treed2f910a48ff61c4a12c4c7059027686bc3b1b8d0 /ui/app/reducers
parentb628df017f14c38f68c3048ef503ce8722f07f3b (diff)
downloadtangerine-wallet-browser-29facfe4d6194fe519c906983682a655f8fb6406.tar.gz
tangerine-wallet-browser-29facfe4d6194fe519c906983682a655f8fb6406.tar.zst
tangerine-wallet-browser-29facfe4d6194fe519c906983682a655f8fb6406.zip
Fix more transition bugs
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/app.js9
-rw-r--r--ui/app/reducers/metamask.js13
2 files changed, 16 insertions, 6 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 309351956..0e0740c9d 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -278,10 +278,13 @@ function reduceApp(state, action) {
case actions.CLEAR_SEED_WORD_CACHE:
return extend(appState, {
transForward: true,
- currentView: {
- name: 'accounts',
- },
+ currentView: {},
isLoading: false,
+ accountDetail: {
+ subview: 'transactions',
+ accountExport: 'none',
+ privateKey: '',
+ },
})
case actions.DISPLAY_WARNING:
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 9398f1497..8bf5c8aae 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -69,17 +69,24 @@ function reduceMetamask(state, action) {
}
return newState
+ case actions.SHOW_NEW_VAULT_SEED:
+ return extend(metamaskState, {
+ isUnlocked: true,
+ isInitialized: false,
+ })
+
case actions.CLEAR_SEED_WORD_CACHE:
var newState = extend(metamaskState, {
+ isUnlocked: true,
isInitialized: true,
+ selectedAccount: action.value,
})
delete newState.seedWords
return newState
- case actions.CREATE_NEW_VAULT_IN_PROGRESS:
+ case actions.SHOW_ACCOUNT_DETAIL:
return extend(metamaskState, {
- isUnlocked: true,
- isInitialized: true,
+ selectedAccount: action.value,
})
default: