aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-06-28 07:46:14 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-06-28 07:46:33 +0800
commit690685d20de310b4c4589e92a5053afd9c56e85a (patch)
tree36a47ef9bfc7243584a4dc1381d7b7c3f01157d0 /app/scripts/controllers/transactions.js
parent0ee4502d716ebe28fa426a05c454a75c7f82d965 (diff)
downloadtangerine-wallet-browser-690685d20de310b4c4589e92a5053afd9c56e85a.tar.gz
tangerine-wallet-browser-690685d20de310b4c4589e92a5053afd9c56e85a.tar.zst
tangerine-wallet-browser-690685d20de310b4c4589e92a5053afd9c56e85a.zip
nonce-tracker: only check transactions that are not supposed to be ignored
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 460280578..c74427cd5 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -26,7 +26,14 @@ module.exports = class TransactionController extends EventEmitter {
this.nonceTracker = new NonceTracker({
provider: this.provider,
blockTracker: this.provider._blockTracker,
- getPendingTransactions: (address) => this.getFilteredTxList({ from: address, status: 'submitted', err: undefined }),
+ getPendingTransactions: (address) => {
+ return this.getFilteredTxList({
+ from: address,
+ status: 'submitted',
+ err: undefined,
+ ignore: undefined,
+ })
+ },
})
this.query = opts.ethQuery
this.txProviderUtils = new TxProviderUtil(this.query)