From cd2442e3e77e50c935b5c84e6ccc8f3c7da45de0 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Fri, 18 Nov 2016 10:48:00 -0800 Subject: [PATCH] Persist keyrings from migration to storage. --- app/scripts/keyring-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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