diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 02:48:00 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-19 02:48:00 +0800 |
| commit | cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0 (patch) | |
| tree | b2da537bc4018e1bea23df39e6ff3365772c889f /app | |
| parent | bef023fb4a699c16fe0fff30ce18840678ed7ad0 (diff) | |
| download | tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.tar tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.tar.gz tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.tar.bz2 tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.tar.lz tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.tar.xz tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.tar.zst tangerine-wallet-browser-cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0.zip | |
Persist keyrings from migration to storage.
Diffstat (limited to 'app')
| -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 |