From ff67293a8ef61308d602d09f26b163b9b9ec90d3 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Wed, 10 Oct 2018 04:26:38 -1000
Subject: [PATCH] transactions - add txReceipt to the txMeta body for confirmed
 txs (#5375)

---
 app/scripts/controllers/transactions/index.js | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index ebd49f882..1d566522c 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -362,7 +362,29 @@ class TransactionController extends EventEmitter {
     this.txStateManager.setTxStatusSubmitted(txId)
   }
 
-  confirmTransaction (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)
+      }
+    }
+
     this.txStateManager.setTxStatusConfirmed(txId)
     this._markNonceDuplicatesDropped(txId)
   }