From bb81ac7cd6f5695aab7829042ada4bf2065bc24b Mon Sep 17 00:00:00 2001
From: Erik Marks <rekmarks@protonmail.com>
Date: Thu, 12 Nov 2020 14:57:29 -0800
Subject: [PATCH] Fix setGasPrice dispatch function params

---
 .../gas-price-button-group.component.js                   | 8 ++++----
 .../send-content/send-gas-row/send-gas-row.component.js   | 6 +++---
 .../send-content/send-gas-row/send-gas-row.container.js   | 8 ++++----
 .../swaps-gas-customization-modal.component.js            | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js b/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
index 95252f408..044df3dc5 100644
--- a/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
+++ b/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
@@ -94,10 +94,10 @@ export default class GasPriceButtonGroup extends Component {
     return (
       <Button
         onClick={() =>
-          handleGasPriceSelection(
-            priceInHexWei,
-            renderableGasInfo.gasEstimateType,
-          )
+          handleGasPriceSelection({
+            gasPrice: priceInHexWei,
+            gasEstimateType: renderableGasInfo.gasEstimateType,
+          })
         }
         key={`gas-price-button-${index}`}
       >
diff --git a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
index 97aa901ab..07f7d728a 100644
--- a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
@@ -101,7 +101,7 @@ export default class SendGasRow extends Component {
           className="gas-price-button-group--small"
           showCheck={false}
           {...gasPriceButtonGroupProps}
-          handleGasPriceSelection={async (...args) => {
+          handleGasPriceSelection={async (opts) => {
             metricsEvent({
               eventOpts: {
                 category: 'Transactions',
@@ -109,7 +109,7 @@ export default class SendGasRow extends Component {
                 name: 'Changed Gas Button',
               },
             })
-            await gasPriceButtonGroupProps.handleGasPriceSelection(...args)
+            await gasPriceButtonGroupProps.handleGasPriceSelection(opts)
             if (maxModeOn) {
               this.setMaxAmount()
             }
@@ -134,7 +134,7 @@ export default class SendGasRow extends Component {
       <div>
         <AdvancedGasInputs
           updateCustomGasPrice={(newGasPrice) =>
-            setGasPrice(newGasPrice, gasLimit)
+            setGasPrice({ gasPrice: newGasPrice, gasLimit })
           }
           updateCustomGasLimit={(newGasLimit) =>
             setGasLimit(newGasLimit, gasPrice)
diff --git a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js
index 0762fde9a..7387fd93f 100644
--- a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js
+++ b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js
@@ -89,11 +89,11 @@ function mapDispatchToProps(dispatch) {
   return {
     showCustomizeGasModal: () =>
       dispatch(showModal({ name: 'CUSTOMIZE_GAS', hideBasic: true })),
-    setGasPrice: (newPrice, gasLimit) => {
-      dispatch(setGasPrice(newPrice))
-      dispatch(setCustomGasPrice(newPrice))
+    setGasPrice: ({ gasPrice, gasLimit }) => {
+      dispatch(setGasPrice(gasPrice))
+      dispatch(setCustomGasPrice(gasPrice))
       if (gasLimit) {
-        dispatch(setGasTotal(calcGasTotal(gasLimit, newPrice)))
+        dispatch(setGasTotal(calcGasTotal(gasLimit, gasPrice)))
       }
     },
     setGasLimit: (newLimit, gasPrice) => {
diff --git a/ui/app/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js b/ui/app/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js
index 8640628e5..53b4583dd 100644
--- a/ui/app/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js
+++ b/ui/app/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js
@@ -61,9 +61,9 @@ export default class GasModalPageContainer extends Component {
       <BasicTabContent
         gasPriceButtonGroupProps={{
           ...gasPriceButtonGroupProps,
-          handleGasPriceSelection: (gasPriceInHexWei, gasEstimateType) => {
+          handleGasPriceSelection: ({ gasPrice, gasEstimateType }) => {
             this.setGasSpeedType(gasEstimateType)
-            this.props.setSwapsCustomizationModalPrice(gasPriceInHexWei)
+            this.props.setSwapsCustomizationModalPrice(gasPrice)
           },
         }}
       />