From b1de2cdefa2341eeab8d0269a1b14b349fdd5d16 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Mon, 30 Jan 2017 13:09:46 -0800
Subject: [PATCH] metamask - rename getSelectedAccount to getSelectedAddress

---
 app/scripts/metamask-controller.js | 6 +++---
 app/scripts/transaction-manager.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2f9e37cee..64deae426 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -71,7 +71,7 @@ module.exports = class MetamaskController extends EventEmitter {
       txList: this.configManager.getTxList(),
       txHistoryLimit: 40,
       setTxList: this.configManager.setTxList.bind(this.configManager),
-      getSelectedAccount: this.preferencesController.getSelectedAccount.bind(this.preferencesController),
+      getSelectedAddress: this.preferencesController.getSelectedAddress.bind(this.preferencesController),
       getGasMultiplier: this.configManager.getGasMultiplier.bind(this.configManager),
       getNetwork: this.getStateNetwork.bind(this),
       signTransaction: this.keyringController.signTransaction.bind(this.keyringController),
@@ -125,7 +125,7 @@ module.exports = class MetamaskController extends EventEmitter {
       rpcUrl: this.configManager.getCurrentRpcAddress(),
       // account mgmt
       getAccounts: (cb) => {
-        let selectedAccount = this.preferencesController.getSelectedAccount()
+        let selectedAccount = this.preferencesController.getSelectedAddress()
         let result = selectedAccount ? [selectedAccount] : []
         cb(null, result)
       },
@@ -342,7 +342,7 @@ module.exports = class MetamaskController extends EventEmitter {
   // ensuring they are only ever available in the background process.
   clearSeedWordCache (cb) {
     this.configManager.setSeedWords(null)
-    cb(null, this.preferencesController.getSelectedAccount())
+    cb(null, this.preferencesController.getSelectedAddress())
   }
 
   importAccountWithStrategy (strategy, args, cb) {
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index 6d0121afd..c7d4686f3 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -13,7 +13,7 @@ module.exports = class TransactionManager extends EventEmitter {
     this.txList = opts.txList || []
     this._setTxList = opts.setTxList
     this.txHistoryLimit = opts.txHistoryLimit
-    this.getSelectedAccount = opts.getSelectedAccount
+    this.getSelectedAddress = opts.getSelectedAddress
     this.provider = opts.provider
     this.blockTracker = opts.blockTracker
     this.txProviderUtils = new TxProviderUtil(this.provider)
@@ -25,7 +25,7 @@ module.exports = class TransactionManager extends EventEmitter {
   }
 
   getState () {
-    var selectedAccount = this.getSelectedAccount()
+    var selectedAccount = this.getSelectedAddress()
     return {
       transactions: this.getTxList(),
       unconfTxs: this.getUnapprovedTxList(),