From e08f197e7cda11cd4e776d2f937c109bbcacfd31 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Fri, 30 Aug 2024 10:35:24 +0200
Subject: [PATCH 01/14] add applied filters to onxy upen filters button press

---
 src/components/Search/SearchPageHeader.tsx  |  9 +++-
 src/libs/SearchUtils.ts                     | 48 ++++++++++++++++++++-
 src/types/form/SearchAdvancedFiltersForm.ts |  4 ++
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index c28eed688aaa..0cfffc55c8b0 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -314,7 +314,14 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
             <Button
                 text={translate('search.filtersHeader')}
                 icon={Expensicons.Filters}
-                onPress={() => Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS)}
+                onPress={() => {
+                    const filters = SearchUtils.getFilters(queryJSON);
+                    const form = SearchUtils.getFilterFormObject(filters);
+                    form.type = queryJSON.type;
+                    form.status = queryJSON.status;
+                    SearchActions.updateAdvancedFilters(form);
+                    Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
                 medium
             />
         </HeaderWrapper>
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 4a8864fef769..c6fdec992ae9 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -22,6 +22,7 @@ import * as TransactionUtils from './TransactionUtils';
 import * as UserUtils from './UserUtils';
 
 type KeysOfFilterKeysObject = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS;
+type KeysOfRootKeysObject = keyof typeof CONST.SEARCH.SYNTAX_ROOT_KEYS;
 
 const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
@@ -441,7 +442,14 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
         if (filterKey === FILTER_KEYS.KEYWORD && filterValue) {
             const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
             if (keyInCorrectForm) {
-                return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValue as string}`;
+                return `${filterValue as string}`;
+            }
+        }
+
+        if ((filterKey === FILTER_KEYS.TYPE || filterKey === FILTER_KEYS.STATUS) && filterValue) {
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_ROOT_KEYS) as KeysOfRootKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_ROOT_KEYS[key] === filterKey);
+            if (keyInCorrectForm) {
+                return `${CONST.SEARCH.SYNTAX_ROOT_KEYS[keyInCorrectForm]}:${filterValue as string}`;
             }
         }
 
@@ -457,7 +465,7 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
             Array.isArray(filterValue) &&
             filterValue.length > 0
         ) {
-            const filterValueArray = filterValues[filterKey] ?? [];
+            const filterValueArray = Array.from(new Set<string>(filterValues[filterKey] ?? []));
             const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
             if (keyInCorrectForm) {
                 return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValueArray.map(sanitizeString).join(',')}`;
@@ -517,6 +525,41 @@ function getFilters(queryJSON: SearchQueryJSON) {
     return filters;
 }
 
+function getFilterFormObject(filters: QueryFilters) {
+    const filterKeys = Object.keys(filters);
+    const filterFormObject = {} as Partial<SearchAdvancedFiltersForm>;
+    for (const filterKey of filterKeys) {
+        if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION) {
+            filterFormObject[filterKey] = filters[filterKey]?.[0]?.value.toLocaleString();
+        }
+        if (
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO
+        ) {
+            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toLocaleString());
+        }
+        if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
+            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toLocaleString()).join(' ');
+        }
+        if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE) {
+            filterFormObject[FILTER_KEYS.DATE_BEFORE] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toLocaleString();
+            filterFormObject[FILTER_KEYS.DATE_AFTER] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toLocaleString();
+        }
+        if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
+            filterFormObject[FILTER_KEYS.LESS_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toLocaleString();
+            filterFormObject[FILTER_KEYS.GREATER_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toLocaleString();
+        }
+    }
+
+    return filterFormObject;
+}
+
 /**
  * Given a SearchQueryJSON this function will try to find the value of policyID filter saved in query
  * and return just the first policyID value from the filter.
@@ -575,6 +618,7 @@ export {
     buildSearchQueryString,
     getCurrentSearchParams,
     getFilters,
+    getFilterFormObject,
     getPolicyIDFromSearchQuery,
     getListItem,
     getSearchHeaderTitle,
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 6541072cae81..8e62b869779d 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -2,6 +2,8 @@ import type {ValueOf} from 'type-fest';
 import type Form from './Form';
 
 const FILTER_KEYS = {
+    TYPE: 'type',
+    STATUS: 'status',
     DATE_AFTER: 'dateAfter',
     DATE_BEFORE: 'dateBefore',
     CURRENCY: 'currency',
@@ -26,6 +28,8 @@ type InputID = ValueOf<typeof FILTER_KEYS>;
 type SearchAdvancedFiltersForm = Form<
     InputID,
     {
+        [FILTER_KEYS.TYPE]: string;
+        [FILTER_KEYS.STATUS]: string;
         [FILTER_KEYS.DATE_AFTER]: string;
         [FILTER_KEYS.DATE_BEFORE]: string;
         [FILTER_KEYS.CURRENCY]: string[];

From cebebc8fbc6f24104c0e5df31a0cd44e74ec9679 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 2 Sep 2024 13:57:44 +0200
Subject: [PATCH 02/14] change toString function

---
 src/libs/SearchUtils.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index c6fdec992ae9..af823d059165 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -530,7 +530,7 @@ function getFilterFormObject(filters: QueryFilters) {
     const filterFormObject = {} as Partial<SearchAdvancedFiltersForm>;
     for (const filterKey of filterKeys) {
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION) {
-            filterFormObject[filterKey] = filters[filterKey]?.[0]?.value.toLocaleString();
+            filterFormObject[filterKey] = filters[filterKey]?.[0]?.value.toString();
         }
         if (
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY ||
@@ -542,18 +542,18 @@ function getFilterFormObject(filters: QueryFilters) {
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM ||
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO
         ) {
-            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toLocaleString());
+            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString());
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
-            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toLocaleString()).join(' ');
+            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString()).join(' ');
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE) {
-            filterFormObject[FILTER_KEYS.DATE_BEFORE] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toLocaleString();
-            filterFormObject[FILTER_KEYS.DATE_AFTER] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toLocaleString();
+            filterFormObject[FILTER_KEYS.DATE_BEFORE] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
+            filterFormObject[FILTER_KEYS.DATE_AFTER] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toString();
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
-            filterFormObject[FILTER_KEYS.LESS_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toLocaleString();
-            filterFormObject[FILTER_KEYS.GREATER_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toLocaleString();
+            filterFormObject[FILTER_KEYS.LESS_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
+            filterFormObject[FILTER_KEYS.GREATER_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toString();
         }
     }
 

From 88e8219542b72bc946831743038f64bef05f0b0d Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 2 Sep 2024 14:55:12 +0200
Subject: [PATCH 03/14] add applied filters on narrow view

---
 src/pages/Search/SearchTypeMenu.tsx       |  1 +
 src/pages/Search/SearchTypeMenuNarrow.tsx | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index c434bf346592..19d4a411bdc2 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -65,6 +65,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
             <SearchTypeMenuNarrow
                 typeMenuItems={typeMenuItems}
                 activeItemIndex={activeItemIndex}
+                queryJSON={queryJSON}
                 title={title}
             />
         );
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 0aa01dbb9fe4..c772d649a182 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -4,23 +4,27 @@ import Button from '@components/Button';
 import Icon from '@components/Icon';
 import PopoverMenu from '@components/PopoverMenu';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as SearchActions from '@libs/actions/Search';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Expensicons from '@src/components/Icon/Expensicons';
+import * as SearchUtils from '@src/libs/SearchUtils';
 import ROUTES from '@src/ROUTES';
 import type {SearchTypeMenuItem} from './SearchTypeMenu';
 
 type SearchTypeMenuNarrowProps = {
     typeMenuItems: SearchTypeMenuItem[];
     activeItemIndex: number;
+    queryJSON: SearchQueryJSON;
     title?: string;
 };
 
-function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTypeMenuNarrowProps) {
+function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}: SearchTypeMenuNarrowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {singleExecution} = useSingleExecution();
@@ -96,7 +100,14 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTyp
             </PressableWithFeedback>
             <Button
                 icon={Expensicons.Filters}
-                onPress={() => Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS)}
+                onPress={() => {
+                    const filters = SearchUtils.getFilters(queryJSON);
+                    const form = SearchUtils.getFilterFormObject(filters);
+                    form.type = queryJSON.type;
+                    form.status = queryJSON.status;
+                    SearchActions.updateAdvancedFilters(form);
+                    Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
             />
             <PopoverMenu
                 menuItems={popoverMenuItems}

From d0028ce6d7f3487a68772e221fed1c1ddc822c18 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 2 Sep 2024 15:01:25 +0200
Subject: [PATCH 04/14] improve function names

---
 src/components/Search/SearchPageHeader.tsx |  2 +-
 src/libs/SearchUtils.ts                    | 22 +++++++++++-----------
 src/pages/Search/SearchTypeMenuNarrow.tsx  |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 0cfffc55c8b0..568da4bc6fec 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -316,7 +316,7 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
                 icon={Expensicons.Filters}
                 onPress={() => {
                     const filters = SearchUtils.getFilters(queryJSON);
-                    const form = SearchUtils.getFilterFormObject(filters);
+                    const form = SearchUtils.getFiltersForm(filters);
                     form.type = queryJSON.type;
                     form.status = queryJSON.status;
                     SearchActions.updateAdvancedFilters(form);
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 76c05b6a06ba..78af152cdb66 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -537,12 +537,12 @@ function getFilters(queryJSON: SearchQueryJSON) {
     return filters;
 }
 
-function getFilterFormObject(filters: QueryFilters) {
+function getFiltersForm(filters: QueryFilters) {
     const filterKeys = Object.keys(filters);
-    const filterFormObject = {} as Partial<SearchAdvancedFiltersForm>;
+    const filtersForm = {} as Partial<SearchAdvancedFiltersForm>;
     for (const filterKey of filterKeys) {
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION) {
-            filterFormObject[filterKey] = filters[filterKey]?.[0]?.value.toString();
+            filtersForm[filterKey] = filters[filterKey]?.[0]?.value.toString();
         }
         if (
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY ||
@@ -554,22 +554,22 @@ function getFilterFormObject(filters: QueryFilters) {
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM ||
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO
         ) {
-            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString());
+            filtersForm[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString());
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
-            filterFormObject[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString()).join(' ');
+            filtersForm[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString()).join(' ');
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE) {
-            filterFormObject[FILTER_KEYS.DATE_BEFORE] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
-            filterFormObject[FILTER_KEYS.DATE_AFTER] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toString();
+            filtersForm[FILTER_KEYS.DATE_BEFORE] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
+            filtersForm[FILTER_KEYS.DATE_AFTER] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toString();
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
-            filterFormObject[FILTER_KEYS.LESS_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
-            filterFormObject[FILTER_KEYS.GREATER_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toString();
+            filtersForm[FILTER_KEYS.LESS_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
+            filtersForm[FILTER_KEYS.GREATER_THAN] = filters[filterKey]?.find((filter) => filter.operator === 'gt')?.value.toString();
         }
     }
 
-    return filterFormObject;
+    return filtersForm;
 }
 
 /**
@@ -630,7 +630,7 @@ export {
     buildSearchQueryString,
     getCurrentSearchParams,
     getFilters,
-    getFilterFormObject,
+    getFiltersForm,
     getPolicyIDFromSearchQuery,
     getListItem,
     getSearchHeaderTitle,
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index c772d649a182..266d0bdd0bda 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -102,7 +102,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}
                 icon={Expensicons.Filters}
                 onPress={() => {
                     const filters = SearchUtils.getFilters(queryJSON);
-                    const form = SearchUtils.getFilterFormObject(filters);
+                    const form = SearchUtils.getFiltersForm(filters);
                     form.type = queryJSON.type;
                     form.status = queryJSON.status;
                     SearchActions.updateAdvancedFilters(form);

From 1b2eecf2fd55bb39e40502ec9833b5ded76abeaf Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Mon, 2 Sep 2024 16:11:32 +0200
Subject: [PATCH 05/14] review suggestions

---
 src/components/Search/SearchPageHeader.tsx |  6 ++---
 src/libs/SearchUtils.ts                    | 31 ++++++++++------------
 src/pages/Search/SearchTypeMenuNarrow.tsx  |  6 ++---
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 568da4bc6fec..7411563e24db 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -316,10 +316,8 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
                 icon={Expensicons.Filters}
                 onPress={() => {
                     const filters = SearchUtils.getFilters(queryJSON);
-                    const form = SearchUtils.getFiltersForm(filters);
-                    form.type = queryJSON.type;
-                    form.status = queryJSON.status;
-                    SearchActions.updateAdvancedFilters(form);
+                    const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
+                    SearchActions.updateAdvancedFilters(values);
                     Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
                 }}
                 medium
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 78af152cdb66..e604f970962f 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -21,8 +21,7 @@ import * as searchParser from './SearchParser/searchParser';
 import * as TransactionUtils from './TransactionUtils';
 import * as UserUtils from './UserUtils';
 
-type KeysOfFilterKeysObject = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS;
-type KeysOfRootKeysObject = keyof typeof CONST.SEARCH.SYNTAX_ROOT_KEYS;
+type FilterKeys = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS;
 
 const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
@@ -444,25 +443,20 @@ function getChatFiltersTranslationKey(has: ValueOf<typeof CONST.SEARCH.CHAT_TYPE
 function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFiltersForm>) {
     const filtersString = Object.entries(filterValues).map(([filterKey, filterValue]) => {
         if ((filterKey === FILTER_KEYS.MERCHANT || filterKey === FILTER_KEYS.DESCRIPTION || filterKey === FILTER_KEYS.REPORT_ID) && filterValue) {
-            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
             if (keyInCorrectForm) {
                 return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${sanitizeString(filterValue as string)}`;
             }
         }
         if (filterKey === FILTER_KEYS.KEYWORD && filterValue) {
-            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
-            if (keyInCorrectForm) {
-                return `${filterValue as string}`;
-            }
+            return `${filterValue as string}`;
         }
-
-        if ((filterKey === FILTER_KEYS.TYPE || filterKey === FILTER_KEYS.STATUS) && filterValue) {
-            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_ROOT_KEYS) as KeysOfRootKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_ROOT_KEYS[key] === filterKey);
-            if (keyInCorrectForm) {
-                return `${CONST.SEARCH.SYNTAX_ROOT_KEYS[keyInCorrectForm]}:${filterValue as string}`;
-            }
+        if (filterKey === FILTER_KEYS.TYPE && filterValue) {
+            return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${filterValue as string}`;
+        }
+        if (filterKey === FILTER_KEYS.STATUS && filterValue) {
+            return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${filterValue as string}`;
         }
-
         if (
             (filterKey === FILTER_KEYS.CATEGORY ||
                 filterKey === FILTER_KEYS.CARD_ID ||
@@ -478,7 +472,7 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
             filterValue.length > 0
         ) {
             const filterValueArray = Array.from(new Set<string>(filterValues[filterKey] ?? []));
-            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
             if (keyInCorrectForm) {
                 return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValueArray.map(sanitizeString).join(',')}`;
             }
@@ -537,7 +531,7 @@ function getFilters(queryJSON: SearchQueryJSON) {
     return filters;
 }
 
-function getFiltersForm(filters: QueryFilters) {
+function getFiltersFormValues(filters: QueryFilters, queryJSON: SearchQueryJSON) {
     const filterKeys = Object.keys(filters);
     const filtersForm = {} as Partial<SearchAdvancedFiltersForm>;
     for (const filterKey of filterKeys) {
@@ -569,6 +563,9 @@ function getFiltersForm(filters: QueryFilters) {
         }
     }
 
+    filtersForm[FILTER_KEYS.TYPE] = queryJSON.type;
+    filtersForm[FILTER_KEYS.STATUS] = queryJSON.status;
+
     return filtersForm;
 }
 
@@ -630,7 +627,7 @@ export {
     buildSearchQueryString,
     getCurrentSearchParams,
     getFilters,
-    getFiltersForm,
+    getFiltersFormValues,
     getPolicyIDFromSearchQuery,
     getListItem,
     getSearchHeaderTitle,
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 266d0bdd0bda..adb1d0f496db 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -102,10 +102,8 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}
                 icon={Expensicons.Filters}
                 onPress={() => {
                     const filters = SearchUtils.getFilters(queryJSON);
-                    const form = SearchUtils.getFiltersForm(filters);
-                    form.type = queryJSON.type;
-                    form.status = queryJSON.status;
-                    SearchActions.updateAdvancedFilters(form);
+                    const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
+                    SearchActions.updateAdvancedFilters(values);
                     Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
                 }}
             />

From 3260c11b37de8a5f6380d0a448851632523545e2 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Tue, 3 Sep 2024 10:55:02 +0200
Subject: [PATCH 06/14] fix ts and ampersant error

---
 src/ROUTES.ts                              | 2 +-
 src/components/Search/types.ts             | 2 +-
 src/pages/Search/AdvancedSearchFilters.tsx | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 231997e398bc..47435b647c27 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -35,7 +35,7 @@ const ROUTES = {
 
     SEARCH_CENTRAL_PANE: {
         route: 'search',
-        getRoute: ({query, isCustomQuery = false}: {query: SearchQueryString; isCustomQuery?: boolean}) => `search?q=${query}&isCustomQuery=${isCustomQuery}` as const,
+        getRoute: ({query, isCustomQuery = false}: {query: SearchQueryString; isCustomQuery?: boolean}) => `search?q=${encodeURIComponent(query)}&isCustomQuery=${isCustomQuery}` as const,
     },
     SEARCH_ADVANCED_FILTERS: 'search/filters',
     SEARCH_ADVANCED_FILTERS_DATE: 'search/filters/date',
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 9f2aca1ff957..6c3a7bffdf5d 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -49,7 +49,7 @@ type QueryFilter = {
     value: string | number;
 };
 
-type AdvancedFiltersKeys = ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS> | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS;
+type AdvancedFiltersKeys = ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>;
 
 type QueryFilters = {
     [K in AdvancedFiltersKeys]?: QueryFilter[];
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index aec2b8e93363..04603de579d3 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -170,6 +170,8 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
         if (greaterThan) {
             return translate('search.filters.amount.greaterThan', convertToDisplayStringWithoutCurrency(Number(greaterThan)));
         }
+        // Will never happen
+        return;
     }
 
     if (
@@ -184,9 +186,6 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
         return filters[fieldName];
     }
 
-    // Todo Once all Advanced filters are implemented this line can be cleaned up. See: https://github.com/Expensify/App/issues/45026
-    // @ts-expect-error this property access is temporarily an error, because not every SYNTAX_FILTER_KEYS is handled by form.
-    // When all filters are updated here: src/types/form/SearchAdvancedFiltersForm.ts this line comment + type cast can be removed.
     const filterValue = filters[fieldName] as string;
     return filterValue ? Str.recapitalize(filterValue) : undefined;
 }

From 975349e565412122927488b03e660e214590ac33 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Tue, 3 Sep 2024 13:04:27 +0200
Subject: [PATCH 07/14] review suggestions

---
 src/libs/SearchUtils.ts                    | 2 +-
 src/pages/Search/AdvancedSearchFilters.tsx | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index e604f970962f..e486711f14a3 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -471,7 +471,7 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
             Array.isArray(filterValue) &&
             filterValue.length > 0
         ) {
-            const filterValueArray = Array.from(new Set<string>(filterValues[filterKey] ?? []));
+            const filterValueArray = [...new Set<string>(filterValues[filterKey] ?? [])];
             const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
             if (keyInCorrectForm) {
                 return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValueArray.map(sanitizeString).join(',')}`;
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 04603de579d3..662590f1714a 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -1,4 +1,3 @@
-import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
 import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils';
@@ -186,8 +185,8 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
         return filters[fieldName];
     }
 
-    const filterValue = filters[fieldName] as string;
-    return filterValue ? Str.recapitalize(filterValue) : undefined;
+    const filterValue = filters[fieldName];
+    return Array.isArray(filterValue) ? filterValue.join(', ') : filterValue;
 }
 
 function getFilterTaxRateDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, taxRates: Record<string, string[]>) {

From 507fc44c8084b17af94ed556ce0dab954206dc89 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Thu, 5 Sep 2024 12:39:06 +0200
Subject: [PATCH 08/14] review

---
 src/components/Search/SearchPageHeader.tsx | 14 ++++++-----
 src/libs/SearchUtils.ts                    | 27 +++++++++++++++++-----
 src/pages/Search/SearchTypeMenuNarrow.tsx  | 13 ++++++-----
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 2742c4721430..34b969c58f61 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -295,6 +295,13 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
         return null;
     }
 
+    const onPress = () => {
+        const filters = SearchUtils.getFilters(queryJSON);
+        const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
+        SearchActions.updateAdvancedFilters(values);
+        Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
     return (
         <HeaderWrapper
             title={headerTitle}
@@ -316,12 +323,7 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
             <Button
                 text={translate('search.filtersHeader')}
                 icon={Expensicons.Filters}
-                onPress={() => {
-                    const filters = SearchUtils.getFilters(queryJSON);
-                    const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
-                    SearchActions.updateAdvancedFilters(values);
-                    Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
-                }}
+                onPress={onPress}
                 medium
             />
         </HeaderWrapper>
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index c17660a1cc1a..ab85bf15e5f9 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -402,7 +402,8 @@ function buildAmountFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>
 }
 
 function sanitizeString(str: string) {
-    if (str.includes(' ') || str.includes(',')) {
+    const regexp = /[<>,:=]/g;
+    if (regexp.test(str)) {
         return `"${str}"`;
     }
     return str;
@@ -442,13 +443,14 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
             }
         }
         if (filterKey === FILTER_KEYS.KEYWORD && filterValue) {
-            return `${filterValue as string}`;
+            const value = (filterValue as string).split(' ').map(sanitizeString).join(' ');
+            return `${value}`;
         }
         if (filterKey === FILTER_KEYS.TYPE && filterValue) {
-            return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${filterValue as string}`;
+            return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${sanitizeString(filterValue as string)}`;
         }
         if (filterKey === FILTER_KEYS.STATUS && filterValue) {
-            return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${filterValue as string}`;
+            return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${sanitizeString(filterValue as string)}`;
         }
         if (
             (filterKey === FILTER_KEYS.CATEGORY ||
@@ -524,6 +526,9 @@ function getFilters(queryJSON: SearchQueryJSON) {
     return filters;
 }
 
+/**
+ * returns the values of the filters in a format that can be used in the SearchAdvancedFiltersForm as initial form values
+ */
 function getFiltersFormValues(filters: QueryFilters, queryJSON: SearchQueryJSON) {
     const filterKeys = Object.keys(filters);
     const filtersForm = {} as Partial<SearchAdvancedFiltersForm>;
@@ -539,12 +544,22 @@ function getFiltersFormValues(filters: QueryFilters, queryJSON: SearchQueryJSON)
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG ||
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY ||
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM ||
-            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN ||
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.HAS
         ) {
             filtersForm[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString());
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
-            filtersForm[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString()).join(' ');
+            filtersForm[filterKey] = filters[filterKey]
+                ?.map((filter) => filter.value.toString())
+                .map((filter) => {
+                    if (filter.includes(' ')) {
+                        return `"${filter}"`;
+                    }
+                    return filter;
+                })
+                .join(' ');
         }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE) {
             filtersForm[FILTER_KEYS.DATE_BEFORE] = filters[filterKey]?.find((filter) => filter.operator === 'lt')?.value.toString();
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index adb1d0f496db..ee57294fcea4 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -35,6 +35,12 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}
 
     const openMenu = () => setIsPopoverVisible(true);
     const closeMenu = () => setIsPopoverVisible(false);
