m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge pull request #1880 from MetaMask/pendingFix

Browse Source 
fix getPendingTransactions function for pendingTxTracker
This commit is contained in:
Frankie 2017-08-08 22:00:17 -04:00 committed by GitHub
commit d40bd9a726
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/controllers/transactions.js
View File

@ -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,
})
},
})

2
app/scripts/lib/pending-tx-tracker.js
View File

@ -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) => {