diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-11-23 09:40:29 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-11-23 09:41:54 +0800 |
| commit | 05c8658ff343af61b1a40a5624ecba77adb2ef00 (patch) | |
| tree | 5c2f426a63e22f4abc378a59bb86faba7e002877 /app/scripts/keyring-controller.js | |
| parent | 1e46d858e995c6c50f155f1bcdaf64b922402599 (diff) | |
| download | tangerine-wallet-browser-05c8658ff343af61b1a40a5624ecba77adb2ef00.tar.gz tangerine-wallet-browser-05c8658ff343af61b1a40a5624ecba77adb2ef00.tar.zst tangerine-wallet-browser-05c8658ff343af61b1a40a5624ecba77adb2ef00.zip | |
Fix new encryptor migration logic
Diffstat (limited to 'app/scripts/keyring-controller.js')
| -rw-r--r-- | app/scripts/keyring-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 141a1281a..68cf62f7a 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -118,6 +118,7 @@ module.exports = class KeyringController extends EventEmitter { return this.idStoreMigrator.migratedVaultForPassword(password) .then((serialized) => { if (serialized && shouldMigrate) { + this.password = password const keyring = this.restoreKeyring(serialized) this.keyrings.push(keyring) this.configManager.setSelectedAccount(keyring.getAccounts()[0]) @@ -185,7 +186,6 @@ module.exports = class KeyringController extends EventEmitter { cb(null, this.getState()) }) .catch((err) => { - console.error(err) cb(err) }) } @@ -558,7 +558,7 @@ module.exports = class KeyringController extends EventEmitter { } setLocked (cb) { - this.key = null + this.password = null this.keyrings = [] this.emit('update') cb() |