+    const onPress = () => {
+        const filters = SearchUtils.getFilters(queryJSON);
+        const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
+        SearchActions.updateAdvancedFilters(values);
+        Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
 
     const popoverMenuItems = typeMenuItems.map((item, index) => {
         const isSelected = title ? false : index === activeItemIndex;
@@ -100,12 +106,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}
             </PressableWithFeedback>
             <Button
                 icon={Expensicons.Filters}
-                onPress={() => {
-                    const filters = SearchUtils.getFilters(queryJSON);
-                    const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
-                    SearchActions.updateAdvancedFilters(values);
-                    Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
-                }}
+                onPress={onPress}
             />
             <PopoverMenu
                 menuItems={popoverMenuItems}

From e5fb7851b3e46177ac52b0521bcd4595bd9a6384 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Thu, 5 Sep 2024 15:29:12 +0200
Subject: [PATCH 09/14] fix function signature

---
 src/components/Search/SearchPageHeader.tsx | 3 +--
 src/libs/SearchUtils.ts                    | 3 ++-
 src/pages/Search/SearchTypeMenuNarrow.tsx  | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index 34b969c58f61..761a7a3c94df 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -296,8 +296,7 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
     }
 
     const onPress = () => {
-        const filters = SearchUtils.getFilters(queryJSON);
-        const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
+        const values = SearchUtils.getFiltersFormValues(queryJSON);
         SearchActions.updateAdvancedFilters(values);
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
     };
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index ab85bf15e5f9..c3fdef35cff1 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -529,7 +529,8 @@ function getFilters(queryJSON: SearchQueryJSON) {
 /**
  * returns the values of the filters in a format that can be used in the SearchAdvancedFiltersForm as initial form values
  */
-function getFiltersFormValues(filters: QueryFilters, queryJSON: SearchQueryJSON) {
+function getFiltersFormValues(queryJSON: SearchQueryJSON) {
+    const filters = getFilters(queryJSON);
     const filterKeys = Object.keys(filters);
     const filtersForm = {} as Partial<SearchAdvancedFiltersForm>;
     for (const filterKey of filterKeys) {
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index ee57294fcea4..5df9b1fb62e9 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -36,8 +36,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}
     const openMenu = () => setIsPopoverVisible(true);
     const closeMenu = () => setIsPopoverVisible(false);
     const onPress = () => {
-        const filters = SearchUtils.getFilters(queryJSON);
-        const values = SearchUtils.getFiltersFormValues(filters, queryJSON);
+        const values = SearchUtils.getFiltersFormValues(queryJSON);
         SearchActions.updateAdvancedFilters(values);
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
     };

From 49119f9b6e7872732aa52d39b40dbda1405b89d6 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Fri, 6 Sep 2024 09:23:09 +0200
Subject: [PATCH 10/14] fix string sanitization

---
 src/libs/SearchUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index c3fdef35cff1..1163105ecce5 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -402,7 +402,7 @@ function buildAmountFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>
 }
 
 function sanitizeString(str: string) {
-    const regexp = /[<>,:=]/g;
+    const regexp = /[<>,:= ]/g;
     if (regexp.test(str)) {
         return `"${str}"`;
     }

From ad05cf4b0cbfa5ecec1851a26db26ebf070f455e Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Tue, 10 Sep 2024 11:05:35 +0200
Subject: [PATCH 11/14] remove is and has filters

---
 src/CONST.ts                                  |  11 --
 src/ROUTES.ts                                 |   3 -
 src/SCREENS.ts                                |   2 -
 src/languages/en.ts                           |   3 -
 src/languages/es.ts                           |   3 -
 .../ModalStackNavigators/index.tsx            |   2 -
 src/libs/Navigation/linkingConfig/config.ts   |   2 -
 src/libs/SearchParser/searchParser.js         | 126 ++++++++----------
 src/libs/SearchParser/searchParser.peggy      |   2 -
 src/libs/SearchUtils.ts                       |  31 +----
 src/pages/Search/AdvancedSearchFilters.tsx    |  35 +----
 .../SearchFiltersHasPage.tsx                  |  75 -----------
 .../SearchFiltersIsPage.tsx                   |  66 ---------
 src/types/form/SearchAdvancedFiltersForm.ts   |   4 -
 14 files changed, 56 insertions(+), 309 deletions(-)
 delete mode 100644 src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
 delete mode 100644 src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx

diff --git a/src/CONST.ts b/src/CONST.ts
index d0695b1e285f..39b6902234b4 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5395,11 +5395,6 @@ const CONST = {
             DONE: 'done',
             PAID: 'paid',
         },
-        CHAT_STATUS: {
-            UNREAD: 'unread',
-            PINNED: 'pinned',
-            DRAFT: 'draft',
-        },
         BULK_ACTION_TYPES: {
             EXPORT: 'export',
             HOLD: 'hold',
@@ -5441,10 +5436,6 @@ const CONST = {
                 LINKS: 'links',
             },
         },
-        CHAT_TYPES: {
-            LINK: 'link',
-            ATTACHMENT: 'attachment',
-        },
         TABLE_COLUMNS: {
             RECEIPT: 'receipt',
             DATE: 'date',
@@ -5492,8 +5483,6 @@ const CONST = {
             REPORT_ID: 'reportID',
             KEYWORD: 'keyword',
             IN: 'in',
-            HAS: 'has',
-            IS: 'is',
         },
     },
 
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index fc867fe15538..faa406136ec9 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -53,9 +53,6 @@ const ROUTES = {
     SEARCH_ADVANCED_FILTERS_FROM: 'search/filters/from',
     SEARCH_ADVANCED_FILTERS_TO: 'search/filters/to',
     SEARCH_ADVANCED_FILTERS_IN: 'search/filters/in',
-    SEARCH_ADVANCED_FILTERS_HAS: 'search/filters/has',
-    SEARCH_ADVANCED_FILTERS_IS: 'search/filters/is',
-
     SEARCH_REPORT: {
         route: 'search/view/:reportID/:reportActionID?',
         getRoute: (reportID: string, reportActionID?: string) => {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 67ba5b84c9ec..27328c0c8951 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -47,8 +47,6 @@ const SCREENS = {
         ADVANCED_FILTERS_FROM_RHP: 'Search_Advanced_Filters_From_RHP',
         ADVANCED_FILTERS_TO_RHP: 'Search_Advanced_Filters_To_RHP',
         ADVANCED_FILTERS_IN_RHP: 'Search_Advanced_Filters_In_RHP',
-        ADVANCED_FILTERS_HAS_RHP: 'Search_Advanced_Filters_Has_RHP',
-        ADVANCED_FILTERS_IS_RHP: 'Search_Advanced_Filters_Is_RHP',
         TRANSACTION_HOLD_REASON_RHP: 'Search_Transaction_Hold_Reason_RHP',
         BOTTOM_TAB: 'Search_Bottom_Tab',
     },
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 3d37787038ea..0fb15a8c834c 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3918,12 +3918,9 @@ export default {
             keyword: 'Keyword',
             hasKeywords: 'Has keywords',
             currency: 'Currency',
-            has: 'Has',
             link: 'Link',
-            is: 'Is',
             pinned: 'Pinned',
             unread: 'Unread',
-            draft: 'Draft',
             amount: {
                 lessThan: (amount?: string) => `Less than ${amount ?? ''}`,
                 greaterThan: (amount?: string) => `Greater than ${amount ?? ''}`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ff7650e9e02c..eddac07422b3 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3969,12 +3969,9 @@ export default {
             keyword: 'Palabra clave',
             hasKeywords: 'Tiene palabras clave',
             currency: 'Divisa',
-            has: 'Tiene',
             link: 'Enlace',
-            is: 'Está',
             pinned: 'Fijado',
             unread: 'No leído',
-            draft: 'Borrador',
             amount: {
                 lessThan: (amount?: string) => `Menos de ${amount ?? ''}`,
                 greaterThan: (amount?: string) => `Más que ${amount ?? ''}`,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 1b2390b17c39..76a9fad2749b 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -544,8 +544,6 @@ const SearchAdvancedFiltersModalStackNavigator = createModalStackNavigator<Searc
     [SCREENS.SEARCH.ADVANCED_FILTERS_FROM_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_IN_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersInPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_HAS_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_IS_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage').default,
 });
 
 const RestrictedActionModalStackNavigator = createModalStackNavigator<SearchReportParamList>({
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 65fb05f8d008..47bc5f421093 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1082,8 +1082,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.SEARCH.ADVANCED_FILTERS_FROM_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_FROM,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_TO,
                         [SCREENS.SEARCH.ADVANCED_FILTERS_IN_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_IN,
-                        [SCREENS.SEARCH.ADVANCED_FILTERS_HAS_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_HAS,
-                        [SCREENS.SEARCH.ADVANCED_FILTERS_IS_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_IS,
                     },
                 },
                 [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: {
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 32fd834c1346..622c3f5f3c4a 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -200,14 +200,12 @@ function peg$parse(input, options) {
   var peg$c17 = "cardID";
   var peg$c18 = "from";
   var peg$c19 = "expenseType";
-  var peg$c20 = "has";
-  var peg$c21 = "is";
-  var peg$c22 = "type";
-  var peg$c23 = "status";
-  var peg$c24 = "sortBy";
-  var peg$c25 = "sortOrder";
-  var peg$c26 = "policyID";
-  var peg$c27 = "\"";
+  var peg$c20 = "type";
+  var peg$c21 = "status";
+  var peg$c22 = "sortBy";
+  var peg$c23 = "sortOrder";
+  var peg$c24 = "policyID";
+  var peg$c25 = "\"";
 
   var peg$r0 = /^[:=]/;
   var peg$r1 = /^[^"\r\n]/;
@@ -237,21 +235,19 @@ function peg$parse(input, options) {
   var peg$e20 = peg$literalExpectation("cardID", false);
   var peg$e21 = peg$literalExpectation("from", false);
   var peg$e22 = peg$literalExpectation("expenseType", false);
-  var peg$e23 = peg$literalExpectation("has", false);
-  var peg$e24 = peg$literalExpectation("is", false);
-  var peg$e25 = peg$otherExpectation("default key");
-  var peg$e26 = peg$literalExpectation("type", false);
-  var peg$e27 = peg$literalExpectation("status", false);
-  var peg$e28 = peg$literalExpectation("sortBy", false);
-  var peg$e29 = peg$literalExpectation("sortOrder", false);
-  var peg$e30 = peg$literalExpectation("policyID", false);
-  var peg$e31 = peg$otherExpectation("quote");
-  var peg$e32 = peg$literalExpectation("\"", false);
-  var peg$e33 = peg$classExpectation(["\"", "\r", "\n"], true, false);
-  var peg$e34 = peg$otherExpectation("word");
-  var peg$e35 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", "@", ".", "/", "#", "&", "+", "-", "\\", "'", ",", ";"], false, false);
-  var peg$e36 = peg$otherExpectation("whitespace");
-  var peg$e37 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
+  var peg$e23 = peg$otherExpectation("default key");
+  var peg$e24 = peg$literalExpectation("type", false);
+  var peg$e25 = peg$literalExpectation("status", false);
+  var peg$e26 = peg$literalExpectation("sortBy", false);
+  var peg$e27 = peg$literalExpectation("sortOrder", false);
+  var peg$e28 = peg$literalExpectation("policyID", false);
+  var peg$e29 = peg$otherExpectation("quote");
+  var peg$e30 = peg$literalExpectation("\"", false);
+  var peg$e31 = peg$classExpectation(["\"", "\r", "\n"], true, false);
+  var peg$e32 = peg$otherExpectation("word");
+  var peg$e33 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", "@", ".", "/", "#", "&", "+", "-", "\\", "'", ",", ";"], false, false);
+  var peg$e34 = peg$otherExpectation("whitespace");
+  var peg$e35 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -853,30 +849,12 @@ function peg$parse(input, options) {
                                   if (peg$silentFails === 0) { peg$fail(peg$e22); }
                                 }
                                 if (s1 === peg$FAILED) {
-                                  if (input.substr(peg$currPos, 3) === peg$c20) {
-                                    s1 = peg$c20;
-                                    peg$currPos += 3;
+                                  if (input.substr(peg$currPos, 2) === peg$c11) {
+                                    s1 = peg$c11;
+                                    peg$currPos += 2;
                                   } else {
                                     s1 = peg$FAILED;
-                                    if (peg$silentFails === 0) { peg$fail(peg$e23); }
-                                  }
-                                  if (s1 === peg$FAILED) {
-                                    if (input.substr(peg$currPos, 2) === peg$c11) {
-                                      s1 = peg$c11;
-                                      peg$currPos += 2;
-                                    } else {
-                                      s1 = peg$FAILED;
-                                      if (peg$silentFails === 0) { peg$fail(peg$e14); }
-                                    }
-                                    if (s1 === peg$FAILED) {
-                                      if (input.substr(peg$currPos, 2) === peg$c21) {
-                                        s1 = peg$c21;
-                                        peg$currPos += 2;
-                                      } else {
-                                        s1 = peg$FAILED;
-                                        if (peg$silentFails === 0) { peg$fail(peg$e24); }
-                                      }
-                                    }
+                                    if (peg$silentFails === 0) { peg$fail(peg$e14); }
                                   }
                                 }
                               }
@@ -913,44 +891,44 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c22) {
-      s1 = peg$c22;
+    if (input.substr(peg$currPos, 4) === peg$c20) {
+      s1 = peg$c20;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 6) === peg$c23) {
-        s1 = peg$c23;
+      if (input.substr(peg$currPos, 6) === peg$c21) {
+        s1 = peg$c21;
         peg$currPos += 6;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e27); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 === peg$FAILED) {
-        if (input.substr(peg$currPos, 6) === peg$c24) {
-          s1 = peg$c24;
+        if (input.substr(peg$currPos, 6) === peg$c22) {
+          s1 = peg$c22;
           peg$currPos += 6;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e28); }
+          if (peg$silentFails === 0) { peg$fail(peg$e26); }
         }
         if (s1 === peg$FAILED) {
-          if (input.substr(peg$currPos, 9) === peg$c25) {
-            s1 = peg$c25;
+          if (input.substr(peg$currPos, 9) === peg$c23) {
+            s1 = peg$c23;
             peg$currPos += 9;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e29); }
+            if (peg$silentFails === 0) { peg$fail(peg$e27); }
           }
           if (s1 === peg$FAILED) {
-            if (input.substr(peg$currPos, 8) === peg$c26) {
-              s1 = peg$c26;
+            if (input.substr(peg$currPos, 8) === peg$c24) {
+              s1 = peg$c24;
               peg$currPos += 8;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e30); }
+              if (peg$silentFails === 0) { peg$fail(peg$e28); }
             }
           }
         }
@@ -965,7 +943,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
 
     return s0;
@@ -1006,11 +984,11 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c27;
+      s1 = peg$c25;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1019,7 +997,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -1028,15 +1006,15 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e33); }
+          if (peg$silentFails === 0) { peg$fail(peg$e31); }
         }
       }
       if (input.charCodeAt(peg$currPos) === 34) {
-        s3 = peg$c27;
+        s3 = peg$c25;
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
@@ -1052,7 +1030,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
 
     return s0;
@@ -1069,7 +1047,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -1079,7 +1057,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e35); }
+          if (peg$silentFails === 0) { peg$fail(peg$e33); }
         }
       }
     } else {
@@ -1093,7 +1071,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
 
     return s0;
@@ -1121,7 +1099,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -1130,12 +1108,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e37); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e36); }
+    if (peg$silentFails === 0) { peg$fail(peg$e34); }
 
     return s0;
   }
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index bea1e5cfd6ff..f9f681736c61 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -119,9 +119,7 @@ key "key"
       / "cardID"
       / "from"
       / "expenseType"
-      / "has"
       / "in"
-      / "is"
     )
 
 defaultKey "default key"
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 0f6be6635788..f488d90cfb89 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -488,28 +488,6 @@ function getExpenseTypeTranslationKey(expenseType: ValueOf<typeof CONST.SEARCH.T
     }
 }
 
-function getChatFiltersTranslationKey(has: ValueOf<typeof CONST.SEARCH.CHAT_TYPES>): TranslationPaths {
-    // eslint-disable-next-line default-case
-    switch (has) {
-        case CONST.SEARCH.CHAT_TYPES.LINK:
-            return 'search.filters.link';
-        case CONST.SEARCH.CHAT_TYPES.ATTACHMENT:
-            return 'common.attachment';
-    }
-}
-
-function getChatStatusTranslationKey(chatStatus: ValueOf<typeof CONST.SEARCH.CHAT_STATUS>): TranslationPaths {
-    // eslint-disable-next-line default-case
-    switch (chatStatus) {
-        case CONST.SEARCH.CHAT_STATUS.PINNED:
-            return 'search.filters.pinned';
-        case CONST.SEARCH.CHAT_STATUS.UNREAD:
-            return 'search.filters.unread';
-        case CONST.SEARCH.CHAT_STATUS.DRAFT:
-            return 'search.filters.draft';
-    }
-}
-
 /**
  * Given object with chosen search filters builds correct query string from them
  */
@@ -540,9 +518,7 @@ function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFilters
                 filterKey === FILTER_KEYS.CURRENCY ||
                 filterKey === FILTER_KEYS.FROM ||
                 filterKey === FILTER_KEYS.TO ||
-                filterKey === FILTER_KEYS.IN ||
-                filterKey === FILTER_KEYS.HAS ||
-                filterKey === FILTER_KEYS.IS) &&
+                filterKey === FILTER_KEYS.IN) &&
             Array.isArray(filterValue) &&
             filterValue.length > 0
         ) {
@@ -635,8 +611,7 @@ function getFiltersFormValues(queryJSON: SearchQueryJSON) {
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY ||
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM ||
             filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO ||
-            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN ||
-            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.HAS
+            filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN
         ) {
             filtersForm[filterKey] = filters[filterKey]?.map((filter) => filter.value.toString());
         }
@@ -751,6 +726,4 @@ export {
     buildCannedSearchQuery,
     isCannedSearchQuery,
     getExpenseTypeTranslationKey,
-    getChatFiltersTranslationKey,
-    getChatStatusTranslationKey,
 };
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 8c309109a7d7..3d4200c3eb2a 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -97,28 +97,18 @@ const baseFilterConfig = {
         description: 'common.to' as const,
         route: ROUTES.SEARCH_ADVANCED_FILTERS_TO,
     },
-    has: {
-        getTitle: getFilterHasDisplayTitle,
-        description: 'search.filters.has' as const,
-        route: ROUTES.SEARCH_ADVANCED_FILTERS_HAS,
-    },
     in: {
         getTitle: getFilterInDisplayTitle,
         description: 'common.in' as const,
         route: ROUTES.SEARCH_ADVANCED_FILTERS_IN,
     },
-    is: {
-        getTitle: getFilterIsDisplayTitle,
-        description: 'search.filters.is' as const,
-        route: ROUTES.SEARCH_ADVANCED_FILTERS_IS,
-    },
 };
 
 const typeFiltersKeys: Record<string, Array<ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>>> = {
     [CONST.SEARCH.DATA_TYPES.EXPENSE]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'expenseType', 'tag', 'from', 'to', 'cardID'],
     [CONST.SEARCH.DATA_TYPES.INVOICE]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'tag', 'from', 'to', 'cardID'],
     [CONST.SEARCH.DATA_TYPES.TRIP]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'tag', 'from', 'to', 'cardID'],
