aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-09-27 09:11:51 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-09-27 09:12:53 +0800
commit508696f71d6b5b14c708a3229039f9f915ce48ce (patch)
tree71af5b58ff0f3317d4b1289dc178f027bd5e6929 /app
parent80c98b16531db4c6a13a52df800967af2bc4a676 (diff)
downloadtangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.tar
tangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.tar.gz
tangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.tar.bz2
tangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.tar.lz
tangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.tar.xz
tangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.tar.zst
tangerine-wallet-browser-508696f71d6b5b14c708a3229039f9f915ce48ce.zip
transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/transactions.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index ec1524968..6ea2933dc 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -62,7 +62,7 @@ module.exports = class TransactionController extends EventEmitter {
nonceTracker: this.nonceTracker,
retryLimit: 3500, // Retry 3500 blocks, or about 1 day.
getBalance: (address) => {
- const account = this.accountTracker.getState().accounts[address]
+ const account = this.accountTracker.store.getState().accounts[address]
if (!account) return
return account.balance
},
@@ -111,6 +111,10 @@ module.exports = class TransactionController extends EventEmitter {
return this.txStateManager.getPendingTransactions(account).length
}
+ getFilteredTxList (opts) {
+ return this.txStateManager.getFilteredTxList(opts)
+ }
+
getChainId () {
const networkState = this.networkStore.getState()
const getChainId = parseInt(networkState)