diff options
author | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2018-10-11 02:10:43 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-11 02:10:43 +0800 |
commit | 3d0ba46f21045a08fb0196e6a6b9cdb713031e0d (patch) | |
tree | cad505b31d309053f8847f0bc65100434d633d2c | |
parent | b45479934dadd8a4177b51b81732ab15f3226b93 (diff) | |
parent | 428a7cacdfbb3080a860bf1fdb774cc8ae218c04 (diff) | |
download | tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.tar tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.tar.gz tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.tar.bz2 tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.tar.lz tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.tar.xz tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.tar.zst tangerine-wallet-browser-3d0ba46f21045a08fb0196e6a6b9cdb713031e0d.zip |
Merge pull request #5490 from whymarrh/revert-5375
Revert txReceipt merge
-rw-r--r-- | app/scripts/controllers/transactions/index.js | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 1d566522c..ebd49f882 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -362,29 +362,7 @@ class TransactionController extends EventEmitter { this.txStateManager.setTxStatusSubmitted(txId) } - /** - Sets the status of the transaction to confirmed - and sets the status of nonce duplicates as dropped - if the txParams have data it will fetch the txReceipt - @param txId {number} - the tx's Id - @returns {Promise<void>} - */ - - async confirmTransaction (txId) { - // get the txReceipt before marking the transaction confirmed - // to ensure the receipt is gotten before the ui revives the tx - const txMeta = this.txStateManager.getTx(txId) - if (txMeta.txParams.data) { - try { - const txReceipt = await this.query.getTransactionReceipt() - txMeta.txReceipt = txReceipt - this.txStateManager.updateTx(txMeta, 'transactions#confirmTransaction - add txReceipt') - - } catch (err) { - log.error(err) - } - } - + confirmTransaction (txId) { this.txStateManager.setTxStatusConfirmed(txId) this._markNonceDuplicatesDropped(txId) } |