fix(HarvestModal): Make closable to avoid use getting stuck into AA

cozy · Apr 3, 2024 · c4a6261 · c4a6261
1 parent 79bc63f
commit c4a6261
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ducks/settings/HarvestBankAccountSettings.jsx b/src/ducks/settings/HarvestBankAccountSettings.jsx
@@ -47,7 +47,7 @@ const HarvestBankAccountSettings = ({
     <HarvestVaultProvider>
       <VaultUnlockProvider>
         <HarvestTrackingProvider>
-          <HarvestModal>
+          <HarvestModal onDismiss={onDismiss}>
             <HarvestSwitch
               initialFragment={`/accounts/${connectionId}`}
               routes={[

diff --git a/src/ducks/settings/HarvestModal.jsx b/src/ducks/settings/HarvestModal.jsx
@@ -4,6 +4,7 @@ import Dialog from 'cozy-ui/transpiled/react/Dialog'
 import { withStyles } from 'cozy-ui/transpiled/react/styles'
 import { useVaultUnlockContext } from 'cozy-keys-lib'
 import { useDialogContext } from 'cozy-harvest-lib/dist/components/DialogContext'
+import { DialogCloseButton } from 'cozy-ui/transpiled/react/CozyDialogs'
 
 const withHarvestDialogStyles = () => {
   /**
@@ -36,7 +37,7 @@ const withHarvestDialogStyles = () => {
 /**
  * This component copies the functionality of the modal in Harvest and its Routes component.
  */
-const HarvestModal = ({ children }) => {
+const HarvestModal = ({ children, onDismiss }) => {
   const { showingUnlockForm } = useVaultUnlockContext()
   const dialogContext = useDialogContext()
 
@@ -46,6 +47,7 @@ const HarvestModal = ({ children }) => {
 
   return (
     <Dialog disableRestoreFocus {...dialogContext.dialogProps}>
+      <DialogCloseButton onClick={onDismiss} />
       {children}
     </Dialog>
   )