Skip to content

fix: handle back navigation on confirm modal #58794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danieldoglas merged 1 commit into from
Mar 28, 2025
Merged

fix: handle back navigation on confirm modal #58794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/ConfirmModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ type ConfirmModalProps = {

/** Whether the confirm button is loading */
isConfirmLoading?: boolean;

/** Whether to handle navigation back when modal show. */
shouldHandleNavigationBack?: boolean;
};

function ConfirmModal({
Expand Down Expand Up @@ -143,6 +146,7 @@ function ConfirmModal({
shouldEnableNewFocusManagement,
restoreFocusType,
isConfirmLoading,
shouldHandleNavigationBack,
}: ConfirmModalProps) {
// We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use the correct modal type
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
Expand All @@ -160,6 +164,7 @@ function ConfirmModal({
innerContainerStyle={image ? styles.pt0 : {}}
shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
restoreFocusType={restoreFocusType}
shouldHandleNavigationBack={shouldHandleNavigationBack}
>
<ConfirmContent
title={title}
Expand Down
1 change: 1 addition & 0 deletions src/pages/iou/request/step/DiscardChangesConfirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function DiscardChangesConfirmation({getHasUnsavedChanges}: DiscardChangesConfir
}
}}
onCancel={() => setIsVisible(false)}
shouldHandleNavigationBack
/>
);
}
Expand Down