diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-01-31 07:57:49 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-31 07:57:49 +0800 |
commit | 82578538198de74955d7bc5cfd3c9a02d1b69a6d (patch) | |
tree | aad1a62ee4ed4b7e34c0bd78b9f680dc2aeaaded /app/scripts/transaction-manager.js | |
parent | b6909574a7036c396ed85809cbd90aa2171b012f (diff) | |
parent | 0b9d37c6c8e714eb26bec5156e984a6b0cd268ad (diff) | |
download | tangerine-wallet-browser-82578538198de74955d7bc5cfd3c9a02d1b69a6d.tar.gz tangerine-wallet-browser-82578538198de74955d7bc5cfd3c9a02d1b69a6d.tar.zst tangerine-wallet-browser-82578538198de74955d7bc5cfd3c9a02d1b69a6d.zip |
Merge pull request #1069 from MetaMask/i1066
Introduce Preferences Controller
Diffstat (limited to 'app/scripts/transaction-manager.js')
-rw-r--r-- | app/scripts/transaction-manager.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index 6d0121afd..d69dab1d7 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,11 +25,11 @@ module.exports = class TransactionManager extends EventEmitter { } getState () { - var selectedAccount = this.getSelectedAccount() + 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}), } } |