Skip to content

Fix/66033 - After importing members, tapping device back button navigates to import page #69436

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
Beamanator merged 4 commits into from
Sep 8, 2025
Merged

Fix/66033 - After importing members, tapping device back button navigates to import page #69436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
206b612
Fix - After importing members, tapping device back button navigates t…
dmkt9 Jul 14, 2025
b7b83b5
Merge branch 'main' into fix/66033
dmkt9 Aug 28, 2025
e71e35a
Merge branch 'main' into fix/66033
dmkt9 Sep 5, 2025
eb6ddee
Fix - After importing members, tapping device back button navigates t…
dmkt9 Sep 5, 2025
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
6 changes: 3 additions & 3 deletions src/components/Modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ function Modal({fullscreen = true, onModalHide = () => {}, type, onModalShow = (

const hideModal = () => {
onModalHide();
if ((window.history.state as WindowState)?.shouldGoBack && shouldHandleNavigationBack) {
window.history.back();
}
};

const handlePopStateRef = useRef(() => {
Expand Down Expand Up @@ -66,6 +63,9 @@ function Modal({fullscreen = true, onModalHide = () => {}, type, onModalShow = (
const onModalWillHide = () => {
setStatusBarColor(previousStatusBarColor);
rest.onModalWillHide?.();
if ((window.history.state as WindowState)?.shouldGoBack && shouldHandleNavigationBack) {
window.history.back();
}
};

return (
Expand Down
10 changes: 7 additions & 3 deletions src/pages/workspace/members/ImportedMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {useCallback, useState} from 'react';
import {InteractionManager} from 'react-native';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import type {ColumnRole} from '@components/ImportColumn';
Expand Down Expand Up @@ -29,7 +30,7 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) {
const [isImporting, setIsImporting] = useState(false);
const [isValidationEnabled, setIsValidationEnabled] = useState(false);
const {setIsClosing} = useCloseImportPage();

const [shouldShowConfirmModal, setShouldShowConfirmModal] = useState(true);
const policyID = route.params.policyID;
const policy = usePolicy(policyID);

Expand Down Expand Up @@ -157,7 +158,7 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) {
const closeImportPageAndModal = () => {
setIsClosing(true);
setIsImporting(false);
Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID));
setShouldShowConfirmModal(false);
};

return (
Expand All @@ -179,14 +180,17 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) {
learnMoreLink={CONST.IMPORT_SPREADSHEET.MEMBERS_ARTICLE_LINK}
/>
<ConfirmModal
isVisible={spreadsheet?.shouldFinalModalBeOpened}
isVisible={spreadsheet?.shouldFinalModalBeOpened && shouldShowConfirmModal}
title={spreadsheet?.importFinalModal?.title ?? ''}
prompt={spreadsheet?.importFinalModal?.prompt ?? ''}
onConfirm={closeImportPageAndModal}
onCancel={closeImportPageAndModal}
confirmText={translate('common.buttonConfirm')}
shouldShowCancelButton={false}
shouldHandleNavigationBack
onModalHide={() => {
InteractionManager.runAfterInteractions(() => Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID)));
}}
/>
</ScreenWrapper>
);
Expand Down
Loading