From b1fef686ba8d586e3e96e224333177cc3955c6d1 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Mon, 12 Jan 2026 10:55:31 +0100
Subject: [PATCH] Revert "Fix opening an expense report from Reports page shows
 the same report when open Inbox"

---
 .../Navigation/NavigationTabBar/index.tsx     | 38 ++++---------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/components/Navigation/NavigationTabBar/index.tsx b/src/components/Navigation/NavigationTabBar/index.tsx
index 07cb2a5640429..67fa08bd3848b 100644
--- a/src/components/Navigation/NavigationTabBar/index.tsx
+++ b/src/components/Navigation/NavigationTabBar/index.tsx
@@ -36,14 +36,7 @@ import {startSpan} from '@libs/telemetry/activeSpans';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
 import navigationRef from '@navigation/navigationRef';
-import type {
-    DomainSplitNavigatorParamList,
-    ReportsSplitNavigatorParamList,
-    RootNavigatorParamList,
-    SearchFullscreenNavigatorParamList,
-    State,
-    WorkspaceSplitNavigatorParamList,
-} from '@navigation/types';
+import type {DomainSplitNavigatorParamList, RootNavigatorParamList, SearchFullscreenNavigatorParamList, State, WorkspaceSplitNavigatorParamList} from '@navigation/types';
 import NavigationTabBarAvatar from '@pages/home/sidebar/NavigationTabBarAvatar';
 import NavigationTabBarFloatingActionButton from '@pages/home/sidebar/NavigationTabBarFloatingActionButton';
 import variables from '@styles/variables';
@@ -61,14 +54,6 @@ type NavigationTabBarProps = {
     shouldShowFloatingCameraButton?: boolean;
 };
 
-function getLastRoute(navigator: string, screen: string) {
-    const rootState = navigationRef.getRootState() as State<RootNavigatorParamList>;
-    const lastNavigator = rootState.routes.findLast((route) => route.name === navigator);
-    const lastNavigatorState = lastNavigator && lastNavigator.key ? getPreservedNavigatorState(lastNavigator?.key) : undefined;
-    const lastRoute = lastNavigatorState?.routes.findLast((route) => route.name === screen);
-    return lastRoute;
-}
-
 function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatingCameraButton = true}: NavigationTabBarProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -176,21 +161,8 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatin
             name: CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB,
             op: CONST.TELEMETRY.SPAN_NAVIGATE_TO_INBOX_TAB,
         });
-
-        if (shouldUseNarrowLayout) {
-            Navigation.navigate(ROUTES.HOME);
-            return;
-        }
-
-        const lastReportRoute = getLastRoute(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR, SCREENS.REPORT);
-        if (lastReportRoute) {
-            const {reportID, reportActionID, referrer, backTo} = lastReportRoute.params as ReportsSplitNavigatorParamList[typeof SCREENS.REPORT];
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID, reportActionID, referrer, backTo));
-            return;
-        }
-
         Navigation.navigate(ROUTES.HOME);
-    }, [selectedTab, shouldUseNarrowLayout]);
+    }, [selectedTab]);
 
     const [lastSearchParams] = useOnyx(ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY, {canBeMissing: true});
 
@@ -210,7 +182,11 @@ function NavigationTabBar({selectedTab, isTopLevelBar = false, shouldShowFloatin
                 op: CONST.TELEMETRY.SPAN_ON_LAYOUT_SKELETON_REPORTS,
             });
 
-            const lastSearchRoute = getLastRoute(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR, SCREENS.SEARCH.ROOT);
+            const rootState = navigationRef.getRootState() as State<RootNavigatorParamList>;
+            const lastSearchNavigator = rootState.routes.findLast((route) => route.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+            const lastSearchNavigatorState = lastSearchNavigator && lastSearchNavigator.key ? getPreservedNavigatorState(lastSearchNavigator?.key) : undefined;
+            const lastSearchRoute = lastSearchNavigatorState?.routes.findLast((route) => route.name === SCREENS.SEARCH.ROOT);
+
             if (lastSearchRoute) {
                 const {q, ...rest} = lastSearchRoute.params as SearchFullscreenNavigatorParamList[typeof SCREENS.SEARCH.ROOT];
                 const queryJSON = buildSearchQueryJSON(q);