Improve insufficient balance checking in retry loop

2 files changed, 10 insertions, 4 deletions

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 02487c385..ca379a7ff 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -445,13 +445,10 @@ module.exports = class TransactionController extends EventEmitter {
   _resubmitTx (txMeta, cb) {
     const address = txMeta.txParams.from
     const balance = this.ethStore.getState().accounts[address].balance
-    const nonce = Number.parseInt(this.ethStore.getState().accounts[address].nonce)
-    const txNonce = Number.parseInt(txMeta.txParams.nonce)
-    const gtBalance = Number.parseInt(txMeta.txParams.value) > Number.parseInt(balance)
     if (!('retryCount' in txMeta)) txMeta.retryCount = 0
 
     // if the value of the transaction is greater then the balance, fail.
-    if (gtBalance) {
+    if (!this.txProviderUtils.sufficientBalance(txMeta.txParams, balance)) {
       const message = 'Insufficient balance.'
       this.setTxStatusFailed(txMeta.id, { message })
       cb()
diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index 149d93102..4e780fcc0 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -118,6 +118,15 @@ module.exports = class txProviderUtils {
     }
   }
 
+  sufficientBalance (tx, hexBalance) {
+    const balance = hexToBn(hexBalance)
+    const value = hexToBn(tx.value)
+    const gasLimit = hexToBn(tx.gas)
+    const gasPrice = hexToBn(tx.gasPrice)
+
+    const maxCost = value.add(gasLimit.mul(gasPrice))
+    return balance.gte(maxCost)
+  }
 
 }