adjust linking from search page

Expensify · Nov 18, 2024 · b2c1ec5 · b2c1ec5
1 parent 8549d41
commit b2c1ec5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
@@ -368,11 +368,14 @@ function Search({queryJSON, onSearchListScroll, isSearchScreenFocused, contentCo
 
         if (SearchUIUtils.isReportActionListItemType(item)) {
             const reportActionID = item.reportActionID;
-            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, reportActionID, backTo}));
+
+            // We always want to open it in RHP
+            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, reportActionID, backTo}), {reportPathConversionEnabled: false});
             return;
         }
 
-        Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo}));
+        // We always want to open it in RHP
+        Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo}), {reportPathConversionEnabled: false});
     };
 
     const fetchMoreResults = () => {

diff --git a/src/libs/Navigation/linkTo/helpers/shouldConvertReportPath.ts b/src/libs/Navigation/linkTo/helpers/shouldConvertReportPath.ts
@@ -5,7 +5,7 @@ import SCREENS from '@src/SCREENS';
 // It's necessary to stay in RHP if we are in RHP report or in fullscreen if we are in fullscreen report.
 function shouldConvertReportPath(currentFocusedRoute: NavigationPartialRoute, focusedRouteFromPath: NavigationPartialRoute) {
     // @TODO: Navigating from search central pane could be handled with explicit convert: false option. We would need to add it as option to linkTo.
-    if (focusedRouteFromPath.name === SCREENS.REPORT && (currentFocusedRoute.name === SCREENS.SEARCH.REPORT_RHP || currentFocusedRoute.name === SCREENS.SEARCH.CENTRAL_PANE)) {
+    if (focusedRouteFromPath.name === SCREENS.REPORT && currentFocusedRoute.name === SCREENS.SEARCH.REPORT_RHP) {
         return true;
     }