1 files changed, 12 insertions, 11 deletions
diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index ad07c813f..23c915a61 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -38,11 +38,6 @@ module.exports = class TransactionStateManager extends EventEmitter {
     }, opts)
   }
 
-  // Returns the number of txs for the current network.
-  getTxCount () {
-    return this.getTxList().length
-  }
-
   getTxList () {
     const network = this.getNetwork()
     const fullTxList = this.getFullTxList()
@@ -88,7 +83,7 @@ module.exports = class TransactionStateManager extends EventEmitter {
     txMeta.history.push(snapshot)
 
     const transactions = this.getFullTxList()
-    const txCount = this.getTxCount()
+    const txCount = transactions.length
     const txHistoryLimit = this.txHistoryLimit
 
     // checks if the length of the tx history is
@@ -111,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
@@ -144,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 = {