From 385c4cc012bdb33a19297f28ba869afe827156f1 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Wed, 31 Dec 2025 14:54:20 +0100
Subject: [PATCH] Revert "fix: app opens Inbox after refreshing Reports page
 with Split RHP opened"

---
 src/ROUTES.ts                                 | 14 -----------
 src/SCREENS.ts                                |  1 -
 .../ModalStackNavigators/index.tsx            |  1 -
 .../helpers/getAdaptedStateFromPath.ts        | 25 +++----------------
 .../linkingConfig/RELATIONS/SEARCH_TO_RHP.ts  |  1 -
 src/libs/Navigation/linkingConfig/config.ts   | 15 -----------
 src/libs/actions/IOU/index.ts                 | 13 +++-------
 7 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 3074432aa0d28..0798fb8016668 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -772,20 +772,6 @@ const ROUTES = {
             return getUrlWithBackToParam(`create/split-expense/overview/${reportID}/${originalTransactionID}${splitExpenseTransactionIDPart}`, backTo);
         },
     },
-    SPLIT_EXPENSE_SEARCH: {
-        route: 'create/split-expense/overview/:reportID/:transactionID/:splitExpenseTransactionID?/search',
-        getRoute: (reportID: string | undefined, originalTransactionID: string | undefined, splitExpenseTransactionID?: string, backTo?: string) => {
-            if (!reportID || !originalTransactionID) {
-                Log.warn(`Invalid ${reportID}(reportID) or ${originalTransactionID}(transactionID) is used to build the SPLIT_EXPENSE_SEARCH route`);
-            }
-
-            // eslint-disable-next-line no-restricted-syntax -- Legacy route generation
-            return getUrlWithBackToParam(
-                `create/split-expense/overview/${reportID}/${originalTransactionID}${splitExpenseTransactionID ? `/${splitExpenseTransactionID}` : ''}/search`,
-                backTo,
-            );
-        },
-    },
     SPLIT_EXPENSE_CREATE_DATE_RANGE: {
         route: 'create/split-expense/create-date-range/:reportID/:transactionID?',
         getRoute: (reportID: string | undefined, transactionID: string | undefined, backTo?: string) => {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index ed79d21a54124..15142dbbe5ede 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -321,7 +321,6 @@ const SCREENS = {
         STEP_REPORT: 'Money_Request_Report',
         EDIT_REPORT: 'Money_Request_Edit_Report',
         SPLIT_EXPENSE: 'Money_Request_Split_Expense',
-        SPLIT_EXPENSE_SEARCH: 'Money_Request_Split_Expense_Search',
         SPLIT_EXPENSE_CREATE_DATE_RANGE: 'Money_Request_Split_Expense_Create_Date_Range',
         SPLIT_EXPENSE_EDIT: 'Money_Request_Split_Expense_Edit',
         DISTANCE_CREATE: 'Money_Request_Distance_Create',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 79a8aaf0f59ce..ac9e52a9fa00c 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -176,7 +176,6 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNa
     [SCREENS.MONEY_REQUEST.STEP_SUBRATE_EDIT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepSubrate').default,
     [SCREENS.MONEY_REQUEST.RECEIPT_VIEW]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepScan/ReceiptView').default,
     [SCREENS.MONEY_REQUEST.SPLIT_EXPENSE]: () => require<ReactComponentModule>('../../../../pages/iou/SplitExpensePage').default,
-    [SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_SEARCH]: () => require<ReactComponentModule>('../../../../pages/iou/SplitExpensePage').default,
     [SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_CREATE_DATE_RANGE]: () => require<ReactComponentModule>('../../../../pages/iou/SplitExpenseCreateDateRagePage').default,
     [SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_EDIT]: () => require<ReactComponentModule>('../../../../pages/iou/SplitExpenseEditPage').default,
     [SCREENS.MONEY_REQUEST.DISTANCE_CREATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/DistanceRequestStartPage').default,
diff --git a/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts b/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts
index af421e67df2a8..62c4de2a5e33f 100644
--- a/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts
+++ b/src/libs/Navigation/helpers/getAdaptedStateFromPath.ts
@@ -43,23 +43,6 @@ function isRouteWithReportID(route: NavigationPartialRoute): route is Route<stri
     return route.params !== undefined && 'reportID' in route.params && typeof route.params.reportID === 'string';
 }
 
-/**
- * Get the appropriate screen name for RHP_TO_SEARCH lookup.
- * Split tabs (amount, percentage, date) are nested routes within SPLIT_EXPENSE/SPLIT_EXPENSE_SEARCH.
- * When a split tab route is accessed from search context (path contains '/search'),
- * we use SPLIT_EXPENSE_SEARCH for the mapping lookup instead of the tab name.
- */
-function getSearchScreenNameForRoute(route: NavigationPartialRoute): string {
-    const splitTabNames = Object.values(CONST.TAB.SPLIT) as string[];
-    const isSplitTabRoute = splitTabNames.includes(route.name);
-
-    if (isSplitTabRoute && route.path?.includes('/search')) {
-        return SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_SEARCH;
-    }
-
-    return route.name;
-}
-
 function getMatchingFullScreenRoute(route: NavigationPartialRoute) {
     // Check for backTo param. One screen with different backTo value may need different screens visible under the overlay.
     if (isRouteWithBackToParam(route)) {
@@ -86,11 +69,11 @@ function getMatchingFullScreenRoute(route: NavigationPartialRoute) {
         // If not, get the matching full screen route for the back to state.
         return getMatchingFullScreenRoute(focusedStateForBackToRoute);
     }
-    const routeNameForLookup = getSearchScreenNameForRoute(route);
-    if (RHP_TO_SEARCH[routeNameForLookup]) {
-        const paramsFromRoute = getParamsFromRoute(RHP_TO_SEARCH[routeNameForLookup]);
+
+    if (RHP_TO_SEARCH[route.name]) {
+        const paramsFromRoute = getParamsFromRoute(RHP_TO_SEARCH[route.name]);
         const searchRoute = {
-            name: RHP_TO_SEARCH[routeNameForLookup],
+            name: RHP_TO_SEARCH[route.name],
             params: paramsFromRoute.length > 0 ? pick(route.params, paramsFromRoute) : undefined,
         };
         return {
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts
index b6ba33cb8c56f..5349533dbf929 100644
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts
@@ -49,7 +49,6 @@ const SEARCH_TO_RHP: Partial<Record<keyof SearchFullscreenNavigatorParamList, st
         SCREENS.SEARCH.ADVANCED_FILTERS_PURCHASE_CURRENCY_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_FIELD_RHP,
         SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP,
-        SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_SEARCH,
         SCREENS.RIGHT_MODAL.SEARCH_REPORT,
     ],
 };
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 494cdbbf9c648..d1c2eac00a6b9 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1507,21 +1507,6 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                                 },
                             },
                         },
-                        [SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_SEARCH]: {
-                            path: ROUTES.SPLIT_EXPENSE_SEARCH.route,
-                            exact: true,
-                            screens: {
-                                [CONST.TAB.SPLIT.AMOUNT]: {
-                                    path: CONST.TAB.SPLIT.AMOUNT,
-                                },
-                                [CONST.TAB.SPLIT.PERCENTAGE]: {
-                                    path: CONST.TAB.SPLIT.PERCENTAGE,
-                                },
-                                [CONST.TAB.SPLIT.DATE]: {
-                                    path: CONST.TAB.SPLIT.DATE,
-                                },
-                            },
-                        },
                         [SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_CREATE_DATE_RANGE]: {
                             path: ROUTES.SPLIT_EXPENSE_CREATE_DATE_RANGE.route,
                             exact: true,
diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts
index 209457f6e2dd4..9b5c4c7651e3f 100644
--- a/src/libs/actions/IOU/index.ts
+++ b/src/libs/actions/IOU/index.ts
@@ -14091,11 +14091,8 @@ function initSplitExpense(transactions: OnyxCollection<OnyxTypes.Transaction>, r
         });
 
         Onyx.set(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${originalTransactionID}`, draftTransaction);
-        if (isSearchTopmostFullScreenRoute()) {
-            Navigation.navigate(ROUTES.SPLIT_EXPENSE_SEARCH.getRoute(reportID, originalTransactionID, transaction.transactionID, Navigation.getActiveRoute()));
-        } else {
-            Navigation.navigate(ROUTES.SPLIT_EXPENSE.getRoute(reportID, originalTransactionID, transaction.transactionID, Navigation.getActiveRoute()));
-        }
+
+        Navigation.navigate(ROUTES.SPLIT_EXPENSE.getRoute(reportID, originalTransactionID, transaction.transactionID, Navigation.getActiveRoute()));
         return;
     }
 
@@ -14124,11 +14121,7 @@ function initSplitExpense(transactions: OnyxCollection<OnyxTypes.Transaction>, r
 
     Onyx.set(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transaction?.transactionID}`, draftTransaction);
 
-    if (isSearchTopmostFullScreenRoute()) {
-        Navigation.navigate(ROUTES.SPLIT_EXPENSE_SEARCH.getRoute(reportID, transaction.transactionID, undefined, Navigation.getActiveRoute()));
-    } else {
-        Navigation.navigate(ROUTES.SPLIT_EXPENSE.getRoute(reportID, transaction.transactionID, undefined, Navigation.getActiveRoute()));
-    }
+    Navigation.navigate(ROUTES.SPLIT_EXPENSE.getRoute(reportID, transaction.transactionID, undefined, Navigation.getActiveRoute()));
 }
 
 /**