fix: back button returns to expense report after submitting track expense

src/libs/Navigation/Navigation.ts

@@ -11,7 +11,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {HybridAppRoute, Route} from '@src/ROUTES';
 import ROUTES, {HYBRID_APP_ROUTES} from '@src/ROUTES';
-import {PROTECTED_SCREENS} from '@src/SCREENS';
+import SCREENS, {PROTECTED_SCREENS} from '@src/SCREENS';
 import type {Screen} from '@src/SCREENS';
 import type {Report} from '@src/types/onyx';
 import originalCloseRHPFlow from './closeRHPFlow';
@@ -428,6 +428,13 @@ function getTopMostCentralPaneRouteFromRootState() {
     return getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
 }
 
+function getReportRouteByID(reportID?: string) {
+    if (!reportID) {
+        return null;
+    }
+    return navigationRef.getRootState().routes.find((route) => route.name === SCREENS.REPORT && !!route.params && 'reportID' in route.params && route.params.reportID === reportID);
+}
+
 function removeScreenFromNavigationState(screen: Screen) {
     isNavigationReady().then(() => {
         navigationRef.dispatch((state) => {
@@ -442,6 +449,19 @@ function removeScreenFromNavigationState(screen: Screen) {
     });
 }
 
+function removeScreenByKey(key: string) {
+    const state = navigationRef.getRootState();
+    const routes = state.routes.filter((item) => item.key !== key);
+
+    navigationRef.current?.dispatch(() => {
+        return CommonActions.reset({
+            ...state,
+            routes,
+            index: routes.length < state.routes.length ? state.index - 1 : state.index,
+        });
+    });
+}
+
 export default {
     setShouldPopAllStateOnUP,
     navigate,
@@ -467,6 +487,8 @@ export default {
     setNavigationActionToMicrotaskQueue,
     getTopMostCentralPaneRouteFromRootState,
     removeScreenFromNavigationState,
+    removeScreenByKey,
+    getReportRouteByID,
 };
 
 export {navigationRef};

src/libs/actions/IOU.ts

@@ -4414,6 +4414,12 @@ function requestMoney(requestMoneyInformation: RequestMoneyInformation) {
 
     InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID));
     Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : activeReportID);
+
+    const trackReport = Navigation.getReportRouteByID(linkedTrackedExpenseReportAction?.childReportID);
+    if (trackReport?.key) {
+        Navigation.isNavigationReady().then(() => Navigation.removeScreenByKey(trackReport.key));
+    }
+
     if (activeReportID) {
         notifyNewAction(activeReportID, payeeAccountID);
     }

tests/actions/IOUTest.ts

@@ -77,8 +77,19 @@ jest.mock('@src/libs/Navigation/Navigation', () => ({
     goBack: jest.fn(),
     getTopmostReportId: jest.fn(() => topMostReportID),
     setNavigationActionToMicrotaskQueue: jest.fn(),
+    removeScreenByKey: jest.fn(),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    getPreviousTrackReport: jest.fn(),
 }));
 
+jest.mock('@src/libs/Navigation/navigationRef', () => ({
+    getRootState: () => ({
+        routes: [],
+    }),
+}));
+
+jest.mock('@react-navigation/native');
+
 jest.mock('@src/libs/actions/Report', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const originalModule = jest.requireActual('@src/libs/actions/Report');
@@ -88,6 +99,7 @@ jest.mock('@src/libs/actions/Report', () => {
         notifyNewAction: jest.fn(),
     };
 });
+
 jest.mock('@src/libs/Navigation/isSearchTopmostCentralPane', () => jest.fn());
 
 const CARLOS_EMAIL = '[email protected]';