diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-08-09 09:49:48 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-08-09 09:49:48 +0800 |
| commit | 5bb84f6e21842b9ac860be48c0ddc322d654559b (patch) | |
| tree | 81fe69cee64f5c110357c2a334cec4c19ca94447 /app | |
| parent | cd1437fdd3fa897720733a5a5099e640bde5dfa2 (diff) | |
| download | tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.tar tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.tar.gz tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.tar.bz2 tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.tar.lz tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.tar.xz tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.tar.zst tangerine-wallet-browser-5bb84f6e21842b9ac860be48c0ddc322d654559b.zip | |
fix getPendingTransactions function for pendingTxTracker
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 3 | ||||
| -rw-r--r-- | 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) => { |