Address PR feedback

Author: pedronfigueiredo

ui/pages/confirmations/components/confirm/info/shared/constants.ts

@@ -1,3 +1,6 @@
 export const HEX_ZERO = '0x0';
 
 export const TOKEN_VALUE_UNLIMITED_THRESHOLD = 10 ** 15;
+
+export const DAI_CONTRACT_ADDRESS =
+  '0x6B175474E89094C44Da98b954EedeAC495271d0F';

ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/permit-simulation/permit-simulation.tsx

@@ -107,14 +107,12 @@ const PermitSimulation: React.FC<object> = () => {
     </ConfirmInfoRow>
   );
 
-  let descriptionKey;
+  let descriptionKey = 'permitSimulationDetailInfo';
   if (isNFT) {
     descriptionKey = 'simulationDetailsApproveDesc';
   } else if (message.allowed === false) {
     // revoke permit
     descriptionKey = 'revokeSimulationDetailsDesc';
-  } else {
-    descriptionKey = 'permitSimulationDetailInfo';
   }
 
   return (

ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign-v4-simulation/value-display/value-display.tsx

@@ -28,12 +28,12 @@ import {
   formatAmount,
   formatAmountMaxPrecision,
 } from '../../../../../simulation-details/formatAmount';
-import { TOKEN_VALUE_UNLIMITED_THRESHOLD } from '../../../shared/constants';
+import {
+  DAI_CONTRACT_ADDRESS,
+  TOKEN_VALUE_UNLIMITED_THRESHOLD,
+} from '../../../shared/constants';
 import { getAmountColors } from '../../../utils';
 
-export const DAI_CONTRACT_ADDRESS =
-  '0x6B175474E89094C44Da98b954EedeAC495271d0F';
-
 type PermitSimulationValueDisplayParams = {
   /** ID of the associated chain. */
   chainId: Hex;

ui/pages/confirmations/components/confirm/title/title.tsx

@@ -5,7 +5,6 @@ import {
 import React, { memo, useMemo } from 'react';
 
 import { TokenStandard } from '../../../../../../shared/constants/transaction';
-import { parseTypedDataMessage } from '../../../../../../shared/modules/transaction.utils';
 import GeneralAlert from '../../../../../components/app/alert-system/general-alert/general-alert';
 import { Box, Text } from '../../../../../components/component-library';
 import {
@@ -22,8 +21,8 @@ import { Confirmation, SignatureRequestType } from '../../../types/confirm';
 import { isSIWESignatureRequest } from '../../../utils';
 import { useIsNFT } from '../info/approve/hooks/use-is-nft';
 import { useTokenTransactionData } from '../info/hooks/useTokenTransactionData';
-import { DAI_CONTRACT_ADDRESS } from '../info/typed-sign/typed-sign-v4-simulation/value-display/value-display';
 import { getIsRevokeSetApprovalForAll } from '../info/utils';
+import { getIsRevokeDAIPermit } from '../utils';
 import { useCurrentSpendingCap } from './hooks/useCurrentSpendingCap';
 
 function ConfirmBannerAlert({ ownerId }: { ownerId: string }) {
@@ -87,16 +86,10 @@ const getTitle = (
           return t('setApprovalForAllRedesignedTitle');
         }
 
-        const msgData = (confirmation as SignatureRequestType)?.msgParams?.data;
-        const {
-          message,
-          domain: { verifyingContract },
-        } = parseTypedDataMessage(msgData as string);
-        const revokeDAIPermit =
-          message.allowed === false &&
-          verifyingContract === DAI_CONTRACT_ADDRESS;
-
-        if (revokeDAIPermit) {
+        const isRevokeDAIPermit = getIsRevokeDAIPermit(
+          confirmation as SignatureRequestType,
+        );
+        if (isRevokeDAIPermit) {
           return t('confirmTitleRevokeApproveTransaction');
         }
 
@@ -153,16 +146,10 @@ const getDescription = (
           return t('confirmTitleDescApproveTransaction');
         }
 
-        const msgData = (confirmation as SignatureRequestType)?.msgParams?.data;
-        const {
-          message,
-          domain: { verifyingContract },
-        } = parseTypedDataMessage(msgData as string);
-        const revokeDAIPermit =
-          message.allowed === false &&
-          verifyingContract === DAI_CONTRACT_ADDRESS;
-
-        if (revokeDAIPermit) {
+        const isRevokeDAIPermit = getIsRevokeDAIPermit(
+          confirmation as SignatureRequestType,
+        );
+        if (isRevokeDAIPermit) {
           return '';
         }
 

ui/pages/confirmations/components/confirm/utils.ts

@@ -1,5 +1,7 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
+import { parseTypedDataMessage } from '../../../../../shared/modules/transaction.utils';
 import { Confirmation, SignatureRequestType } from '../../types/confirm';
+import { DAI_CONTRACT_ADDRESS } from './info/shared/constants';
 
 export const getConfirmationSender = (
   currentConfirmation: Confirmation | undefined,
@@ -28,3 +30,15 @@ export const formatNumber = (value: number, decimals: number) => {
   });
   return formatter.format(value);
 };
+
+export const getIsRevokeDAIPermit = (confirmation: SignatureRequestType) => {
+  const msgData = confirmation?.msgParams?.data;
+  const {
+    message,
+    domain: { verifyingContract },
+  } = parseTypedDataMessage(msgData as string);
+  const isRevokeDAIPermit =
+    message.allowed === false && verifyingContract === DAI_CONTRACT_ADDRESS;
+
+  return isRevokeDAIPermit;
+};