Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions

1 files changed, 2 insertions, 10 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 5a645022a..79699965b 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -46,7 +46,6 @@ ConfirmTxScreen.prototype.render = function () {
   var txData = unconfTxList[index] || unconfTxList[0] || {}
   var txParams = txData.txParams || {}
   var isNotification = isPopupOrNotification() === 'notification'
-
   return (
 
     h('.flex-column.flex-grow', [
@@ -125,17 +124,10 @@ function currentTxView (opts) {
 }
 ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) {
   var state = this.props
-
-  var txParams = txData.txParams || {}
-  var address = txParams.from || state.selectedAccount
+  var address = txData.txParams.from || state.selectedAccount
   var account = state.accounts[address]
   var balance = account ? account.balance : '0x0'
-
-  var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16)
-  var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)
-  var txFee = gasCost.mul(gasPrice)
-  var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16)
-  var maxCost = txValue.add(txFee)
+  var maxCost = new BN(txData.maxCost)
 
   var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16)
   return maxCost.gt(balanceBn)