aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/keychains
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-02-22 07:46:31 +0800
committerGitHub <noreply@github.com>2018-02-22 07:46:31 +0800
commiteed75735b8e90d121537249cf147c1ece60f1e47 (patch)
treec7cfc9bea782df7035761caa8c1809d8fde58824 /ui/app/keychains
parent16754fa30744df8b3b3edc0e5229db29f3ad23ec (diff)
parente27a3823ba2595baa7c3378e6a6f2aa5dae30250 (diff)
downloadtangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.gz
tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.zst
tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.zip
Merge pull request #3050 from MetaMask/uat
[EPIC] Merge UAT into master
Diffstat (limited to 'ui/app/keychains')
-rw-r--r--ui/app/keychains/hd/restore-vault.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 24b37a83d..a4ed137f9 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -107,6 +107,7 @@ RestoreVaultScreen.prototype.render = function () {
}
RestoreVaultScreen.prototype.showInitializeMenu = function () {
+ this.props.dispatch(actions.unMarkPasswordForgotten())
if (this.props.forgottenPassword) {
this.props.dispatch(actions.backToUnlockView())
} else {
@@ -149,6 +150,9 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
this.warning = null
this.props.dispatch(actions.displayWarning(this.warning))
this.props.dispatch(actions.createNewVaultAndRestore(password, seed))
+ .then(() => {
+ this.props.dispatch(actions.unMarkPasswordForgotten())
+ })
.catch((err) => {
log.error(err.message)
})