diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts index d3f8cfe47f5e..c812cd179e50 100644 --- a/src/libs/Navigation/Navigation.ts +++ b/src/libs/Navigation/Navigation.ts @@ -589,10 +589,6 @@ function popRootToTop() { navigationRef.current?.dispatch({...StackActions.popToTop(), target: rootState.key}); } -function pop(target: string) { - navigationRef.current?.dispatch({...StackActions.pop(), target}); -} - function removeScreenFromNavigationState(screen: string) { isNavigationReady().then(() => { navigationRef.current?.dispatch((state) => { @@ -656,7 +652,6 @@ export default { setNavigationActionToMicrotaskQueue, popToTop, popRootToTop, - pop, removeScreenFromNavigationState, removeScreenByKey, getReportRouteByID, diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 16b9a1f7c45f..0dead2df208d 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -55,9 +55,8 @@ import isFileUploadable from '@libs/isFileUploadable'; import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import * as Localize from '@libs/Localize'; import Log from '@libs/Log'; -import isReportOpenInRHP from '@libs/Navigation/helpers/isReportOpenInRHP'; import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute'; -import Navigation, {navigationRef} from '@libs/Navigation/Navigation'; +import Navigation from '@libs/Navigation/Navigation'; import {buildNextStep} from '@libs/NextStepUtils'; import * as NumberUtils from '@libs/NumberUtils'; import {getManagerMcTestParticipant, getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils'; @@ -841,18 +840,9 @@ Onyx.connect({ /** * @private * After finishing the action in RHP from the Inbox tab, besides dismissing the modal, we should open the report. - * If the action is done from the report RHP, then we just want to dismiss the money request flow screens. * It is a helper function used only in this file. */ function dismissModalAndOpenReportInInboxTab(reportID?: string) { - const rootState = navigationRef.getRootState(); - if (isReportOpenInRHP(rootState)) { - const rhpKey = rootState.routes.at(-1)?.state?.key; - if (rhpKey) { - Navigation.pop(rhpKey); - return; - } - } if (isSearchTopmostFullScreenRoute() || !reportID) { Navigation.dismissModal(); return; diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index f81d40bef8f0..c9e2e97beac5 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -97,9 +97,12 @@ jest.mock('@src/libs/Navigation/Navigation', () => ({ getReportRouteByID: jest.fn(), getActiveRouteWithoutParams: jest.fn(), getActiveRoute: jest.fn(), - navigationRef: { - getRootState: jest.fn(), - }, +})); + +jest.mock('@src/libs/Navigation/navigationRef', () => ({ + getRootState: () => ({ + routes: [], + }), })); jest.mock('@react-navigation/native');