From a195955b58749f55b650521f02c311690ee6ce8e Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Wed, 25 Sep 2024 12:58:06 +0200
Subject: [PATCH 1/3] Preserve policyID when navigating to canned search
 queries

---
 src/components/Search/SearchStatusBar.tsx | 88 ++++++++++++-----------
 src/components/Search/index.tsx           |  5 +-
 src/hooks/useDeleteSavedSearch.tsx        |  3 +-
 src/libs/SearchUtils.ts                   | 14 +++-
 src/pages/Search/SearchTypeMenu.tsx       | 24 +++++--
 src/pages/Search/SearchTypeMenuNarrow.tsx |  6 +-
 6 files changed, 83 insertions(+), 57 deletions(-)

diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx
index ea19ef5f4e99..f37ccc7806b2 100644
--- a/src/components/Search/SearchStatusBar.tsx
+++ b/src/components/Search/SearchStatusBar.tsx
@@ -15,125 +15,126 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
-import type {ChatSearchStatus, ExpenseSearchStatus, InvoiceSearchStatus, SearchQueryString, SearchStatus, TripSearchStatus} from './types';
+import type {ChatSearchStatus, ExpenseSearchStatus, InvoiceSearchStatus, SearchStatus, TripSearchStatus} from './types';
 
 type SearchStatusBarProps = {
     type: SearchDataTypes;
     status: SearchStatus;
+    policyID: string | undefined;
     resetOffset: () => void;
 };
 
-const expenseOptions: Array<{key: ExpenseSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+const expenseOptions: Array<{status: ExpenseSearchStatus; type: SearchDataTypes; icon: IconAsset; text: TranslationPaths}> = [
     {
-        key: CONST.SEARCH.STATUS.EXPENSE.ALL,
+        type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+        status: CONST.SEARCH.STATUS.EXPENSE.ALL,
         icon: Expensicons.All,
         text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL),
     },
     {
-        key: CONST.SEARCH.STATUS.EXPENSE.DRAFTS,
+        type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+        status: CONST.SEARCH.STATUS.EXPENSE.DRAFTS,
         icon: Expensicons.Pencil,
         text: 'common.drafts',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.DRAFTS),
     },
     {
-        key: CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING,
+        type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+        status: CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING,
         icon: Expensicons.Hourglass,
         text: 'common.outstanding',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING),
     },
     {
-        key: CONST.SEARCH.STATUS.EXPENSE.APPROVED,
+        type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+        status: CONST.SEARCH.STATUS.EXPENSE.APPROVED,
         icon: Expensicons.ThumbsUp,
         text: 'iou.approved',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.APPROVED),
     },
     {
-        key: CONST.SEARCH.STATUS.EXPENSE.PAID,
+        type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+        status: CONST.SEARCH.STATUS.EXPENSE.PAID,
         icon: Expensicons.MoneyBag,
         text: 'iou.settledExpensify',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.PAID),
     },
 ];
 
-const invoiceOptions: Array<{key: InvoiceSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+const invoiceOptions: Array<{type: SearchDataTypes; status: InvoiceSearchStatus; icon: IconAsset; text: TranslationPaths}> = [
     {
-        key: CONST.SEARCH.STATUS.INVOICE.ALL,
+        type: CONST.SEARCH.DATA_TYPES.INVOICE,
+        status: CONST.SEARCH.STATUS.INVOICE.ALL,
         icon: Expensicons.All,
         text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.ALL),
     },
     {
-        key: CONST.SEARCH.STATUS.INVOICE.OUTSTANDING,
+        type: CONST.SEARCH.DATA_TYPES.INVOICE,
+        status: CONST.SEARCH.STATUS.INVOICE.OUTSTANDING,
         icon: Expensicons.Hourglass,
         text: 'common.outstanding',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.OUTSTANDING),
     },
     {
-        key: CONST.SEARCH.STATUS.INVOICE.PAID,
+        type: CONST.SEARCH.DATA_TYPES.INVOICE,
+        status: CONST.SEARCH.STATUS.INVOICE.PAID,
         icon: Expensicons.MoneyBag,
         text: 'iou.settledExpensify',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.PAID),
     },
 ];
 
