From b0122be3c960b68620c5769ca969db60e4a45351 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 14 Mar 2018 19:03:14 -0230
Subject: [PATCH] Set retry gasPrice to forceGasMin on confirm screen in cases
 where gas is not edited.

---
 .../pending-tx/confirm-send-ether.js          | 19 +++++++++++++++++--
 .../pending-tx/confirm-send-token.js          | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index dca39f0a5..a4763eab7 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -493,9 +493,24 @@ ConfirmSendEther.prototype.gatherTxMeta = function () {
   const txData = clone(state.txData) || clone(props.txData)
 
   const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
-  const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
+  const {
+    lastGasPrice,
+    txParams: {
+      gasPrice: txGasPrice,
+      gas: txGasLimit,
+    },
+  } = txData
 
-  txData.txParams.gasPrice = sendGasPrice || txGasPrice
+  let forceGasMin
+  if (lastGasPrice) {
+    forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
+      multiplicandBase: 16,
+      multiplierBase: 10,
+      toNumericBase: 'hex',
+    }))
+  }
+
+  txData.txParams.gasPrice = sendGasPrice || forceGasMin || txGasPrice
   txData.txParams.gas = sendGasLimit || txGasLimit
 
   // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index 6035dd801..f1142b142 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -486,9 +486,24 @@ ConfirmSendToken.prototype.gatherTxMeta = function () {
   const txData = clone(state.txData) || clone(props.txData)
 
   const { gasPrice: sendGasPrice, gas: sendGasLimit } = props.send
-  const { gasPrice: txGasPrice, gas: txGasLimit } = txData.txParams
+  const {
+    lastGasPrice,
+    txParams: {
+      gasPrice: txGasPrice,
+      gas: txGasLimit,
+    },
+  } = txData
 
-  txData.txParams.gasPrice = sendGasPrice || txGasPrice
+  let forceGasMin
+  if (lastGasPrice) {
+    forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
+      multiplicandBase: 16,
+      multiplierBase: 10,
+      toNumericBase: 'hex',
+    }))
+  }
+
+  txData.txParams.gasPrice = sendGasPrice || forceGasMin || txGasPrice
   txData.txParams.gas = sendGasLimit || txGasLimit
 
   // log.debug(`UI has defaulted to tx meta ${JSON.stringify(txData)}`)