From a73aecc796c2f2416227508db8e96e22915cfa65 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Wed, 6 Sep 2017 14:01:07 -0700
Subject: [PATCH] fix merge and errors disaperaing on update

---
 app/scripts/controllers/transactions.js | 2 +-
 app/scripts/lib/tx-state-manager.js     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 3f2a7ce16..5aaee7be0 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -56,7 +56,7 @@ module.exports = class TransactionController extends EventEmitter {
         })
       },
       getConfirmedTransactions: (address) => {
-        return this.getFilteredTxList({
+        return this.txStateManager.getFilteredTxList({
           from: address,
           status: 'confirmed',
           err: undefined,
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index 64925c528..eb2a187db 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -180,9 +180,12 @@ module.exports = class TransactionStateManger extends ObservableStore {
     this._setTxStatus(txId, 'confirmed')
   }
 
-  setTxStatusFailed (txId, reason) {
+  setTxStatusFailed (txId, err) {
     const txMeta = this.getTx(txId)
-    txMeta.err = reason
+    txMeta.err = {
+      message: err.toString(),
+      stack: err.stack,
+    }
     this.updateTx(txMeta)
     this._setTxStatus(txId, 'failed')
   }