diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-10-07 04:17:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 04:17:45 +0800 |
| commit | 9adf77e3fe324d1366d2caf0044bfd223965d4fa (patch) | |
| tree | d4ace491cfd417fc9afca2733b141b92e2a157d2 /app/scripts/controllers | |
| parent | 53da368d2370edbb78eca063ff701c0492abbff6 (diff) | |
| parent | a417fab0ebd71d22f51a8e30590c259b32164fd2 (diff) | |
| download | tangerine-wallet-browser-9adf77e3fe324d1366d2caf0044bfd223965d4fa.tar.gz tangerine-wallet-browser-9adf77e3fe324d1366d2caf0044bfd223965d4fa.tar.zst tangerine-wallet-browser-9adf77e3fe324d1366d2caf0044bfd223965d4fa.zip | |
Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMined
Mark tx as failed after tx with same nonce is mined
Diffstat (limited to 'app/scripts/controllers')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index a0f983deb..ef659a300 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -62,6 +62,7 @@ module.exports = class TransactionController extends EventEmitter { retryTimePeriod: 86400000, // Retry 3500 blocks, or about 1 day. publishTransaction: (rawTx) => this.query.sendRawTransaction(rawTx), getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager), + getCompletedTransactions: this.txStateManager.getConfirmedTransactions.bind(this.txStateManager), }) this.txStateManager.store.subscribe(() => this.emit('update:badge')) |