From 34e2f6650d0db42b9f820d56a7acf9b72ca14da2 Mon Sep 17 00:00:00 2001
From: kumavis <kumavis@users.noreply.github.com>
Date: Fri, 7 Jul 2017 01:50:48 -0700
Subject: tx controller - clean code

---
 app/scripts/controllers/transactions.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'app/scripts/controllers')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 42baaaadc..b855f910c 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -241,23 +241,24 @@ module.exports = class TransactionController extends EventEmitter {
 
     this.txProviderUtils.publishTransaction(rawTx, (err, txHash) => {
       if (err) {
-        const errorMessage = err.message.toLowerCase()
         /*
-        Dont marked as failed if the error is because
-        it's a "known" transaction
+        Dont marked as failed if the error is a "known" transaction warning
         "there is already a transaction with the same sender-nonce
         but higher/same gas price"
         */
-
-        // geth
-        if (errorMessage !== 'replacement transaction underpriced' 
-        // geth
-        && !errorMessage.startsWith('known transaction')
-        // parity
-        && errorMessage !== 'gas price too low to replace'
-        ) {
-          this.setTxStatusFailed(txId)
-        }
+        const errorMessage = err.message.toLowerCase()
+        const isKnownTx = (
+          // geth
+          errorMessage === 'replacement transaction underpriced' 
+          || errorMessage.startsWith('known transaction')
+          // parity
+          || errorMessage === 'gas price too low to replace'
+        )
+        // ignore resubmit warnings, return early
+        if (isKnownTx) return cb()
+        
+        // encountered unknown error, set status to failed 
+        this.setTxStatusFailed(txId, err.message)
         return cb(err)
       }
       this.setTxHash(txId, txHash)
-- 
cgit