From aa9ee8af6cb0a44f9510f5c2879f6e97ae6ce925 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Fri, 12 May 2023 13:27:25 -0500
Subject: [PATCH] Update useDraftTransactionGasValues (#19105)

* useDraftTransactionGasValues: update return value

* rn useDraftTransactionGasValues
-> useDraftTransactionWithTxParams
---
 .../confirm-legacy-gas-display.js                          | 4 ++--
 ui/components/app/gas-details-item/gas-details-item.js     | 4 ++--
 ...tionGasValues.js => useDraftTransactionWithTxParams.js} | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename ui/hooks/{useDraftTransactionGasValues.js => useDraftTransactionWithTxParams.js} (92%)

diff --git a/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js b/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
index c09ad91ac..124fbb0d9 100644
--- a/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
+++ b/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js
@@ -23,7 +23,7 @@ import {
   TextVariant,
   TextColor,
 } from '../../../../helpers/constants/design-system';
-import { useDraftTransactionGasValues } from '../../../../hooks/useDraftTransactionGasValues';
+import { useDraftTransactionWithTxParams } from '../../../../hooks/useDraftTransactionWithTxParams';
 import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
 import MultilayerFeeMessage from '../../multilayer-fee-message/multi-layer-fee-message';
 import { Icon, IconName } from '../../../component-library';
@@ -41,7 +41,7 @@ const ConfirmLegacyGasDisplay = () => {
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
   const nativeCurrency = useSelector(getNativeCurrency);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
-  const { transactionData } = useDraftTransactionGasValues();
+  const transactionData = useDraftTransactionWithTxParams();
   const txData = useSelector((state) => txDataSelector(state));
   const { id: transactionId, dappSuggestedGasFees } = txData;
   const transaction = Object.keys(transactionData).length
diff --git a/ui/components/app/gas-details-item/gas-details-item.js b/ui/components/app/gas-details-item/gas-details-item.js
index a7acc35af..cc716900d 100644
--- a/ui/components/app/gas-details-item/gas-details-item.js
+++ b/ui/components/app/gas-details-item/gas-details-item.js
@@ -20,13 +20,13 @@ import GasTiming from '../gas-timing/gas-timing.component';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
 import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display';
 import { hexWEIToDecGWEI } from '../../../../shared/modules/conversion.utils';
-import { useDraftTransactionGasValues } from '../../../hooks/useDraftTransactionGasValues';
+import { useDraftTransactionWithTxParams } from '../../../hooks/useDraftTransactionWithTxParams';
 import GasDetailsItemTitle from './gas-details-item-title';
 
 const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
   const t = useI18nContext();
   const draftTransaction = useSelector(getCurrentDraftTransaction);
-  const { transactionData } = useDraftTransactionGasValues();
+  const transactionData = useDraftTransactionWithTxParams();
 
   const {
     hexMinimumTransactionFee: draftHexMinimumTransactionFee,
diff --git a/ui/hooks/useDraftTransactionGasValues.js b/ui/hooks/useDraftTransactionWithTxParams.js
similarity index 92%
rename from ui/hooks/useDraftTransactionGasValues.js
rename to ui/hooks/useDraftTransactionWithTxParams.js
index b94a8b816..7e822f18e 100644
--- a/ui/hooks/useDraftTransactionGasValues.js
+++ b/ui/hooks/useDraftTransactionWithTxParams.js
@@ -8,13 +8,14 @@ import { getUnapprovedTransactions } from '../selectors';
  * the gas data from draftTransaction and unapprovedTx has to be reorganized
  * to mimic the txdata.txParam from a confirmTransaction
  *
- * @returns {Object txData.txParams}
+ * @returns {object} The transaction data
  */
-export const useDraftTransactionGasValues = () => {
+export const useDraftTransactionWithTxParams = () => {
   const draftTransaction = useSelector(getCurrentDraftTransaction);
   const unapprovedTxs = useSelector(getUnapprovedTransactions);
 
   let transactionData = {};
+
   if (Object.keys(draftTransaction).length !== 0) {
     const editingTransaction = unapprovedTxs[draftTransaction.id];
     transactionData = {
@@ -36,5 +37,5 @@ export const useDraftTransactionGasValues = () => {
     };
   }
 
-  return { transactionData };
+  return transactionData;
 };