-const tripOptions: Array<{key: TripSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+const tripOptions: Array<{type: SearchDataTypes; status: TripSearchStatus; icon: IconAsset; text: TranslationPaths}> = [
     {
-        key: CONST.SEARCH.STATUS.TRIP.ALL,
+        type: CONST.SEARCH.DATA_TYPES.TRIP,
+        status: CONST.SEARCH.STATUS.TRIP.ALL,
         icon: Expensicons.All,
         text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL),
     },
     {
-        key: CONST.SEARCH.STATUS.TRIP.CURRENT,
+        type: CONST.SEARCH.DATA_TYPES.TRIP,
+        status: CONST.SEARCH.STATUS.TRIP.CURRENT,
         icon: Expensicons.Calendar,
         text: 'search.filters.current',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.CURRENT),
     },
     {
-        key: CONST.SEARCH.STATUS.TRIP.PAST,
+        type: CONST.SEARCH.DATA_TYPES.TRIP,
+        status: CONST.SEARCH.STATUS.TRIP.PAST,
         icon: Expensicons.History,
         text: 'search.filters.past',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.PAST),
     },
 ];
 
-const chatOptions: Array<{key: ChatSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+const chatOptions: Array<{type: SearchDataTypes; status: ChatSearchStatus; icon: IconAsset; text: TranslationPaths}> = [
     {
-        key: CONST.SEARCH.STATUS.CHAT.ALL,
+        type: CONST.SEARCH.DATA_TYPES.CHAT,
+        status: CONST.SEARCH.STATUS.CHAT.ALL,
         icon: Expensicons.All,
         text: 'common.all',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.CHAT.ALL),
     },
     {
-        key: CONST.SEARCH.STATUS.CHAT.UNREAD,
+        type: CONST.SEARCH.DATA_TYPES.CHAT,
+        status: CONST.SEARCH.STATUS.CHAT.UNREAD,
         icon: Expensicons.ChatBubbleUnread,
         text: 'common.unread',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.CHAT.UNREAD),
     },
     {
-        key: CONST.SEARCH.STATUS.CHAT.SENT,
+        type: CONST.SEARCH.DATA_TYPES.CHAT,
+        status: CONST.SEARCH.STATUS.CHAT.SENT,
         icon: Expensicons.Send,
         text: 'common.sent',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.CHAT.SENT),
     },
     {
-        key: CONST.SEARCH.STATUS.CHAT.ATTACHMENTS,
+        type: CONST.SEARCH.DATA_TYPES.CHAT,
+        status: CONST.SEARCH.STATUS.CHAT.ATTACHMENTS,
         icon: Expensicons.Document,
         text: 'common.attachments',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.CHAT.ATTACHMENTS),
     },
     {
-        key: CONST.SEARCH.STATUS.CHAT.LINKS,
+        type: CONST.SEARCH.DATA_TYPES.CHAT,
+        status: CONST.SEARCH.STATUS.CHAT.LINKS,
         icon: Expensicons.Paperclip,
         text: 'common.links',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.CHAT.LINKS),
     },
     {
-        key: CONST.SEARCH.STATUS.CHAT.PINNED,
+        type: CONST.SEARCH.DATA_TYPES.CHAT,
+        status: CONST.SEARCH.STATUS.CHAT.PINNED,
         icon: Expensicons.Pin,
         text: 'search.filters.pinned',
-        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.CHAT.PINNED),
     },
 ];
 
@@ -151,7 +152,7 @@ function getOptions(type: SearchDataTypes) {
     }
 }
 
