diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-01-19 04:15:58 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 04:15:58 +0800 |
commit | 28212d167cbd201f78e0253cf9c6fb676d71cb7a (patch) | |
tree | d278415f35a74e26459ca47f10798368e8b91403 /ui/app/reducers/app.js | |
parent | 4a0f330a066ed2a557b4622163221b410b6b6e40 (diff) | |
parent | 3273f507f7a9cf33cfdbb4fffa243d75fde98b10 (diff) | |
download | tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.gz tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.bz2 tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.lz tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.xz tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.tar.zst tangerine-wallet-browser-28212d167cbd201f78e0253cf9c6fb676d71cb7a.zip |
Merge pull request #1022 from MetaMask/i715-AddImportMenu
Add ability to import private keys
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 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: { |