From f5b0795ac5582dd53de728479cf47c43eabfe67c Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Mon, 21 Nov 2016 16:21:16 -0800
Subject: change all instances of selectedAddress to selectedAccount.

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

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

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 951918460..d230b3483 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -67,7 +67,7 @@ module.exports = class MetamaskController {
       addNewKeyring: keyringController.addNewKeyring.bind(keyringController),
       addNewAccount: keyringController.addNewAccount.bind(keyringController),
       submitPassword: keyringController.submitPassword.bind(keyringController),
-      setSelectedAddress: keyringController.setSelectedAddress.bind(keyringController),
+      setSelectedAccount: keyringController.setSelectedAccount.bind(keyringController),
       approveTransaction: keyringController.approveTransaction.bind(keyringController),
       cancelTransaction: keyringController.cancelTransaction.bind(keyringController),
       signMessage: keyringController.signMessage.bind(keyringController),
@@ -125,8 +125,8 @@ module.exports = class MetamaskController {
       rpcUrl: this.configManager.getCurrentRpcAddress(),
       // account mgmt
       getAccounts: (cb) => {
-        var selectedAddress = this.configManager.getSelectedAccount()
-        var result = selectedAddress ? [selectedAddress] : []
+        var selectedAccount = this.configManager.getSelectedAccount()
+        var result = selectedAccount ? [selectedAccount] : []
         cb(null, result)
       },
       // tx signing
@@ -177,14 +177,14 @@ module.exports = class MetamaskController {
     // keyringController substate
     function keyringControllerToPublic (state) {
       return {
-        selectedAddress: state.selectedAddress,
+        selectedAccount: state.selectedAccount,
       }
     }
     // config substate
     function configToPublic (state) {
       return {
         provider: state.provider,
-        selectedAddress: state.selectedAccount,
+        selectedAccount: state.selectedAccount,
       }
     }
     // dump obj into store
-- 
cgit v1.2.3