From bc6312e9e3d3a48b886f53279f13f176c71e4019 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Fri, 18 Nov 2016 15:58:49 -0800
Subject: Promisify persistence of keyrings before returning key Change single
 letter variables (shame)

---
 app/scripts/keyring-controller.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/scripts/keyring-controller.js')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 9046108c0..cf761c88c 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -127,8 +127,9 @@ 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 this.persistAllKeyrings()
+        .then(() => { return key })
       }
       return key
     })
@@ -274,13 +275,12 @@ module.exports = class KeyringController extends EventEmitter {
   }
 
   persistAllKeyrings () {
-    const serialized = this.keyrings.map((k) => {
+    const serialized = this.keyrings.map((keyring) => {
       return {
-        type: k.type,
-        data: k.serialize(),
+        type: keyring.type,
+        data: keyring.serialize(),
       }
     })
-
     return this.encryptor.encryptWithKey(this.key, serialized)
     .then((encryptedString) => {
       this.configManager.setVault(encryptedString)
-- 
cgit