aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-08-27 02:52:43 +0800
committerGitHub <noreply@github.com>2016-08-27 02:52:43 +0800
commit9497d282c796a443ce329f302d6ec9a5290fa987 (patch)
treed7763ffba381fc6873021ad6423c3422e0b42ebf /app
parent78f73038e789f4483f728a7cc9ea1c68b0b3d7fa (diff)
parentae3358666014e4c302284e7ef760ce0d24cd7094 (diff)
downloadtangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.tar
tangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.tar.gz
tangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.tar.bz2
tangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.tar.lz
tangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.tar.xz
tangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.tar.zst
tangerine-wallet-browser-9497d282c796a443ce329f302d6ec9a5290fa987.zip
Merge pull request #588 from MetaMask/i#563forgotPassword
Add a back button for Lock screen
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/idStore.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 7ac71e409..0f36a520b 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -45,7 +45,11 @@ function IdentityStore (opts = {}) {
IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
delete this._keyStore
+ var serializedKeystore = this.configManager.getWallet()
+ if (serializedKeystore) {
+ this.configManager.setData({})
+ }
this._createIdmgmt(password, null, entropy, (err) => {
if (err) return cb(err)
@@ -437,6 +441,7 @@ IdentityStore.prototype.tryPassword = function (password, cb) {
IdentityStore.prototype._createIdmgmt = function (password, seed, entropy, cb) {
const configManager = this.configManager
+
var keyStore = null
LightwalletKeyStore.deriveKeyFromPassword(password, (err, derivedKey) => {
if (err) return cb(err)