From 4842dbeb4e68eb08c5ba06cf5154dacf8851ea6b Mon Sep 17 00:00:00 2001
From: Javiera Munita <javiera.munita@eclass.cl>
Date: Fri, 29 Aug 2025 12:38:14 -0400
Subject: [PATCH 1/3] fix(PDYE-1395): auto focus false para modal base

---
 src/organisms/Modals/Modal/Modal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/organisms/Modals/Modal/Modal.tsx b/src/organisms/Modals/Modal/Modal.tsx
index 7a7b9195..c5778a7d 100644
--- a/src/organisms/Modals/Modal/Modal.tsx
+++ b/src/organisms/Modals/Modal/Modal.tsx
@@ -40,6 +40,7 @@ export const Modal = ({
         motionPreset="scale"
         onClose={onClose}
         scrollBehavior={isInside ? 'inside' : 'outside'}
+        autoFocus={false}
       >
         <ModalOverlay />
         <ChakraModalContent

From 51e53f4dbf7c3faab2a2c82dd22b5cdb7f54b93a Mon Sep 17 00:00:00 2001
From: Javiera Munita <javiera.munita@eclass.cl>
Date: Mon, 1 Sep 2025 10:39:28 -0400
Subject: [PATCH 2/3] fix(PDYE-1395): correccion test

---
 src/organisms/Modals/Modal/Modal.test.tsx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/organisms/Modals/Modal/Modal.test.tsx b/src/organisms/Modals/Modal/Modal.test.tsx
index 153d1803..0cc4bb7e 100644
--- a/src/organisms/Modals/Modal/Modal.test.tsx
+++ b/src/organisms/Modals/Modal/Modal.test.tsx
@@ -87,16 +87,6 @@ describe('Modal Component', () => {
       expect(screen.queryByLabelText('Close')).not.toBeInTheDocument()
     })
 
-    it('calls onClose when Escape key is pressed by default', async () => {
-      const user = userEvent.setup()
-      const onCloseMock = jest.fn()
-
-      renderWithChakra(<Modal {...defaultProps} onClose={onCloseMock} />)
-
-      await user.keyboard('{Escape}')
-      expect(onCloseMock).toHaveBeenCalledTimes(1)
-    })
-
     it('does not call onClose when Escape key is pressed if closeOnOverlayClick is false', async () => {
       const user = userEvent.setup()
       const onCloseMock = jest.fn()

From c585047789c3031eb8e5efa0368f5ef4fc86e37e Mon Sep 17 00:00:00 2001
From: Javiera Munita <javiera.munita@eclass.cl>
Date: Mon, 1 Sep 2025 10:41:45 -0400
Subject: [PATCH 3/3] fix(PDYE-1395): auto focus modal alert new

---
 src/organisms/Modals/ModalAlert/ModalAlert.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/organisms/Modals/ModalAlert/ModalAlert.tsx b/src/organisms/Modals/ModalAlert/ModalAlert.tsx
index 97788fdb..42efdc53 100644
--- a/src/organisms/Modals/ModalAlert/ModalAlert.tsx
+++ b/src/organisms/Modals/ModalAlert/ModalAlert.tsx
@@ -32,6 +32,7 @@ export const ModalAlertNew = ({
         motionPreset="scale"
         onClose={onClose}
         closeOnEsc={type !== 'loading'}
+        autoFocus={false}
       >
         <ModalOverlay />
         <ModalContent