-function SearchStatusBar({type, status, resetOffset}: SearchStatusBarProps) {
+function SearchStatusBar({type, status, policyID, resetOffset}: SearchStatusBarProps) {
     const {singleExecution} = useSingleExecution();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -171,15 +172,16 @@ function SearchStatusBar({type, status, resetOffset}: SearchStatusBarProps) {
             {options.map((item, index) => {
                 const onPress = singleExecution(() => {
                     resetOffset();
-                    Navigation.setParams({q: item.query});
+                    const query = SearchUtils.buildCannedSearchQuery({type: item.type, status: item.status, policyID});
+                    Navigation.setParams({q: query});
                 });
-                const isActive = status === item.key;
+                const isActive = status === item.status;
                 const isFirstItem = index === 0;
                 const isLastItem = index === options.length - 1;
 
                 return (
                     <Button
-                        key={item.key}
+                        key={item.status}
                         onLayout={(e) => {
                             if (!isActive || isScrolledRef.current || !('left' in e.nativeEvent.layout)) {
                                 return;
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index d1080da19932..6a3c001e7662 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -93,7 +93,7 @@ function Search({queryJSON}: SearchProps) {
     const [selectedTransactionsToDelete, setSelectedTransactionsToDelete] = useState<string[]>([]);
     const [deleteExpensesConfirmModalVisible, setDeleteExpensesConfirmModalVisible] = useState(false);
     const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
-    const {type, status, sortBy, sortOrder, hash} = queryJSON;
+    const {type, status, policyID, sortBy, sortOrder, hash} = queryJSON;
 
     const [currentSearchResults] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
 
@@ -211,6 +211,7 @@ function Search({queryJSON}: SearchProps) {
                     <SearchStatusBar
                         type={type}
                         status={status}
+                        policyID={policyID}
                         resetOffset={resetOffset}
                     />
                 ) : (
@@ -243,6 +244,7 @@ function Search({queryJSON}: SearchProps) {
                 <SearchStatusBar
                     type={type}
                     status={status}
+                    policyID={policyID}
                     resetOffset={resetOffset}
                 />
                 <EmptySearchView type={type} />
@@ -350,6 +352,7 @@ function Search({queryJSON}: SearchProps) {
             <SearchStatusBar
                 type={type}
                 status={status}
+                policyID={policyID}
                 resetOffset={resetOffset}
             />
             <SelectionListWithModal<ReportListItemType | TransactionListItemType | ReportActionListItemType>
diff --git a/src/hooks/useDeleteSavedSearch.tsx b/src/hooks/useDeleteSavedSearch.tsx
index ddd2b83f5bc9..668f9048e7fb 100644
--- a/src/hooks/useDeleteSavedSearch.tsx
+++ b/src/hooks/useDeleteSavedSearch.tsx
@@ -3,7 +3,6 @@ import ConfirmModal from '@components/ConfirmModal';
 import Navigation from '@libs/Navigation/Navigation';
 import * as SearchUtils from '@libs/SearchUtils';
 import * as SearchActions from '@userActions/Search';
-import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import useLocalize from './useLocalize';
 
@@ -23,7 +22,7 @@ export default function useDeleteSavedSearch() {
         SearchActions.clearAdvancedFilters();
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL),
+                query: SearchUtils.buildCannedSearchQuery(),
             }),
         );
     };
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index e178c7dcb77b..e65112e3bcc9 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -772,8 +772,18 @@ function getSearchHeaderTitle(
     return title;
 }
 
-function buildCannedSearchQuery(type: SearchDataTypes = CONST.SEARCH.DATA_TYPES.EXPENSE, status: SearchStatus = CONST.SEARCH.STATUS.EXPENSE.ALL): SearchQueryString {
-    return normalizeQuery(`type:${type} status:${status}`);
+function buildCannedSearchQuery({
+    type = CONST.SEARCH.DATA_TYPES.EXPENSE,
+    status = CONST.SEARCH.STATUS.EXPENSE.ALL,
+    policyID,
+}: {
+    type?: SearchDataTypes;
+    status?: SearchStatus;
+    policyID?: string;
+} = {}): SearchQueryString {
+    const queryString = policyID ? `type:${type} status:${status} policyID:${policyID}` : `type:${type} status:${status}`;
+
+    return normalizeQuery(queryString);
 }
 
 function getOverflowMenu(itemName: string, hash: number, inputQuery: string, showDeleteModal: (hash: number) => void, isMobileMenu?: boolean, closeMenu?: () => void) {
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 311168dc5d61..5f1e26232b44 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -49,7 +49,7 @@ type SearchTypeMenuItem = {
     title: string;
     type: SearchDataTypes;
     icon: IconAsset;
-    route?: Route;
+    getRoute: (policyID?: string) => Route;
 };
 
 function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
@@ -72,25 +72,37 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
             title: translate('common.expenses'),
             type: CONST.SEARCH.DATA_TYPES.EXPENSE,
             icon: Expensicons.Receipt,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
+            getRoute: (policyID?: string) => {
+                const query = SearchUtils.buildCannedSearchQuery({policyID});
+                return ROUTES.SEARCH_CENTRAL_PANE.getRoute({query});
+            },
         },
         {
             title: translate('common.chats'),
             type: CONST.SEARCH.DATA_TYPES.CHAT,
             icon: Expensicons.ChatBubbles,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.CHAT, CONST.SEARCH.STATUS.TRIP.ALL)}),
+            getRoute: (policyID?: string) => {
+                const query = SearchUtils.buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.CHAT, status: CONST.SEARCH.STATUS.CHAT.ALL, policyID});
+                return ROUTES.SEARCH_CENTRAL_PANE.getRoute({query});
+            },
         },
         {
             title: translate('workspace.common.invoices'),
             type: CONST.SEARCH.DATA_TYPES.INVOICE,
             icon: Expensicons.InvoiceGeneric,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.ALL)}),
+            getRoute: (policyID?: string) => {
+                const query = SearchUtils.buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.INVOICE, status: CONST.SEARCH.STATUS.INVOICE.ALL, policyID});
+                return ROUTES.SEARCH_CENTRAL_PANE.getRoute({query});
+            },
         },
         {
             title: translate('travel.trips'),
             type: CONST.SEARCH.DATA_TYPES.TRIP,
             icon: Expensicons.Suitcase,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL)}),
