diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-06-25 07:13:27 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-06-25 07:13:27 +0800 |
| commit | 122018a96a1b2b6d9b7eefe150ff76a9de69bdd7 (patch) | |
| tree | cc72b18de256dad9db7055b4c4631cfa9d192347 /app/scripts/lib | |
| parent | fa7e4665594525256b846de93bdd46115a3a53a7 (diff) | |
| download | tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.tar tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.tar.gz tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.tar.bz2 tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.tar.lz tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.tar.xz tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.tar.zst tangerine-wallet-browser-122018a96a1b2b6d9b7eefe150ff76a9de69bdd7.zip | |
Fixed tests
Diffstat (limited to 'app/scripts/lib')
| -rw-r--r-- | app/scripts/lib/config-manager.js | 1 | ||||
| -rw-r--r-- | app/scripts/lib/idStore.js | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 9793728bb..0af82c89c 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -1,5 +1,4 @@ const Migrator = require('pojo-migrator') -const extend = require('xtend') const MetamaskConfig = require('../config.js') const migrations = require('./migrations') diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 568d9f9a5..f705c07a7 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -43,7 +43,10 @@ function IdentityStore (opts = {}) { IdentityStore.prototype.createNewVault = function (password, entropy, cb) { delete this._keyStore - this.configManager.clearWallet() + if (this.configManager) { + this.configManager.clearWallet() + } + this._createIdmgmt(password, null, entropy, (err) => { if (err) return cb(err) @@ -439,7 +442,7 @@ IdentityStore.prototype._createIdmgmt = function (password, seed, entropy, cb) { keyStore: keyStore, derivedKey: derivedKey, hdPathSTring: this.hdPathString, - this.configManager, + configManager: this.configManager, }) cb() |