From 50075c6df5af4441db78b47f3bc2036a65228224 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Thu, 7 Sep 2017 00:55:21 -0700
Subject: [PATCH] fix messy merge

---
 app/scripts/controllers/transactions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 5aaee7be0..d71be37d8 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -62,10 +62,6 @@ module.exports = class TransactionController extends EventEmitter {
           err: undefined,
         })
       },
-      giveUpOnTransaction: (txId) => {
-        const msg = `Gave up submitting after 3500 blocks un-mined.`
-        this.setTxStatusFailed(txId, msg)
-      },
     })
 
     this.pendingTxTracker = new PendingTransactionTracker({
@@ -80,6 +76,10 @@ module.exports = class TransactionController extends EventEmitter {
       getPendingTransactions: () => {
         return this.txStateManager.getFilteredTxList({ status: 'submitted' })
       },
+      giveUpOnTransaction: (txId) => {
+        const msg = `Gave up submitting after 3500 blocks un-mined.`
+        this.setTxStatusFailed(txId, msg)
+      },
     })
 
     this.txStateManager.subscribe(() => {