From 3f4c988018e7f3f44b7622c6b4ad87847538db90 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 4 Aug 2021 18:27:14 -0230
Subject: [PATCH] Ensure gas fees update in popover on poll for new values
 (#11760)

---
 ui/hooks/useGasFeeInputs.js | 42 +++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/ui/hooks/useGasFeeInputs.js b/ui/hooks/useGasFeeInputs.js
index eb746c167..e2402ec10 100644
--- a/ui/hooks/useGasFeeInputs.js
+++ b/ui/hooks/useGasFeeInputs.js
@@ -206,41 +206,51 @@ export function useGasFeeInputs(
     estimatedGasFeeTimeBounds,
   } = useGasFeeEstimates();
 
+  const [initialMaxFeePerGas] = useState(
+    Number(hexWEIToDecGWEI(transaction?.txParams?.maxFeePerGas)),
+  );
+  const [initialMaxPriorityFeePerGas] = useState(
+    Number(hexWEIToDecGWEI(transaction?.txParams?.maxPriorityFeePerGas)),
+  );
+  const [initialGasPrice] = useState(
+    Number(hexWEIToDecGWEI(transaction?.txParams?.gasPrice)),
+  );
+
+  const [initialMatchingEstimateLevel] = useState(
+    getMatchingEstimateFromGasFees(
+      gasFeeEstimates,
+      initialMaxFeePerGas,
+      initialMaxPriorityFeePerGas,
+      initialGasPrice,
+      networkAndAccountSupports1559,
+    ),
+  );
+
   // This hook keeps track of a few pieces of transitional state. It is
   // transitional because it is only used to modify a transaction in the
   // metamask (background) state tree.
   const [maxFeePerGas, setMaxFeePerGas] = useState(
-    transaction?.txParams?.maxFeePerGas
-      ? Number(hexWEIToDecGWEI(transaction.txParams.maxFeePerGas))
+    initialMaxFeePerGas && !initialMatchingEstimateLevel
+      ? initialMaxFeePerGas
       : null,
   );
   const [maxPriorityFeePerGas, setMaxPriorityFeePerGas] = useState(
-    transaction?.txParams?.maxPriorityFeePerGas
-      ? Number(hexWEIToDecGWEI(transaction.txParams.maxPriorityFeePerGas))
+    initialMaxPriorityFeePerGas && !initialMatchingEstimateLevel
+      ? initialMaxPriorityFeePerGas
       : null,
   );
   const [gasPriceHasBeenManuallySet, setGasPriceHasBeenManuallySet] = useState(
     false,
   );
   const [gasPrice, setGasPrice] = useState(
-    transaction?.txParams?.gasPrice
-      ? Number(hexWEIToDecGWEI(transaction.txParams.gasPrice))
-      : null,
+    initialGasPrice && !initialMatchingEstimateLevel ? initialGasPrice : null,
   );
   const [gasLimit, setGasLimit] = useState(
     Number(hexToDecimal(transaction?.txParams?.gas ?? minimumGasLimit)),
   );
 
   const [estimateToUse, setInternalEstimateToUse] = useState(
-    transaction
-      ? getMatchingEstimateFromGasFees(
-          gasFeeEstimates,
-          maxFeePerGas,
-          maxPriorityFeePerGas,
-          gasPrice,
-          networkAndAccountSupports1559,
-        )
-      : defaultEstimateToUse,
+    transaction ? initialMatchingEstimateLevel : defaultEstimateToUse,
   );
 
   // We specify whether to use the estimate value by checking if the state