-    [CONST.SEARCH.DATA_TYPES.CHAT]: ['date', 'keyword', 'from', 'has', 'in', 'is'],
+    [CONST.SEARCH.DATA_TYPES.CHAT]: ['date', 'keyword', 'from', 'in'],
 };
 
 function getFilterCardDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, cards: CardList) {
@@ -224,27 +214,6 @@ function getFilterExpenseDisplayTitle(filters: Partial<SearchAdvancedFiltersForm
 function getFilterInDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, translate: LocaleContextProps['translate'], reports?: OnyxCollection<Report>) {
     return filters.in ? filters.in.map((id) => ReportUtils.getReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`])).join(', ') : undefined;
 }
-
-function getFilterHasDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, translate: LocaleContextProps['translate']) {
-    const filterValue = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.HAS];
-    return filterValue
-        ? Object.values(CONST.SEARCH.CHAT_TYPES)
-              .filter((hasFilter) => filterValue.includes(hasFilter))
-              .map((hasFilter) => translate(SearchUtils.getChatFiltersTranslationKey(hasFilter)))
-              .join(', ')
-        : undefined;
-}
-
-function getFilterIsDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, translate: LocaleContextProps['translate']) {
-    const filterValue = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.IS];
-    return filterValue
-        ? Object.values(CONST.SEARCH.CHAT_STATUS)
-              .filter((chatStatus) => filterValue.includes(chatStatus))
-              .map((chatStatus) => translate(SearchUtils.getChatStatusTranslationKey(chatStatus)))
-              .join(', ')
-        : undefined;
-}
-
 function AdvancedSearchFilters() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -291,7 +260,7 @@ function AdvancedSearchFilters() {
             filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, cardList);
         } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE) {
             filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, taxRates);
-        } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE || key === CONST.SEARCH.SYNTAX_FILTER_KEYS.HAS || key === CONST.SEARCH.SYNTAX_FILTER_KEYS.IS) {
+        } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE) {
             filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate);
         } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM || key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO) {
             filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters[key] ?? [], personalDetails);
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
deleted file mode 100644
index e964554373b0..000000000000
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersHasPage.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React, {useCallback, useMemo} from 'react';
-import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
-import * as SearchActions from '@userActions/Search';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-
-type FilterItem = {
-    name: string;
-    value: typeof CONST.SEARCH.CHAT_TYPES.ATTACHMENT | typeof CONST.SEARCH.CHAT_TYPES.LINK;
-};
-
-function SearchFiltersHasPage() {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-
-    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
-
-    const filterItems: FilterItem[] = useMemo(
-        () => [
-            {
-                name: translate('common.attachment'),
-                value: CONST.SEARCH.CHAT_TYPES.ATTACHMENT,
-            },
-            {
-                name: translate('search.filters.link'),
-                value: CONST.SEARCH.CHAT_TYPES.LINK,
-            },
-        ],
-        [translate],
-    );
-
-    const selectedOptions = useMemo(() => {
-        return searchAdvancedFiltersForm?.has?.map((value) => filterItems.find((filterItem) => filterItem.value === value)).filter((item): item is FilterItem => item !== undefined) ?? [];
-    }, [searchAdvancedFiltersForm, filterItems]);
-
-    const updateHasFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({has: values}), []);
-
-    return (
-        <ScreenWrapper
-            testID={SearchFiltersHasPage.displayName}
-            shouldShowOfflineIndicatorInWideScreen
-            offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
-            shouldEnableMaxHeight
-        >
-            <HeaderWithBackButton
-                title={translate('search.filters.has')}
-                onBackButtonPress={() => {
-                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
-                }}
-            />
-            <View style={[styles.flex1]}>
-                <SearchMultipleSelectionPicker
-                    pickerTitle={translate('search.filters.has')}
-                    items={filterItems}
-                    initiallySelectedItems={selectedOptions}
-                    onSaveSelection={updateHasFilter}
-                    shouldShowTextInput={false}
-                />
-            </View>
-        </ScreenWrapper>
-    );
-}
-
-SearchFiltersHasPage.displayName = 'SearchFiltersHasPage';
-
-export default SearchFiltersHasPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
deleted file mode 100644
index d2431776eb44..000000000000
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersIsPage.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, {useCallback, useMemo} from 'react';
-import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
-import {getChatStatusTranslationKey} from '@libs/SearchUtils';
-import * as SearchActions from '@userActions/Search';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-
-function SearchFiltersIsPage() {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-
-    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
-    const selectedChatStatuses = searchAdvancedFiltersForm?.is?.map((chatStatus) => {
-        const chatStatusName = translate(getChatStatusTranslationKey(chatStatus as ValueOf<typeof CONST.SEARCH.CHAT_STATUS>));
-        return {name: chatStatusName, value: chatStatus};
-    });
-    const allChatStatuses = Object.values(CONST.SEARCH.CHAT_STATUS);
-
-    const chatStatusItems = useMemo(() => {
-        return allChatStatuses.map((chatStatus) => {
-            const chatStatusName = translate(getChatStatusTranslationKey(chatStatus));
-            return {name: chatStatusName, value: chatStatus};
-        });
-    }, [allChatStatuses, translate]);
-
-    const updateChatIsFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({is: values}), []);
-
-    return (
-        <ScreenWrapper
-            testID={SearchFiltersIsPage.displayName}
-            shouldShowOfflineIndicatorInWideScreen
-            offlineIndicatorStyle={styles.mtAuto}
-            includeSafeAreaPaddingBottom={false}
-            shouldEnableMaxHeight
-        >
-            <HeaderWithBackButton
-                title={translate('search.filters.is')}
-                onBackButtonPress={() => {
-                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
-                }}
-            />
-            <View style={[styles.flex1]}>
-                <SearchMultipleSelectionPicker
-                    pickerTitle={translate('search.filters.is')}
-                    items={chatStatusItems}
-                    initiallySelectedItems={selectedChatStatuses}
-                    onSaveSelection={updateChatIsFilter}
-                    shouldShowTextInput={false}
-                />
-            </View>
-        </ScreenWrapper>
-    );
-}
-
-SearchFiltersIsPage.displayName = 'SearchFiltersIsPage';
-
-export default SearchFiltersIsPage;
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 414b5eef95b9..a70e58d48a19 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -22,8 +22,6 @@ const FILTER_KEYS = {
     FROM: 'from',
     TO: 'to',
     IN: 'in',
-    HAS: 'has',
-    IS: 'is',
 } as const;
 
 type InputID = ValueOf<typeof FILTER_KEYS>;
@@ -51,8 +49,6 @@ type SearchAdvancedFiltersForm = Form<
         [FILTER_KEYS.FROM]: string[];
         [FILTER_KEYS.TO]: string[];
         [FILTER_KEYS.IN]: string[];
-        [FILTER_KEYS.HAS]: string[];
-        [FILTER_KEYS.IS]: string[];
     }
 >;
 

From b57bbcf21517351f07bbe25452b15c14c06c8257 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Tue, 10 Sep 2024 11:30:53 +0200
Subject: [PATCH 12/14] fix typecheck

---
 src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
index ff3c60693cbc..ecdae4ed55b1 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -61,7 +61,6 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
         SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_IN_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP,
-        SCREENS.SEARCH.ADVANCED_FILTERS_HAS_RHP,
     ],
     [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: [
         SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD,

From e96f20d4b026a92c95f29ac35e831367f86e3d2a Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Wed, 11 Sep 2024 10:36:50 +0200
Subject: [PATCH 13/14] fix filters and reset button

---
 src/libs/actions/Search.ts                     | 16 +++++++++++++++-
 src/pages/Search/AdvancedSearchFilters.tsx     |  2 +-
 src/pages/Search/SearchAdvancedFiltersPage.tsx |  5 ++++-
 src/pages/Search/SearchTypeMenu.tsx            |  6 +++++-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 020fc1bd2c30..2ca6f7ccf47f 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -1,5 +1,6 @@
 import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import type {FormOnyxValues} from '@components/Form/types';
 import type {SearchQueryJSON} from '@components/Search/types';
 import * as API from '@libs/API';
@@ -10,6 +11,7 @@ import fileDownload from '@libs/fileDownload';
 import enhanceParameters from '@libs/Network/enhanceParameters';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type {SearchTransaction} from '@src/types/onyx/SearchResults';
 import * as Report from './Report';
 
@@ -128,10 +130,21 @@ function updateAdvancedFilters(values: Partial<FormOnyxValues<typeof ONYXKEYS.FO
 /**
  * Clears all values for the advanced filters search form.
  */
-function clearAdvancedFilters() {
+function clearAllFilters() {
     Onyx.set(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, null);
 }
 
+function clearAdvancedFilters() {
+    const values: Partial<Record<ValueOf<typeof FILTER_KEYS>, null>> = {};
+    Object.values(FILTER_KEYS)
+        .filter((key) => key !== FILTER_KEYS.TYPE && key !== FILTER_KEYS.STATUS)
+        .forEach((key) => {
+            values[key] = null;
+        });
+
+    Onyx.merge(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values);
+}
+
 export {
     search,
     createTransactionThread,
@@ -140,5 +153,6 @@ export {
     unholdMoneyRequestOnSearch,
     exportSearchItemsToCSV,
     updateAdvancedFilters,
+    clearAllFilters,
     clearAdvancedFilters,
 };
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 3d4200c3eb2a..aa0f6ce85802 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -229,7 +229,7 @@ function AdvancedSearchFilters() {
 
     const onFormSubmit = () => {
         const query = SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters);
-        SearchActions.clearAdvancedFilters();
+        SearchActions.clearAllFilters();
         Navigation.dismissModal();
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
diff --git a/src/pages/Search/SearchAdvancedFiltersPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage.tsx
index 9c205de2433b..687e04c7341b 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage.tsx
@@ -6,6 +6,7 @@ import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as SearchActions from '@userActions/Search';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import AdvancedSearchFilters from './AdvancedSearchFilters';
@@ -17,7 +18,9 @@ function SearchAdvancedFiltersPage() {
     const emptySearchFilters: SearchAdvancedFiltersForm = {} as SearchAdvancedFiltersForm;
     const [searchAdvancedFilters = emptySearchFilters] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
 
-    const shouldShowResetFilters = Object.values(searchAdvancedFilters).some((value) => (Array.isArray(value) ? value.length !== 0 : !!value));
+    const shouldShowResetFilters = Object.entries(searchAdvancedFilters)
+        .filter(([key]) => CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE !== key && CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS !== key)
+        .some(([, value]) => (Array.isArray(value) ? value.length !== 0 : !!value));
 
     return (
         <ScreenWrapper
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index f892df28fe8a..84373b0d4964 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -6,6 +6,7 @@ import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as SearchActions from '@libs/actions/Search';
 import Navigation from '@libs/Navigation/Navigation';
 import * as SearchUtils from '@libs/SearchUtils';
 import variables from '@styles/variables';
@@ -81,7 +82,10 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     return (
         <View style={[styles.pb4, styles.mh3, styles.mt3]}>
             {typeMenuItems.map((item, index) => {
-                const onPress = singleExecution(() => Navigation.navigate(item.route));
+                const onPress = singleExecution(() => {
+                    SearchActions.clearAllFilters();
+                    Navigation.navigate(item.route);
+                });
 
                 return (
                     <MenuItem

From 263c291ca10baa86eb9dc1dd00129fa11e816457 Mon Sep 17 00:00:00 2001
From: 289Adam289 <adam.szwaja@swmansion.com>
Date: Wed, 11 Sep 2024 13:39:08 +0200
Subject: [PATCH 14/14] fix on narrow layout

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 5df9b1fb62e9..3bbd594eb115 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -46,7 +46,10 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title}
 
         return {
             text: item.title,
-            onSelected: singleExecution(() => Navigation.navigate(item.route)),
+            onSelected: singleExecution(() => {
+                SearchActions.clearAllFilters();
+                Navigation.navigate(item.route);
+            }),
             icon: item.icon,
             iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
             iconRight: Expensicons.Checkmark,