diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-08-09 10:00:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 10:00:17 +0800 |
| commit | d40bd9a726b7bef900d36ed195e38e8537cc791d (patch) | |
| tree | 4d64aa3605e5601bf6a4ff1856fa23ac42afb377 /app/scripts | |
| parent | 02a6cd255ba1d081bf2a37a9df05536eb169ca34 (diff) | |
| parent | 9c9165e930684b53d525d6bced6df1a76030253b (diff) | |
| download | tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.gz tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.bz2 tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.lz tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.xz tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.zst tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.zip | |
Merge pull request #1880 from MetaMask/pendingFix
fix getPendingTransactions function for pendingTxTracker
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) => { |