From 68974d9b9c904fa1dd11a8042fec4ba8ef4e8458 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Tue, 8 Oct 2024 11:41:20 +0100
Subject: [PATCH] fix: Prefer token symbol to token name

---
 ui/components/app/confirm/info/row/address.tsx             | 6 +++++-
 .../approve-static-simulation.tsx                          | 1 +
 .../revoke-static-simulation/revoke-static-simulation.tsx  | 2 ++
 .../revoke-set-approval-for-all-static-simulation.tsx      | 7 ++++++-
 .../set-approval-for-all-static-simulation.tsx             | 1 +
 .../permit-simulation/value-display/value-display.tsx      | 6 +++++-
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ui/components/app/confirm/info/row/address.tsx b/ui/components/app/confirm/info/row/address.tsx
index ec8a0c7c669d..7d28851ece92 100644
--- a/ui/components/app/confirm/info/row/address.tsx
+++ b/ui/components/app/confirm/info/row/address.tsx
@@ -44,7 +44,11 @@ export const ConfirmInfoRowAddress = memo(
           // component can support variations. See this comment for context: //
           // https://github.com/MetaMask/metamask-extension/pull/23487#discussion_r1525055546
           isPetNamesEnabled && !isSnapUsingThis ? (
-            <Name value={hexAddress} type={NameType.ETHEREUM_ADDRESS} />
+            <Name
+              value={hexAddress}
+              type={NameType.ETHEREUM_ADDRESS}
+              preferContractSymbol
+            />
           ) : (
             <>
               <Box
diff --git a/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
index 2a97577756b2..bdbe0e6fbae3 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx
@@ -87,6 +87,7 @@ export const ApproveStaticSimulation = () => {
           <Name
             value={transactionMeta.txParams.to as string}
             type={NameType.ETHEREUM_ADDRESS}
+            preferContractSymbol
           />
         </Box>
       </Box>
diff --git a/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx
index 199852538f17..38ff93ba9b36 100644
--- a/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx
@@ -23,6 +23,7 @@ export const RevokeStaticSimulation = () => {
           <Name
             value={transactionMeta.txParams.to as string}
             type={NameType.ETHEREUM_ADDRESS}
+            preferContractSymbol
           />
         </Box>
       </Box>
@@ -36,6 +37,7 @@ export const RevokeStaticSimulation = () => {
           <Name
             value={transactionMeta.txParams.from as string}
             type={NameType.ETHEREUM_ADDRESS}
+            preferContractSymbol
           />
         </Box>
       </Box>
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/revoke-set-approval-for-all-static-simulation/revoke-set-approval-for-all-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/revoke-set-approval-for-all-static-simulation/revoke-set-approval-for-all-static-simulation.tsx
index 7cc141fb64e5..64e90a7066e6 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/revoke-set-approval-for-all-static-simulation/revoke-set-approval-for-all-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/revoke-set-approval-for-all-static-simulation/revoke-set-approval-for-all-static-simulation.tsx
@@ -29,6 +29,7 @@ export const RevokeSetApprovalForAllStaticSimulation = ({
           <Name
             value={transactionMeta.txParams.to as string}
             type={NameType.ETHEREUM_ADDRESS}
+            preferContractSymbol
           />
         </Box>
       </Box>
@@ -39,7 +40,11 @@ export const RevokeSetApprovalForAllStaticSimulation = ({
     <ConfirmInfoRow label={t('permissionFrom')}>
       <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
         <Box display={Display.Flex} alignItems={AlignItems.center}>
-          <Name value={spender} type={NameType.ETHEREUM_ADDRESS} />
+          <Name
+            value={spender}
+            type={NameType.ETHEREUM_ADDRESS}
+            preferContractSymbol
+          />
         </Box>
       </Box>
     </ConfirmInfoRow>
diff --git a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-static-simulation/set-approval-for-all-static-simulation.tsx b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-static-simulation/set-approval-for-all-static-simulation.tsx
index c50d10094486..177ef4080860 100644
--- a/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-static-simulation/set-approval-for-all-static-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/set-approval-for-all-info/set-approval-for-all-static-simulation/set-approval-for-all-static-simulation.tsx
@@ -47,6 +47,7 @@ export const SetApprovalForAllStaticSimulation = () => {
           <Name
             value={transactionMeta.txParams.to as string}
             type={NameType.ETHEREUM_ADDRESS}
+            preferContractSymbol
           />
         </Box>
       </Box>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx
index 25fad3020103..633191cd2638 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/value-display/value-display.tsx
@@ -116,7 +116,11 @@ const PermitSimulationValueDisplay: React.FC<
             </Text>
           </Tooltip>
         </Box>
-        <Name value={tokenContract} type={NameType.ETHEREUM_ADDRESS} />
+        <Name
+          value={tokenContract}
+          type={NameType.ETHEREUM_ADDRESS}
+          preferContractSymbol
+        />
       </Box>
       <Box>
         {fiatValue && <IndividualFiatDisplay fiatAmount={fiatValue} shorten />}