From 0ac1f749fd68244682d0f2c763028cdf6aa29486 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Wed, 1 Mar 2017 14:37:51 -0800
Subject: Various improvements to gas input.

---
 ui/app/components/pending-tx-details.js | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'ui/app/components/pending-tx-details.js')

diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index b1ab9576b..fc8d65454 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -32,10 +32,8 @@ PTXP.render = function () {
   var account = props.accounts[address]
   var balance = account ? account.balance : '0x0'
 
-  const gas = state.gas || txParams.gas
-  const gasPrice = state.gasPrice || txData.gasPrice
-  const gasDefault = txParams.gas
-  const gasPriceDefault = txData.gasPrice
+  const gas = (state.gas === undefined) ? txParams.gas : state.gas
+  const gasPrice = (state.gasPrice === undefined) ? txData.gasPrice : state.gasPrice
 
   var txFee = state.txFee || txData.txFee || ''
   var maxCost = state.maxCost || txData.maxCost || ''
@@ -131,11 +129,7 @@ PTXP.render = function () {
               },
               onChange: (newHex) => {
                 log.info(`Gas limit changed to ${newHex}`)
-                if (newHex === '0x0') {
-                  this.setState({gas: gasDefault})
-                } else {
-                  this.setState({ gas: newHex })
-                }
+                this.setState({ gas: newHex })
               },
             }),
           ]),
@@ -155,11 +149,7 @@ PTXP.render = function () {
               },
               onChange: (newHex) => {
                 log.info(`Gas price changed to: ${newHex}`)
-                if (newHex === '0x0') {
-                  this.setState({gasPrice: gasPriceDefault})
-                } else {
-                  this.setState({ gasPrice: newHex })
-                }
+                this.setState({ gasPrice: newHex })
               },
             }),
           ]),
-- 
cgit v1.2.3


From 72932bdcba10bd9d47724f271d0c14f84d12b759 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Wed, 1 Mar 2017 17:03:55 -0800
Subject: Prevent submission of invalid gas parameters.

---
 ui/app/components/pending-tx-details.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'ui/app/components/pending-tx-details.js')

diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index fc8d65454..e92ce575f 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -306,7 +306,6 @@ PTXP.gatherParams = function () {
   const state = this.state || {}
   const txData = state.txData || props.txData
   const txParams = txData.txParams
-
   const gas = state.gas || txParams.gas
   const gasPrice = state.gasPrice || txParams.gasPrice
   const resultTx = extend(txParams, {
@@ -320,6 +319,16 @@ PTXP.gatherParams = function () {
   return resultTxMeta
 }
 
+PTXP.verifyGasParams = function () {
+  // We call this in case the gas has not been modified at all
+  if (!this.state) { return true }
+  return this._notZeroOrEmptyString(this.state.gas) && this._notZeroOrEmptyString(this.state.gasPrice)
+}
+
+PTXP._notZeroOrEmptyString = function (obj) {
+  return obj !== '' && obj !== '0x0'
+}
+
 function forwardCarrat () {
   return (
 
-- 
cgit v1.2.3