diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-07-26 06:26:41 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-26 06:26:41 +0800 |
commit | a929fb2387de87619192ea0a86fe1ead4f7a0361 (patch) | |
tree | 21ced267219f692dc00234f814059e7dc68afbda /app/scripts/controllers/transactions.js | |
parent | b81f8831505b1ebb1d58a474d52b068d42879d56 (diff) | |
parent | 0c73d6d852ac9c98613f71d6ee87f9d89c3c2b47 (diff) | |
download | tangerine-wallet-browser-a929fb2387de87619192ea0a86fe1ead4f7a0361.tar.gz tangerine-wallet-browser-a929fb2387de87619192ea0a86fe1ead4f7a0361.tar.zst tangerine-wallet-browser-a929fb2387de87619192ea0a86fe1ead4f7a0361.zip |
Merge branch 'master' into betterErrorsOnTx
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r-- | app/scripts/controllers/transactions.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 5485dc723..7b2e4e314 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -469,7 +469,7 @@ module.exports = class TransactionController extends EventEmitter { })) } - async _resubmitTx (txMeta, cb) { + async _resubmitTx (txMeta) { const address = txMeta.txParams.from const balance = this.ethStore.getState().accounts[address].balance if (!('retryCount' in txMeta)) txMeta.retryCount = 0 @@ -481,17 +481,17 @@ module.exports = class TransactionController extends EventEmitter { stack: '_resubnitTx: custom tx-controller error', message, }) - cb() - return log.error(message) + log.error(message) + return } // Only auto-submit already-signed txs: - if (!('rawTx' in txMeta)) return cb() + if (!('rawTx' in txMeta)) return // Increment a try counter. txMeta.retryCount++ const rawTx = txMeta.rawTx - return await this.txProviderUtils.publishTransaction(rawTx, cb) + return await this.txProviderUtils.publishTransaction(rawTx) } // checks the network for signed txs and |