+            getRoute: (policyID?: string) => {
+                const query = SearchUtils.buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.TRIP, status: CONST.SEARCH.STATUS.TRIP.ALL, policyID});
+                return ROUTES.SEARCH_CENTRAL_PANE.getRoute({query});
+            },
         },
     ];
 
@@ -221,7 +233,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 {typeMenuItems.map((item, index) => {
                     const onPress = singleExecution(() => {
                         SearchActions.clearAllFilters();
-                        Navigation.navigate(item.route);
+                        Navigation.navigate(item.getRoute(queryJSON.policyID));
                     });
 
                     return (
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index b5d390e2fc53..a61c1ca3de5e 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -48,7 +48,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
     const {singleExecution} = useSingleExecution();
     const {windowHeight} = useWindowDimensions();
     const {translate} = useLocalize();
-    const {hash} = queryJSON;
+    const {hash, policyID} = queryJSON;
     const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
 
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
@@ -72,7 +72,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
                 text: item.title,
                 onSelected: singleExecution(() => {
                     SearchActions.clearAllFilters();
-                    Navigation.navigate(item.route);
+                    Navigation.navigate(item.getRoute(policyID));
                 }),
                 isSelected,
                 icon: item.icon,
@@ -99,7 +99,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
         }
 
         return items;
-    }, [typeMenuItems, activeItemIndex, title, theme, singleExecution, closeMenu, currentSavedSearch]);
+    }, [typeMenuItems, title, activeItemIndex, singleExecution, theme, policyID, closeMenu, currentSavedSearch]);
 
     const menuIcon = useMemo(() => (title ? Expensicons.Filters : popoverMenuItems[activeItemIndex]?.icon ?? Expensicons.Receipt), [activeItemIndex, popoverMenuItems, title]);
     const menuTitle = useMemo(() => title ?? popoverMenuItems[activeItemIndex]?.text, [activeItemIndex, popoverMenuItems, title]);

From ea1cd8a3742bbd4a0d7ecaacc2bafa6c21e65e97 Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Fri, 27 Sep 2024 16:47:44 +0200
Subject: [PATCH 2/3] Correctly saved policyID in saved searches

