diff options
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 5 | ||||
| -rw-r--r-- | app/scripts/lib/pending-tx-tracker.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 664dbff6b..28130c164 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -46,10 +46,11 @@ module.exports = class TransactionController extends EventEmitter { return account.balance }, publishTransaction: this.txProviderUtil.publishTransaction.bind(this.txProviderUtil), - getPendingTransactions: (address) => { + getPendingTransactions: () => { + const network = this.getNetwork() return this.getFilteredTxList({ - from: address, status: 'submitted', + metamaskNetworkId: network, }) }, }) 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) => { |