From b1de2cdefa2341eeab8d0269a1b14b349fdd5d16 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 30 Jan 2017 13:09:46 -0800 Subject: metamask - rename getSelectedAccount to getSelectedAddress --- app/scripts/transaction-manager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/scripts/transaction-manager.js') 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(), -- cgit From 2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 30 Jan 2017 15:25:12 -0800 Subject: continue rename selectedAccount to selectedAddress --- app/scripts/transaction-manager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/scripts/transaction-manager.js') diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index c7d4686f3..d69dab1d7 100644 --- a/app/scripts/transaction-manager.js +++ b/app/scripts/transaction-manager.js @@ -25,11 +25,11 @@ module.exports = class TransactionManager extends EventEmitter { } getState () { - var selectedAccount = this.getSelectedAddress() + var selectedAddress = this.getSelectedAddress() return { transactions: this.getTxList(), unconfTxs: this.getUnapprovedTxList(), - selectedAccountTxList: this.getFilteredTxList({metamaskNetworkId: this.getNetwork(), from: selectedAccount}), + selectedAddressTxList: this.getFilteredTxList({metamaskNetworkId: this.getNetwork(), from: selectedAddress}), } } -- cgit