Merge pull request #90107 from Expensify/revert-88118-fix/search-params-overwrite

[CP Staging] Revert "Fix navigation arrows disappearing during report browsing"

Author: mountiny

src/components/MoneyRequestReportView/MoneyRequestReportNavigation.tsx

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

src/components/Search/index.tsx

@@ -27,7 +27,6 @@ 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';
@@ -1208,16 +1207,6 @@ 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;
             }
@@ -1258,9 +1247,6 @@ function Search({
             betas,
             email,
             accountID,
-            queryJSON,
-            offset,
-            searchResults?.search?.hasMoreResults,
         ],
     );
 

src/hooks/useSearchPageSetup.ts

@@ -2,7 +2,6 @@ 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';
@@ -57,11 +56,6 @@ function useSearchPageSetup(queryJSON: Readonly<SearchQueryJSON> | undefined) {
         }
         const shouldSkipWaitForWrites = hasDeferredWrite(CONST.DEFERRED_LAYOUT_WRITE_KEYS.SEARCH);
         search({queryJSON, searchKey: currentSearchKey, offset: 0, shouldCalculateTotals, isLoading: false, skipWaitForWrites: shouldSkipWaitForWrites});
-
-        // Save query context so SearchTabButton can restore the last search when
-        // the user returns to the Search tab. This is the explicit replacement for
-        // the old implicit save-on-every-search() default.
-        saveLastSearchParams({queryJSON, offset: 0, searchKey: currentSearchKey, hasMoreResults: false, allowPostSearchRecount: false});
     }, [hash, isOffline, shouldUseLiveData, queryJSON, isSnapshotDataLoaded, isSnapshotSearchLoading, currentSearchKey, shouldCalculateTotals]);
 
     useFocusEffect(() => {

src/libs/actions/Search.ts

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