Merge pull request #90175 from callstack-internal/fix/search-params-overwrite-v2

Fix navigation arrows disappearing during report browsing - v2

Author: yuwenmemon

src/components/MoneyRequestReportView/MoneyRequestReportNavigation.tsx

@@ -158,6 +158,7 @@ function MoneyRequestReportNavigationInner({reportID, shouldDisplayNarrowVersion
                 shouldCalculateTotals: false,
                 searchKey: lastSearchQuery.searchKey,
                 isLoading: isSearchLoading,
+                shouldUpdateLastSearchParams: true,
             });
         }
 

src/components/Search/index.tsx

@@ -27,6 +27,7 @@ import useSearchHighlightAndScroll from '@hooks/useSearchHighlightAndScroll';
 import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {turnOffMobileSelectionMode, turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import {saveLastSearchParams} from '@libs/actions/ReportNavigation';
 import type {TransactionPreviewData} from '@libs/actions/Search';
 import {setOptimisticDataForTransactionThreadPreview} from '@libs/actions/Search';
 import {flushDeferredWrite, getOptimisticWatchKey, hasDeferredWrite} from '@libs/deferredLayoutWrite';
@@ -1207,6 +1208,16 @@ function Search({
                     unmarkReportIDAsMultiTransactionExpense(reportID);
                 }
 
+                // Persist the current search context so prev/next navigation arrows
+                // in the report RHP can reference the correct result set.
+                saveLastSearchParams({
+                    queryJSON,
+                    offset,
+                    searchKey: currentSearchKey,
+                    hasMoreResults: !!searchResults?.search?.hasMoreResults,
+                    allowPostSearchRecount: true,
+                });
+
                 requestAnimationFrame(() => Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID, backTo})));
                 return;
             }
@@ -1246,6 +1257,10 @@ function Search({
             betas,
             email,
             accountID,
+            queryJSON,
+            offset,
+            searchResults?.search?.hasMoreResults,
+            currentSearchKey,
         ],
     );
 

src/hooks/useSearchPageSetup.ts

@@ -2,6 +2,7 @@ import {useFocusEffect} from '@react-navigation/native';
 import {useEffect} from 'react';
 import {useSearchActionsContext, useSearchStateContext} from '@components/Search/SearchContext';
 import type {SearchQueryJSON} from '@components/Search/types';
+import {saveLastSearchParams} from '@libs/actions/ReportNavigation';
 import {openSearch, search} from '@libs/actions/Search';
 import {hasDeferredWrite} from '@libs/deferredLayoutWrite';
 import {isSearchDataLoaded} from '@libs/SearchUIUtils';
@@ -10,6 +11,10 @@ import useNetwork from './useNetwork';
 import usePrevious from './usePrevious';
 import useSearchShouldCalculateTotals from './useSearchShouldCalculateTotals';
 
+// Gates the save below to real hash changes so snapshot-loading re-fires don't wipe fields
+// (hasMoreResults, previousLengthOfResults) maintained by report-browsing callers.
+let lastSavedSearchHash: number | undefined;
+
 /**
  * Handles page-level setup for Search that must happen before the Search component mounts:
  * - Clears selected transactions when the query changes
@@ -51,6 +56,14 @@ function useSearchPageSetup(queryJSON: Readonly<SearchQueryJSON> | undefined) {
         if (!queryJSON || hash === undefined || shouldUseLiveData || isOffline) {
             return;
         }
+
+        // Must run even on cached snapshots, else SearchTabButton's Onyx fallback restores
+        // a stale query after a tab switch (e.g. filter reappears after Reset).
+        if (lastSavedSearchHash !== hash) {
+            saveLastSearchParams({queryJSON, offset: 0, searchKey: currentSearchKey, hasMoreResults: false, allowPostSearchRecount: false});
+            lastSavedSearchHash = hash;
+        }
+
         if (isSnapshotDataLoaded || isSnapshotSearchLoading) {
             return;
         }

src/libs/actions/Search.ts

@@ -531,7 +531,7 @@ function search({
     prevReportsLength,
     isOffline = false,
     isLoading,
-    shouldUpdateLastSearchParams = true,
+    shouldUpdateLastSearchParams = false,
     skipWaitForWrites = false,
 }: {
     queryJSON: Readonly<SearchQueryJSON>;