aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-09-11 05:52:36 +0800
committerGitHub <noreply@github.com>2018-09-11 05:52:36 +0800
commit7fe638fec5d24f399bd89daa8c0738e776b1cab7 (patch)
tree9ba71f0082bc27a78ef667ebd19bd66368e270c5 /ui
parent9b3b70433ea570d0c7a99034499fa9f86caf4d56 (diff)
parent8541442b8db8d845f6d92675997d612f8751074c (diff)
downloadtangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.tar
tangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.tar.gz
tangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.tar.bz2
tangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.tar.lz
tangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.tar.xz
tangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.tar.zst
tangerine-wallet-browser-7fe638fec5d24f399bd89daa8c0738e776b1cab7.zip
Merge pull request #5229 from whymarrh/fix-confirm-seed-words
Clear old seed words when importing new seed words
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 6d5b1ef3f..846a8cb8f 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -413,12 +413,18 @@ function createNewVaultAndRestore (password, seed) {
log.debug(`background.createNewVaultAndRestore`)
return new Promise((resolve, reject) => {
- background.createNewVaultAndRestore(password, seed, err => {
+ background.clearSeedWordCache((err) => {
if (err) {
return reject(err)
}
- resolve()
+ background.createNewVaultAndRestore(password, seed, (err) => {
+ if (err) {
+ return reject(err)
+ }
+
+ resolve()
+ })
})
})
.then(() => dispatch(actions.unMarkPasswordForgotten()))