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: fix merge and errors disaperaing on update

---
 app/scripts/controllers/transactions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/controllers/transactions.js')

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,
-- 
cgit