diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx index 962508caffade..9ce5dc36befeb 100644 --- a/src/components/Modal/index.tsx +++ b/src/components/Modal/index.tsx @@ -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(() => { @@ -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 ( diff --git a/src/pages/workspace/members/ImportedMembersPage.tsx b/src/pages/workspace/members/ImportedMembersPage.tsx index f40b48ddab576..012036bd0bc1f 100644 --- a/src/pages/workspace/members/ImportedMembersPage.tsx +++ b/src/pages/workspace/members/ImportedMembersPage.tsx @@ -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'; @@ -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); @@ -157,7 +158,7 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) { const closeImportPageAndModal = () => { setIsClosing(true); setIsImporting(false); - Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID)); + setShouldShowConfirmModal(false); }; return ( @@ -179,7 +180,7 @@ function ImportedMembersPage({route}: ImportedMembersPageProps) { learnMoreLink={CONST.IMPORT_SPREADSHEET.MEMBERS_ARTICLE_LINK} /> { + InteractionManager.runAfterInteractions(() => Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(policyID))); + }} /> );