aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/keychains
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-02-09 06:16:58 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-02-09 08:43:31 +0800
commiteb919f4710b37d09c9a3a68ed4c719e487cce9d9 (patch)
tree30e0c843a692ac10c637467b525f9bef0c795f48 /ui/app/keychains
parent2fd9e58e612e9fe341c9107a677238a566e3c1b8 (diff)
parentf39222c9afd9dcab4c6234940eb9a9cb06dbc6f0 (diff)
downloadtangerine-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/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)
})