Skip to content
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

fix: correct back button behavior on copilot confirmation page #53438

Merged
merged 2 commits into from
Dec 9, 2024
+9 −1
Merged

fix: correct back button behavior on copilot confirmation page #53438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f60e5b
fix: correct back button behavior on copilot confirmation page
daledah Dec 3, 2024
42e346c
Merge branch 'main' into fix/53007
daledah Dec 9, 2024
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
2 changes: 2 additions & 0 deletions src/components/ValidateCodeActionModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function ValidateCodeActionModal({
sendValidateCode,
hasMagicCodeBeenSent,
isLoading,
shouldHandleNavigationBack,
}: ValidateCodeActionModalProps) {
const themeStyles = useThemeStyles();
const firstRenderRef = useRef(true);
Expand All @@ -52,6 +53,7 @@ function ValidateCodeActionModal({

return (
<Modal
shouldHandleNavigationBack={shouldHandleNavigationBack}
type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
isVisible={isVisible}
onClose={hide}
Expand Down
3 changes: 3 additions & 0 deletions src/components/ValidateCodeActionModal/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ type ValidateCodeActionModalProps = {

/** Whether the form is loading or not */
isLoading?: boolean;

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

// eslint-disable-next-line import/prefer-default-export
Expand Down
1 change: 1 addition & 0 deletions src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ function ConfirmDelegatePage({route}: ConfirmDelegatePageProps) {
shouldShowRightIcon
/>
<DelegateMagicCodeModal
shouldHandleNavigationBack
login={login}
role={role}
onClose={() => {
Expand Down
4 changes: 3 additions & 1 deletion src/pages/settings/Security/AddDelegate/DelegateMagicCodeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ type DelegateMagicCodeModalProps = {
role: ValueOf<typeof CONST.DELEGATE_ROLE>;
isValidateCodeActionModalVisible: boolean;
onClose?: () => void;
shouldHandleNavigationBack?: boolean;
};

function DelegateMagicCodeModal({login, role, onClose, isValidateCodeActionModalVisible}: DelegateMagicCodeModalProps) {
function DelegateMagicCodeModal({login, role, onClose, isValidateCodeActionModalVisible, shouldHandleNavigationBack}: DelegateMagicCodeModalProps) {
const {translate} = useLocalize();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);

Expand Down Expand Up @@ -48,6 +49,7 @@ function DelegateMagicCodeModal({login, role, onClose, isValidateCodeActionModal

return (
<ValidateCodeActionModal
shouldHandleNavigationBack={shouldHandleNavigationBack}
clearError={clearError}
onClose={onBackButtonPress}
validateError={validateLoginError}
Expand Down
Loading