3 files changed, 25 insertions, 10 deletions
diff --git a/app/scripts/lib/nonce-tracker.js b/app/scripts/lib/nonce-tracker.js
index ed9dd3f11..5b1cd7f43 100644
--- a/app/scripts/lib/nonce-tracker.js
+++ b/app/scripts/lib/nonce-tracker.js
@@ -31,14 +31,13 @@ class NonceTracker {
     const networkNonceResult = await this._getNetworkNextNonce(address)
     const highestLocallyConfirmed = this._getHighestLocallyConfirmed(address)
     const nextNetworkNonce = networkNonceResult.nonce
-    const highestLocalNonce = highestLocallyConfirmed
-    const highestSuggested = Math.max(nextNetworkNonce, highestLocalNonce)
+    const highestSuggested = Math.max(nextNetworkNonce, highestLocallyConfirmed)
 
     const pendingTxs = this.getPendingTransactions(address)
     const localNonceResult = this._getHighestContinuousFrom(pendingTxs, highestSuggested) || 0
 
     nonceDetails.params = {
-      highestLocalNonce,
+      highestLocallyConfirmed,
       highestSuggested,
       nextNetworkNonce,
     }
diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js
index a869588d0..b93591e65 100644
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@@ -23,10 +23,20 @@ function setupRaven(opts) {
     release,
     transport: function(opts) {
       const report = opts.data
-      // simplify ethjs error messages
+      // simplify certain complex error messages
       report.exception.values.forEach(item => {
-        item.value = extractEthjsErrorMessage(item.value)
+        let errorMessage = item.value
+        // simplify ethjs error messages
+        errorMessage = extractEthjsErrorMessage(errorMessage)
+        // simplify 'Transaction Failed: known transaction'
+        if (errorMessage.indexOf('Transaction Failed: known transaction') === 0) {
+          // cut the hash from the error message
+          errorMessage = 'Transaction Failed: known transaction'
+        }
+        // finalize
+        item.value = errorMessage
       })
+
       // modify report urls
       rewriteReportUrls(report)
       // make request normally
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index ab344ae9b..23c915a61 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -106,12 +106,9 @@ module.exports = class TransactionStateManager extends EventEmitter {
   }
 
   updateTx (txMeta, note) {
+    // validate txParams
     if (txMeta.txParams) {
-      Object.keys(txMeta.txParams).forEach((key) => {
-        const value = txMeta.txParams[key]
-        if (typeof value !== 'string') console.error(`${key}: ${value} in txParams is not a string`)
-        if (!ethUtil.isHexPrefixed(value)) console.error('is not hex prefixed, anything on txParams must be hex prefixed')
-      })
+      this.validateTxParams(txMeta.txParams)
     }
 
     // create txMeta snapshot for history
@@ -139,6 +136,15 @@ module.exports = class TransactionStateManager extends EventEmitter {
     this.updateTx(txMeta, `txStateManager#updateTxParams`)
   }
 
+  // validates txParams members by type
+  validateTxParams(txParams) {
+    Object.keys(txParams).forEach((key) => {
+      const value = txParams[key]
+      if (typeof value !== 'string') throw new Error(`${key}: ${value} in txParams is not a string`)
+      if (!ethUtil.isHexPrefixed(value)) throw new Error('is not hex prefixed, everything on txParams must be hex prefixed')
+    })
+  }
+
 /*
   Takes an object of fields to search for eg:
   let thingsToLookFor = {