diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-05-05 11:41:59 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-05-05 11:41:59 +0800 |
commit | 6ee193f80230729abf6ac00f59d9888712ddd5ad (patch) | |
tree | 1f088d44cec805edba6998c0692620f47f0b6d67 /ui/app/reducers/app.js | |
parent | 93db6cacb5bd05fd5f8b786733f13231a2c3fb0c (diff) | |
parent | 37dc13ce3bf0c40b755d33b8ba63c4662a0d3415 (diff) | |
download | tangerine-wallet-browser-6ee193f80230729abf6ac00f59d9888712ddd5ad.tar.gz tangerine-wallet-browser-6ee193f80230729abf6ac00f59d9888712ddd5ad.tar.zst tangerine-wallet-browser-6ee193f80230729abf6ac00f59d9888712ddd5ad.zip |
Merge branch 'MoveAccountExportToSubview' into FixButtonStyleBug
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r-- | ui/app/reducers/app.js | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index d958b6730..309351956 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -23,6 +23,9 @@ function reduceApp(state, action) { var appState = extend({ currentView: seedWords ? seedConfView : defaultView, + accountDetail: { + subview: 'transactions', + }, currentDomain: 'example.com', transForward: true, // Used to render transition direction isLoading: false, // Used to display loading indicator @@ -133,6 +136,7 @@ function reduceApp(state, action) { return extend(appState, { currentView: {}, accountDetail: { + subview: 'transactions', accountExport: 'none', privateKey: '', }, @@ -146,6 +150,7 @@ function reduceApp(state, action) { context: action.value || account, }, accountDetail: { + subview: 'transactions', accountExport: 'none', privateKey: '', }, @@ -159,6 +164,7 @@ function reduceApp(state, action) { context: action.value, }, accountDetail: { + subview: 'transactions', accountExport: 'none', privateKey: '', }, @@ -220,6 +226,9 @@ function reduceApp(state, action) { name: 'accountDetail', context: state.metamask.selectedAddress, }, + accountDetail: { + subview: 'transactions', + }, }) } @@ -287,7 +296,13 @@ function reduceApp(state, action) { case actions.REQUEST_ACCOUNT_EXPORT: return extend(appState, { + transForward: true, + currentView: { + name: 'accountDetail', + context: appState.currentView.context, + }, accountDetail: { + subview: 'export', accountExport: 'requested', }, }) @@ -295,6 +310,7 @@ function reduceApp(state, action) { case actions.EXPORT_ACCOUNT: return extend(appState, { accountDetail: { + subview: 'export', accountExport: 'completed', }, }) @@ -302,6 +318,7 @@ function reduceApp(state, action) { case actions.SHOW_PRIVATE_KEY: return extend(appState, { accountDetail: { + subview: 'export', accountExport: 'completed', privateKey: action.value, }, |