From 5bb84f6e21842b9ac860be48c0ddc322d654559b Mon Sep 17 00:00:00 2001 From: frankiebee Date: Tue, 8 Aug 2017 21:49:48 -0400 Subject: [PATCH 1/2] fix getPendingTransactions function for pendingTxTracker --- app/scripts/controllers/transactions.js | 3 +-- app/scripts/lib/pending-tx-tracker.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 664dbff6b..542881b8f 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -46,9 +46,8 @@ module.exports = class TransactionController extends EventEmitter { return account.balance }, publishTransaction: this.txProviderUtil.publishTransaction.bind(this.txProviderUtil), - getPendingTransactions: (address) => { + getPendingTransactions: () => { return this.getFilteredTxList({ - from: address, status: 'submitted', }) }, diff --git a/app/scripts/lib/pending-tx-tracker.js b/app/scripts/lib/pending-tx-tracker.js index 6921997b2..19720db3f 100644 --- a/app/scripts/lib/pending-tx-tracker.js +++ b/app/scripts/lib/pending-tx-tracker.js @@ -66,7 +66,7 @@ module.exports = class PendingTransactionTracker extends EventEmitter { resubmitPendingTxs () { - const pending = this.getPendingTransactions('status', 'submitted') + const pending = this.getPendingTransactions() // only try resubmitting if their are transactions to resubmit if (!pending.length) return pending.forEach((txMeta) => this._resubmitTx(txMeta).catch((err) => { From 9c9165e930684b53d525d6bced6df1a76030253b Mon Sep 17 00:00:00 2001 From: frankiebee Date: Tue, 8 Aug 2017 21:54:26 -0400 Subject: [PATCH 2/2] filter by network for pending txs --- app/scripts/controllers/transactions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 542881b8f..28130c164 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -47,8 +47,10 @@ module.exports = class TransactionController extends EventEmitter { }, publishTransaction: this.txProviderUtil.publishTransaction.bind(this.txProviderUtil), getPendingTransactions: () => { + const network = this.getNetwork() return this.getFilteredTxList({ status: 'submitted', + metamaskNetworkId: network, }) }, })