From 912ccefa6352d2143d266cc0b78481a321fa3002 Mon Sep 17 00:00:00 2001
From: Pedro Figueiredo <pedro.figueiredo@consensys.net>
Date: Thu, 5 Sep 2024 17:45:26 +0100
Subject: [PATCH] Address feedback

---
 .../approve-static-simulation.tsx             |  4 +-
 .../approve/hooks/use-custom-spending-cap.ts  |  7 ---
 .../revoke-static-simulation.tsx              | 47 +++++++++++--------
 3 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 ui/pages/confirmations/components/confirm/info/approve/hooks/use-custom-spending-cap.ts

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 8fd4c55e353a..c7a61eb89c71 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
@@ -65,7 +65,7 @@ export const ApproveStaticSimulation = () => {
     </Text>
   );
 
-  const simulationElements = (
+  const SpendingCapRow = (
     <ConfirmInfoRow
       label={isNFT ? t('simulationApproveHeading') : t('spendingCap')}
     >
@@ -93,6 +93,8 @@ export const ApproveStaticSimulation = () => {
     </ConfirmInfoRow>
   );
 
+  const simulationElements = SpendingCapRow;
+
   return (
     <StaticSimulation
       title={t('simulationDetailsTitle')}
diff --git a/ui/pages/confirmations/components/confirm/info/approve/hooks/use-custom-spending-cap.ts b/ui/pages/confirmations/components/confirm/info/approve/hooks/use-custom-spending-cap.ts
deleted file mode 100644
index 8089af6b9cf2..000000000000
--- a/ui/pages/confirmations/components/confirm/info/approve/hooks/use-custom-spending-cap.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { useState } from 'react';
-
-export const useCustomSpendingCap = () => {
-  const [customSpendingCap, setCustomSpendingCap] = useState('');
-
-  return { customSpendingCap, setCustomSpendingCap };
-};
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 5e51722a7479..199852538f17 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
@@ -16,29 +16,36 @@ export const RevokeStaticSimulation = () => {
     currentConfirmation: TransactionMeta;
   };
 
-  const simulationElements = (
-    <>
-      <ConfirmInfoRow label={t('spendingCap')}>
-        <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
-          <Box display={Display.Flex}>
-            <Name
-              value={transactionMeta.txParams.to as string}
-              type={NameType.ETHEREUM_ADDRESS}
-            />
-          </Box>
+  const TokenContractRow = (
+    <ConfirmInfoRow label={t('spendingCap')}>
+      <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
+        <Box display={Display.Flex}>
+          <Name
+            value={transactionMeta.txParams.to as string}
+            type={NameType.ETHEREUM_ADDRESS}
+          />
         </Box>
-      </ConfirmInfoRow>
+      </Box>
+    </ConfirmInfoRow>
+  );
 
-      <ConfirmInfoRow label={t('spender')}>
-        <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
-          <Box display={Display.Flex}>
-            <Name
-              value={transactionMeta.txParams.from as string}
-              type={NameType.ETHEREUM_ADDRESS}
-            />
-          </Box>
+  const SpenderRow = (
+    <ConfirmInfoRow label={t('spender')}>
+      <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
+        <Box display={Display.Flex}>
+          <Name
+            value={transactionMeta.txParams.from as string}
+            type={NameType.ETHEREUM_ADDRESS}
+          />
         </Box>
-      </ConfirmInfoRow>
+      </Box>
+    </ConfirmInfoRow>
+  );
+
+  const simulationElements = (
+    <>
+      {TokenContractRow}
+      {SpenderRow}
     </>
   );