Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions.

2 files changed, 8 insertions, 12 deletions

diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 9b9a4e4ea..928149ccd 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -494,13 +494,11 @@ ConfirmSendEther.prototype.gatherTxMeta = function () {
   const state = this.state
   const txData = clone(state.txData) || clone(props.txData)
 
-  if (txData.lastGasPrice) {
-    const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
-    const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
+  const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
+  const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
 
-    txData.txParams.gasPrice = sendGasPrice || txGasPrice
-    txData.txParams.gas = sendGasLimit || txGasLimit
-  }
+  txData.txParams.gasPrice = sendGasPrice || txGasPrice
+  txData.txParams.gas = sendGasLimit || txGasLimit
 
   // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)
   return txData
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index ac773b1d2..fe323ffd3 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -487,13 +487,11 @@ ConfirmSendToken.prototype.gatherTxMeta = function () {
   const state = this.state
   const txData = clone(state.txData) || clone(props.txData)
 
-  if (txData.lastGasPrice) {
-    const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
-    const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
+  const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
+  const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
 
-    txData.txParams.gasPrice = sendGasPrice || txGasPrice
-    txData.txParams.gas = sendGasLimit || txGasLimit
-  }
+  txData.txParams.gasPrice = sendGasPrice || txGasPrice
+  txData.txParams.gas = sendGasLimit || txGasLimit
 
   // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)
   return txData