aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-12-07 13:13:29 +0800
committerGitHub <noreply@github.com>2017-12-07 13:13:29 +0800
commit373f8b72d048d84f537d97d87c7f106e0b8db087 (patch)
tree94fb9302fad2d52b927bc5a48339ab2965e003fe /app/scripts/controllers
parentec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7 (diff)
parenta78cc013d199547ba865a0d1c2fec9a328ce7e0b (diff)
downloadtangerine-wallet-browser-373f8b72d048d84f537d97d87c7f106e0b8db087.tar.gz
tangerine-wallet-browser-373f8b72d048d84f537d97d87c7f106e0b8db087.tar.zst
tangerine-wallet-browser-373f8b72d048d84f537d97d87c7f106e0b8db087.zip
Merge branch 'master' into NewUI-flat
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r--app/scripts/controllers/transactions.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index a861c0342..ce709bd28 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -72,6 +72,12 @@ module.exports = class TransactionController extends EventEmitter {
})
this.pendingTxTracker.on('tx:failed', this.txStateManager.setTxStatusFailed.bind(this.txStateManager))
this.pendingTxTracker.on('tx:confirmed', this.txStateManager.setTxStatusConfirmed.bind(this.txStateManager))
+ this.pendingTxTracker.on('tx:block-update', (txMeta, latestBlockNumber) => {
+ if (!txMeta.firstRetryBlockNumber) {
+ txMeta.firstRetryBlockNumber = latestBlockNumber
+ this.txStateManager.updateTx(txMeta, 'transactions/pending-tx-tracker#event: tx:block-update')
+ }
+ })
this.pendingTxTracker.on('tx:retry', (txMeta) => {
if (!('retryCount' in txMeta)) txMeta.retryCount = 0
txMeta.retryCount++