diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2017-12-08 01:46:28 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-08 01:46:28 +0800 |
commit | 845aec82b976b1676c504832f152d6d9142c11e1 (patch) | |
tree | f6306a17629d68e217488ab15af7ce5029c07335 /app/scripts/controllers | |
parent | bd5ce9461e5119c13ab8be29db5cdfc57228bac8 (diff) | |
parent | 2e9137dddd4abd07cc45caa670f09bdc9559bbbb (diff) | |
download | tangerine-wallet-browser-845aec82b976b1676c504832f152d6d9142c11e1.tar.gz tangerine-wallet-browser-845aec82b976b1676c504832f152d6d9142c11e1.tar.zst tangerine-wallet-browser-845aec82b976b1676c504832f152d6d9142c11e1.zip |
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r-- | app/scripts/controllers/network.js | 2 | ||||
-rw-r--r-- | app/scripts/controllers/transactions.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js index 23afdc12b..045bfcc5d 100644 --- a/app/scripts/controllers/network.js +++ b/app/scripts/controllers/network.js @@ -53,7 +53,7 @@ module.exports = class NetworkController extends EventEmitter { lookupNetwork () { // Prevent firing when provider is not defined. if (!this.ethQuery || !this.ethQuery.sendAsync) { - return + return log.warn('NetworkController - lookupNetwork aborted due to missing ethQuery') } this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => { if (err) return this.setNetworkState('loading') 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++ |