feat: do not require scroll if Permit Simulation is shown

MetaMask · Sep 4, 2024 · dcf9a9c · dcf9a9c
1 parent 9f30b98
commit dcf9a9c
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 7 deletions.
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
@@ -9,6 +9,7 @@ import {
   signatureRequestSIWE,
   unapprovedPersonalSignMsg,
 } from '../../../../../../test/data/confirmations/personal_sign';
+import { permitSignatureMsg } from '../../../../../../test/data/confirmations/typed_sign';
 import mockState from '../../../../../../test/data/mock-state.json';
 import { fireEvent, renderWithProvider } from '../../../../../../test/jest';
 import * as MMIConfirmations from '../../../../../hooks/useMMIConfirmations';
@@ -33,10 +34,11 @@ jest.mock(
   }),
 );
 
-const render = (args = {}) => {
+const render = (args = {}, metamaskState = {}) => {
   const store = configureStore({
     metamask: {
       ...mockState.metamask,
+      ...metamaskState,
     },
     confirm: {
       currentConfirmation: {
@@ -105,6 +107,23 @@ describe('ConfirmFooter', () => {
       const confirmButton = getByText('Confirm');
       expect(confirmButton).not.toBeDisabled();
     });
+
+    it('when the confirmation is a Permit with the transaction simulation setting enabled', () => {
+      const { getByText } = render(
+        {
+          confirm: {
+            currentConfirmation: permitSignatureMsg,
+            isScrollToBottomCompleted: false,
+          },
+        },
+        {
+          useTransactionSimulations: true,
+        },
+      );
+
+      const confirmButton = getByText('Confirm');
+      expect(confirmButton).not.toBeDisabled();
+    });
   });
 
   describe('renders disabled "Confirm" Button', () => {
@@ -119,6 +138,23 @@ describe('ConfirmFooter', () => {
       const confirmButton = getByText('Confirm');
       expect(confirmButton).toBeDisabled();
     });
+
+    it('when the confirmation is a Permit with the transaction simulation setting disabled', () => {
+      const { getByText } = render(
+        {
+          confirm: {
+            currentConfirmation: permitSignatureMsg,
+            isScrollToBottomCompleted: false,
+          },
+        },
+        {
+          useTransactionSimulations: false,
+        },
+      );
+
+      const confirmButton = getByText('Confirm');
+      expect(confirmButton).toBeDisabled();
+    });
   });
 
   it('invoke action rejectPendingApproval when cancel button is clicked', () => {

diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -29,8 +29,11 @@ import {
   ///: END:ONLY_INCLUDE_IF
 } from '../../../../../store/actions';
 import { confirmSelector } from '../../../selectors';
+import { selectUseTransactionSimulations } from '../../../selectors/preferences';
+
 import {
   REDESIGN_DEV_TRANSACTION_TYPES,
+  isPermitSignatureRequest,
   isSIWESignatureRequest,
 } from '../../../utils';
 import { getConfirmationSender } from '../utils';
@@ -111,6 +114,9 @@ const Footer = () => {
   const t = useI18nContext();
   const confirm = useSelector(confirmSelector);
   const customNonceValue = useSelector(getCustomNonceValue);
+  const useTransactionSimulations = useSelector(
+    selectUseTransactionSimulations,
+  );
 
   const { currentConfirmation, isScrollToBottomCompleted } = confirm;
   const { from } = getConfirmationSender(currentConfirmation);
@@ -128,14 +134,18 @@ const Footer = () => {
   });
 
   const isSIWE = isSIWESignatureRequest(currentConfirmation);
+  const isPermit = isPermitSignatureRequest(currentConfirmation);
+  const isPermitSimulationShown = isPermit && useTransactionSimulations;
+
+  console.log('isPermit', isPermit);
+  console.log('isPermitSimulationShown', isPermitSimulationShown);
 
   const isConfirmDisabled =
-    !isSIWE &&
-    (!isScrollToBottomCompleted ||
-      ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-      mmiSubmitDisabled ||
-      ///: END:ONLY_INCLUDE_IF
-      hardwareWalletRequiresConnection);
+    (!isScrollToBottomCompleted && !isSIWE && !isPermitSimulationShown) ||
+    ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+    mmiSubmitDisabled ||
+    ///: END:ONLY_INCLUDE_IF
+    hardwareWalletRequiresConnection;
 
   const onCancel = useCallback(
     ({ location }: { location?: MetaMetricsEventLocation }) => {