aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-24 08:17:08 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-26 05:13:32 +0800
commit483a7fee0a815812ef43601f64083ed26825d0a4 (patch)
tree5a39a1dd9cd825dbcadb67688ff1cbcc923f8f10 /app/scripts/lib
parent3756384da6cb7d1566271cb99ec561d3b051a4ac (diff)
downloadtangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.tar
tangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.tar.gz
tangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.tar.bz2
tangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.tar.lz
tangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.tar.xz
tangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.tar.zst
tangerine-wallet-browser-483a7fee0a815812ef43601f64083ed26825d0a4.zip
Add a back button on lock screen to go back to init menu
Diffstat (limited to 'app/scripts/lib')
-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)