---
 src/components/Search/SearchPageHeader.tsx |  5 +++--
 src/libs/SearchUtils.ts                    | 10 +++++++++-
 src/pages/Search/AdvancedSearchFilters.tsx | 13 +++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 704f72055410..5784c7c38219 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -296,8 +296,9 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
     }
 
     const onPress = () => {
-        const values = SearchUtils.buildFilterFormValuesFromQuery(queryJSON);
-        SearchActions.updateAdvancedFilters(values);
+        const filterFormValues = SearchUtils.buildFilterFormValuesFromQuery(queryJSON);
+        SearchActions.updateAdvancedFilters(filterFormValues);
+
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
     };
 
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index e65112e3bcc9..a0b3a2c34c93 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -576,7 +576,7 @@ function buildSearchQueryString(queryJSON?: SearchQueryJSON) {
  */
 function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvancedFiltersForm>) {
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
-    const {type, status, ...otherFilters} = filterValues;
+    const {type, status, policyID, ...otherFilters} = filterValues;
     const filtersString: string[] = [];
 
     if (type) {
@@ -589,6 +589,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
         filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${sanitizedStatus}`);
     }
 
+    if (policyID) {
+        const sanitizedPolicyID = sanitizeString(policyID);
+        filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID}:${sanitizedPolicyID}`);
+    }
+
     const mappedFilters = Object.entries(otherFilters)
         .map(([filterKey, filterValue]) => {
             if ((filterKey === FILTER_KEYS.MERCHANT || filterKey === FILTER_KEYS.DESCRIPTION || filterKey === FILTER_KEYS.REPORT_ID) && filterValue) {
@@ -685,6 +690,9 @@ function buildFilterFormValuesFromQuery(queryJSON: SearchQueryJSON) {
 
     filtersForm[FILTER_KEYS.TYPE] = queryJSON.type;
     filtersForm[FILTER_KEYS.STATUS] = queryJSON.status;
+    if (queryJSON.policyID) {
+        filtersForm[FILTER_KEYS.POLICY_ID] = queryJSON.policyID;
+    }
 
     return filtersForm;
 }
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 87ee65a7e2df..306ae1b2401c 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -9,7 +9,7 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import ScrollView from '@components/ScrollView';
-import type {AdvancedFiltersKeys, SearchQueryJSON} from '@components/Search/types';
+import type {AdvancedFiltersKeys} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -230,8 +230,8 @@ function AdvancedSearchFilters() {
     const personalDetails = usePersonalDetails();
     const currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
 
-    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterFormValues(searchAdvancedFilters) || '', [searchAdvancedFilters]);
-    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery()) ?? ({} as SearchQueryJSON), [queryString]);
+    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterFormValues(searchAdvancedFilters), [searchAdvancedFilters]);
+    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery()), [queryString]);
 
     const applyFiltersAndNavigate = () => {
         SearchActions.clearAllFilters();
@@ -245,7 +245,7 @@ function AdvancedSearchFilters() {
 
     const onSaveSearch = () => {
         const savedSearchKeys = Object.keys(savedSearches ?? {});
-        if (savedSearches && savedSearchKeys.includes(String(queryJSON.hash))) {
+        if (!queryJSON || (savedSearches && savedSearchKeys.includes(String(queryJSON.hash)))) {
             // If the search is already saved, return early to prevent unnecessary API calls
             Navigation.dismissModal();
             return;
@@ -299,6 +299,8 @@ function AdvancedSearchFilters() {
         };
     });
 
+    const displaySearchButton = queryJSON && !SearchUtils.isCannedSearchQuery(queryJSON);
+
     return (
         <>
             <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
@@ -320,8 +322,7 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
-
-            {!SearchUtils.isCannedSearchQuery(queryJSON) && (
+            {displaySearchButton && (
                 <Button
                     text={translate('search.saveSearch')}
                     onPress={onSaveSearch}

From d9741fdd9a3eae62085b7b73cb2091e406bcbe3b Mon Sep 17 00:00:00 2001
From: Mateusz Titz <titzmateusz@gmail.com>
Date: Mon, 30 Sep 2024 16:15:51 +0200
Subject: [PATCH 3/3] Update policyID code after merge with main

---
 src/pages/Search/SearchPage.tsx          | 1 +
 src/pages/Search/SearchPageBottomTab.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index 47c29b99b02f..7f82aaabfc6f 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -50,6 +50,7 @@ function SearchPage({route}: SearchPageProps) {
                         <SearchStatusBar
                             type={queryJSON.type}
                             status={queryJSON.status}
+                            policyID={queryJSON.policyID}
                         />
                         <Search queryJSON={queryJSON} />
                     </>
diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index cbff3bc33f94..38e4c5166884 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -111,6 +111,7 @@ function SearchPageBottomTab() {
                             <SearchStatusBar
                                 type={queryJSON.type}
                                 status={queryJSON.status}
+                                policyID={queryJSON.policyID}
                                 onStatusChange={() => {
                                     topBarOffset.value = withTiming(variables.searchHeaderHeight, {duration: ANIMATION_DURATION_IN_MS});
                                 }}