diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 07:40:25 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 07:40:25 +0800 |
| commit | c695d54b01bf4766f20e3f9e00e980df3408e29d (patch) | |
| tree | b7954a3d77ea4fb2113e121d8f16382c55014345 /app/scripts/keyring-controller.js | |
| parent | 3cd839d27f78d9e59248a85be72a31cff9a3404c (diff) | |
| parent | 626903e9f237163fe00132c777435caa845ad3f3 (diff) | |
| download | tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.tar tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.tar.gz tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.tar.bz2 tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.tar.lz tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.tar.xz tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.tar.zst tangerine-wallet-browser-c695d54b01bf4766f20e3f9e00e980df3408e29d.zip | |
Merge branch 'dev' into failing-tests
Diffstat (limited to 'app/scripts/keyring-controller.js')
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 10d686e23..9046108c0 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -117,7 +117,6 @@ module.exports = class KeyringController extends EventEmitter { migrateAndGetKey (password) { let key const shouldMigrate = !!this.configManager.getWallet() && !this.configManager.getVault() - return this.loadKey(password) .then((derivedKey) => { key = derivedKey @@ -128,6 +127,7 @@ module.exports = class KeyringController extends EventEmitter { if (serialized && shouldMigrate) { const keyring = this.restoreKeyring(serialized) this.keyrings.push(keyring) + this.persistAllKeyrings() this.configManager.setSelectedAccount(keyring.getAccounts()[0]) } return key |