diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 10 | ||||
| -rw-r--r-- | ui/app/app.js | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index e33a3800a..d5a00833b 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -157,11 +157,16 @@ function tryUnlockMetamask (password) { return (dispatch) => { dispatch(actions.showLoadingIndication()) dispatch(actions.unlockInProgress()) - background.submitPassword(password, (err, selectedAccount) => { + background.submitPassword(password, (err, newState) => { dispatch(actions.hideLoadingIndication()) if (err) { dispatch(actions.unlockFailed()) } else { + dispatch(this.updateMetamaskState(newState)) + let selectedAccount + try { + selectedAccount = newState.metamask.selectedAccount + } catch (e) {} dispatch(actions.unlockMetamask(selectedAccount)) } }) @@ -171,10 +176,11 @@ function tryUnlockMetamask (password) { function createNewVault (password, entropy) { return (dispatch) => { dispatch(actions.createNewVaultInProgress()) - background.createNewVault(password, entropy, (err, result) => { + background.createNewVault(password, entropy, (err, newState) => { if (err) { return dispatch(actions.showWarning(err.message)) } + dispatch(this.updateMetamaskState(newState)) dispatch(this.showAccountsPage()) dispatch(this.hideLoadingIndication()) }) diff --git a/ui/app/app.js b/ui/app/app.js index 7392e275d..cbe02b683 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -402,6 +402,7 @@ App.prototype.renderPrimary = function () { // show initialize screen if (!props.isInitialized || props.forgottenPassword) { + // show current view switch (props.currentView.name) { |