Close confirm details screen when import succeeds, show modal on ImportedMembersPage

When importing members with missing roles, the confirmation page now
navigates back when the import succeeds, letting ImportedMembersPage's
existing ImportSpreadsheetConfirmModal (which has an isFocused guard)
display the success modal. This matches the reviewer's expectation that
the confirm details screen closes while the modal remains visible.

Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

Author: MelvinBot

src/pages/workspace/members/ImportedMembersConfirmationPage.tsx

@@ -5,20 +5,17 @@ import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ImportSpreadsheetConfirmModal from '@components/ImportSpreadsheetConfirmModal';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import ReportActionAvatars from '@components/ReportActionAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
-import useCloseImportPage from '@hooks/useCloseImportPage';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {closeImportPage} from '@libs/actions/ImportSpreadsheet';
 import {openExternalLink} from '@libs/actions/Link';
 import {clearImportedSpreadsheetMemberData, importPolicyMembers} from '@libs/actions/Policy/Member';
 import Navigation from '@libs/Navigation/Navigation';
@@ -31,7 +28,6 @@ import WorkspaceMemberDetailsRoleSelectionModal from '@pages/workspace/Workspace
 import type {ListItemType} from '@pages/workspace/WorkspaceMemberRoleSelectionModal';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 type ImportedMembersConfirmationPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.MEMBERS_IMPORTED>;
@@ -49,14 +45,22 @@ function ImportedMembersConfirmationPage({route}: ImportedMembersConfirmationPag
     const {isOffline} = useNetwork();
 
     const personalDetails = usePersonalDetails();
-    const {setIsClosing} = useCloseImportPage();
-
     useEffect(() => {
         return () => {
             clearImportedSpreadsheetMemberData();
         };
     }, []);
 
+    // Navigate back to ImportedMembersPage when import succeeds so the
+    // confirm-details screen closes while the global success modal (rendered
+    // by ImportedMembersPage's ImportSpreadsheetConfirmModal) is shown.
+    useEffect(() => {
+        if (!spreadsheet?.shouldFinalModalBeOpened) {
+            return;
+        }
+        Navigation.goBack();
+    }, [spreadsheet?.shouldFinalModalBeOpened]);
+
     const [importedSpreadsheetMemberData] = useOnyx(ONYXKEYS.IMPORTED_SPREADSHEET_MEMBER_DATA);
     const newMembers = useMemo(() => {
         return importedSpreadsheetMemberData?.filter((member) => !isPolicyMemberWithoutPendingDelete(member.email, policy) && !member.role) ?? [];
@@ -89,13 +93,6 @@ function ImportedMembersConfirmationPage({route}: ImportedMembersConfirmationPag
         importPolicyMembers(policy, membersWithRole);
     }, [importedSpreadsheetMemberData, newMembers, policy, role]);
 
-    const closeImportPageAndModal = () => {
-        setIsClosing(true);
-        setIsImporting(false);
-        closeImportPage();
-        Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID));
-    };
-
     const onRoleChange = (item: ListItemType) => {
         setRole(item.value);
         setIsRoleSelectionModalVisible(false);
@@ -203,11 +200,6 @@ function ImportedMembersConfirmationPage({route}: ImportedMembersConfirmationPag
                     </View>
                 </PressableWithoutFeedback>
             </FixedFooter>
-            <ImportSpreadsheetConfirmModal
-                isVisible={spreadsheet?.shouldFinalModalBeOpened}
-                closeImportPageAndModal={closeImportPageAndModal}
-                shouldHandleNavigationBack={false}
-            />
             <WorkspaceMemberDetailsRoleSelectionModal
                 isVisible={isRoleSelectionModalVisible}
                 items={roleItems}