diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-19 05:14:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 05:14:27 +0800 |
| commit | 25e57939920d4685a20b4e7b3a14060e9d3314c7 (patch) | |
| tree | fa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 /ui/app/reducers | |
| parent | 9ab7ce370bc12e10b3458c0755f0dd8488788bec (diff) | |
| parent | 0e01abdf7154067ca50bf279340b868aefd8343f (diff) | |
| download | tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.gz tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.tar.zst tangerine-wallet-browser-25e57939920d4685a20b4e7b3a14060e9d3314c7.zip | |
Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0
Version 3.1.0
Diffstat (limited to 'ui/app/reducers')
| -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 dc7344b3e..ae91272cc 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -99,6 +99,14 @@ function reduceApp (state, action) { transForward: action.value, }) + case actions.SHOW_IMPORT_PAGE: + return extend(appState, { + currentView: { + name: 'import-menu', + }, + transForward: true, + }) + case actions.SHOW_INFO_PAGE: return extend(appState, { currentView: { @@ -128,6 +136,15 @@ function reduceApp (state, action) { isLoading: false, }) + case actions.NEW_ACCOUNT_SCREEN: + return extend(appState, { + currentView: { + name: 'new-account', + context: appState.currentView.context, + }, + transForward: true, + }) + case actions.SHOW_SEND_PAGE: return extend(appState, { currentView: { |