Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic

Fix conf tx balance logic

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa825e860..cced970cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- Fix rendering bug where the Confirm transaction view would lets you approve transactions when the account has insufficient balance.
 - Add ability to import accounts in JSON file format (used by Mist, Geth, MyEtherWallet, and more!)
 ## 3.1.1 2017-1-20
 
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index a6e03c3ed..1bd69f7d9 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -134,7 +134,7 @@ ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) {
   var address = txData.txParams.from || state.selectedAccount
   var account = state.accounts[address]
   var balance = account ? account.balance : '0x0'
-  var maxCost = new BN(txData.maxCost)
+  var maxCost = new BN(txData.maxCost, 16)
 
   var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16)
   return maxCost.gt(balanceBn)