diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-02-09 06:16:58 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-02-09 08:43:31 +0800 |
| commit | eb919f4710b37d09c9a3a68ed4c719e487cce9d9 (patch) | |
| tree | 30e0c843a692ac10c637467b525f9bef0c795f48 /ui/app/app.js | |
| parent | 2fd9e58e612e9fe341c9107a677238a566e3c1b8 (diff) | |
| parent | f39222c9afd9dcab4c6234940eb9a9cb06dbc6f0 (diff) | |
| download | tangerine-wallet-browser-eb919f4710b37d09c9a3a68ed4c719e487cce9d9.tar.gz tangerine-wallet-browser-eb919f4710b37d09c9a3a68ed4c719e487cce9d9.tar.zst tangerine-wallet-browser-eb919f4710b37d09c9a3a68ed4c719e487cce9d9.zip | |
Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254
Diffstat (limited to 'ui/app/app.js')
| -rw-r--r-- | ui/app/app.js | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 09af2db2c..0ecfd0dde 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -352,7 +352,6 @@ class App extends Component { const { noActiveNotices, lostAccounts, - isInitialized, forgottenPassword, currentView, activeAddress, @@ -373,6 +372,15 @@ class App extends Component { }) } + if (forgottenPassword) { + log.debug('rendering restore vault screen') + return h(Redirect, { + to: { + pathname: RESTORE_VAULT_ROUTE, + }, + }) + } + // notices if (!noActiveNotices || (lostAccounts && lostAccounts.length > 0)) { return h(Redirect, { @@ -422,20 +430,20 @@ class App extends Component { // } // show initialize screen - if (!isInitialized || forgottenPassword) { - // show current view - log.debug('rendering an initialize screen') - // switch (props.currentView.name) { - - // case 'restoreVault': - // log.debug('rendering restore vault screen') - // return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) - - // default: - // log.debug('rendering menu screen') - // return h(InitializeMenuScreen, {key: 'menuScreenInit'}) - // } - } + // if (!isInitialized || forgottenPassword) { + // // show current view + // log.debug('rendering an initialize screen') + // // switch (props.currentView.name) { + + // // case 'restoreVault': + // // log.debug('rendering restore vault screen') + // // return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) + + // // default: + // // log.debug('rendering menu screen') + // // return h(InitializeMenuScreen, {key: 'menuScreenInit'}) + // // } + // } // // show unlock screen // if (!props.isUnlocked) { |