From f9b31fe2c3a43339a4519761e4c8b2f3813e85e0 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 30 Jan 2017 15:08:31 -0800
Subject: rename selectedAccount to selectedAddress

---
 app/scripts/keyring-controller.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 3e329cb3f..f7a4e4010 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -150,7 +150,7 @@ class KeyringController extends EventEmitter {
       const firstAccount = accounts[0]
       if (!firstAccount) throw new Error('KeyringController - First Account not found.')
       const hexAccount = normalizeAddress(firstAccount)
-      this.setSelectedAccount(hexAccount)
+      this.emit('newAccount', hexAccount)
       return this.setupAccounts(accounts)
     })
     .then(this.persistAllKeyrings.bind(this, password))
@@ -391,7 +391,6 @@ class KeyringController extends EventEmitter {
       const firstAccount = accounts[0]
       if (!firstAccount) throw new Error('KeyringController - No account found on keychain.')
       const hexAccount = normalizeAddress(firstAccount)
-      this.setSelectedAccount(hexAccount)
       this.emit('newAccount', hexAccount)
       return this.setupAccounts(accounts)
     })
@@ -638,7 +637,6 @@ class KeyringController extends EventEmitter {
 
     this.keyrings = []
     this.identities = {}
-    this.setSelectedAccount()
   }
 
 }
-- 
cgit v1.2.3