From 65989829d10b9fa7b6dce71085f788f8027dac05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 26 Aug 2024 14:05:58 +0200
Subject: [PATCH 001/101] WIP

---
 src/ROUTES.ts                              |  4 ++--
 src/components/Search/index.tsx            | 12 +++++++++---
 src/languages/en.ts                        |  1 +
 src/languages/es.ts                        |  1 +
 src/libs/API/types.ts                      |  2 ++
 src/libs/Navigation/types.ts               |  1 +
 src/libs/actions/Search.ts                 | 13 +++++++++++++
 src/pages/Search/AdvancedSearchFilters.tsx | 18 ++++++++++++++++++
 src/pages/Search/SearchPage.tsx            |  3 ++-
 9 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 47a2ad76209e..93e34a934c21 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -35,8 +35,8 @@ const ROUTES = {
 
     SEARCH_CENTRAL_PANE: {
         route: 'search',
-        getRoute: ({query, isCustomQuery = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; policyIDs?: string}) =>
-            `search?q=${query}&isCustomQuery=${isCustomQuery}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
+        getRoute: ({query, isCustomQuery = false, isSavedSearch = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; isSavedSearch?: boolean; policyIDs?: string}) =>
+            `search?q=${query}&isCustomQuery=${isCustomQuery}${isSavedSearch ? `&isSavedSearch=${isSavedSearch}` : ''}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
     },
     SEARCH_ADVANCED_FILTERS: 'search/filters',
     SEARCH_ADVANCED_FILTERS_DATE: 'search/filters/date',
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index df5398bffffa..de1d03bd4372 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -36,6 +36,7 @@ import type {SearchColumnType, SearchQueryJSON, SearchStatus, SelectedTransactio
 type SearchProps = {
     queryJSON: SearchQueryJSON;
     isCustomQuery: boolean;
+    isSavedSearch: boolean;
     policyIDs?: string;
 };
 
@@ -73,7 +74,7 @@ function prepareTransactionsList(item: TransactionListItemType, selectedTransact
     return {...selectedTransactions, [item.keyForList]: {isSelected: true, canDelete: item.canDelete, canHold: item.canHold, canUnhold: item.canUnhold, action: item.action}};
 }
 
-function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
+function Search({queryJSON, policyIDs, isCustomQuery, isSavedSearch}: SearchProps) {
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -117,9 +118,14 @@ function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
             return;
         }
 
-        SearchActions.search({queryJSON, offset, policyIDs});
+        if (isSavedSearch === 'true') {
+            SearchActions.saveSearch({queryJSON, policyIDs});
+        } else {
+            SearchActions.search({queryJSON, offset, policyIDs});
+        }
+
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [isOffline, offset, queryJSON]);
+    }, [isOffline, offset, queryJSON, isSavedSearch]);
 
     const handleOnCancelConfirmModal = () => {
         setDeleteExpensesConfirmModalVisible(false);
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 632da6f9c3ae..a7fd9e76444b 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3746,6 +3746,7 @@ export default {
                 buttonText: 'Book a trip',
             },
         },
+        saveSearch: 'Save search',
         groupedExpenses: 'grouped expenses',
         bulkActions: {
             delete: 'Delete',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 77ba5e5abf45..a0d35c7505ef 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3796,6 +3796,7 @@ export default {
                 buttonText: 'Reserva un viaje',
             },
         },
+        saveSearch: 'Guardar búsqueda',
         groupedExpenses: 'gastos agrupados',
         bulkActions: {
             delete: 'Eliminar',
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 5ea2ae44b74d..25b97eb17034 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -336,6 +336,7 @@ const WRITE_COMMANDS = {
     CREATE_EXPENSIFY_CARD: 'CreateExpensifyCard',
     CREATE_ADMIN_ISSUED_VIRTUAL_CARD: 'CreateAdminIssuedVirtualCard',
     TOGGLE_CARD_CONTINUOUS_RECONCILIATION: 'ToggleCardContinuousReconciliation',
+    SAVE_SEARCH: 'SaveSearch',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -677,6 +678,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.CREATE_EXPENSIFY_CARD]: Parameters.CreateExpensifyCardParams;
     [WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD]: Omit<Parameters.CreateExpensifyCardParams, 'feedCountry'>;
     [WRITE_COMMANDS.TOGGLE_CARD_CONTINUOUS_RECONCILIATION]: Parameters.ToggleCardContinuousReconciliationParams;
+    [WRITE_COMMANDS.SAVE_SEARCH]: Parameters.SearchParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index ceb62f1dac1c..c183619d7873 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -69,6 +69,7 @@ type CentralPaneScreensParamList = {
     [SCREENS.SEARCH.CENTRAL_PANE]: {
         q: SearchQueryString;
         isCustomQuery: boolean;
+        isSavedSearch: boolean;
         policyIDs?: string;
     };
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: undefined;
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index b51955c9cc59..833079486a98 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -49,6 +49,18 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
     return {optimisticData, finallyData};
 }
 
+function saveSearch({queryJSON, offset, policyIDs}: {queryJSON: SearchQueryJSON; offset?: number; policyIDs?: string}) {
+    const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
+    const queryWithOffset = {
+        ...queryJSON,
+        offset,
+    };
+    const jsonQuery = JSON.stringify(queryWithOffset);
+
+    API.write(WRITE_COMMANDS.SAVE_SEARCH, {hash: queryJSON.hash, jsonQuery, policyIDs}, {optimisticData, finallyData});
+}
+
+
 function search({queryJSON, offset, policyIDs}: {queryJSON: SearchQueryJSON; offset?: number; policyIDs?: string}) {
     const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
 
@@ -133,6 +145,7 @@ function clearAdvancedFilters() {
 }
 
 export {
+    saveSearch,
     search,
     createTransactionThread,
     deleteMoneyRequestOnSearch,
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 4b859e37785e..d4b3bb7d3f7d 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -23,6 +23,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import type {CardList, PersonalDetailsList} from '@src/types/onyx';
+import Button from '@components/Button';
 
 function getFilterCardDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, cards: CardList) {
     const filterValue = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID];
@@ -213,6 +214,17 @@ function AdvancedSearchFilters() {
         [searchAdvancedFilters, translate, cardList, taxRates, personalDetails],
     );
 
+    const onSaveSearch = () => {
+        SearchActions.clearAdvancedFilters();
+        Navigation.navigate(
+            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                query: SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters),
+                isCustomQuery: true,
+                isSavedSearch: true,
+            }),
+        );
+    }
+    
     const onFormSubmit = () => {
         const query = SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters);
         SearchActions.clearAdvancedFilters();
@@ -245,6 +257,12 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
+            <Button
+                text={translate('search.saveSearch')}
+                onPress={onSaveSearch}
+                style={[styles.mh4, styles.mt4]}
+                large
+            />
             <FormAlertWithSubmitButton
                 buttonText={translate('search.viewResults')}
                 containerStyles={[styles.m4, styles.mb5]}
diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index e2495c02d44f..70df7256240f 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -17,7 +17,7 @@ type SearchPageProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.SEA
 function SearchPage({route}: SearchPageProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
-    const {policyIDs, q, isCustomQuery} = route.params;
+    const {policyIDs, q, isCustomQuery, isSavedSearch} = route.params;
 
     const queryJSON = useMemo(() => buildSearchQueryJSON(q, policyIDs), [q, policyIDs]);
 
@@ -44,6 +44,7 @@ function SearchPage({route}: SearchPageProps) {
                 {queryJSON && (
                     <Search
                         isCustomQuery={isCustomQuery}
+                        isSavedSearch={isSavedSearch}
                         queryJSON={queryJSON}
                         policyIDs={policyIDs}
                     />

From 8da87e9a052656a4edb91217f4652b0607e7a276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 27 Aug 2024 16:08:18 +0200
Subject: [PATCH 002/101] wip

---
 src/ROUTES.ts                              |  4 +--
 src/components/Search/index.tsx            | 12 ++------
 src/libs/API/parameters/SaveSearch.ts      |  8 +++++
 src/libs/API/parameters/index.ts           |  2 ++
 src/libs/API/types.ts                      |  2 +-
 src/libs/Navigation/types.ts               |  1 -
 src/libs/actions/Search.ts                 | 12 ++------
 src/pages/Search/AdvancedSearchFilters.tsx | 35 ++++++++++++----------
 src/pages/Search/SearchPage.tsx            |  3 +-
 9 files changed, 39 insertions(+), 40 deletions(-)
 create mode 100644 src/libs/API/parameters/SaveSearch.ts

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 93e34a934c21..47a2ad76209e 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -35,8 +35,8 @@ const ROUTES = {
 
     SEARCH_CENTRAL_PANE: {
         route: 'search',
-        getRoute: ({query, isCustomQuery = false, isSavedSearch = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; isSavedSearch?: boolean; policyIDs?: string}) =>
-            `search?q=${query}&isCustomQuery=${isCustomQuery}${isSavedSearch ? `&isSavedSearch=${isSavedSearch}` : ''}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
+        getRoute: ({query, isCustomQuery = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; policyIDs?: string}) =>
+            `search?q=${query}&isCustomQuery=${isCustomQuery}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
     },
     SEARCH_ADVANCED_FILTERS: 'search/filters',
     SEARCH_ADVANCED_FILTERS_DATE: 'search/filters/date',
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index de1d03bd4372..e2f3fe61cd4f 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -36,7 +36,6 @@ import type {SearchColumnType, SearchQueryJSON, SearchStatus, SelectedTransactio
 type SearchProps = {
     queryJSON: SearchQueryJSON;
     isCustomQuery: boolean;
-    isSavedSearch: boolean;
     policyIDs?: string;
 };
 
@@ -74,7 +73,7 @@ function prepareTransactionsList(item: TransactionListItemType, selectedTransact
     return {...selectedTransactions, [item.keyForList]: {isSelected: true, canDelete: item.canDelete, canHold: item.canHold, canUnhold: item.canUnhold, action: item.action}};
 }
 
-function Search({queryJSON, policyIDs, isCustomQuery, isSavedSearch}: SearchProps) {
+function Search({queryJSON, policyIDs, isCustomQuery}: SearchProps) {
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -117,15 +116,10 @@ function Search({queryJSON, policyIDs, isCustomQuery, isSavedSearch}: SearchProp
         if (isOffline) {
             return;
         }
-
-        if (isSavedSearch === 'true') {
-            SearchActions.saveSearch({queryJSON, policyIDs});
-        } else {
-            SearchActions.search({queryJSON, offset, policyIDs});
-        }
+        SearchActions.search({queryJSON, offset, policyIDs});
 
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [isOffline, offset, queryJSON, isSavedSearch]);
+    }, [isOffline, offset, queryJSON, policyIDs]);
 
     const handleOnCancelConfirmModal = () => {
         setDeleteExpensesConfirmModalVisible(false);
diff --git a/src/libs/API/parameters/SaveSearch.ts b/src/libs/API/parameters/SaveSearch.ts
new file mode 100644
index 000000000000..e0ad38dd8363
--- /dev/null
+++ b/src/libs/API/parameters/SaveSearch.ts
@@ -0,0 +1,8 @@
+import type {SearchQueryString} from '@components/Search/types';
+
+type SaveSearchParams = {
+    jsonQuery: SearchQueryString;
+    name?: string;
+};
+
+export default SaveSearchParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 9696f4213a48..906db044e484 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -280,3 +280,5 @@ export type {default as OpenCardDetailsPageParams} from './OpenCardDetailsPagePa
 export type {default as EnablePolicyCompanyCardsParams} from './EnablePolicyCompanyCardsParams';
 export type {default as ToggleCardContinuousReconciliationParams} from './ToggleCardContinuousReconciliationParams';
 export type {default as UpdateExpensifyCardLimitTypeParams} from './UpdateExpensifyCardLimitTypeParams';
+export type {default as SaveSearchParams} from './SaveSearch';
+
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 25b97eb17034..8b0166701b32 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -678,7 +678,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.CREATE_EXPENSIFY_CARD]: Parameters.CreateExpensifyCardParams;
     [WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD]: Omit<Parameters.CreateExpensifyCardParams, 'feedCountry'>;
     [WRITE_COMMANDS.TOGGLE_CARD_CONTINUOUS_RECONCILIATION]: Parameters.ToggleCardContinuousReconciliationParams;
-    [WRITE_COMMANDS.SAVE_SEARCH]: Parameters.SearchParams;
+    [WRITE_COMMANDS.SAVE_SEARCH]: Parameters.SaveSearchParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index c183619d7873..ceb62f1dac1c 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -69,7 +69,6 @@ type CentralPaneScreensParamList = {
     [SCREENS.SEARCH.CENTRAL_PANE]: {
         q: SearchQueryString;
         isCustomQuery: boolean;
-        isSavedSearch: boolean;
         policyIDs?: string;
     };
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: undefined;
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 833079486a98..57272f5efeec 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -49,18 +49,12 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
     return {optimisticData, finallyData};
 }
 
-function saveSearch({queryJSON, offset, policyIDs}: {queryJSON: SearchQueryJSON; offset?: number; policyIDs?: string}) {
+function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: string}) {
     const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
-    const queryWithOffset = {
-        ...queryJSON,
-        offset,
-    };
-    const jsonQuery = JSON.stringify(queryWithOffset);
-
-    API.write(WRITE_COMMANDS.SAVE_SEARCH, {hash: queryJSON.hash, jsonQuery, policyIDs}, {optimisticData, finallyData});
+    const jsonQuery = JSON.stringify(queryJSON);
+    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, finallyData});
 }
 
-
 function search({queryJSON, offset, policyIDs}: {queryJSON: SearchQueryJSON; offset?: number; policyIDs?: string}) {
     const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
 
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index d4b3bb7d3f7d..6ed780c0ed31 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -131,11 +131,11 @@ function AdvancedSearchFilters() {
     const styles = useThemeStyles();
     const {singleExecution} = useSingleExecution();
     const waitForNavigate = useWaitForNavigation();
-
     const [searchAdvancedFilters = {} as SearchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
     const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
     const taxRates = getAllTaxRates();
     const personalDetails = usePersonalDetails();
+    const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all';
 
     const advancedFilters = useMemo(
         () => [
@@ -214,26 +214,29 @@ function AdvancedSearchFilters() {
         [searchAdvancedFilters, translate, cardList, taxRates, personalDetails],
     );
 
+    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters), [searchAdvancedFilters]);
+
     const onSaveSearch = () => {
+        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || DEFAULT_SAVE_SEARCH_QUERY_STRING);
+        if (!queryJSON) {
+            return;
+        }
+
+        SearchActions.saveSearch({
+            queryJSON,
+        });
+
+        applyFiltersAndNavigate();
+    };
+
+    const applyFiltersAndNavigate = () => {
         SearchActions.clearAdvancedFilters();
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query: SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters),
-                isCustomQuery: true,
-                isSavedSearch: true,
-            }),
-        );
-    }
-    
-    const onFormSubmit = () => {
-        const query = SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters);
-        SearchActions.clearAdvancedFilters();
-        Navigation.navigate(
-            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query,
+                query: queryString,
                 isCustomQuery: true,
             }),
-        );
+        )
     };
 
     return (
@@ -266,7 +269,7 @@ function AdvancedSearchFilters() {
             <FormAlertWithSubmitButton
                 buttonText={translate('search.viewResults')}
                 containerStyles={[styles.m4, styles.mb5]}
-                onSubmit={onFormSubmit}
+                onSubmit={applyFiltersAndNavigate}
                 enabledWhenOffline
             />
         </>
diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index 70df7256240f..e2495c02d44f 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -17,7 +17,7 @@ type SearchPageProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.SEA
 function SearchPage({route}: SearchPageProps) {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
-    const {policyIDs, q, isCustomQuery, isSavedSearch} = route.params;
+    const {policyIDs, q, isCustomQuery} = route.params;
 
     const queryJSON = useMemo(() => buildSearchQueryJSON(q, policyIDs), [q, policyIDs]);
 
@@ -44,7 +44,6 @@ function SearchPage({route}: SearchPageProps) {
                 {queryJSON && (
                     <Search
                         isCustomQuery={isCustomQuery}
-                        isSavedSearch={isSavedSearch}
                         queryJSON={queryJSON}
                         policyIDs={policyIDs}
                     />

From 6391ba44ede45bf3a4819274dc0cb5a8830231b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 15:16:17 +0200
Subject: [PATCH 003/101] add onyx key for NVP SAVED_SEARCHES

---
 src/ONYXKEYS.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 6a1fc8a629ed..92647c157bb9 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -403,6 +403,9 @@ const ONYXKEYS = {
     /** Stores the route to open after changing app permission from settings */
     LAST_ROUTE: 'lastRoute',
 
+    /** Stores the information about the saved searches */
+    SAVED_SEARCHES: 'nvp_savedSearches',
+
     /** Collection Keys */
     COLLECTION: {
         DOWNLOAD: 'download_',
@@ -630,6 +633,7 @@ const ONYXKEYS = {
         SAGE_INTACCT_DIMENSION_TYPE_FORM_DRAFT: 'sageIntacctDimensionTypeFormDraft',
         SEARCH_ADVANCED_FILTERS_FORM: 'searchAdvancedFiltersForm',
         SEARCH_ADVANCED_FILTERS_FORM_DRAFT: 'searchAdvancedFiltersFormDraft',
+        SEARCH_SAVED_SEARCH_RENAME_FORM: 'searchSavedSearchRenameForm',
         TEXT_PICKER_MODAL_FORM: 'textPickerModalForm',
         TEXT_PICKER_MODAL_FORM_DRAFT: 'textPickerModalFormDraft',
         RULES_REQUIRED_RECEIPT_AMOUNT_FORM: 'rulesRequiredReceiptAmountForm',
@@ -912,6 +916,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_PRIVATE_CANCELLATION_DETAILS]: OnyxTypes.CancellationDetails[];
     [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
     [ONYXKEYS.LAST_ROUTE]: string;
+    [ONYXKEYS.SAVED_SEARCHES]: OnyxTypes.SaveSearch[];
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

From 24ff12419365f0eb3e3600420bb2ede206af0238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:47:04 +0200
Subject: [PATCH 004/101] add saved search route

---
 src/ROUTES.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 2e8421532048..e9d14fc4db63 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -38,6 +38,10 @@ const ROUTES = {
         getRoute: ({query, isCustomQuery = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; policyIDs?: string}) =>
             `search?q=${query}&isCustomQuery=${isCustomQuery}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
     },
+    SEARCH_SAVED_SEARCH_RENAME: {
+        route: 'search/saved-search/rename',
+        getRoute: ({name, jsonQuery}: {name: string; jsonQuery: SearchQueryString}) => `search/saved-search/rename?name=${name}&q=${jsonQuery}` as const,
+    },
     SEARCH_ADVANCED_FILTERS: 'search/filters',
     SEARCH_ADVANCED_FILTERS_DATE: 'search/filters/date',
     SEARCH_ADVANCED_FILTERS_CURRENCY: 'search/filters/currency',

From ef223934225b56af545e94eabb2193ce645e12bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:47:19 +0200
Subject: [PATCH 005/101] add saved search screens

---
 src/SCREENS.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 9634cc1b02ac..2abd88ac14a0 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -46,6 +46,7 @@ const SCREENS = {
         ADVANCED_FILTERS_TAG_RHP: 'Search_Advanced_Filters_Tag_RHP',
         ADVANCED_FILTERS_FROM_RHP: 'Search_Advanced_Filters_From_RHP',
         ADVANCED_FILTERS_TO_RHP: 'Search_Advanced_Filters_To_RHP',
+        SAVED_SEARCH_RENAME_RHP: 'Search_Saved_Search_Rename_RHP',
         TRANSACTION_HOLD_REASON_RHP: 'Search_Transaction_Hold_Reason_RHP',
         BOTTOM_TAB: 'Search_Bottom_Tab',
     },
@@ -163,6 +164,7 @@ const SCREENS = {
         TRAVEL: 'Travel',
         SEARCH_REPORT: 'SearchReport',
         SEARCH_ADVANCED_FILTERS: 'SearchAdvancedFilters',
+        SEARCH_SAVED_SEARCH: 'SearchSavedSearch',
         SETTINGS_CATEGORIES: 'SettingsCategories',
         RESTRICTED_ACTION: 'RestrictedAction',
         REPORT_EXPORT: 'Report_Export',

From 3fe465417884eaea357e66159ab6d4e6afa56cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:47:33 +0200
Subject: [PATCH 006/101] add Onyx types

---
 src/types/onyx/SaveSearch.ts | 12 ++++++++++++
 src/types/onyx/index.ts      |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 src/types/onyx/SaveSearch.ts

diff --git a/src/types/onyx/SaveSearch.ts b/src/types/onyx/SaveSearch.ts
new file mode 100644
index 000000000000..531084d1ade9
--- /dev/null
+++ b/src/types/onyx/SaveSearch.ts
@@ -0,0 +1,12 @@
+/**
+ * Model of saved search
+ */
+type SaveSearch = {
+    /** Name of the saved search */
+    name: string;
+
+    /** Query string for the saved search */
+    query: string;
+};
+
+export default SaveSearch;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 54ee7fe25892..4c68ad4f6e6d 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -77,6 +77,7 @@ import type ReportViolations from './ReportViolation';
 import type Request from './Request';
 import type Response from './Response';
 import type ReviewDuplicates from './ReviewDuplicates';
+import type SaveSearch from './SaveSearch';
 import type ScreenShareRequest from './ScreenShareRequest';
 import type SearchResults from './SearchResults';
 import type SecurityGroup from './SecurityGroup';
@@ -222,4 +223,5 @@ export type {
     MobileSelectionMode,
     WorkspaceTooltip,
     CardFeeds,
+    SaveSearch,
 };

From 1783ff70b7e16f0b68ef7f6dc68c75ea3292413c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:48:39 +0200
Subject: [PATCH 007/101] add saved search navigators

---
 .../Navigation/AppNavigator/ModalStackNavigators/index.tsx  | 6 ++++++
 .../AppNavigator/Navigators/RightModalNavigator.tsx         | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 187e71df4d98..d122a4927048 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -22,6 +22,7 @@ import type {
     RoomMembersNavigatorParamList,
     SearchAdvancedFiltersParamList,
     SearchReportParamList,
+    SearchSavedSearchParamList,
     SettingsNavigatorParamList,
     SignInNavigatorParamList,
     SplitDetailsNavigatorParamList,
@@ -535,6 +536,10 @@ const SearchAdvancedFiltersModalStackNavigator = createModalStackNavigator<Searc
     [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage').default,
 });
 
+const SearchSavedSearchModalStackNavigator = createModalStackNavigator<SearchSavedSearchParamList>({
+    [SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SavedSearchRenamePage').default,
+});
+
 const RestrictedActionModalStackNavigator = createModalStackNavigator<SearchReportParamList>({
     [SCREENS.RESTRICTED_ACTION_ROOT]: () => require<ReactComponentModule>('../../../../pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage').default,
 });
@@ -570,4 +575,5 @@ export {
     SearchReportModalStackNavigator,
     RestrictedActionModalStackNavigator,
     SearchAdvancedFiltersModalStackNavigator,
+    SearchSavedSearchModalStackNavigator,
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 646552c44055..730115c1c014 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -187,6 +187,10 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                         name={SCREENS.RIGHT_MODAL.SEARCH_ADVANCED_FILTERS}
                         component={ModalStackNavigators.SearchAdvancedFiltersModalStackNavigator}
                     />
+                    <Stack.Screen
+                        name={SCREENS.RIGHT_MODAL.SEARCH_SAVED_SEARCH}
+                        component={ModalStackNavigators.SearchSavedSearchModalStackNavigator}
+                    />
                 </Stack.Navigator>
             </View>
         </NoDropZone>

From beb323a587faadec60d752d65cd3806779379733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:49:19 +0200
Subject: [PATCH 008/101] add saved search params and screens

---
 src/libs/Navigation/linkingConfig/config.ts |  5 +++++
 src/libs/Navigation/types.ts                | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 6ee3b14b64ed..b14eec22fcc9 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1055,6 +1055,11 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_TO,
                     },
                 },
+                [SCREENS.RIGHT_MODAL.SEARCH_SAVED_SEARCH]: {
+                    screens: {
+                        [SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP]: ROUTES.SEARCH_SAVED_SEARCH_RENAME.route,
+                    },
+                },
                 [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: {
                     screens: {
                         [SCREENS.RESTRICTED_ACTION_ROOT]: ROUTES.RESTRICTED_ACTION.route,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 4e5e3a2c6fac..cb5127e7952c 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -13,6 +13,7 @@ import type {
 import type {TupleToUnion, ValueOf} from 'type-fest';
 import type {SearchQueryString} from '@components/Search/types';
 import type {IOURequestType} from '@libs/actions/IOU';
+import type {SaveSearchParams} from '@libs/API/parameters';
 import type CONST from '@src/CONST';
 import type {Country, IOUAction, IOUType} from '@src/CONST';
 import type NAVIGATORS from '@src/NAVIGATORS';
@@ -1115,6 +1116,7 @@ type RightModalNavigatorParamList = {
     [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: NavigatorScreenParams<SearchReportParamList>;
     [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: NavigatorScreenParams<RestrictedActionParamList>;
     [SCREENS.RIGHT_MODAL.SEARCH_ADVANCED_FILTERS]: NavigatorScreenParams<SearchAdvancedFiltersParamList>;
+    [SCREENS.RIGHT_MODAL.SEARCH_SAVED_SEARCH]: NavigatorScreenParams<SearchSavedSearchParamList>;
 };
 
 type TravelNavigatorParamList = {
@@ -1330,6 +1332,13 @@ type SearchAdvancedFiltersParamList = {
     [SCREENS.SEARCH.ADVANCED_FILTERS_RHP]: Record<string, never>;
 };
 
+type SearchSavedSearchParamList = {
+    [SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP]: SaveSearchParams;
+    [SCREENS.SEARCH.SAVED_SEARCH_DELETE_RHP]: {
+        hash: number;
+    };
+};
+
 type RestrictedActionParamList = {
     [SCREENS.RESTRICTED_ACTION_ROOT]: {
         policyID: string;
@@ -1408,5 +1417,6 @@ export type {
     TransactionDuplicateNavigatorParamList,
     SearchReportParamList,
     SearchAdvancedFiltersParamList,
+    SearchSavedSearchParamList,
     RestrictedActionParamList,
 };

From e9fa98545bdf8fde97287be0cc6a7a1639e3e265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:49:56 +0200
Subject: [PATCH 009/101] add utils for saved search

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

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 8d4a59f3987c..cc86c45d6793 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -3,9 +3,11 @@ import type {ASTNode, QueryFilter, QueryFilters, SearchColumnType, SearchQueryJS
 import ReportListItem from '@components/SelectionList/Search/ReportListItem';
 import TransactionListItem from '@components/SelectionList/Search/TransactionListItem';
 import type {ListItem, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
+import * as Expensicons from '@src/components/Icon/Expensicons';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
@@ -15,6 +17,7 @@ import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDeta
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {translateLocal} from './Localize';
+import Navigation from './Navigation/Navigation';
 import navigationRef from './Navigation/navigationRef';
 import type {AuthScreensParamList, BottomTabNavigatorParamList, RootStackParamList, State} from './Navigation/types';
 import * as searchParser from './SearchParser/searchParser';
@@ -23,6 +26,8 @@ import * as UserUtils from './UserUtils';
 
 type KeysOfFilterKeysObject = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS;
 
+const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all';
+
 const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
     [CONST.SEARCH.TABLE_COLUMNS.FROM]: 'formattedFrom' as const,
@@ -552,6 +557,25 @@ function buildCannedSearchQuery(type: SearchDataTypes = CONST.SEARCH.DATA_TYPES.
     return normalizeQuery(`type:${type} status:${status}`);
 }
 
+function getOverflowMenu(itemName: string, hash: number, inputQuery: string, showDeleteModal: (hash: number) => void) {
+    return [
+        {
+            text: translateLocal('common.rename'),
+            onSelected: () => Navigation.navigate(ROUTES.SEARCH_SAVED_SEARCH_RENAME.getRoute({name: itemName, jsonQuery: inputQuery})),
+            icon: Expensicons.Pencil,
+            shouldShowRightIcon: false,
+            shouldShowRightComponent: false,
+        },
+        {
+            text: translateLocal('common.delete'),
+            onSelected: () => showDeleteModal(hash),
+            icon: Expensicons.Trashcan,
+            shouldShowRightIcon: false,
+            shouldShowRightComponent: false,
+        },
+    ];
+}
+
 export {
     buildQueryStringFromFilters,
     buildSearchQueryJSON,
@@ -571,4 +595,6 @@ export {
     shouldShowYear,
     buildCannedSearchQuery,
     getExpenseTypeTranslationKey,
+    getOverflowMenu,
+    DEFAULT_SAVE_SEARCH_QUERY_STRING,
 };

From 644e4ab44a48e47d1224ea47d16841ef4bcbccac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:51:20 +0200
Subject: [PATCH 010/101] add delete saved search

---
 src/libs/API/parameters/DeleteSavedSearch.ts | 5 +++++
 src/libs/API/parameters/index.ts             | 1 +
 src/libs/API/types.ts                        | 2 ++
 src/libs/actions/Search.ts                   | 6 ++++++
 4 files changed, 14 insertions(+)
 create mode 100644 src/libs/API/parameters/DeleteSavedSearch.ts

diff --git a/src/libs/API/parameters/DeleteSavedSearch.ts b/src/libs/API/parameters/DeleteSavedSearch.ts
new file mode 100644
index 000000000000..23b20204bcd2
--- /dev/null
+++ b/src/libs/API/parameters/DeleteSavedSearch.ts
@@ -0,0 +1,5 @@
+type DeleteSavedSearchParams = {
+    hash: number;
+};
+
+export default DeleteSavedSearchParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index d82cf44d1ce1..2061430b64f6 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -286,6 +286,7 @@ export type {default as EnablePolicyCompanyCardsParams} from './EnablePolicyComp
 export type {default as ToggleCardContinuousReconciliationParams} from './ToggleCardContinuousReconciliationParams';
 export type {default as UpdateExpensifyCardLimitTypeParams} from './UpdateExpensifyCardLimitTypeParams';
 export type {default as SaveSearchParams} from './SaveSearch';
+export type {default as DeleteSavedSearchParams} from './DeleteSavedSearch';
 
 export type {default as UpdateXeroGenericTypeParams} from './UpdateXeroGenericTypeParams';
 export type {default as UpdateCardSettlementFrequencyParams} from './UpdateCardSettlementFrequencyParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index f886a24ff80a..08bfbb6e7468 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -342,6 +342,7 @@ const WRITE_COMMANDS = {
     CREATE_ADMIN_ISSUED_VIRTUAL_CARD: 'CreateAdminIssuedVirtualCard',
     TOGGLE_CARD_CONTINUOUS_RECONCILIATION: 'ToggleCardContinuousReconciliation',
     SAVE_SEARCH: 'SaveSearch',
+    DELETE_SAVED_SEARCH: 'DeleteSavedSearch',
     UPDATE_CARD_SETTLEMENT_FREQUENCY: 'UpdateCardSettlementFrequency',
     UPDATE_CARD_SETTLEMENT_ACCOUNT: 'UpdateCardSettlementAccount',
     UPDATE_XERO_IMPORT_TRACKING_CATEGORIES: 'UpdateXeroImportTrackingCategories',
@@ -696,6 +697,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD]: Omit<Parameters.CreateExpensifyCardParams, 'feedCountry'>;
     [WRITE_COMMANDS.TOGGLE_CARD_CONTINUOUS_RECONCILIATION]: Parameters.ToggleCardContinuousReconciliationParams;
     [WRITE_COMMANDS.SAVE_SEARCH]: Parameters.SaveSearchParams;
+    [WRITE_COMMANDS.DELETE_SAVED_SEARCH]: Parameters.DeleteSavedSearchParams;
     [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY]: Parameters.UpdateCardSettlementFrequencyParams;
     [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_ACCOUNT]: Parameters.UpdateCardSettlementAccountParams;
 
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 57272f5efeec..14ad17960b75 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -55,6 +55,11 @@ function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: strin
     API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, finallyData});
 }
 
+function deleteSavedSearch(hash: number) {
+    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
+    API.write(WRITE_COMMANDS.DELETE_SAVED_SEARCH, {hash}, {optimisticData, finallyData});
+}
+
 function search({queryJSON, offset, policyIDs}: {queryJSON: SearchQueryJSON; offset?: number; policyIDs?: string}) {
     const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
 
@@ -148,4 +153,5 @@ export {
     exportSearchItemsToCSV,
     updateAdvancedFilters,
     clearAdvancedFilters,
+    deleteSavedSearch,
 };

From 763c98508298cdd3ab255cd94a480489a69446ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:51:31 +0200
Subject: [PATCH 011/101] add delete saved search hook

---
 src/hooks/useDeleteSavedSearch.tsx | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/hooks/useDeleteSavedSearch.tsx

diff --git a/src/hooks/useDeleteSavedSearch.tsx b/src/hooks/useDeleteSavedSearch.tsx
new file mode 100644
index 000000000000..4b9a1234d9ff
--- /dev/null
+++ b/src/hooks/useDeleteSavedSearch.tsx
@@ -0,0 +1,48 @@
+import React, {useState} from 'react';
+import ConfirmModal from '@components/ConfirmModal';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SearchActions from '@userActions/Search';
+import ROUTES from '@src/ROUTES';
+import useLocalize from './useLocalize';
+
+const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all';
+
+export default function useDeleteSavedSearch() {
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const [hashToDelete, setHashToDelete] = useState(0);
+    const {translate} = useLocalize();
+
+    const showDeleteModal = (hash: number) => {
+        setIsDeleteModalVisible(true);
+        setHashToDelete(hash);
+    };
+
+    const handleDelete = () => {
+        SearchActions.deleteSavedSearch(hashToDelete);
+        setIsDeleteModalVisible(false);
+        SearchActions.clearAdvancedFilters();
+        Navigation.navigate(
+            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                query: DEFAULT_SAVE_SEARCH_QUERY_STRING,
+                isCustomQuery: true,
+            }),
+        );
+    };
+
+    function DeleteConfirmModal() {
+        return (
+            <ConfirmModal
+                title={translate('search.deleteSavedSearch')}
+                onConfirm={handleDelete}
+                onCancel={() => setIsDeleteModalVisible(false)}
+                isVisible={isDeleteModalVisible}
+                prompt={translate('search.deleteSavedSearchConfirm')}
+                confirmText={translate('common.delete')}
+                cancelText={translate('common.cancel')}
+                danger
+            />
+        );
+    }
+
+    return {showDeleteModal, DeleteConfirmModal};
+}

From 53bd9c773f3ccc930e75cfb0b5c58d1c3760a102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:51:54 +0200
Subject: [PATCH 012/101] fix lint

---
 src/pages/Search/AdvancedSearchFilters.tsx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 6ed780c0ed31..2fb57b7e81fb 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -2,6 +2,7 @@ import {Str} from 'expensify-common';
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
@@ -23,7 +24,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import type {CardList, PersonalDetailsList} from '@src/types/onyx';
-import Button from '@components/Button';
 
 function getFilterCardDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, cards: CardList) {
     const filterValue = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID];
@@ -216,6 +216,16 @@ function AdvancedSearchFilters() {
 
     const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters), [searchAdvancedFilters]);
 
+    const applyFiltersAndNavigate = () => {
+        SearchActions.clearAdvancedFilters();
+        Navigation.navigate(
+            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                query: queryString,
+                isCustomQuery: true,
+            }),
+        );
+    };
+
     const onSaveSearch = () => {
         const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || DEFAULT_SAVE_SEARCH_QUERY_STRING);
         if (!queryJSON) {
@@ -229,16 +239,6 @@ function AdvancedSearchFilters() {
         applyFiltersAndNavigate();
     };
 
-    const applyFiltersAndNavigate = () => {
-        SearchActions.clearAdvancedFilters();
-        Navigation.navigate(
-            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query: queryString,
-                isCustomQuery: true,
-            }),
-        )
-    };
-
     return (
         <>
             <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>

From a99b9ae7ac4a69f1353145e514e37df8d836e81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:52:19 +0200
Subject: [PATCH 013/101] fix lint

---
 src/pages/Search/SearchTypeMenu.tsx       | 192 +++++++++++++++++-----
 src/pages/Search/SearchTypeMenuNarrow.tsx | 144 ++++++++++++----
 2 files changed, 260 insertions(+), 76 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index a2d84209114b..81706fcf368f 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,7 +1,14 @@
-import React from 'react';
+import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
+import type {TextStyle, ViewStyle} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {MenuItemBaseProps} from '@components/MenuItem';
 import MenuItem from '@components/MenuItem';
+import MenuItemList from '@components/MenuItemList';
 import type {SearchQueryJSON} from '@components/Search/types';
+import Text from '@components/Text';
+import ThreeDotsMenu from '@components/ThreeDotsMenu';
+import useDeleteSavedSearch from '@hooks/useDeleteSavedSearch';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSingleExecution from '@hooks/useSingleExecution';
@@ -11,12 +18,19 @@ import * as SearchUtils from '@libs/SearchUtils';
 import variables from '@styles/variables';
 import * as Expensicons from '@src/components/Icon/Expensicons';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
 import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
 
+type SavedSearchMenuItem = MenuItemBaseProps & {
+    key: string;
+    hash: string;
+    styles: Array<ViewStyle | TextStyle>;
+};
+
 type SearchTypeMenuProps = {
     queryJSON: SearchQueryJSON;
     isCustomQuery: boolean;
@@ -30,32 +44,118 @@ type SearchTypeMenuItem = {
 };
 
 function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
-    const {type} = queryJSON;
+    const {type, hash} = queryJSON;
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
+    const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES);
+    const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
 
-    const typeMenuItems: SearchTypeMenuItem[] = [
-        {
-            title: translate('common.expenses'),
-            type: CONST.SEARCH.DATA_TYPES.EXPENSE,
-            icon: Expensicons.Receipt,
-            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
-        },
-        {
-            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)}),
-        },
-        {
-            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)}),
+    const typeMenuItems: SearchTypeMenuItem[] = useMemo(
+        () => [
+            {
+                title: translate('common.expenses'),
+                type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+                icon: Expensicons.Receipt,
+                route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
+            },
+            {
+                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)}),
+            },
+            {
+                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)}),
+            },
+        ],
+        [translate],
+    );
+
+    const getOverflowMenu = useCallback(
+        (itemName: string, itemHash: number) => SearchUtils.getOverflowMenu(itemName, itemHash, queryJSON?.inputQuery ?? '', showDeleteModal),
+        [queryJSON, showDeleteModal],
+    );
+
+    const createSavedSearchMenuItem = useCallback(
+        (item: {name: string; query: string}, key: string, isNarrow: boolean) => {
+            const baseMenuItem: SavedSearchMenuItem = {
+                key: item.name,
+                title: item.name,
+                hash: key,
+                shouldShowRightComponent: true,
+                focused: Number(key) === hash,
+                onPress: () => {
+                    const parsedQueryJSON: SearchQueryJSON = JSON.parse(item?.query ?? '{}') as SearchQueryJSON;
+                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: parsedQueryJSON?.inputQuery ?? '', isCustomQuery: true}));
+                },
+                rightComponent: (
+                    <ThreeDotsMenu
+                        menuItems={getOverflowMenu(item.name, Number(key))}
+                        anchorPosition={{horizontal: 0, vertical: 380}}
+                        anchorAlignment={{
+                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+                        }}
+                    />
+                ),
+                styles: [styles.textBlue, styles.alignItemsCenter],
+            };
+
+            if (!isNarrow) {
+                return {
+                    ...baseMenuItem,
+                    shouldRenderTooltip: Object.keys(savedSearches ?? {}).length === 1,
+                    tooltipAnchorAlignment: {
+                        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                    },
+                    tooltipShiftHorizontal: -28,
+                    renderTooltipContent: () => (
+                        <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                            <Expensicons.Lightbulb
+                                width={16}
+                                height={16}
+                                color={styles.colorMuted as unknown as string}
+                            />
+                            <Text style={[styles.colorMuted, styles.textNormal, styles.ml1]}>You can rename your saved search</Text>
+                        </View>
+                    ),
+                };
+            }
+
+            return baseMenuItem;
         },
-    ];
+        [hash, savedSearches, styles, getOverflowMenu],
+    );
+
+    const savedSearchesMenuItems = useMemo(() => {
+        if (!savedSearches) {
+            return [];
+        }
+        return Object.entries(savedSearches).map(([key, item]) => createSavedSearchMenuItem(item, key, shouldUseNarrowLayout));
+    }, [savedSearches, createSavedSearchMenuItem, shouldUseNarrowLayout]);
+
+    const handleSavedSearches = useCallback(
+        () => ({
+            savedSearchesMenuItems,
+            renderSavedSearchesSection: () => (
+                <View style={[styles.pb1, styles.mh3]}>
+                    <Text style={[styles.sectionTitle, styles.pb1]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
+                    <MenuItemList
+                        menuItems={savedSearchesMenuItems}
+                        shouldUseSingleExecution
+                    />
+                </View>
+            ),
+        }),
+        [savedSearchesMenuItems, styles, translate],
+    );
+
     const activeItemIndex = typeMenuItems.findIndex((item) => item.type === type);
 
     if (shouldUseNarrowLayout) {
@@ -66,33 +166,39 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
                 typeMenuItems={typeMenuItems}
                 activeItemIndex={activeItemIndex}
                 title={title}
+                handleSavedSearches={handleSavedSearches}
+                queryJSON={queryJSON}
             />
         );
     }
 
     return (
-        <View style={[styles.pb4, styles.mh3, styles.mt3]}>
-            {typeMenuItems.map((item, index) => {
-                const onPress = singleExecution(() => Navigation.navigate(item.route));
-
-                return (
-                    <MenuItem
-                        key={item.title}
-                        disabled={false}
-                        interactive
-                        title={item.title}
-                        icon={item.icon}
-                        iconWidth={variables.iconSizeNormal}
-                        iconHeight={variables.iconSizeNormal}
-                        wrapperStyle={styles.sectionMenuItem}
-                        focused={index === activeItemIndex}
-                        hoverAndPressStyle={styles.hoveredComponentBG}
-                        onPress={onPress}
-                        isPaneMenu
-                    />
-                );
-            })}
-        </View>
+        <>
+            <View style={[styles.pb4, styles.mh3, styles.mt3]}>
+                {typeMenuItems.map((item, index) => {
+                    const onPress = singleExecution(() => Navigation.navigate(item.route));
+
+                    return (
+                        <MenuItem
+                            key={item.title}
+                            disabled={false}
+                            interactive
+                            title={item.title}
+                            icon={item.icon}
+                            iconWidth={variables.iconSizeNormal}
+                            iconHeight={variables.iconSizeNormal}
+                            wrapperStyle={styles.sectionMenuItem}
+                            focused={index === activeItemIndex}
+                            hoverAndPressStyle={styles.hoveredComponentBG}
+                            onPress={onPress}
+                            isPaneMenu
+                        />
+                    );
+                })}
+            </View>
+            {savedSearches && handleSavedSearches().renderSavedSearchesSection()}
+            <DeleteConfirmModal />
+        </>
     );
 }
 
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 0aa01dbb9fe4..c5aa26f0e5e0 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -1,68 +1,145 @@
-import React, {useMemo, useRef, useState} from 'react';
+import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {Animated, View} from 'react-native';
+import type {GestureResponderEvent, TextStyle, ViewStyle} from 'react-native';
 import Button from '@components/Button';
 import Icon from '@components/Icon';
+import type {MenuItemBaseProps} from '@components/MenuItem';
 import PopoverMenu from '@components/PopoverMenu';
+import type {PopoverMenuItem} from '@components/PopoverMenu';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
+import ThreeDotsMenu from '@components/ThreeDotsMenu';
+import useDeleteSavedSearch from '@hooks/useDeleteSavedSearch';
+import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
+import * as SearchUtils from '@libs/SearchUtils';
 import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {SearchTypeMenuItem} from './SearchTypeMenu';
 
+type SavedSearchMenuItem = MenuItemBaseProps & {
+    key: string;
+    hash: string;
+    styles: Array<ViewStyle | TextStyle>;
+};
+
 type SearchTypeMenuNarrowProps = {
     typeMenuItems: SearchTypeMenuItem[];
     activeItemIndex: number;
     title?: string;
+    handleSavedSearches: () => {
+        savedSearchesMenuItems: SavedSearchMenuItem[];
+    };
+    queryJSON: SearchQueryJSON;
+};
+
+type SavedSearchMenuItemProps = MenuItemBaseProps & {
+    text: string;
+    styles?: Array<ViewStyle | TextStyle>;
+    disabled?: boolean;
 };
 
-function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTypeMenuNarrowProps) {
+function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSavedSearches, queryJSON}: SearchTypeMenuNarrowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {singleExecution} = useSingleExecution();
     const {windowHeight} = useWindowDimensions();
+    const {translate} = useLocalize();
+    const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
 
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
     const buttonRef = useRef<HTMLDivElement>(null);
 
-    const openMenu = () => setIsPopoverVisible(true);
-    const closeMenu = () => setIsPopoverVisible(false);
-
-    const popoverMenuItems = typeMenuItems.map((item, index) => {
-        const isSelected = title ? false : index === activeItemIndex;
-
-        return {
-            text: item.title,
-            onSelected: singleExecution(() => Navigation.navigate(item.route)),
-            icon: item.icon,
-            iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
-            iconRight: Expensicons.Checkmark,
-            shouldShowRightIcon: isSelected,
-            success: isSelected,
-            containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
-        };
-    });
-
-    if (title) {
-        popoverMenuItems.push({
-            text: title,
-            onSelected: closeMenu,
-            icon: Expensicons.Filters,
-            iconFill: theme.iconSuccessFill,
-            success: true,
-            containerStyle: [{backgroundColor: theme.border}],
-            iconRight: Expensicons.Checkmark,
-            shouldShowRightIcon: false,
+    const openMenu = useCallback(() => setIsPopoverVisible(true), []);
+    const closeMenu = useCallback(() => setIsPopoverVisible(false), []);
+
+    const {savedSearchesMenuItems} = handleSavedSearches();
+
+    const popoverMenuItems = useMemo(() => {
+        const items = typeMenuItems.map((item, index) => {
+            const isSelected = title ? false : index === activeItemIndex;
+
+            return {
+                text: item.title,
+                onSelected: singleExecution(() => Navigation.navigate(item.route)),
+                icon: item.icon,
+                iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
+                iconRight: Expensicons.Checkmark,
+                shouldShowRightIcon: isSelected,
+                success: isSelected,
+                containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
+            };
         });
-    }
+
+        if (title) {
+            items.push({
+                text: title,
+                onSelected: closeMenu,
+                icon: Expensicons.Filters,
+                iconFill: theme.iconSuccessFill,
+                success: true,
+                containerStyle: [{backgroundColor: theme.border}],
+                iconRight: Expensicons.Checkmark,
+                shouldShowRightIcon: false,
+            });
+        }
+
+        return items;
+    }, [typeMenuItems, activeItemIndex, title, theme, singleExecution, closeMenu]);
 
     const menuIcon = useMemo(() => (title ? Expensicons.Filters : popoverMenuItems[activeItemIndex]?.icon ?? Expensicons.Receipt), [activeItemIndex, popoverMenuItems, title]);
     const menuTitle = useMemo(() => title ?? popoverMenuItems[activeItemIndex]?.text, [activeItemIndex, popoverMenuItems, title]);
-    const titleViewStyles = title ? {...styles.flex1, ...styles.justifyContentCenter} : {};
+    const titleViewStyles = useMemo(() => (title ? {...styles.flex1, ...styles.justifyContentCenter} : {}), [title, styles]);
+
+    const getOverflowMenu = useCallback(
+        (itemName: string, hash: number) => {
+            const inputQuery = queryJSON.inputQuery ?? '';
+            return SearchUtils.getOverflowMenu(itemName, hash, inputQuery, showDeleteModal);
+        },
+        [queryJSON, showDeleteModal],
+    );
+
+    const allMenuItems = useMemo(() => {
+        const items = [...popoverMenuItems];
+        const newItems: SavedSearchMenuItemProps[] = [];
+        if (savedSearchesMenuItems && savedSearchesMenuItems.length > 0) {
+            newItems.push({
+                text: translate('search.savedSearchesMenuItemTitle'),
+                styles: [styles.textSupporting],
+                disabled: true,
+            });
+            newItems.push(
+                ...savedSearchesMenuItems.map((item: SavedSearchMenuItem) => ({
+                    text: item.title ?? '',
+                    styles: [styles.textSupporting],
+                    onSelected: (event: GestureResponderEvent | KeyboardEvent) => {
+                        if (item.onPress) {
+                            item.onPress(event);
+                        }
+                        closeMenu();
+                    },
+                    shouldShowRightComponent: true,
+                    rightComponent: (
+                        <ThreeDotsMenu
+                            menuItems={getOverflowMenu(item.title ?? '', Number(item.hash ?? ''))}
+                            anchorPosition={{horizontal: 0, vertical: 380}}
+                            anchorAlignment={{
+                                horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                                vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+                            }}
+                        />
+                    ),
+                })),
+            );
+        }
+        return [...items, ...newItems];
+    }, [popoverMenuItems, savedSearchesMenuItems, translate, closeMenu, getOverflowMenu, styles.textSupporting]);
 
     return (
         <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>
@@ -99,13 +176,14 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTyp
                 onPress={() => Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS)}
             />
             <PopoverMenu
-                menuItems={popoverMenuItems}
+                menuItems={allMenuItems as PopoverMenuItem[]}
                 isVisible={isPopoverVisible}
                 anchorPosition={styles.createMenuPositionSidebar(windowHeight)}
                 onClose={closeMenu}
                 onItemSelected={closeMenu}
                 anchorRef={buttonRef}
             />
+            <DeleteConfirmModal />
         </View>
     );
 }

From 86e8ed2e3671f71d72fe8374d6d154b0dc2b3926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:52:35 +0200
Subject: [PATCH 014/101] handle cancel button

---
 .../createCustomBottomTabNavigator/TopBar.tsx   | 17 +++++++++++++++--
 src/pages/Search/SearchPageBottomTab.tsx        |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
index dc3ab4c48c08..bc59419cd3ea 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
@@ -5,6 +5,7 @@ import Breadcrumbs from '@components/Breadcrumbs';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import {PressableWithoutFeedback} from '@components/Pressable';
+import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import WorkspaceSwitcherButton from '@components/WorkspaceSwitcherButton';
 import useLocalize from '@hooks/useLocalize';
@@ -13,6 +14,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
+import * as SearchUtils from '@libs/SearchUtils';
 import SignInButton from '@pages/home/sidebar/SignInButton';
 import * as Session from '@userActions/Session';
 import Timing from '@userActions/Timing';
@@ -20,9 +22,9 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
-type TopBarProps = {breadcrumbLabel: string; activeWorkspaceID?: string; shouldDisplaySearch?: boolean};
+type TopBarProps = {breadcrumbLabel: string; activeWorkspaceID?: string; shouldDisplaySearch?: boolean; isCustomSearchQuery?: boolean};
 
-function TopBar({breadcrumbLabel, activeWorkspaceID, shouldDisplaySearch = true}: TopBarProps) {
+function TopBar({breadcrumbLabel, activeWorkspaceID, shouldDisplaySearch = true, isCustomSearchQuery = false}: TopBarProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
@@ -60,6 +62,17 @@ function TopBar({breadcrumbLabel, activeWorkspaceID, shouldDisplaySearch = true}
                     </View>
                 </View>
                 {displaySignIn && <SignInButton />}
+                {isCustomSearchQuery && (
+                    <PressableWithoutFeedback
+                        accessibilityLabel={translate('common.cancel')}
+                        style={[styles.textBlue]}
+                        onPress={() => {
+                            Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
+                        }}
+                    >
+                        <Text style={[styles.textBlue]}>Cancel</Text>
+                    </PressableWithoutFeedback>
+                )}
                 {displaySearch && (
                     <Tooltip text={translate('common.find')}>
                         <PressableWithoutFeedback
diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 029407026dc8..77d073134638 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -61,6 +61,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyIDs}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
+                            isCustomSearchQuery={isCustomQuery}
                         />
                         <SearchTypeMenu
                             isCustomQuery={isCustomQuery}

From 5086308577737ae7bc56f165459617738fd08835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:52:50 +0200
Subject: [PATCH 015/101] modify component for mobile functionality for saved
 search

---
 src/components/PopoverMenu.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index f7dd40177275..36b3bb1577d5 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -251,7 +251,9 @@ function PopoverMenu({
                             focused={focusedIndex === menuIndex}
                             displayInDefaultIconColor={item.displayInDefaultIconColor}
                             shouldShowRightIcon={item.shouldShowRightIcon}
+                            shouldShowRightComponent={item.shouldShowRightComponent}
                             iconRight={item.iconRight}
+                            rightComponent={item.rightComponent}
                             shouldPutLeftPaddingWhenNoIcon={item.shouldPutLeftPaddingWhenNoIcon}
                             label={item.label}
                             isLabelHoverable={item.isLabelHoverable}

From bfa7c2e49059c4a43a783fa8ce9dd8d60ebbbaba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:53:07 +0200
Subject: [PATCH 016/101] saved search rename page

---
 src/pages/Search/SavedSearchRenamePage.tsx | 77 ++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 src/pages/Search/SavedSearchRenamePage.tsx

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
new file mode 100644
index 000000000000..b72e94e8fc8b
--- /dev/null
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -0,0 +1,77 @@
+import React, {useState} from 'react';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+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 CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SavedSearchRenamePage({route}: {route: {params: {q: string; name: string}}}) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {q, name} = route.params;
+    const [newName, setNewName] = useState(name);
+
+    const applyFiltersAndNavigate = () => {
+        SearchActions.clearAdvancedFilters();
+        Navigation.navigate(
+            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                query: q,
+                isCustomQuery: true,
+            }),
+        );
+    };
+
+    const onSaveSearch = () => {
+        const queryJSON = SearchUtils.buildSearchQueryJSON(q);
+        if (!queryJSON) {
+            return;
+        }
+
+        SearchActions.saveSearch({
+            queryJSON,
+            name: newName,
+        });
+
+        applyFiltersAndNavigate();
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SavedSearchRenamePage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+        >
+            <HeaderWithBackButton title={translate('common.rename')} />
+            <FormProvider
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                submitButtonText={translate('common.save')}
+                onSubmit={onSaveSearch}
+                style={[styles.mh5, styles.flex1]}
+            >
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID="name"
+                    name="name"
+                    defaultValue={name}
+                    label={translate('search.searchName')}
+                    accessibilityLabel={translate('search.searchName')}
+                    role={CONST.ROLE.PRESENTATION}
+                    onChangeText={(renamedName) => setNewName(renamedName)}
+                />
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SavedSearchRenamePage.displayName = 'SavedSearchRenamePage';
+
+export default SavedSearchRenamePage;

From 24c50e2ec4364c95b6843cb996d1d88e573b97e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 4 Sep 2024 16:53:26 +0200
Subject: [PATCH 017/101] add translation

---
 src/languages/en.ts | 5 +++++
 src/languages/es.ts | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 17b1e229253e..0db9690b59f1 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -377,6 +377,7 @@ export default {
         reportID: 'Report ID',
         outstanding: 'Outstanding',
         days: 'days',
+        rename: 'Rename',
     },
     location: {
         useCurrent: 'Use current location',
@@ -3773,6 +3774,10 @@ export default {
             },
         },
         saveSearch: 'Save search',
+        deleteSavedSearch: 'Delete saved search',
+        deleteSavedSearchConfirm: 'Are you sure you want to delete this search?',
+        searchName: 'Search name',
+        savedSearchesMenuItemTitle: 'Saved',
         groupedExpenses: 'grouped expenses',
         bulkActions: {
             delete: 'Delete',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index bc222414095b..e0ce61674150 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -261,6 +261,7 @@ export default {
         comma: 'la coma',
         semicolon: 'el punto y coma',
         please: 'Por favor',
+        rename: 'Renombrar',
         contactUs: 'contáctenos',
         pleaseEnterEmailOrPhoneNumber: 'Por favor, escribe un email o número de teléfono',
         fixTheErrors: 'corrige los errores',
@@ -3825,6 +3826,10 @@ export default {
             },
         },
         saveSearch: 'Guardar búsqueda',
+        savedSearchesMenuItemTitle: 'Guardadas',
+        searchName: 'Nombre de la búsqueda',
+        deleteSavedSearch: 'Eliminar búsqueda guardada',
+        deleteSavedSearchConfirm: '¿Estás seguro de que quieres eliminar esta búsqueda?',
         groupedExpenses: 'gastos agrupados',
         bulkActions: {
             delete: 'Eliminar',

From a60778ea33766875682509427cec2aa3e1203ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:13:01 +0200
Subject: [PATCH 018/101] add star icon

---
 assets/images/star.svg             | 1 +
 src/components/Icon/Expensicons.ts | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 assets/images/star.svg

diff --git a/assets/images/star.svg b/assets/images/star.svg
new file mode 100644
index 000000000000..bcce04a7542d
--- /dev/null
+++ b/assets/images/star.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m11.458 2.9418 1.2135 2.5604c0.2355 0.49948 0.6931 0.84491 1.2224 0.92427l2.714 0.41078c1.3324 0.20073 1.864 1.9046 0.8995 2.8825l-1.9649 1.9933c-0.3835 0.3874-0.5563 0.9476-0.4665 1.4961l0.4643 2.8125c0.2265 1.3794-1.1641 2.432-2.3552 1.7808l-2.4291-1.328c-0.4733-0.2591-1.0385-0.2591-1.5118 0l-2.4291 1.328c-1.191 0.6512-2.5839-0.4014-2.3551-1.7808l0.46429-2.8125c0.08972-0.5485-0.08523-1.1063-0.46653-1.4961l-1.9649-1.9933c-0.96449-0.97795-0.4329-2.6818 0.89944-2.8825l2.714-0.41078c0.52935-0.07936 0.98694-0.42479 1.2224-0.92427l1.2134-2.5604c0.59663-1.2557 2.317-1.2557 2.9114 0h0.0045z"/></svg>
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index b1adf360bae6..db3ca4620e11 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -192,6 +192,7 @@ import Workspace from '@assets/images/workspace-default-avatar.svg';
 import Wrench from '@assets/images/wrench.svg';
 import Clear from '@assets/images/x-circle.svg';
 import Zoom from '@assets/images/zoom.svg';
+import Star from '@assets/images/star.svg';
 
 export {
     ActiveRoomAvatar,
@@ -388,4 +389,5 @@ export {
     CalendarSolid,
     Filter,
     Feed,
+    Star,
 };

From 966c1b80ae03a0d142fc6a8fdc6d0d663d44203b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:13:28 +0200
Subject: [PATCH 019/101] add missing properties from MenuItem

---
 src/components/MenuItemList.tsx | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/components/MenuItemList.tsx b/src/components/MenuItemList.tsx
index 4ba9260e23ff..f5818e8005ac 100644
--- a/src/components/MenuItemList.tsx
+++ b/src/components/MenuItemList.tsx
@@ -1,10 +1,11 @@
 import React, {useRef} from 'react';
-import type {GestureResponderEvent, View} from 'react-native';
+import type {GestureResponderEvent, StyleProp, View, ViewStyle} from 'react-native';
 import useSingleExecution from '@hooks/useSingleExecution';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import CONST from '@src/CONST';
 import type {MenuItemProps} from './MenuItem';
 import MenuItem from './MenuItem';
+import IconAsset from '@src/types/utils/IconAsset';
 
 type MenuItemLink = string | (() => Promise<string>);
 
@@ -19,9 +20,24 @@ type MenuItemListProps = {
 
     /** Whether or not to use the single execution hook */
     shouldUseSingleExecution?: boolean;
+
+    /** Any additional styles to apply for each item */
+    wrapperStyle?: StyleProp<ViewStyle>;
+
+    /** Icon to display on the left side of each item */
+    icon?: IconAsset;
+
+    /** Icon Width */
+    iconWidth?: number;
+
+    /** Icon Height */
+    iconHeight?: number;
+
+    /** Is this in the Pane */
+    isPaneMenu?: boolean;
 };
 
-function MenuItemList({menuItems = [], shouldUseSingleExecution = false}: MenuItemListProps) {
+function MenuItemList({menuItems = [], shouldUseSingleExecution = false, wrapperStyle = {}, icon = undefined, iconWidth = undefined, iconHeight = undefined, isPaneMenu = false}: MenuItemListProps) {
     const popoverAnchor = useRef<View>(null);
     const {isExecuting, singleExecution} = useSingleExecution();
 
@@ -44,9 +60,14 @@ function MenuItemList({menuItems = [], shouldUseSingleExecution = false}: MenuIt
             {menuItems.map((menuItemProps) => (
                 <MenuItem
                     key={menuItemProps.title}
+                    wrapperStyle={wrapperStyle}
                     onSecondaryInteraction={menuItemProps.link !== undefined ? (e) => secondaryInteraction(menuItemProps.link, e) : undefined}
                     ref={popoverAnchor}
                     shouldBlockSelection={!!menuItemProps.link}
+                    icon={icon}
+                    iconWidth={iconWidth}
+                    iconHeight={iconHeight}
+                    isPaneMenu={isPaneMenu}
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...menuItemProps}
                     disabled={!!menuItemProps.disabled || isExecuting}

From a21b7f7b0842677d9ae8743b54dac4e48bdd9b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:14:05 +0200
Subject: [PATCH 020/101] fix popover menu not closing

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

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index cc86c45d6793..d05cfba10ead 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -557,11 +557,16 @@ function buildCannedSearchQuery(type: SearchDataTypes = CONST.SEARCH.DATA_TYPES.
     return normalizeQuery(`type:${type} status:${status}`);
 }
 
-function getOverflowMenu(itemName: string, hash: number, inputQuery: string, showDeleteModal: (hash: number) => void) {
+function getOverflowMenu(itemName: string, hash: number, inputQuery: string, showDeleteModal: (hash: number) => void, isMobileMenu?: boolean, closeMenu?: () => void) {
     return [
         {
             text: translateLocal('common.rename'),
-            onSelected: () => Navigation.navigate(ROUTES.SEARCH_SAVED_SEARCH_RENAME.getRoute({name: itemName, jsonQuery: inputQuery})),
+            onSelected: () => {
+                if (isMobileMenu && closeMenu) {
+                    closeMenu();
+                }
+                Navigation.navigate(ROUTES.SEARCH_SAVED_SEARCH_RENAME.getRoute({name: itemName, jsonQuery: inputQuery}));
+            },
             icon: Expensicons.Pencil,
             shouldShowRightIcon: false,
             shouldShowRightComponent: false,

From c8b3d4ab785c38cada535d07dc5c35413a3516cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:14:26 +0200
Subject: [PATCH 021/101] fix default query string

---
 src/pages/Search/AdvancedSearchFilters.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 2fb57b7e81fb..223f2763bc9c 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -135,7 +135,7 @@ function AdvancedSearchFilters() {
     const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
     const taxRates = getAllTaxRates();
     const personalDetails = usePersonalDetails();
-    const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all';
+    const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all sortBy:date sortOrder:desc';
 
     const advancedFilters = useMemo(
         () => [

From 3a9daaf74835be1599e65c19556d3c9aeaeb9ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:14:47 +0200
Subject: [PATCH 022/101] fix renaming for default query string to get the same
 hash

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

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index b72e94e8fc8b..41150a29a090 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -30,7 +30,9 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(q);
+        const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all sortBy:date sortOrder:desc';
+
+        const queryJSON = SearchUtils.buildSearchQueryJSON(q || DEFAULT_SAVE_SEARCH_QUERY_STRING);
         if (!queryJSON) {
             return;
         }

From 637bb6fb676f494ddab0caa85607d6318050b409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:15:05 +0200
Subject: [PATCH 023/101] fix popover menu not closing

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index c5aa26f0e5e0..91d707291402 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -100,7 +100,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
     const getOverflowMenu = useCallback(
         (itemName: string, hash: number) => {
             const inputQuery = queryJSON.inputQuery ?? '';
-            return SearchUtils.getOverflowMenu(itemName, hash, inputQuery, showDeleteModal);
+            return SearchUtils.getOverflowMenu(itemName, hash, inputQuery, showDeleteModal, true, closeMenu);
         },
         [queryJSON, showDeleteModal],
     );
@@ -122,12 +122,11 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
                         if (item.onPress) {
                             item.onPress(event);
                         }
-                        closeMenu();
                     },
                     shouldShowRightComponent: true,
                     rightComponent: (
                         <ThreeDotsMenu
-                            menuItems={getOverflowMenu(item.title ?? '', Number(item.hash ?? ''))}
+                            menuItems={getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), )}
                             anchorPosition={{horizontal: 0, vertical: 380}}
                             anchorAlignment={{
                                 horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,

From 8250b36926036cb41e2b71030980f9cd53bf07f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:15:25 +0200
Subject: [PATCH 024/101] add green color and background related styles

---
 src/styles/index.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/styles/index.ts b/src/styles/index.ts
index 948f845bf9c3..36abd3eb0b7b 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -5171,6 +5171,14 @@ const styles = (theme: ThemeColors) =>
             marginLeft: 19,
             backgroundColor: theme.border,
         },
+
+        colorGreenSuccess: {
+            color: colors.green400,
+        },
+
+        bgPaleGreen: {
+            backgroundColor: colors.green100,
+        },
     } satisfies Styles);
 
 type ThemeStyles = ReturnType<typeof styles>;

From c5fe7a85222fc4784587254516a25ba7cb4ac95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:15:42 +0200
Subject: [PATCH 025/101] fix tooltip display

---
 src/pages/Search/SearchTypeMenu.tsx | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 81706fcf368f..4b438038f53e 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -90,8 +90,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
                 shouldShowRightComponent: true,
                 focused: Number(key) === hash,
                 onPress: () => {
-                    const parsedQueryJSON: SearchQueryJSON = JSON.parse(item?.query ?? '{}') as SearchQueryJSON;
-                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: parsedQueryJSON?.inputQuery ?? '', isCustomQuery: true}));
+                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query ?? '', isCustomQuery: true}));
                 },
                 rightComponent: (
                     <ThreeDotsMenu
@@ -103,7 +102,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
                         }}
                     />
                 ),
-                styles: [styles.textBlue, styles.alignItemsCenter],
+                styles: [styles.alignItemsCenter],
             };
 
             if (!isNarrow) {
@@ -114,15 +113,17 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
                         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
                     },
-                    tooltipShiftHorizontal: -28,
+                    tooltipShiftHorizontal: -32,
+                    tooltipShiftVertical: 15,
+                    tooltipWrapperStyle: [styles.bgPaleGreen, styles.mh4, styles.pv2],
                     renderTooltipContent: () => (
                         <View style={[styles.flexRow, styles.alignItemsCenter]}>
                             <Expensicons.Lightbulb
                                 width={16}
                                 height={16}
-                                color={styles.colorMuted as unknown as string}
+                                fill={styles.colorGreenSuccess.color}
                             />
-                            <Text style={[styles.colorMuted, styles.textNormal, styles.ml1]}>You can rename your saved search</Text>
+                            <Text style={[styles.ml1, styles.textLabel]}>You can rename your saved search</Text>
                         </View>
                     ),
                 };
@@ -144,11 +145,16 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
         () => ({
             savedSearchesMenuItems,
             renderSavedSearchesSection: () => (
-                <View style={[styles.pb1, styles.mh3]}>
+                <View style={[styles.pb4, styles.mh3, styles.mt3]}>
                     <Text style={[styles.sectionTitle, styles.pb1]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
                     <MenuItemList
                         menuItems={savedSearchesMenuItems}
+                        wrapperStyle={styles.sectionMenuItem}
+                        icon={Expensicons.Star}
+                        iconWidth={variables.iconSizeNormal}
+                        iconHeight={variables.iconSizeNormal}                        
                         shouldUseSingleExecution
+                        isPaneMenu
                     />
                 </View>
             ),

From b2161a07ff7b0869f0ecf9f7b650c99d66182da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:28:29 +0200
Subject: [PATCH 026/101] fix lint and prettier

---
 src/components/Icon/Expensicons.ts        |  2 +-
 src/components/MenuItemList.tsx           | 12 ++++++++++--
 src/pages/Search/SearchTypeMenu.tsx       |  2 +-
 src/pages/Search/SearchTypeMenuNarrow.tsx | 11 ++++++-----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index db3ca4620e11..2b274de59bb2 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -168,6 +168,7 @@ import Linkedin from '@assets/images/social-linkedin.svg';
 import Podcast from '@assets/images/social-podcast.svg';
 import Twitter from '@assets/images/social-twitter.svg';
 import Youtube from '@assets/images/social-youtube.svg';
+import Star from '@assets/images/star.svg';
 import Stopwatch from '@assets/images/stopwatch.svg';
 import Suitcase from '@assets/images/suitcase.svg';
 import Sync from '@assets/images/sync.svg';
@@ -192,7 +193,6 @@ import Workspace from '@assets/images/workspace-default-avatar.svg';
 import Wrench from '@assets/images/wrench.svg';
 import Clear from '@assets/images/x-circle.svg';
 import Zoom from '@assets/images/zoom.svg';
-import Star from '@assets/images/star.svg';
 
 export {
     ActiveRoomAvatar,
diff --git a/src/components/MenuItemList.tsx b/src/components/MenuItemList.tsx
index f5818e8005ac..921fe7ce023d 100644
--- a/src/components/MenuItemList.tsx
+++ b/src/components/MenuItemList.tsx
@@ -3,9 +3,9 @@ import type {GestureResponderEvent, StyleProp, View, ViewStyle} from 'react-nati
 import useSingleExecution from '@hooks/useSingleExecution';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import CONST from '@src/CONST';
+import type IconAsset from '@src/types/utils/IconAsset';
 import type {MenuItemProps} from './MenuItem';
 import MenuItem from './MenuItem';
-import IconAsset from '@src/types/utils/IconAsset';
 
 type MenuItemLink = string | (() => Promise<string>);
 
@@ -37,7 +37,15 @@ type MenuItemListProps = {
     isPaneMenu?: boolean;
 };
 
-function MenuItemList({menuItems = [], shouldUseSingleExecution = false, wrapperStyle = {}, icon = undefined, iconWidth = undefined, iconHeight = undefined, isPaneMenu = false}: MenuItemListProps) {
+function MenuItemList({
+    menuItems = [],
+    shouldUseSingleExecution = false,
+    wrapperStyle = {},
+    icon = undefined,
+    iconWidth = undefined,
+    iconHeight = undefined,
+    isPaneMenu = false,
+}: MenuItemListProps) {
     const popoverAnchor = useRef<View>(null);
     const {isExecuting, singleExecution} = useSingleExecution();
 
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 4b438038f53e..79181409b0aa 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -152,7 +152,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
                         wrapperStyle={styles.sectionMenuItem}
                         icon={Expensicons.Star}
                         iconWidth={variables.iconSizeNormal}
-                        iconHeight={variables.iconSizeNormal}                        
+                        iconHeight={variables.iconSizeNormal}
                         shouldUseSingleExecution
                         isPaneMenu
                     />
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 91d707291402..44d3e369272b 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -102,7 +102,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
             const inputQuery = queryJSON.inputQuery ?? '';
             return SearchUtils.getOverflowMenu(itemName, hash, inputQuery, showDeleteModal, true, closeMenu);
         },
-        [queryJSON, showDeleteModal],
+        [queryJSON, showDeleteModal, closeMenu],
     );
 
     const allMenuItems = useMemo(() => {
@@ -119,14 +119,15 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
                     text: item.title ?? '',
                     styles: [styles.textSupporting],
                     onSelected: (event: GestureResponderEvent | KeyboardEvent) => {
-                        if (item.onPress) {
-                            item.onPress(event);
+                        if (!item.onPress) {
+                            return;
                         }
+                        item.onPress(event);
                     },
                     shouldShowRightComponent: true,
                     rightComponent: (
                         <ThreeDotsMenu
-                            menuItems={getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), )}
+                            menuItems={getOverflowMenu(item.title ?? '', Number(item.hash ?? ''))}
                             anchorPosition={{horizontal: 0, vertical: 380}}
                             anchorAlignment={{
                                 horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
@@ -138,7 +139,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
             );
         }
         return [...items, ...newItems];
-    }, [popoverMenuItems, savedSearchesMenuItems, translate, closeMenu, getOverflowMenu, styles.textSupporting]);
+    }, [popoverMenuItems, savedSearchesMenuItems, translate, getOverflowMenu, styles.textSupporting]);
 
     return (
         <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>

From eb283ee66bbe1e42ea50c8f994d5284626fd3efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:39:47 +0200
Subject: [PATCH 027/101] add missing translation key

---
 src/languages/en.ts | 1 +
 src/languages/es.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 0db9690b59f1..d1cf8897a9f7 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3774,6 +3774,7 @@ export default {
             },
         },
         saveSearch: 'Save search',
+        saveSearchTooltipText: 'You can rename your saved search',
         deleteSavedSearch: 'Delete saved search',
         deleteSavedSearchConfirm: 'Are you sure you want to delete this search?',
         searchName: 'Search name',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e0ce61674150..36c9bd8f1fb7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3826,6 +3826,7 @@ export default {
             },
         },
         saveSearch: 'Guardar búsqueda',
+        saveSearchTooltipText: 'Puedes renombrar tu búsqueda guardada',
         savedSearchesMenuItemTitle: 'Guardadas',
         searchName: 'Nombre de la búsqueda',
         deleteSavedSearch: 'Eliminar búsqueda guardada',

From 2c28b519158404185e4e4871c04df2c12b3bb5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:39:54 +0200
Subject: [PATCH 028/101] fix tooltip rendering

---
 src/pages/Search/SearchTypeMenu.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 79181409b0aa..73686f1aaf44 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useMemo} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {TextStyle, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
@@ -51,6 +51,11 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
     const {translate} = useLocalize();
     const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES);
     const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
+    const [prevSavedSearchesLength, setPrevSavedSearchesLength] = useState(0);
+
+    useEffect(() => {
+        setPrevSavedSearchesLength(Object.keys(savedSearches ?? {}).length);
+    }, [savedSearches]);
 
     const typeMenuItems: SearchTypeMenuItem[] = useMemo(
         () => [
@@ -108,7 +113,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
             if (!isNarrow) {
                 return {
                     ...baseMenuItem,
-                    shouldRenderTooltip: Object.keys(savedSearches ?? {}).length === 1,
+                    shouldRenderTooltip: Object.keys(savedSearches ?? {}).length === 1 && prevSavedSearchesLength === 0,
                     tooltipAnchorAlignment: {
                         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
@@ -123,7 +128,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
                                 height={16}
                                 fill={styles.colorGreenSuccess.color}
                             />
-                            <Text style={[styles.ml1, styles.textLabel]}>You can rename your saved search</Text>
+                            <Text style={[styles.ml1, styles.textLabel]}>{translate('search.saveSearchTooltipText')}</Text>
                         </View>
                     ),
                 };
@@ -131,7 +136,7 @@ function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
 
             return baseMenuItem;
         },
-        [hash, savedSearches, styles, getOverflowMenu],
+        [hash, savedSearches, styles, getOverflowMenu, prevSavedSearchesLength],
     );
 
     const savedSearchesMenuItems = useMemo(() => {

From 6a774501fa10883f1f9b9e0d30605f3e229d859d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:51:30 +0200
Subject: [PATCH 029/101] fix old code relics

---
 src/hooks/useDeleteSavedSearch.tsx         | 1 -
 src/pages/Search/AdvancedSearchFilters.tsx | 4 ++--
 src/pages/Search/SavedSearchRenamePage.tsx | 1 -
 src/pages/Search/SearchPageBottomTab.tsx   | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/hooks/useDeleteSavedSearch.tsx b/src/hooks/useDeleteSavedSearch.tsx
index 4b9a1234d9ff..df464cea7daf 100644
--- a/src/hooks/useDeleteSavedSearch.tsx
+++ b/src/hooks/useDeleteSavedSearch.tsx
@@ -24,7 +24,6 @@ export default function useDeleteSavedSearch() {
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
                 query: DEFAULT_SAVE_SEARCH_QUERY_STRING,
-                isCustomQuery: true,
             }),
         );
     };
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 43ae0dfa3bfb..cb887a11a9f8 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -1,5 +1,5 @@
 import {Str} from 'expensify-common';
-import React from 'react';
+import React, { useMemo } from 'react';
 import {View} from 'react-native';
 import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils';
 import type {OnyxCollection} from 'react-native-onyx';
@@ -268,7 +268,7 @@ function AdvancedSearchFilters() {
         Navigation.dismissModal();
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query,
+                query: queryString,
             }),
         );
     };
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index 41150a29a090..dbc0409823a6 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -24,7 +24,6 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
                 query: q,
-                isCustomQuery: true,
             }),
         );
     };
diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index bf881636125b..9c46588bb68e 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -60,7 +60,6 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={isCustomQuery}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From 182e36158ae2636a45055b2f208a84f53b4694bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:56:03 +0200
Subject: [PATCH 030/101] improve code using canned query

---
 src/hooks/useDeleteSavedSearch.tsx         | 6 +++---
 src/libs/SearchUtils.ts                    | 3 ---
 src/pages/Search/AdvancedSearchFilters.tsx | 3 +--
 src/pages/Search/SavedSearchRenamePage.tsx | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/hooks/useDeleteSavedSearch.tsx b/src/hooks/useDeleteSavedSearch.tsx
index df464cea7daf..aa96cc6160cc 100644
--- a/src/hooks/useDeleteSavedSearch.tsx
+++ b/src/hooks/useDeleteSavedSearch.tsx
@@ -3,10 +3,10 @@ import ConfirmModal from '@components/ConfirmModal';
 import Navigation from '@libs/Navigation/Navigation';
 import * as SearchActions from '@userActions/Search';
 import ROUTES from '@src/ROUTES';
+import * as SearchUtils from '@libs/SearchUtils';
+import CONST from '@src/CONST';
 import useLocalize from './useLocalize';
 
-const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all';
-
 export default function useDeleteSavedSearch() {
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const [hashToDelete, setHashToDelete] = useState(0);
@@ -23,7 +23,7 @@ export default function useDeleteSavedSearch() {
         SearchActions.clearAdvancedFilters();
         Navigation.navigate(
             ROUTES.SEARCH_CENTRAL_PANE.getRoute({
-                query: DEFAULT_SAVE_SEARCH_QUERY_STRING,
+                query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL)
             }),
         );
     };
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 41e66fa302d4..cc6a1acdbf09 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -27,8 +27,6 @@ import * as UserUtils from './UserUtils';
 
 type KeysOfFilterKeysObject = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS;
 
-const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all';
-
 const columnNamesToSortingProperty = {
     [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
     [CONST.SEARCH.TABLE_COLUMNS.FROM]: 'formattedFrom' as const,
@@ -725,7 +723,6 @@ export {
     isCannedSearchQuery,
     getExpenseTypeTranslationKey,
     getOverflowMenu,
-    DEFAULT_SAVE_SEARCH_QUERY_STRING,
     getChatFiltersTranslationKey,
     getChatStatusTranslationKey,
 };
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index cb887a11a9f8..73348e890a86 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -258,7 +258,6 @@ function AdvancedSearchFilters() {
     const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
     const taxRates = getAllTaxRates();
     const personalDetails = usePersonalDetails();
-    const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all sortBy:date sortOrder:desc';
     const currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
 
     const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters), [searchAdvancedFilters]);
@@ -274,7 +273,7 @@ function AdvancedSearchFilters() {
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || DEFAULT_SAVE_SEARCH_QUERY_STRING);
+        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL));
         if (!queryJSON) {
             return;
         }
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index dbc0409823a6..2440c2b37b69 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -29,9 +29,8 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
     };
 
     const onSaveSearch = () => {
-        const DEFAULT_SAVE_SEARCH_QUERY_STRING = 'type:expense status:all sortBy:date sortOrder:desc';
 
-        const queryJSON = SearchUtils.buildSearchQueryJSON(q || DEFAULT_SAVE_SEARCH_QUERY_STRING);
+        const queryJSON = SearchUtils.buildSearchQueryJSON(q || SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL));
         if (!queryJSON) {
             return;
         }

From 4f4bb07df546d9638a42c8eff344ce10a2ba9d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:57:44 +0200
Subject: [PATCH 031/101] fix prettier

---
 src/components/Icon/Expensicons.ts         |  2 +-
 src/hooks/useDeleteSavedSearch.tsx         |  6 +++---
 src/pages/Search/AdvancedSearchFilters.tsx |  2 +-
 src/pages/Search/SavedSearchRenamePage.tsx |  1 -
 src/pages/Search/SearchTypeMenu.tsx        | 13 ++++++-------
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index bddeab864ec1..d0c3afc1bea4 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -169,8 +169,8 @@ import Linkedin from '@assets/images/social-linkedin.svg';
 import Podcast from '@assets/images/social-podcast.svg';
 import Twitter from '@assets/images/social-twitter.svg';
 import Youtube from '@assets/images/social-youtube.svg';
-import Star from '@assets/images/star.svg';
 import SpreadsheetComputer from '@assets/images/spreadsheet-computer.svg';
+import Star from '@assets/images/star.svg';
 import Stopwatch from '@assets/images/stopwatch.svg';
 import Suitcase from '@assets/images/suitcase.svg';
 import Sync from '@assets/images/sync.svg';
diff --git a/src/hooks/useDeleteSavedSearch.tsx b/src/hooks/useDeleteSavedSearch.tsx
index aa96cc6160cc..ddd2b83f5bc9 100644
--- a/src/hooks/useDeleteSavedSearch.tsx
+++ b/src/hooks/useDeleteSavedSearch.tsx
@@ -1,10 +1,10 @@
 import React, {useState} from 'react';
 import ConfirmModal from '@components/ConfirmModal';
 import Navigation from '@libs/Navigation/Navigation';
-import * as SearchActions from '@userActions/Search';
-import ROUTES from '@src/ROUTES';
 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';
 
 export default function useDeleteSavedSearch() {
@@ -23,7 +23,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(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL),
             }),
         );
     };
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 73348e890a86..6baafa8a9feb 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -1,5 +1,5 @@
 import {Str} from 'expensify-common';
-import React, { useMemo } from 'react';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils';
 import type {OnyxCollection} from 'react-native-onyx';
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index 2440c2b37b69..a71338ace48c 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -29,7 +29,6 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
     };
 
     const onSaveSearch = () => {
-
         const queryJSON = SearchUtils.buildSearchQueryJSON(q || SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL));
         if (!queryJSON) {
             return;
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 7347534cf7f1..08d51f715272 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -64,12 +64,12 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 icon: Expensicons.Receipt,
                 route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
             },
-        {
-            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)}),
-        },
+            {
+                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)}),
+            },
             {
                 title: translate('workspace.common.invoices'),
                 type: CONST.SEARCH.DATA_TYPES.INVOICE,
@@ -172,7 +172,6 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         [savedSearchesMenuItems, styles, translate],
     );
 
-
     const isCannedQuery = SearchUtils.isCannedSearchQuery(queryJSON);
     const activeItemIndex = isCannedQuery ? typeMenuItems.findIndex((item) => item.type === type) : -1;
 

From 574a5841c3852816c3b5552eed10c8548a6f0ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 15:59:31 +0200
Subject: [PATCH 032/101] fix lint

---
 src/pages/Search/SearchTypeMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 08d51f715272..b31bad985b77 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -141,7 +141,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
             return baseMenuItem;
         },
-        [hash, savedSearches, styles, getOverflowMenu, prevSavedSearchesLength],
+        [hash, savedSearches, styles, getOverflowMenu, prevSavedSearchesLength, translate],
     );
 
     const savedSearchesMenuItems = useMemo(() => {

From aff30f07a3eb7039750f1244f0e588f6ee17303c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 16:05:13 +0200
Subject: [PATCH 033/101] fix cancel button not showing on mobile

---
 src/pages/Search/SearchPageBottomTab.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 9c46588bb68e..0174572f318d 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -60,6 +60,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
+                            isCustomSearchQuery={true}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From 0faec36bb36cde603a03bf19b0751040c36e4a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 16:36:57 +0200
Subject: [PATCH 034/101] fix lint

---
 src/pages/Search/SearchPageBottomTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 0174572f318d..a5d38b45a980 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -60,7 +60,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={true}
+                            isCustomSearchQuery
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From bd4861f1d92bfcf0ecb5ff90f505ec69ffc7b0dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 16:52:46 +0200
Subject: [PATCH 035/101] fix form for saved search rename page

---
 src/ONYXKEYS.ts                               |  1 +
 src/libs/Navigation/types.ts                  |  3 ---
 src/pages/Search/SavedSearchRenamePage.tsx    |  2 +-
 src/types/form/SearchSavedSearchRenameForm.ts | 18 ++++++++++++++++++
 src/types/form/index.ts                       |  1 +
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 src/types/form/SearchSavedSearchRenameForm.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index f9a680c016de..e93d6fd5af2c 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -755,6 +755,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.RULES_REQUIRED_RECEIPT_AMOUNT_FORM]: FormTypes.RulesRequiredReceiptAmountForm;
     [ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AMOUNT_FORM]: FormTypes.RulesMaxExpenseAmountForm;
     [ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AGE_FORM]: FormTypes.RulesMaxExpenseAgeForm;
+    [ONYXKEYS.FORMS.SEARCH_SAVED_SEARCH_RENAME_FORM]: FormTypes.SearchSavedSearchRenameForm;
 };
 
 type OnyxFormDraftValuesMapping = {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 75136b4b1afc..5d00164ef333 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1356,9 +1356,6 @@ type SearchAdvancedFiltersParamList = {
 
 type SearchSavedSearchParamList = {
     [SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP]: SaveSearchParams;
-    [SCREENS.SEARCH.SAVED_SEARCH_DELETE_RHP]: {
-        hash: number;
-    };
 };
 
 type RestrictedActionParamList = {
diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index a71338ace48c..c2fadc0d01de 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -51,7 +51,7 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
         >
             <HeaderWithBackButton title={translate('common.rename')} />
             <FormProvider
-                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                formID={ONYXKEYS.FORMS.SEARCH_SAVED_SEARCH_RENAME_FORM}
                 submitButtonText={translate('common.save')}
                 onSubmit={onSaveSearch}
                 style={[styles.mh5, styles.flex1]}
diff --git a/src/types/form/SearchSavedSearchRenameForm.ts b/src/types/form/SearchSavedSearchRenameForm.ts
new file mode 100644
index 000000000000..67b6596ba2f1
--- /dev/null
+++ b/src/types/form/SearchSavedSearchRenameForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    NAME: 'name',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type SearchSavedSearchRenameForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.NAME]: string;
+    }
+>;
+
+export type {SearchSavedSearchRenameForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index 23903526c89d..730611df202f 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -79,3 +79,4 @@ export type {RulesRequiredReceiptAmountForm} from './RulesRequiredReceiptAmountF
 export type {RulesMaxExpenseAmountForm} from './RulesMaxExpenseAmountForm';
 export type {RulesMaxExpenseAgeForm} from './RulesMaxExpenseAgeForm';
 export type {WorkspaceCompanyCardFeedName} from './WorkspaceCompanyCardFeedName';
+export type {SearchSavedSearchRenameForm} from './SearchSavedSearchRenameForm';
\ No newline at end of file

From 01c9e96fb05ed4ca9139cd2787cb803de808dba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 17:01:06 +0200
Subject: [PATCH 036/101] fix typecheck

---
 src/ONYXKEYS.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index e93d6fd5af2c..b5a592806bec 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -651,6 +651,7 @@ const ONYXKEYS = {
         SEARCH_ADVANCED_FILTERS_FORM: 'searchAdvancedFiltersForm',
         SEARCH_ADVANCED_FILTERS_FORM_DRAFT: 'searchAdvancedFiltersFormDraft',
         SEARCH_SAVED_SEARCH_RENAME_FORM: 'searchSavedSearchRenameForm',
+        SEARCH_SAVED_SEARCH_RENAME_FORM_DRAFT: 'searchSavedSearchRenameFormDraft',
         TEXT_PICKER_MODAL_FORM: 'textPickerModalForm',
         TEXT_PICKER_MODAL_FORM_DRAFT: 'textPickerModalFormDraft',
         RULES_CUSTOM_NAME_MODAL_FORM: 'rulesCustomNameModalForm',

From 869e21cd8f9c9f6dc676199ccda004973fe1fbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Mon, 9 Sep 2024 17:42:10 +0200
Subject: [PATCH 037/101] fix prettier

---
 src/types/form/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index 730611df202f..7d321e4417c0 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -79,4 +79,4 @@ export type {RulesRequiredReceiptAmountForm} from './RulesRequiredReceiptAmountF
 export type {RulesMaxExpenseAmountForm} from './RulesMaxExpenseAmountForm';
 export type {RulesMaxExpenseAgeForm} from './RulesMaxExpenseAgeForm';
 export type {WorkspaceCompanyCardFeedName} from './WorkspaceCompanyCardFeedName';
-export type {SearchSavedSearchRenameForm} from './SearchSavedSearchRenameForm';
\ No newline at end of file
+export type {SearchSavedSearchRenameForm} from './SearchSavedSearchRenameForm';

From 8767a5964be60a47e58fcb89fd2a88cb9b54248e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 08:47:11 +0200
Subject: [PATCH 038/101] fix react compiler errors

---
 src/pages/Search/SearchTypeMenu.tsx       | 103 ++++++++++------------
 src/pages/Search/SearchTypeMenuNarrow.tsx |  72 ++++++---------
 2 files changed, 74 insertions(+), 101 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index b31bad985b77..30d854ec56c9 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,10 +1,11 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import type {TextStyle, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import type {MenuItemBaseProps} from '@components/MenuItem';
 import MenuItem from '@components/MenuItem';
 import MenuItemList from '@components/MenuItemList';
+import type {MenuItemWithLink} from '@components/MenuItemList';
 import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
 import ThreeDotsMenu from '@components/ThreeDotsMenu';
@@ -56,35 +57,32 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         setPrevSavedSearchesLength(Object.keys(savedSearches ?? {}).length);
     }, [savedSearches]);
 
-    const typeMenuItems: SearchTypeMenuItem[] = useMemo(
-        () => [
-            {
-                title: translate('common.expenses'),
-                type: CONST.SEARCH.DATA_TYPES.EXPENSE,
-                icon: Expensicons.Receipt,
-                route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
-            },
-            {
-                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)}),
-            },
-            {
-                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)}),
-            },
-            {
-                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)}),
-            },
-        ],
-        [translate],
-    );
+    const typeMenuItems: SearchTypeMenuItem[] = [
+        {
+            title: translate('common.expenses'),
+            type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+            icon: Expensicons.Receipt,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
+        },
+        {
+            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)}),
+        },
+        {
+            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)}),
+        },
+        {
+            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)}),
+        },
+    ];
 
     const getOverflowMenu = useCallback(
         (itemName: string, itemHash: number) => SearchUtils.getOverflowMenu(itemName, itemHash, queryJSON?.inputQuery ?? '', showDeleteModal),
@@ -144,32 +142,29 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         [hash, savedSearches, styles, getOverflowMenu, prevSavedSearchesLength, translate],
     );
 
-    const savedSearchesMenuItems = useMemo(() => {
+    const savedSearchesMenuItems = () => {
         if (!savedSearches) {
             return [];
         }
         return Object.entries(savedSearches).map(([key, item]) => createSavedSearchMenuItem(item, key, shouldUseNarrowLayout));
-    }, [savedSearches, createSavedSearchMenuItem, shouldUseNarrowLayout]);
-
-    const handleSavedSearches = useCallback(
-        () => ({
-            savedSearchesMenuItems,
-            renderSavedSearchesSection: () => (
-                <View style={[styles.pb4, styles.mh3, styles.mt3]}>
-                    <Text style={[styles.sectionTitle, styles.pb1]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
-                    <MenuItemList
-                        menuItems={savedSearchesMenuItems}
-                        wrapperStyle={styles.sectionMenuItem}
-                        icon={Expensicons.Star}
-                        iconWidth={variables.iconSizeNormal}
-                        iconHeight={variables.iconSizeNormal}
-                        shouldUseSingleExecution
-                        isPaneMenu
-                    />
-                </View>
-            ),
-        }),
-        [savedSearchesMenuItems, styles, translate],
+    };
+
+    const renderSavedSearchesSection = useCallback(
+        (menuItems: MenuItemWithLink[]) => (
+            <View style={[styles.pb4, styles.mh3, styles.mt3]}>
+                <Text style={[styles.sectionTitle, styles.pb1]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
+                <MenuItemList
+                    menuItems={menuItems}
+                    wrapperStyle={styles.sectionMenuItem}
+                    icon={Expensicons.Star}
+                    iconWidth={variables.iconSizeNormal}
+                    iconHeight={variables.iconSizeNormal}
+                    shouldUseSingleExecution
+                    isPaneMenu
+                />
+            </View>
+        ),
+        [styles, translate],
     );
 
     const isCannedQuery = SearchUtils.isCannedSearchQuery(queryJSON);
@@ -183,7 +178,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 typeMenuItems={typeMenuItems}
                 activeItemIndex={activeItemIndex}
                 title={title}
-                handleSavedSearches={handleSavedSearches}
+                savedSearchesMenuItems={savedSearchesMenuItems()}
                 queryJSON={queryJSON}
             />
         );
@@ -213,7 +208,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            {savedSearches && handleSavedSearches().renderSavedSearchesSection()}
+            {savedSearches && renderSavedSearchesSection(savedSearchesMenuItems())}
             <DeleteConfirmModal />
         </>
     );
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 44d3e369272b..ac34b7a806fa 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -1,6 +1,6 @@
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {Animated, View} from 'react-native';
-import type {GestureResponderEvent, TextStyle, ViewStyle} from 'react-native';
+import type {TextStyle, ViewStyle} from 'react-native';
 import Button from '@components/Button';
 import Icon from '@components/Icon';
 import type {MenuItemBaseProps} from '@components/MenuItem';
@@ -33,19 +33,11 @@ type SearchTypeMenuNarrowProps = {
     typeMenuItems: SearchTypeMenuItem[];
     activeItemIndex: number;
     title?: string;
-    handleSavedSearches: () => {
-        savedSearchesMenuItems: SavedSearchMenuItem[];
-    };
+    savedSearchesMenuItems: SavedSearchMenuItem[];
     queryJSON: SearchQueryJSON;
 };
 
-type SavedSearchMenuItemProps = MenuItemBaseProps & {
-    text: string;
-    styles?: Array<ViewStyle | TextStyle>;
-    disabled?: boolean;
-};
-
-function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSavedSearches, queryJSON}: SearchTypeMenuNarrowProps) {
+function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, savedSearchesMenuItems, queryJSON}: SearchTypeMenuNarrowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {singleExecution} = useSingleExecution();
@@ -59,8 +51,6 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
     const openMenu = useCallback(() => setIsPopoverVisible(true), []);
     const closeMenu = useCallback(() => setIsPopoverVisible(false), []);
 
-    const {savedSearchesMenuItems} = handleSavedSearches();
-
     const popoverMenuItems = useMemo(() => {
         const items = typeMenuItems.map((item, index) => {
             const isSelected = title ? false : index === activeItemIndex;
@@ -97,49 +87,37 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, handleSave
     const menuTitle = useMemo(() => title ?? popoverMenuItems[activeItemIndex]?.text, [activeItemIndex, popoverMenuItems, title]);
     const titleViewStyles = useMemo(() => (title ? {...styles.flex1, ...styles.justifyContentCenter} : {}), [title, styles]);
 
-    const getOverflowMenu = useCallback(
-        (itemName: string, hash: number) => {
-            const inputQuery = queryJSON.inputQuery ?? '';
-            return SearchUtils.getOverflowMenu(itemName, hash, inputQuery, showDeleteModal, true, closeMenu);
-        },
-        [queryJSON, showDeleteModal, closeMenu],
-    );
-
     const allMenuItems = useMemo(() => {
         const items = [...popoverMenuItems];
-        const newItems: SavedSearchMenuItemProps[] = [];
-        if (savedSearchesMenuItems && savedSearchesMenuItems.length > 0) {
+        const newItems = [];
+        const savedSearchItems = savedSearchesMenuItems.map((item: SavedSearchMenuItem) => ({
+            text: item.title ?? '',
+            styles: [styles.textSupporting],
+            onSelected: item.onPress,
+            shouldShowRightComponent: true,
+            rightComponent: (
+                <ThreeDotsMenu
+                    menuItems={SearchUtils.getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), queryJSON.inputQuery ?? '', showDeleteModal, true, closeMenu)}
+                    anchorPosition={{horizontal: 0, vertical: 380}}
+                    anchorAlignment={{
+                        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+                    }}
+                />
+            ),
+        }));
+
+        if (savedSearchesMenuItems.length > 0) {
             newItems.push({
                 text: translate('search.savedSearchesMenuItemTitle'),
                 styles: [styles.textSupporting],
                 disabled: true,
             });
-            newItems.push(
-                ...savedSearchesMenuItems.map((item: SavedSearchMenuItem) => ({
-                    text: item.title ?? '',
-                    styles: [styles.textSupporting],
-                    onSelected: (event: GestureResponderEvent | KeyboardEvent) => {
-                        if (!item.onPress) {
-                            return;
-                        }
-                        item.onPress(event);
-                    },
-                    shouldShowRightComponent: true,
-                    rightComponent: (
-                        <ThreeDotsMenu
-                            menuItems={getOverflowMenu(item.title ?? '', Number(item.hash ?? ''))}
-                            anchorPosition={{horizontal: 0, vertical: 380}}
-                            anchorAlignment={{
-                                horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                                vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
-                            }}
-                        />
-                    ),
-                })),
-            );
+            newItems.push(...savedSearchItems);
         }
+
         return [...items, ...newItems];
-    }, [popoverMenuItems, savedSearchesMenuItems, translate, getOverflowMenu, styles.textSupporting]);
+    }, [popoverMenuItems, savedSearchesMenuItems, styles, queryJSON.inputQuery, showDeleteModal, closeMenu, translate]);
 
     return (
         <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>

From 446265aa1dc8c99c3bb0760e07d5c10a89829053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 10:30:27 +0200
Subject: [PATCH 039/101] improve form

---
 src/pages/Search/SavedSearchRenamePage.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index c2fadc0d01de..1f40902b3e69 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -12,6 +12,7 @@ import * as SearchUtils from '@libs/SearchUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/SearchSavedSearchRenameForm';
 
 function SavedSearchRenamePage({route}: {route: {params: {q: string; name: string}}}) {
     const {translate} = useLocalize();
@@ -29,7 +30,7 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(q || SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL));
+        const queryJSON = SearchUtils.buildSearchQueryJSON(q || SearchUtils.buildCannedSearchQuery());
         if (!queryJSON) {
             return;
         }
@@ -58,13 +59,13 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
             >
                 <InputWrapper
                     InputComponent={TextInput}
-                    inputID="name"
-                    name="name"
+                    inputID={INPUT_IDS.NAME}
                     defaultValue={name}
                     label={translate('search.searchName')}
                     accessibilityLabel={translate('search.searchName')}
                     role={CONST.ROLE.PRESENTATION}
                     onChangeText={(renamedName) => setNewName(renamedName)}
+                    shouldSaveDraft
                 />
             </FormProvider>
         </ScreenWrapper>

From cebf87d070d03bf8b12e2fd74af6426aba165d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 10:30:51 +0200
Subject: [PATCH 040/101] add distinct name

---
 src/types/form/SearchSavedSearchRenameForm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/form/SearchSavedSearchRenameForm.ts b/src/types/form/SearchSavedSearchRenameForm.ts
index 67b6596ba2f1..27f28c05ad10 100644
--- a/src/types/form/SearchSavedSearchRenameForm.ts
+++ b/src/types/form/SearchSavedSearchRenameForm.ts
@@ -2,7 +2,7 @@ import type {ValueOf} from 'type-fest';
 import type Form from './Form';
 
 const INPUT_IDS = {
-    NAME: 'name',
+    NAME: 'savedSearchNewName',
 } as const;
 
 type InputID = ValueOf<typeof INPUT_IDS>;

From 6776ef3a366c34532576311b589db987940d93ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 10:31:04 +0200
Subject: [PATCH 041/101] fix cancel button showing everytime

---
 src/pages/Search/SearchPageBottomTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index a5d38b45a980..36349bc821f6 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -60,7 +60,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery
+                            isCustomSearchQuery={queryJSON.inputQuery !== SearchUtils.buildCannedSearchQuery()}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From 69c1f2a418d7a7827486eee48686629e6fd33cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 10:31:13 +0200
Subject: [PATCH 042/101] remove unnecessary params

---
 src/pages/Search/AdvancedSearchFilters.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 6baafa8a9feb..9b2884b0f19a 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -273,7 +273,7 @@ function AdvancedSearchFilters() {
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL));
+        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery());
         if (!queryJSON) {
             return;
         }

From 5b090dbe854f9a4586692de90548a3df0fbba8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 10:45:59 +0200
Subject: [PATCH 043/101] remove default value to be consistent with figma file

---
 src/pages/Search/SavedSearchRenamePage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index 1f40902b3e69..3fc27b54863e 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -60,7 +60,6 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
                 <InputWrapper
                     InputComponent={TextInput}
                     inputID={INPUT_IDS.NAME}
-                    defaultValue={name}
                     label={translate('search.searchName')}
                     accessibilityLabel={translate('search.searchName')}
                     role={CONST.ROLE.PRESENTATION}

From 82fcd1e8d97e9a426b531b906f9940aa0fac1d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 11:18:27 +0200
Subject: [PATCH 044/101] fix bug

---
 src/pages/Search/SearchTypeMenu.tsx       | 6 ++++--
 src/pages/Search/SearchTypeMenuNarrow.tsx | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 30d854ec56c9..5820ab5a8b1d 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -29,6 +29,7 @@ import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
 type SavedSearchMenuItem = MenuItemBaseProps & {
     key: string;
     hash: string;
+    query: string;
     styles: Array<ViewStyle | TextStyle>;
 };
 
@@ -85,7 +86,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     ];
 
     const getOverflowMenu = useCallback(
-        (itemName: string, itemHash: number) => SearchUtils.getOverflowMenu(itemName, itemHash, queryJSON?.inputQuery ?? '', showDeleteModal),
+        (itemName: string, itemHash: number, itemQuery: string) => SearchUtils.getOverflowMenu(itemName, itemHash, itemQuery, showDeleteModal),
         [queryJSON, showDeleteModal],
     );
 
@@ -95,6 +96,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 key: item.name,
                 title: item.name,
                 hash: key,
+                query: item.query,
                 shouldShowRightComponent: true,
                 focused: Number(key) === hash,
                 onPress: () => {
@@ -102,7 +104,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 },
                 rightComponent: (
                     <ThreeDotsMenu
-                        menuItems={getOverflowMenu(item.name, Number(key))}
+                        menuItems={getOverflowMenu(item.name, Number(key), item.query)}
                         anchorPosition={{horizontal: 0, vertical: 380}}
                         anchorAlignment={{
                             horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index ac34b7a806fa..2b2595278970 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -26,6 +26,7 @@ import type {SearchTypeMenuItem} from './SearchTypeMenu';
 type SavedSearchMenuItem = MenuItemBaseProps & {
     key: string;
     hash: string;
+    query: string;
     styles: Array<ViewStyle | TextStyle>;
 };
 
@@ -97,7 +98,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, savedSearc
             shouldShowRightComponent: true,
             rightComponent: (
                 <ThreeDotsMenu
-                    menuItems={SearchUtils.getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), queryJSON.inputQuery ?? '', showDeleteModal, true, closeMenu)}
+                    menuItems={SearchUtils.getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), item.query ?? '', showDeleteModal, true, closeMenu)}
                     anchorPosition={{horizontal: 0, vertical: 380}}
                     anchorAlignment={{
                         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,

From 29aebb69cdcbe13bd44e4dc3aaaf3bac5f857288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 12:07:22 +0200
Subject: [PATCH 045/101] fix lint

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

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 5820ab5a8b1d..805a81567cdb 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -87,7 +87,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
     const getOverflowMenu = useCallback(
         (itemName: string, itemHash: number, itemQuery: string) => SearchUtils.getOverflowMenu(itemName, itemHash, itemQuery, showDeleteModal),
-        [queryJSON, showDeleteModal],
+        [showDeleteModal],
     );
 
     const createSavedSearchMenuItem = useCallback(
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 2b2595278970..3250024e73ee 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -118,7 +118,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, savedSearc
         }
 
         return [...items, ...newItems];
-    }, [popoverMenuItems, savedSearchesMenuItems, styles, queryJSON.inputQuery, showDeleteModal, closeMenu, translate]);
+    }, [popoverMenuItems, savedSearchesMenuItems, styles, showDeleteModal, closeMenu, translate]);
 
     return (
         <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>

From 08feb86f5bb51c678791398dbb1dd348d7891fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 12:21:27 +0200
Subject: [PATCH 046/101] fix lint

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 3250024e73ee..386bbf168bfa 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -7,7 +7,6 @@ import type {MenuItemBaseProps} from '@components/MenuItem';
 import PopoverMenu from '@components/PopoverMenu';
 import type {PopoverMenuItem} from '@components/PopoverMenu';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
 import ThreeDotsMenu from '@components/ThreeDotsMenu';
 import useDeleteSavedSearch from '@hooks/useDeleteSavedSearch';
@@ -35,10 +34,9 @@ type SearchTypeMenuNarrowProps = {
     activeItemIndex: number;
     title?: string;
     savedSearchesMenuItems: SavedSearchMenuItem[];
-    queryJSON: SearchQueryJSON;
 };
 
-function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, savedSearchesMenuItems, queryJSON}: SearchTypeMenuNarrowProps) {
+function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title, savedSearchesMenuItems}: SearchTypeMenuNarrowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {singleExecution} = useSingleExecution();

From dfdcd243aa9094522c127e44da59e24df5b229b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 12:28:50 +0200
Subject: [PATCH 047/101] fix tsc

---
 src/pages/Search/SearchTypeMenu.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 805a81567cdb..7574e2456f31 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -181,7 +181,6 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 activeItemIndex={activeItemIndex}
                 title={title}
                 savedSearchesMenuItems={savedSearchesMenuItems()}
-                queryJSON={queryJSON}
             />
         );
     }

From 48b45a5b5851556cf4b7530f84adba2d78e35dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Tue, 10 Sep 2024 14:32:03 +0200
Subject: [PATCH 048/101] fix spanish translation

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

diff --git a/src/languages/es.ts b/src/languages/es.ts
index f1fdd3e6537c..125ce809af7d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3976,7 +3976,7 @@ export default {
             },
         },
         saveSearch: 'Guardar búsqueda',
-        saveSearchTooltipText: 'Puedes renombrar tu búsqueda guardada',
+        saveSearchTooltipText: 'Puedes cambiar el nombre de tu búsqueda guardada',
         savedSearchesMenuItemTitle: 'Guardadas',
         searchName: 'Nombre de la búsqueda',
         deleteSavedSearch: 'Eliminar búsqueda guardada',

From 0bd6855e41dc3ae44eabcef30f7a2bceab4cb130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 08:31:28 +0200
Subject: [PATCH 049/101] remove blank line

---
 src/libs/API/parameters/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 0ac41a900578..10d080a2990c 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -307,7 +307,6 @@ export type {default as CardDeactivateParams} from './CardDeactivateParams';
 export type {default as UpdateExpensifyCardLimitTypeParams} from './UpdateExpensifyCardLimitTypeParams';
 export type {default as SaveSearchParams} from './SaveSearch';
 export type {default as DeleteSavedSearchParams} from './DeleteSavedSearch';
-
 export type {default as SetPolicyCategoryReceiptsRequiredParams} from './SetPolicyCategoryReceiptsRequiredParams';
 export type {default as RemovePolicyCategoryReceiptsRequiredParams} from './RemovePolicyCategoryReceiptsRequiredParams';
 export type {default as UpdateQuickbooksOnlineAutoCreateVendorParams} from './UpdateQuickbooksOnlineAutoCreateVendorParams';

From b54d83c3a44590f35d82c124d08024ee86f652c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 08:58:02 +0200
Subject: [PATCH 050/101] add the bookmark icon

---
 assets/images/bookmark.svg | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 assets/images/bookmark.svg

diff --git a/assets/images/bookmark.svg b/assets/images/bookmark.svg
new file mode 100644
index 000000000000..d7c1a8397b37
--- /dev/null
+++ b/assets/images/bookmark.svg
@@ -0,0 +1 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve"><path d="M4,3c0-1.105,0.895-2,2-2h8c1.105,0,2,0.895,2,2v15.06c0,0.813-0.918,1.286-1.58,0.814L10,15.725l-4.42,3.149C4.918,19.346,4,18.872,4,18.06V3z"/></svg>

From 0f2d5e485f940287c4c487814d69335e7c1329e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 08:58:15 +0200
Subject: [PATCH 051/101] use the bookmark icon

---
 src/components/Icon/Expensicons.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index 888feabefafd..b76c74170bdd 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -197,6 +197,7 @@ import Workspace from '@assets/images/workspace-default-avatar.svg';
 import Wrench from '@assets/images/wrench.svg';
 import Clear from '@assets/images/x-circle.svg';
 import Zoom from '@assets/images/zoom.svg';
+import Bookmark from '@assets/images/bookmark.svg';
 
 export {
     ActiveRoomAvatar,
@@ -398,4 +399,5 @@ export {
     Star,
     Table,
     SpreadsheetComputer,
+    Bookmark,
 };

From 422e393365762bf81805dd8ea60299414e59453c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 10:17:39 +0200
Subject: [PATCH 052/101] make saved searches scrollable

---
 src/pages/Search/SearchTypeMenu.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 7574e2456f31..74336bd6a086 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -25,6 +25,7 @@ import ROUTES from '@src/ROUTES';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
 import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
+import ScrollView from '@components/ScrollView';
 
 type SavedSearchMenuItem = MenuItemBaseProps & {
     key: string;
@@ -56,6 +57,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
     useEffect(() => {
         setPrevSavedSearchesLength(Object.keys(savedSearches ?? {}).length);
+        console.log('savedSearches length', Object.keys(savedSearches ?? {}).length);
     }, [savedSearches]);
 
     const typeMenuItems: SearchTypeMenuItem[] = [
@@ -158,7 +160,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 <MenuItemList
                     menuItems={menuItems}
                     wrapperStyle={styles.sectionMenuItem}
-                    icon={Expensicons.Star}
+                    icon={Expensicons.Bookmark}
                     iconWidth={variables.iconSizeNormal}
                     iconHeight={variables.iconSizeNormal}
                     shouldUseSingleExecution
@@ -209,7 +211,9 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            {savedSearches && renderSavedSearchesSection(savedSearchesMenuItems())}
+            <ScrollView>
+                {savedSearches && renderSavedSearchesSection(savedSearchesMenuItems())}
+            </ScrollView>
             <DeleteConfirmModal />
         </>
     );

From 06870b05a0be1be81e241ac4eb5dc5732e24e323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 10:50:53 +0200
Subject: [PATCH 053/101] base64 encode for date

---
 src/libs/actions/Search.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 24305c5dee5e..5c4460cc202a 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -51,7 +51,13 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
 
 function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: string}) {
     const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
-    const jsonQuery = JSON.stringify(queryJSON);
+    const modifiedQueryJSON = {
+        ...queryJSON,
+        // we need to base64 encode
+        // to avoid special characters like "<>" being truncated for date
+        inputQuery: btoa(queryJSON.inputQuery),
+    };
+    const jsonQuery = JSON.stringify(modifiedQueryJSON);
     API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, finallyData});
 }
 

From 15760eab2b707cffcab69e3282e12f32b9c71f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 10:51:21 +0200
Subject: [PATCH 054/101] fix accessing saved searches

---
 src/pages/Search/SearchTypeMenu.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 74336bd6a086..f34b248cb319 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -6,6 +6,7 @@ import type {MenuItemBaseProps} from '@components/MenuItem';
 import MenuItem from '@components/MenuItem';
 import MenuItemList from '@components/MenuItemList';
 import type {MenuItemWithLink} from '@components/MenuItemList';
+import ScrollView from '@components/ScrollView';
 import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
 import ThreeDotsMenu from '@components/ThreeDotsMenu';
@@ -25,7 +26,6 @@ import ROUTES from '@src/ROUTES';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
 import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
-import ScrollView from '@components/ScrollView';
 
 type SavedSearchMenuItem = MenuItemBaseProps & {
     key: string;
@@ -57,7 +57,6 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
     useEffect(() => {
         setPrevSavedSearchesLength(Object.keys(savedSearches ?? {}).length);
-        console.log('savedSearches length', Object.keys(savedSearches ?? {}).length);
     }, [savedSearches]);
 
     const typeMenuItems: SearchTypeMenuItem[] = [
@@ -102,7 +101,8 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 shouldShowRightComponent: true,
                 focused: Number(key) === hash,
                 onPress: () => {
-                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query ?? ''}));
+                    // this is to make sure we get the correct query search params, for saved searches saved as "[savedSearchName]"
+                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query?.replace(/"/g, '') ?? ''}));
                 },
                 rightComponent: (
                     <ThreeDotsMenu
@@ -211,9 +211,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            <ScrollView>
-                {savedSearches && renderSavedSearchesSection(savedSearchesMenuItems())}
-            </ScrollView>
+            <ScrollView>{savedSearches && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
             <DeleteConfirmModal />
         </>
     );

From 1273d62174a145752c72cf195dea7dafe2b2b1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 10:51:37 +0200
Subject: [PATCH 055/101] fix style

---
 src/components/Icon/Expensicons.ts |  2 +-
 src/components/MenuItemList.tsx    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index b76c74170bdd..d5b845afc25e 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -24,6 +24,7 @@ import Bell from '@assets/images/bell.svg';
 import BellSlash from '@assets/images/bellSlash.svg';
 import Bill from '@assets/images/bill.svg';
 import Bolt from '@assets/images/bolt.svg';
+import Bookmark from '@assets/images/bookmark.svg';
 import Box from '@assets/images/box.svg';
 import Briefcase from '@assets/images/briefcase.svg';
 import Bug from '@assets/images/bug.svg';
@@ -197,7 +198,6 @@ import Workspace from '@assets/images/workspace-default-avatar.svg';
 import Wrench from '@assets/images/wrench.svg';
 import Clear from '@assets/images/x-circle.svg';
 import Zoom from '@assets/images/zoom.svg';
-import Bookmark from '@assets/images/bookmark.svg';
 
 export {
     ActiveRoomAvatar,
diff --git a/src/components/MenuItemList.tsx b/src/components/MenuItemList.tsx
index 69eb54e89b8f..2e732c691140 100644
--- a/src/components/MenuItemList.tsx
+++ b/src/components/MenuItemList.tsx
@@ -3,8 +3,8 @@ import type {GestureResponderEvent, StyleProp, View, ViewStyle} from 'react-nati
 import useSingleExecution from '@hooks/useSingleExecution';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import CONST from '@src/CONST';
-import type IconAsset from '@src/types/utils/IconAsset';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type IconAsset from '@src/types/utils/IconAsset';
 import type {MenuItemProps} from './MenuItem';
 import MenuItem from './MenuItem';
 import OfflineWithFeedback from './OfflineWithFeedback';
@@ -91,14 +91,14 @@ function MenuItemList({
                 >
                     <MenuItem
                         key={menuItemProps.key ?? menuItemProps.title}
-                    wrapperStyle={wrapperStyle}
+                        wrapperStyle={wrapperStyle}
                         onSecondaryInteraction={menuItemProps.link !== undefined ? (e) => secondaryInteraction(menuItemProps.link, e) : undefined}
                         ref={popoverAnchor}
                         shouldBlockSelection={!!menuItemProps.link}
-                    icon={icon}
-                    iconWidth={iconWidth}
-                    iconHeight={iconHeight}
-                    isPaneMenu={isPaneMenu}
+                        icon={icon}
+                        iconWidth={iconWidth}
+                        iconHeight={iconHeight}
+                        isPaneMenu={isPaneMenu}
                         // eslint-disable-next-line react/jsx-props-no-spreading
                         {...menuItemProps}
                         disabled={!!menuItemProps.disabled || isExecuting}

From 4e0a1938bd8dd60354590b5ba442dfd8bdbeb9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 11:01:40 +0200
Subject: [PATCH 056/101] show save search only if there are filters

---
 src/pages/Search/AdvancedSearchFilters.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 9b2884b0f19a..a260f9d63912 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -342,12 +342,14 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
-            <Button
-                text={translate('search.saveSearch')}
+            {queryString && (
+                <Button
+                    text={translate('search.saveSearch')}
                 onPress={onSaveSearch}
                 style={[styles.mh4, styles.mt4]}
-                large
-            />
+                    large
+                />
+            )}
             <FormAlertWithSubmitButton
                 buttonText={translate('search.viewResults')}
                 containerStyles={[styles.m4, styles.mb5]}

From 83640a6026374c3989e15f0d7b9e0f17872e67b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 11:30:06 +0200
Subject: [PATCH 057/101] fix style

---
 src/pages/Search/AdvancedSearchFilters.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index a260f9d63912..79c67f1beea6 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -345,8 +345,8 @@ function AdvancedSearchFilters() {
             {queryString && (
                 <Button
                     text={translate('search.saveSearch')}
-                onPress={onSaveSearch}
-                style={[styles.mh4, styles.mt4]}
+                    onPress={onSaveSearch}
+                    style={[styles.mh4, styles.mt4]}
                     large
                 />
             )}

From 06acfd945211ce61101d11d942173124d9db6c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 14:05:06 +0200
Subject: [PATCH 058/101] add to central pane

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

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 2b8abc84f31e..428bcc92f89b 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -69,6 +69,7 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
         SCREENS.SEARCH.ADVANCED_FILTERS_IN_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_HAS_RHP,
+        SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP,
     ],
     [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: [
         SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD,

From 1d486e38b611efd5028cf9ec42ec27ddf45bf7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 14:22:06 +0200
Subject: [PATCH 059/101] revert unneeded base64

---
 src/libs/actions/Search.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 5c4460cc202a..24305c5dee5e 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -51,13 +51,7 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
 
 function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: string}) {
     const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
-    const modifiedQueryJSON = {
-        ...queryJSON,
-        // we need to base64 encode
-        // to avoid special characters like "<>" being truncated for date
-        inputQuery: btoa(queryJSON.inputQuery),
-    };
-    const jsonQuery = JSON.stringify(modifiedQueryJSON);
+    const jsonQuery = JSON.stringify(queryJSON);
     API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, finallyData});
 }
 

From 781944885a8849c96dab2a69cd69a64a8fd08436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 15:44:13 +0200
Subject: [PATCH 060/101] remove useless query string replacement

---
 src/pages/Search/SearchTypeMenu.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index f34b248cb319..33e5cf1c4933 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -101,8 +101,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 shouldShowRightComponent: true,
                 focused: Number(key) === hash,
                 onPress: () => {
-                    // this is to make sure we get the correct query search params, for saved searches saved as "[savedSearchName]"
-                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query?.replace(/"/g, '') ?? ''}));
+                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query ?? ''}));
                 },
                 rightComponent: (
                     <ThreeDotsMenu

From f85e084cceceee20d458a31a616c10da5b4e51e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 15:44:25 +0200
Subject: [PATCH 061/101] remove draft value

---
 src/pages/Search/SavedSearchRenamePage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index 3fc27b54863e..955c7a0cff50 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -64,7 +64,6 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
                     accessibilityLabel={translate('search.searchName')}
                     role={CONST.ROLE.PRESENTATION}
                     onChangeText={(renamedName) => setNewName(renamedName)}
-                    shouldSaveDraft
                 />
             </FormProvider>
         </ScreenWrapper>

From aacab14025590c8ca97f707f59250c24c00ab9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 15:59:43 +0200
Subject: [PATCH 062/101] fix cancel button display

---
 src/pages/Search/SearchPageBottomTab.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 36349bc821f6..1448f1bb628c 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -27,17 +27,19 @@ function SearchPageBottomTab() {
     const {clearSelectedTransactions} = useSearchContext();
     const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
 
-    const {queryJSON, policyID} = useMemo(() => {
+    const EXPENSE_FILTERS_TYPE = 'expense';
+
+    const {queryJSON, policyID, isExpenseFilterPage} = useMemo(() => {
         if (activeCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE) {
-            return {queryJSON: undefined, policyID: undefined};
+            return {queryJSON: undefined, policyID: undefined, isExpenseFilterPage: undefined};
         }
 
         const searchParams = activeCentralPaneRoute?.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
         const parsedQuery = SearchUtils.buildSearchQueryJSON(searchParams?.q);
-
         return {
             queryJSON: parsedQuery,
             policyID: parsedQuery && SearchUtils.getPolicyIDFromSearchQuery(parsedQuery),
+            isExpenseFilterPage: parsedQuery?.type === EXPENSE_FILTERS_TYPE,
         };
     }, [activeCentralPaneRoute]);
 
@@ -60,7 +62,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={queryJSON.inputQuery !== SearchUtils.buildCannedSearchQuery()}
+                            isCustomSearchQuery={shouldUseNarrowLayout && isExpenseFilterPage && queryJSON?.inputQuery !== SearchUtils.buildCannedSearchQuery()}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From dc97d03322268583e71063192f9272782adcd126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Wed, 11 Sep 2024 17:04:41 +0200
Subject: [PATCH 063/101] fix renaming on iOS

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

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 073d4143db4a..94665fe2147a 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -702,6 +702,7 @@ function getOverflowMenu(itemName: string, hash: number, inputQuery: string, sho
             icon: Expensicons.Pencil,
             shouldShowRightIcon: false,
             shouldShowRightComponent: false,
+            shouldCallAfterModalHide: true,
         },
         {
             text: translateLocal('common.delete'),

From 676028cbbe8b920c3619ede64b4d9f5dbc4e2f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 09:17:41 +0200
Subject: [PATCH 064/101] add fragment

---
 src/pages/Search/SearchTypeMenu.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index c1f6d541c34d..61304c7e5dbb 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -195,12 +195,13 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     }
 
     return (
-        <View style={[styles.pb4, styles.mh3, styles.mt3]}>
-            {typeMenuItems.map((item, index) => {
-                const onPress = singleExecution(() => {
-                    SearchActions.clearAllFilters();
-                    Navigation.navigate(item.route);
-                });
+        <>
+            <View style={[styles.pb4, styles.mh3, styles.mt3]}>
+                {typeMenuItems.map((item, index) => {
+                    const onPress = singleExecution(() => {
+                        SearchActions.clearAllFilters();
+                        Navigation.navigate(item.route);
+                    });
 
                     return (
                         <MenuItem

From 8bc07902dfde7119e3c5a7e4745dbe61565b82e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 09:21:04 +0200
Subject: [PATCH 065/101] fix icon name

---
 src/components/Icon/Expensicons.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index 6034a6026601..bb6eaf9c0749 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -171,7 +171,7 @@ import Podcast from '@assets/images/social-podcast.svg';
 import Twitter from '@assets/images/social-twitter.svg';
 import Youtube from '@assets/images/social-youtube.svg';
 import SpreadsheetComputer from '@assets/images/spreadsheet-computer.svg';
-import Star from '@assets/images/Star.svg';
+import Star from '@assets/images/star.svg';
 import Stopwatch from '@assets/images/stopwatch.svg';
 import Suitcase from '@assets/images/suitcase.svg';
 import Sync from '@assets/images/sync.svg';

From 5aed67c12e444e7ac88ebc34b37a615b71579492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 09:31:45 +0200
Subject: [PATCH 066/101] fix tooltip rendering

---
 src/pages/Search/SearchTypeMenu.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 61304c7e5dbb..6ca924e96aa3 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -60,7 +60,8 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
     useEffect(() => {
         setPrevSavedSearchesLength(Object.keys(savedSearches ?? {}).length);
-    }, [savedSearches]);
+    }, []);
+
     const personalDetails = usePersonalDetails();
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const taxRates = getAllTaxRates();

From 6b80a66ec27e837bbad04d29d78707a60467d92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 10:25:48 +0200
Subject: [PATCH 067/101] fix style

---
 src/pages/Search/SearchTypeMenu.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 6ca924e96aa3..14e893c6d185 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,13 +1,13 @@
 import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import type {TextStyle, ViewStyle} from 'react-native';
-import type {MenuItemBaseProps} from '@components/MenuItem';
 import {useOnyx} from 'react-native-onyx';
+import type {MenuItemBaseProps} from '@components/MenuItem';
 import MenuItem from '@components/MenuItem';
 import MenuItemList from '@components/MenuItemList';
 import type {MenuItemWithLink} from '@components/MenuItemList';
-import ScrollView from '@components/ScrollView';
 import {usePersonalDetails} from '@components/OnyxProvider';
+import ScrollView from '@components/ScrollView';
 import type {SearchQueryJSON} from '@components/Search/types';
 import Text from '@components/Text';
 import ThreeDotsMenu from '@components/ThreeDotsMenu';

From fde60a49d0ae42c88d8891b4065c9d19e12f403f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 10:25:57 +0200
Subject: [PATCH 068/101] highlight saved search

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 42 ++++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 8e627ab2aec6..bf9be0a0705a 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -48,6 +48,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
     const {singleExecution} = useSingleExecution();
     const {windowHeight} = useWindowDimensions();
     const {translate} = useLocalize();
+    const {hash} = queryJSON;
     const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
 
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
@@ -61,24 +62,32 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
     };
 
+    const currentSavedSearch = useMemo(
+        () =>
+            savedSearchesMenuItems.find((item) => {
+                return Number(item.hash) === hash;
+            }),
+        [savedSearchesMenuItems, hash],
+    );
+
     const popoverMenuItems = useMemo(() => {
         const items = typeMenuItems.map((item, index) => {
             const isSelected = title ? false : index === activeItemIndex;
 
-        return {
-            text: item.title,
-            onSelected: singleExecution(() => {
-                SearchActions.clearAllFilters();
-                Navigation.navigate(item.route);
-            }),
-            icon: item.icon,
-            iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
-            iconRight: Expensicons.Checkmark,
-            shouldShowRightIcon: isSelected,
-            success: isSelected,
-            containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
-        };
-    });
+            return {
+                text: item.title,
+                onSelected: singleExecution(() => {
+                    SearchActions.clearAllFilters();
+                    Navigation.navigate(item.route);
+                }),
+                icon: item.icon,
+                iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
+                iconRight: Expensicons.Checkmark,
+                shouldShowRightIcon: isSelected,
+                success: isSelected,
+                containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
+            };
+        });
 
         if (title) {
             items.push({
@@ -87,14 +96,14 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
                 icon: Expensicons.Filters,
                 iconFill: theme.iconSuccessFill,
                 success: true,
-                containerStyle: [{backgroundColor: theme.border}],
+                containerStyle: !currentSavedSearch ? [{backgroundColor: theme.border}] : undefined,
                 iconRight: Expensicons.Checkmark,
                 shouldShowRightIcon: false,
             });
         }
 
         return items;
-    }, [typeMenuItems, activeItemIndex, title, theme, singleExecution, closeMenu]);
+    }, [typeMenuItems, activeItemIndex, title, theme, singleExecution, 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]);
@@ -118,6 +127,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
                     }}
                 />
             ),
+            containerStyle: currentSavedSearch?.hash === item.hash ? [{backgroundColor: theme.border}] : undefined,
         }));
 
         if (savedSearchesMenuItems.length > 0) {

From 9a1b74af387f57eb47306adb3a3b449ca20e7a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 11:45:12 +0200
Subject: [PATCH 069/101] add onyx util for save search

---
 src/libs/actions/Search.ts | 61 ++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 3b9ac1fdbf25..a1a4db032707 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -12,6 +12,7 @@ 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 {SaveSearch} from '@src/types/onyx';
 import type {SearchTransaction} from '@src/types/onyx/SearchResults';
 import * as Report from './Report';
 
@@ -23,6 +24,42 @@ Onyx.connect({
     },
 });
 
+function getOnyxSavedSearchData(
+    hash: number,
+    name: string,
+    jsonQuery: string,
+): {
+    optimisticData: OnyxUpdate[];
+    failureData: OnyxUpdate[];
+} {
+    const onyxUpdate: SaveSearch = {
+        [hash]: {
+            name,
+            query: jsonQuery,
+        },
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.SAVED_SEARCHES,
+            value: onyxUpdate,
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.SAVED_SEARCHES,
+            value: {
+                [hash]: null,
+            },
+        },
+    ];
+
+    return {optimisticData, failureData};
+}
+
 function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finallyData: OnyxUpdate[]} {
     const optimisticData: OnyxUpdate[] = [
         {
@@ -51,15 +88,24 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
     return {optimisticData, finallyData};
 }
 
-function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: string}) {
-    const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
+function saveSearch({queryJSON}: {queryJSON: SearchQueryJSON}) {
+    const name = queryJSON?.inputQuery ?? '';
+    const {optimisticData, failureData} = getOnyxSavedSearchData(queryJSON.hash, name, JSON.stringify(queryJSON));
     const jsonQuery = JSON.stringify(queryJSON);
-    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, finallyData});
+    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, failureData});
 }
 
 function deleteSavedSearch(hash: number) {
-    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
-    API.write(WRITE_COMMANDS.DELETE_SAVED_SEARCH, {hash}, {optimisticData, finallyData});
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.SAVED_SEARCHES,
+            value: {
+                [hash]: null,
+            },
+        },
+    ];
+    API.write(WRITE_COMMANDS.DELETE_SAVED_SEARCH, {hash}, {optimisticData});
 }
 
 function search({queryJSON, offset}: {queryJSON: SearchQueryJSON; offset?: number}) {
@@ -156,6 +202,10 @@ function clearAdvancedFilters() {
     Onyx.merge(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values);
 }
 
+function dismissSaveSearchRenameTooltip() {
+    Onyx.merge(ONYXKEYS.NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP, true);
+}
+
 export {
     saveSearch,
     search,
@@ -168,4 +218,5 @@ export {
     clearAllFilters,
     clearAdvancedFilters,
     deleteSavedSearch,
+    dismissSaveSearchRenameTooltip,
 };

From cd927b85dd690d846ac854f787599e4b7d7a0fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 11:45:25 +0200
Subject: [PATCH 070/101] fix onyx type

---
 src/types/onyx/SaveSearch.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/types/onyx/SaveSearch.ts b/src/types/onyx/SaveSearch.ts
index 531084d1ade9..7ff35745c7aa 100644
--- a/src/types/onyx/SaveSearch.ts
+++ b/src/types/onyx/SaveSearch.ts
@@ -1,12 +1,15 @@
 /**
  * Model of saved search
  */
-type SaveSearch = {
-    /** Name of the saved search */
-    name: string;
+type SaveSearch = Record<
+    string,
+    {
+        /** Name of the saved search */
+        name: string;
 
-    /** Query string for the saved search */
-    query: string;
-};
+        /** Query string for the saved search */
+        query: string;
+    }
+>;
 
 export default SaveSearch;

From 377d28907a82df72a3c8d1777baebe8a89affa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 11:46:07 +0200
Subject: [PATCH 071/101] fix dependencies

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index bf9be0a0705a..e78bd1e33529 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -140,7 +140,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
         }
 
         return [...items, ...newItems];
-    }, [popoverMenuItems, savedSearchesMenuItems, styles, showDeleteModal, closeMenu, translate]);
+    }, [popoverMenuItems, savedSearchesMenuItems, styles, showDeleteModal, closeMenu, translate, currentSavedSearch?.hash, theme.border]);
 
     return (
         <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>

From 1bdb6bb3e62d8cd95d0df442970afae87e7e6d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 11:46:53 +0200
Subject: [PATCH 072/101] fix tooltip rendering for renaming a saved search

---
 src/ONYXKEYS.ts                     |  7 ++++--
 src/pages/Search/SearchTypeMenu.tsx | 35 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index f97c7246ff8d..0bc583cfc57b 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -215,6 +215,9 @@ const ONYXKEYS = {
     /** The NVP containing all information related to educational tooltip in workspace chat */
     NVP_WORKSPACE_TOOLTIP: 'workspaceTooltip',
 
+    /** Whether to hide save search rename tooltip */
+    NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP: 'nvp_should_hide_save_search_rename_tooltip',
+
     /**  Whether to hide gbr tooltip */
     NVP_SHOULD_HIDE_GBR_TOOLTIP: 'nvp_should_hide_gbr_tooltip',
 
@@ -842,7 +845,7 @@ type OnyxValuesMapping = {
 
     // ONYXKEYS.NVP_TRYNEWDOT is HybridApp onboarding data
     [ONYXKEYS.NVP_TRYNEWDOT]: OnyxTypes.TryNewDot;
-
+    [ONYXKEYS.SAVED_SEARCHES]: OnyxTypes.SaveSearch;
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
@@ -976,7 +979,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
     [ONYXKEYS.IMPORTED_SPREADSHEET]: OnyxTypes.ImportedSpreadsheet;
     [ONYXKEYS.LAST_ROUTE]: string;
-    [ONYXKEYS.SAVED_SEARCHES]: OnyxTypes.SaveSearch[];
+    [ONYXKEYS.NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP]: boolean;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 14e893c6d185..11f5349a161c 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {TextStyle, ViewStyle} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
@@ -55,12 +55,8 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     const {singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES);
+    const [shouldHideSaveSearchRenameTooltip] = useOnyx(ONYXKEYS.NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP, {initialValue: true});
     const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
-    const [prevSavedSearchesLength, setPrevSavedSearchesLength] = useState(0);
-
-    useEffect(() => {
-        setPrevSavedSearchesLength(Object.keys(savedSearches ?? {}).length);
-    }, []);
 
     const personalDetails = usePersonalDetails();
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
@@ -127,7 +123,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
             if (!isNarrow) {
                 return {
                     ...baseMenuItem,
-                    shouldRenderTooltip: Object.keys(savedSearches ?? {}).length === 1 && prevSavedSearchesLength === 0,
+                    shouldRenderTooltip: !shouldHideSaveSearchRenameTooltip,
                     tooltipAnchorAlignment: {
                         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
@@ -135,22 +131,25 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     tooltipShiftHorizontal: -32,
                     tooltipShiftVertical: 15,
                     tooltipWrapperStyle: [styles.bgPaleGreen, styles.mh4, styles.pv2],
-                    renderTooltipContent: () => (
-                        <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                            <Expensicons.Lightbulb
-                                width={16}
-                                height={16}
-                                fill={styles.colorGreenSuccess.color}
-                            />
-                            <Text style={[styles.ml1, styles.textLabel]}>{translate('search.saveSearchTooltipText')}</Text>
-                        </View>
-                    ),
+                    renderTooltipContent: () => {
+                        SearchActions.dismissSaveSearchRenameTooltip();
+                        return (
+                            <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                                <Expensicons.Lightbulb
+                                    width={16}
+                                    height={16}
+                                    fill={styles.colorGreenSuccess.color}
+                                />
+                                <Text style={[styles.ml1, styles.textLabel]}>{translate('search.saveSearchTooltipText')}</Text>
+                            </View>
+                        );
+                    },
                 };
             }
 
             return baseMenuItem;
         },
-        [hash, savedSearches, styles, getOverflowMenu, prevSavedSearchesLength, translate],
+        [hash, styles, getOverflowMenu, translate, shouldHideSaveSearchRenameTooltip],
     );
 
     const savedSearchesMenuItems = () => {

From 0160485bc915c1985980d8dee5d751c118831193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 11:55:54 +0200
Subject: [PATCH 073/101] fix type check

---
 src/libs/actions/Search.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index a1a4db032707..55d6e0b38aad 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -88,11 +88,11 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
     return {optimisticData, finallyData};
 }
 
-function saveSearch({queryJSON}: {queryJSON: SearchQueryJSON}) {
-    const name = queryJSON?.inputQuery ?? '';
-    const {optimisticData, failureData} = getOnyxSavedSearchData(queryJSON.hash, name, JSON.stringify(queryJSON));
+function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: string}) {
+    const saveSearchName = name ?? queryJSON?.inputQuery ?? '';
+    const {optimisticData, failureData} = getOnyxSavedSearchData(queryJSON.hash, saveSearchName, JSON.stringify(queryJSON));
     const jsonQuery = JSON.stringify(queryJSON);
-    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name}, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name: saveSearchName}, {optimisticData, failureData});
 }
 
 function deleteSavedSearch(hash: number) {

From de41f4c52919cf77e3d6430691f49f7c6bc4f4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 13:49:41 +0200
Subject: [PATCH 074/101] fix react compiler error

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 67 ++++++++++-------------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index e78bd1e33529..ccc76d28c667 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -62,13 +62,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
     };
 
-    const currentSavedSearch = useMemo(
-        () =>
-            savedSearchesMenuItems.find((item) => {
-                return Number(item.hash) === hash;
-            }),
-        [savedSearchesMenuItems, hash],
-    );
+    const currentSavedSearch = savedSearchesMenuItems.find((item) => Number(item.hash) === hash);
 
     const popoverMenuItems = useMemo(() => {
         const items = typeMenuItems.map((item, index) => {
@@ -109,38 +103,35 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
     const menuTitle = useMemo(() => title ?? popoverMenuItems[activeItemIndex]?.text, [activeItemIndex, popoverMenuItems, title]);
     const titleViewStyles = useMemo(() => (title ? {...styles.flex1, ...styles.justifyContentCenter} : {}), [title, styles]);
 
-    const allMenuItems = useMemo(() => {
-        const items = [...popoverMenuItems];
-        const newItems = [];
-        const savedSearchItems = savedSearchesMenuItems.map((item: SavedSearchMenuItem) => ({
-            text: item.title ?? '',
-            styles: [styles.textSupporting],
-            onSelected: item.onPress,
-            shouldShowRightComponent: true,
-            rightComponent: (
-                <ThreeDotsMenu
-                    menuItems={SearchUtils.getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), item.query ?? '', showDeleteModal, true, closeMenu)}
-                    anchorPosition={{horizontal: 0, vertical: 380}}
-                    anchorAlignment={{
-                        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
-                    }}
-                />
-            ),
-            containerStyle: currentSavedSearch?.hash === item.hash ? [{backgroundColor: theme.border}] : undefined,
-        }));
-
-        if (savedSearchesMenuItems.length > 0) {
-            newItems.push({
-                text: translate('search.savedSearchesMenuItemTitle'),
-                styles: [styles.textSupporting],
-                disabled: true,
-            });
-            newItems.push(...savedSearchItems);
-        }
+    const savedSearchItems = savedSearchesMenuItems.map((item) => ({
+        text: item.title ?? '',
+        styles: [styles.textSupporting],
+        onSelected: item.onPress,
+        shouldShowRightComponent: true,
+        rightComponent: (
+            <ThreeDotsMenu
+                menuItems={SearchUtils.getOverflowMenu(item.title ?? '', Number(item.hash ?? ''), item.query ?? '', showDeleteModal, true, closeMenu)}
+                anchorPosition={{horizontal: 0, vertical: 380}}
+                anchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+                }}
+            />
+        ),
+        containerStyle: currentSavedSearch?.hash === item.hash ? [{backgroundColor: theme.border}] : undefined,
+    }));
+
+    const allMenuItems = [];
+    allMenuItems.push(...popoverMenuItems);
 
-        return [...items, ...newItems];
-    }, [popoverMenuItems, savedSearchesMenuItems, styles, showDeleteModal, closeMenu, translate, currentSavedSearch?.hash, theme.border]);
+    if (savedSearchesMenuItems.length > 0) {
+        allMenuItems.push({
+            text: translate('search.savedSearchesMenuItemTitle'),
+            styles: [styles.textSupporting],
+            disabled: true,
+        });
+        allMenuItems.push(...savedSearchItems);
+    }
 
     return (
         <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>

From a6a973e1e754d8b67e4674ae9afee3f319f782d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 13:57:27 +0200
Subject: [PATCH 075/101] fix icon

---
 src/components/Icon/Expensicons.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index bb6eaf9c0749..6034a6026601 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -171,7 +171,7 @@ import Podcast from '@assets/images/social-podcast.svg';
 import Twitter from '@assets/images/social-twitter.svg';
 import Youtube from '@assets/images/social-youtube.svg';
 import SpreadsheetComputer from '@assets/images/spreadsheet-computer.svg';
-import Star from '@assets/images/star.svg';
+import Star from '@assets/images/Star.svg';
 import Stopwatch from '@assets/images/stopwatch.svg';
 import Suitcase from '@assets/images/suitcase.svg';
 import Sync from '@assets/images/sync.svg';

From 7767de68214c13ed6bb08e0f1eb1cc1a49bed79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 14:07:44 +0200
Subject: [PATCH 076/101] remove doublon icon

---
 assets/images/star.svg | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 assets/images/star.svg

diff --git a/assets/images/star.svg b/assets/images/star.svg
deleted file mode 100644
index bcce04a7542d..000000000000
--- a/assets/images/star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m11.458 2.9418 1.2135 2.5604c0.2355 0.49948 0.6931 0.84491 1.2224 0.92427l2.714 0.41078c1.3324 0.20073 1.864 1.9046 0.8995 2.8825l-1.9649 1.9933c-0.3835 0.3874-0.5563 0.9476-0.4665 1.4961l0.4643 2.8125c0.2265 1.3794-1.1641 2.432-2.3552 1.7808l-2.4291-1.328c-0.4733-0.2591-1.0385-0.2591-1.5118 0l-2.4291 1.328c-1.191 0.6512-2.5839-0.4014-2.3551-1.7808l0.46429-2.8125c0.08972-0.5485-0.08523-1.1063-0.46653-1.4961l-1.9649-1.9933c-0.96449-0.97795-0.4329-2.6818 0.89944-2.8825l2.714-0.41078c0.52935-0.07936 0.98694-0.42479 1.2224-0.92427l1.2134-2.5604c0.59663-1.2557 2.317-1.2557 2.9114 0h0.0045z"/></svg>

From 0da08e943807cd5fd76acaa620b553509dc738a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 14:32:58 +0200
Subject: [PATCH 077/101] fix type check

---
 src/libs/actions/Search.ts          | 10 +++-------
 src/pages/Search/SearchTypeMenu.tsx |  7 ++++---
 src/types/onyx/SaveSearch.ts        | 24 +++++++++++++-----------
 src/types/onyx/index.ts             |  2 +-
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 55d6e0b38aad..fb8d531fd093 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -43,7 +43,7 @@ function getOnyxSavedSearchData(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SAVED_SEARCHES,
-            value: onyxUpdate,
+            value: [onyxUpdate],
         },
     ];
 
@@ -51,9 +51,7 @@ function getOnyxSavedSearchData(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SAVED_SEARCHES,
-            value: {
-                [hash]: null,
-            },
+            value: [{[hash]: null}],
         },
     ];
 
@@ -100,9 +98,7 @@ function deleteSavedSearch(hash: number) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SAVED_SEARCHES,
-            value: {
-                [hash]: null,
-            },
+            value: [{[hash]: null}],
         },
     ];
     API.write(WRITE_COMMANDS.DELETE_SAVED_SEARCH, {hash}, {optimisticData});
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 11f5349a161c..f9ef89eb0b8a 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -26,9 +26,10 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
+import type {SaveSearchItem} from '@src/types/onyx/SaveSearch';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
-import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
+import type SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
 
 type SavedSearchMenuItem = MenuItemBaseProps & {
     key: string;
@@ -96,7 +97,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     );
 
     const createSavedSearchMenuItem = useCallback(
-        (item: {name: string; query: string}, key: string, isNarrow: boolean) => {
+        (item: SaveSearchItem, key: string, isNarrow: boolean) => {
             const baseMenuItem: SavedSearchMenuItem = {
                 key: item.name,
                 title: item.name,
@@ -156,7 +157,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         if (!savedSearches) {
             return [];
         }
-        return Object.entries(savedSearches).map(([key, item]) => createSavedSearchMenuItem(item, key, shouldUseNarrowLayout));
+        return Object.entries(savedSearches).map(([key, item]) => createSavedSearchMenuItem(item as SaveSearchItem, key, shouldUseNarrowLayout));
     };
 
     const renderSavedSearchesSection = useCallback(
diff --git a/src/types/onyx/SaveSearch.ts b/src/types/onyx/SaveSearch.ts
index 7ff35745c7aa..d8f8bf32f2a1 100644
--- a/src/types/onyx/SaveSearch.ts
+++ b/src/types/onyx/SaveSearch.ts
@@ -1,15 +1,17 @@
 /**
- * Model of saved search
+ * Model of a single saved search
  */
-type SaveSearch = Record<
-    string,
-    {
-        /** Name of the saved search */
-        name: string;
+type SaveSearchItem = {
+    /** Name of the saved search */
+    name: string;
 
-        /** Query string for the saved search */
-        query: string;
-    }
->;
+    /** Query string for the saved search */
+    query: string;
+};
 
-export default SaveSearch;
+/**
+ * Model of saved searches
+ */
+type SaveSearch = Record<number, SaveSearchItem | null>;
+
+export type {SaveSearch, SaveSearchItem};
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 348fe17449e0..c7c264a3da15 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -81,7 +81,7 @@ import type ReportViolations from './ReportViolation';
 import type Request from './Request';
 import type Response from './Response';
 import type ReviewDuplicates from './ReviewDuplicates';
-import type SaveSearch from './SaveSearch';
+import type {SaveSearch} from './SaveSearch';
 import type ScreenShareRequest from './ScreenShareRequest';
 import type SearchResults from './SearchResults';
 import type SecurityGroup from './SecurityGroup';

From f452a9c36179c5c51edf631671d74753bca1b617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 14:38:58 +0200
Subject: [PATCH 078/101] fix typo

---
 src/pages/Search/SearchTypeMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index f9ef89eb0b8a..2ad330aa3592 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -29,7 +29,7 @@ import ROUTES from '@src/ROUTES';
 import type {SaveSearchItem} from '@src/types/onyx/SaveSearch';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
-import type SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
+import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
 
 type SavedSearchMenuItem = MenuItemBaseProps & {
     key: string;

From 938133be54a912d516096f72dd83eca9f28c1639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 15:56:35 +0200
Subject: [PATCH 079/101] fix delete modal not showing on iOS

---
 src/components/PopoverMenu.tsx | 16 +++++++++++++---
 src/libs/SearchUtils.ts        |  2 ++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index c8d849c3832a..177ed70f65a6 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -42,6 +42,9 @@ type PopoverMenuItem = MenuItemProps & {
      *  It is meant to be used in situations where, after clicking on the modal, another one is opened.
      */
     shouldCallAfterModalHide?: boolean;
+
+    /** Whether to close all modals */
+    shouldCloseAllModals?: boolean;    
 };
 
 type PopoverModalProps = Pick<ModalProps, 'animationIn' | 'animationOut' | 'animationInTiming'>;
@@ -97,6 +100,9 @@ type PopoverMenuProps = Partial<PopoverModalProps> & {
 
     /** Whether to show the selected option checkmark */
     shouldShowSelectedItemCheck?: boolean;
+
+     /** Should close all modals */
+    shouldCloseAllModals?: boolean;
 };
 
 function PopoverMenu({
@@ -142,9 +148,13 @@ function PopoverMenu({
             setFocusedIndex(selectedSubMenuItemIndex);
         } else if (selectedItem.shouldCallAfterModalHide && !Browser.isSafari()) {
             onItemSelected(selectedItem, index);
-            Modal.close(() => {
-                selectedItem.onSelected?.();
-            });
+            Modal.close(
+                () => {
+                    selectedItem.onSelected?.();
+                },
+                undefined,
+                selectedItem.shouldCloseAllModals,
+            );
         } else {
             onItemSelected(selectedItem, index);
             selectedItem.onSelected?.();
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 368f285153c9..0d4c40abed2e 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -785,6 +785,8 @@ function getOverflowMenu(itemName: string, hash: number, inputQuery: string, sho
             icon: Expensicons.Trashcan,
             shouldShowRightIcon: false,
             shouldShowRightComponent: false,
+            shouldCallAfterModalHide: true,
+            shouldCloseAllModals: true,            
         },
     ];
 }

From a6b791eae0f2e1f87efaaeefff40c3def2fd24fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 16:35:24 +0200
Subject: [PATCH 080/101] fix lint

---
 src/components/PopoverMenu.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index 177ed70f65a6..ac40c84ea2d3 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -44,7 +44,7 @@ type PopoverMenuItem = MenuItemProps & {
     shouldCallAfterModalHide?: boolean;
 
     /** Whether to close all modals */
-    shouldCloseAllModals?: boolean;    
+    shouldCloseAllModals?: boolean;
 };
 
 type PopoverModalProps = Pick<ModalProps, 'animationIn' | 'animationOut' | 'animationInTiming'>;
@@ -100,9 +100,6 @@ type PopoverMenuProps = Partial<PopoverModalProps> & {
 
     /** Whether to show the selected option checkmark */
     shouldShowSelectedItemCheck?: boolean;
-
-     /** Should close all modals */
-    shouldCloseAllModals?: boolean;
 };
 
 function PopoverMenu({

From 215bb66138ec30a7f8debf9c5b9002ac1b8153fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Thu, 12 Sep 2024 16:35:36 +0200
Subject: [PATCH 081/101] fix style

---
 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 0d4c40abed2e..24872b5d90eb 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -786,7 +786,7 @@ function getOverflowMenu(itemName: string, hash: number, inputQuery: string, sho
             shouldShowRightIcon: false,
             shouldShowRightComponent: false,
             shouldCallAfterModalHide: true,
-            shouldCloseAllModals: true,            
+            shouldCloseAllModals: true,
         },
     ];
 }

From 0fc109867557eabf2e3027d1373dc335a22bc090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 08:18:44 +0200
Subject: [PATCH 082/101] fix prettier

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 781af215e341..1021bde74051 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -68,28 +68,28 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
         const items = typeMenuItems.map((item, index) => {
             const isSelected = title ? false : index === activeItemIndex;
 
-        return {
-            text: item.title,
-            onSelected: singleExecution(() => {
-                SearchActions.clearAllFilters();
-                Navigation.navigate(item.route);
-            }),
-            isSelected,
-            icon: item.icon,
-            iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
-            iconRight: Expensicons.Checkmark,
-            shouldShowRightIcon: isSelected,
-            success: isSelected,
-            containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
-        };
-    });
+            return {
+                text: item.title,
+                onSelected: singleExecution(() => {
+                    SearchActions.clearAllFilters();
+                    Navigation.navigate(item.route);
+                }),
+                isSelected,
+                icon: item.icon,
+                iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
+                iconRight: Expensicons.Checkmark,
+                shouldShowRightIcon: isSelected,
+                success: isSelected,
+                containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
+            };
+        });
 
         if (title) {
             items.push({
                 text: title,
                 onSelected: closeMenu,
                 isSelected: true,
-            icon: Expensicons.Filters,
+                icon: Expensicons.Filters,
                 iconFill: theme.iconSuccessFill,
                 success: true,
                 containerStyle: !currentSavedSearch ? [{backgroundColor: theme.border}] : undefined,

From 5351e5a5aa993dbfefbc9696dfd6ad557cf16f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 09:14:36 +0200
Subject: [PATCH 083/101] fix saved searches display

---
 src/pages/Search/SearchTypeMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 2ad330aa3592..432bb3d1c8e5 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -222,7 +222,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            <ScrollView>{savedSearches && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
+            <ScrollView>{savedSearches && savedSearches.length > 0 && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
             <DeleteConfirmModal />
         </>
     );

From f897ab40966ca3f3b5460be3f3c958549b06c8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 09:15:18 +0200
Subject: [PATCH 084/101] remove onyx code for saved searches (will be done in
 polish phase)

---
 src/libs/actions/Search.ts | 48 +++-----------------------------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index fb8d531fd093..c13e9238e320 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -12,7 +12,6 @@ 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 {SaveSearch} from '@src/types/onyx';
 import type {SearchTransaction} from '@src/types/onyx/SearchResults';
 import * as Report from './Report';
 
@@ -24,40 +23,6 @@ Onyx.connect({
     },
 });
 
-function getOnyxSavedSearchData(
-    hash: number,
-    name: string,
-    jsonQuery: string,
-): {
-    optimisticData: OnyxUpdate[];
-    failureData: OnyxUpdate[];
-} {
-    const onyxUpdate: SaveSearch = {
-        [hash]: {
-            name,
-            query: jsonQuery,
-        },
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.SAVED_SEARCHES,
-            value: [onyxUpdate],
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.SAVED_SEARCHES,
-            value: [{[hash]: null}],
-        },
-    ];
-
-    return {optimisticData, failureData};
-}
-
 function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finallyData: OnyxUpdate[]} {
     const optimisticData: OnyxUpdate[] = [
         {
@@ -88,20 +53,13 @@ function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finall
 
 function saveSearch({queryJSON, name}: {queryJSON: SearchQueryJSON; name?: string}) {
     const saveSearchName = name ?? queryJSON?.inputQuery ?? '';
-    const {optimisticData, failureData} = getOnyxSavedSearchData(queryJSON.hash, saveSearchName, JSON.stringify(queryJSON));
     const jsonQuery = JSON.stringify(queryJSON);
-    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name: saveSearchName}, {optimisticData, failureData});
+
+    API.write(WRITE_COMMANDS.SAVE_SEARCH, {jsonQuery, name: saveSearchName});
 }
 
 function deleteSavedSearch(hash: number) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.SAVED_SEARCHES,
-            value: [{[hash]: null}],
-        },
-    ];
-    API.write(WRITE_COMMANDS.DELETE_SAVED_SEARCH, {hash}, {optimisticData});
+    API.write(WRITE_COMMANDS.DELETE_SAVED_SEARCH, {hash});
 }
 
 function search({queryJSON, offset}: {queryJSON: SearchQueryJSON; offset?: number}) {

From 36936b67e44c6525fadc3c1832942a46cc5b5b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 10:52:49 +0200
Subject: [PATCH 085/101] fix condition

---
 src/pages/Search/SearchTypeMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 432bb3d1c8e5..bbab18525bdf 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -222,7 +222,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            <ScrollView>{savedSearches && savedSearches.length > 0 && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
+            <ScrollView>{savedSearches && Object.keys(savedSearches).length > 0 && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
             <DeleteConfirmModal />
         </>
     );

From c04e7a1f2e4b0d04c935aafd8cf44c10b7a7ce0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 13:55:08 +0200
Subject: [PATCH 086/101] make the popover menu scrollable

---
 src/components/PopoverMenu.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index ac40c84ea2d3..9b8fb9459744 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -1,7 +1,7 @@
 import lodashIsEqual from 'lodash/isEqual';
 import type {RefObject} from 'react';
 import React, {useLayoutEffect, useState} from 'react';
-import {StyleSheet, View} from 'react-native';
+import {ScrollView, StyleSheet, View} from 'react-native';
 import type {ModalProps} from 'react-native-modal';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
@@ -254,7 +254,7 @@ function PopoverMenu({
             restoreFocusType={restoreFocusType}
         >
             <FocusTrapForModal active={isVisible}>
-                <View style={isSmallScreenWidth ? {} : styles.createMenuContainer}>
+                <ScrollView style={isSmallScreenWidth ? {} : styles.createMenuContainer}>
                     {renderHeaderText()}
                     {enteredSubMenuIndexes.length > 0 && renderBackButtonItem()}
                     {currentMenuItems.map((item, menuIndex) => (
@@ -302,7 +302,7 @@ function PopoverMenu({
                             badgeText={item.badgeText}
                         />
                     ))}
-                </View>
+                </ScrollView>
             </FocusTrapForModal>
         </PopoverWithMeasuredContent>
     );

From 4acd1cc269e4586bed3e4afec447ddaa7dd1b0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 13:55:36 +0200
Subject: [PATCH 087/101] fix item highlight with saved search

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index 1021bde74051..f0d2157202ef 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -88,11 +88,11 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
             items.push({
                 text: title,
                 onSelected: closeMenu,
-                isSelected: true,
+                isSelected: !currentSavedSearch,
                 icon: Expensicons.Filters,
                 iconFill: theme.iconSuccessFill,
                 success: true,
-                containerStyle: !currentSavedSearch ? [{backgroundColor: theme.border}] : undefined,
+                containerStyle: undefined,
                 iconRight: Expensicons.Checkmark,
                 shouldShowRightIcon: false,
             });
@@ -120,7 +120,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
                 }}
             />
         ),
-        containerStyle: currentSavedSearch?.hash === item.hash ? [{backgroundColor: theme.border}] : undefined,
+        isSelected: currentSavedSearch?.hash === item.hash
     }));
 
     const allMenuItems = [];

From 6e91abdfafa4e7d7def160e13afa3742df7a0b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 13:55:46 +0200
Subject: [PATCH 088/101] hide save search if no filters

---
 src/pages/Search/AdvancedSearchFilters.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 4af2d1c5852e..2c6fbcd731fd 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -227,6 +227,7 @@ function AdvancedSearchFilters() {
     const personalDetails = usePersonalDetails();
     const currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
 
+    const CANNED_SEARCH_QUERY = 'type:expense status:all';
     const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterValues(searchAdvancedFilters), [searchAdvancedFilters]);
 
     const applyFiltersAndNavigate = () => {
@@ -310,7 +311,7 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
-            {queryString && (
+            {queryString !== CANNED_SEARCH_QUERY && (
                 <Button
                     text={translate('search.saveSearch')}
                     onPress={onSaveSearch}

From a157b368453bbdb888f0d93523c6363e287897a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 13:56:36 +0200
Subject: [PATCH 089/101] fix style

---
 src/pages/Search/SearchTypeMenuNarrow.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
index f0d2157202ef..0158a15bfc41 100644
--- a/src/pages/Search/SearchTypeMenuNarrow.tsx
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -120,7 +120,7 @@ function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, queryJSON, title,
                 }}
             />
         ),
-        isSelected: currentSavedSearch?.hash === item.hash
+        isSelected: currentSavedSearch?.hash === item.hash,
     }));
 
     const allMenuItems = [];

From 2170426deb8e49c989ef9b54284cb692f01af681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 14:18:34 +0200
Subject: [PATCH 090/101] reset filters when clicking on saved search

---
 src/pages/Search/SearchTypeMenu.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index bbab18525bdf..bf1ba2c18608 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -106,6 +106,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                 shouldShowRightComponent: true,
                 focused: Number(key) === hash,
                 onPress: () => {
+                    SearchActions.clearAllFilters();
                     Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query ?? ''}));
                 },
                 rightComponent: (

From 77488c19c1c5d9634734bf4bc7ff439430f5d62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 14:27:56 +0200
Subject: [PATCH 091/101] fix console warning

---
 src/pages/Search/SearchTypeMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index bf1ba2c18608..f9917546f3ec 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -99,7 +99,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     const createSavedSearchMenuItem = useCallback(
         (item: SaveSearchItem, key: string, isNarrow: boolean) => {
             const baseMenuItem: SavedSearchMenuItem = {
-                key: item.name,
+                key: key,
                 title: item.name,
                 hash: key,
                 query: item.query,

From a3f2b23d61501adcb5e6b8a95cc09618260ad9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 14:48:22 +0200
Subject: [PATCH 092/101] fix lint

---
 src/components/PopoverMenu.tsx      | 4 +++-
 src/pages/Search/SearchTypeMenu.tsx | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index 9b8fb9459744..f20d77d1f6c4 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -1,7 +1,8 @@
 import lodashIsEqual from 'lodash/isEqual';
 import type {RefObject} from 'react';
 import React, {useLayoutEffect, useState} from 'react';
-import {ScrollView, StyleSheet, View} from 'react-native';
+import {StyleSheet} from 'react-native';
+import type {View} from 'react-native';
 import type {ModalProps} from 'react-native-modal';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
@@ -20,6 +21,7 @@ import type {MenuItemProps} from './MenuItem';
 import MenuItem from './MenuItem';
 import type BaseModalProps from './Modal/types';
 import PopoverWithMeasuredContent from './PopoverWithMeasuredContent';
+import ScrollView from './ScrollView';
 import Text from './Text';
 
 type PopoverMenuItem = MenuItemProps & {
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index f9917546f3ec..6b3c88717fd6 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -99,7 +99,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     const createSavedSearchMenuItem = useCallback(
         (item: SaveSearchItem, key: string, isNarrow: boolean) => {
             const baseMenuItem: SavedSearchMenuItem = {
-                key: key,
+                key,
                 title: item.name,
                 hash: key,
                 query: item.query,

From 02318862caf466e5e2cbe31e4cfdc5985e73eb20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 21:30:58 +0200
Subject: [PATCH 093/101] proper naming for onyx key

---
 src/ONYXKEYS.ts                     | 6 +++---
 src/libs/actions/Search.ts          | 2 +-
 src/pages/Search/SearchTypeMenu.tsx | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 979e6b1e44f8..149ca686afb1 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -216,8 +216,8 @@ const ONYXKEYS = {
     NVP_WORKSPACE_TOOLTIP: 'workspaceTooltip',
 
     /** Whether to hide save search rename tooltip */
-    NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP: 'nvp_should_hide_save_search_rename_tooltip',
-
+    NVP_SHOULD_HIDE_SAVED_SEARCH_RENAME_TOOLTIP: 'nvp_should_hide_saved_search_rename_tooltip',
+    
     /**  Whether to hide gbr tooltip */
     NVP_SHOULD_HIDE_GBR_TOOLTIP: 'nvp_should_hide_gbr_tooltip',
 
@@ -983,7 +983,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
     [ONYXKEYS.IMPORTED_SPREADSHEET]: OnyxTypes.ImportedSpreadsheet;
     [ONYXKEYS.LAST_ROUTE]: string;
-    [ONYXKEYS.NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP]: boolean;
+    [ONYXKEYS.NVP_SHOULD_HIDE_SAVED_SEARCH_RENAME_TOOLTIP]: boolean;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index c13e9238e320..8b6ed0a81af3 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -157,7 +157,7 @@ function clearAdvancedFilters() {
 }
 
 function dismissSaveSearchRenameTooltip() {
-    Onyx.merge(ONYXKEYS.NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP, true);
+    Onyx.merge(ONYXKEYS.NVP_SHOULD_HIDE_SAVED_SEARCH_RENAME_TOOLTIP, true);
 }
 
 export {
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 6b3c88717fd6..4f4d6c178325 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -56,7 +56,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     const {singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES);
-    const [shouldHideSaveSearchRenameTooltip] = useOnyx(ONYXKEYS.NVP_SHOULD_HIDE_SAVE_SEARCH_RENAME_TOOLTIP, {initialValue: true});
+    const [shouldHideSavedSearchRenameTooltip] = useOnyx(ONYXKEYS.NVP_SHOULD_HIDE_SAVED_SEARCH_RENAME_TOOLTIP, {initialValue: true});
     const {showDeleteModal, DeleteConfirmModal} = useDeleteSavedSearch();
 
     const personalDetails = usePersonalDetails();
@@ -125,7 +125,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
             if (!isNarrow) {
                 return {
                     ...baseMenuItem,
-                    shouldRenderTooltip: !shouldHideSaveSearchRenameTooltip,
+                    shouldRenderTooltip: !shouldHideSavedSearchRenameTooltip,
                     tooltipAnchorAlignment: {
                         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
@@ -151,7 +151,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
             return baseMenuItem;
         },
-        [hash, styles, getOverflowMenu, translate, shouldHideSaveSearchRenameTooltip],
+        [hash, styles, getOverflowMenu, translate, shouldHideSavedSearchRenameTooltip],
     );
 
     const savedSearchesMenuItems = () => {

From 30d7a1d504f06b5ef4d8400681f0244a025254ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 21:32:30 +0200
Subject: [PATCH 094/101] use translation

---
 .../AppNavigator/createCustomBottomTabNavigator/TopBar.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
index bc59419cd3ea..f4728a80f2ca 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
@@ -70,7 +70,7 @@ function TopBar({breadcrumbLabel, activeWorkspaceID, shouldDisplaySearch = true,
                             Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
                         }}
                     >
-                        <Text style={[styles.textBlue]}>Cancel</Text>
+                        <Text style={[styles.textBlue]}>{translate('common.cancel')}</Text>
                     </PressableWithoutFeedback>
                 )}
                 {displaySearch && (

From fa5a70fb746182269fc19e86df6731df67ca23b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 21:33:28 +0200
Subject: [PATCH 095/101] use proper naming

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

diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 8b6ed0a81af3..a4f0e59ef976 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -156,7 +156,7 @@ function clearAdvancedFilters() {
     Onyx.merge(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values);
 }
 
-function dismissSaveSearchRenameTooltip() {
+function dismissSavedSearchRenameTooltip() {
     Onyx.merge(ONYXKEYS.NVP_SHOULD_HIDE_SAVED_SEARCH_RENAME_TOOLTIP, true);
 }
 
@@ -172,5 +172,5 @@ export {
     clearAllFilters,
     clearAdvancedFilters,
     deleteSavedSearch,
-    dismissSaveSearchRenameTooltip,
+    dismissSavedSearchRenameTooltip,
 };
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 4f4d6c178325..427b7df2fe19 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -134,7 +134,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     tooltipShiftVertical: 15,
                     tooltipWrapperStyle: [styles.bgPaleGreen, styles.mh4, styles.pv2],
                     renderTooltipContent: () => {
-                        SearchActions.dismissSaveSearchRenameTooltip();
+                        SearchActions.dismissSavedSearchRenameTooltip();
                         return (
                             <View style={[styles.flexRow, styles.alignItemsCenter]}>
                                 <Expensicons.Lightbulb

From 393664fbfe7e163d2799f1f6a5ec1843c8f1006d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 21:56:51 +0200
Subject: [PATCH 096/101] fix style

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

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 149ca686afb1..97a03b1aafd4 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -217,7 +217,7 @@ const ONYXKEYS = {
 
     /** Whether to hide save search rename tooltip */
     NVP_SHOULD_HIDE_SAVED_SEARCH_RENAME_TOOLTIP: 'nvp_should_hide_saved_search_rename_tooltip',
-    
+
     /**  Whether to hide gbr tooltip */
     NVP_SHOULD_HIDE_GBR_TOOLTIP: 'nvp_should_hide_gbr_tooltip',
 

From 8b4f4e089ce1f39a32532f3c5b024ffb3bc69f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 22:18:20 +0200
Subject: [PATCH 097/101] fix default queryJSON

---
 src/pages/Search/SavedSearchRenamePage.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/Search/SavedSearchRenamePage.tsx b/src/pages/Search/SavedSearchRenamePage.tsx
index 955c7a0cff50..0460ecae5317 100644
--- a/src/pages/Search/SavedSearchRenamePage.tsx
+++ b/src/pages/Search/SavedSearchRenamePage.tsx
@@ -3,6 +3,7 @@ import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
+import type {SearchQueryJSON} from '@components/Search/types';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -30,10 +31,7 @@ function SavedSearchRenamePage({route}: {route: {params: {q: string; name: strin
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(q || SearchUtils.buildCannedSearchQuery());
-        if (!queryJSON) {
-            return;
-        }
+        const queryJSON = SearchUtils.buildSearchQueryJSON(q || SearchUtils.buildCannedSearchQuery()) ?? ({} as SearchQueryJSON);
 
         SearchActions.saveSearch({
             queryJSON,

From 2dc08e931bb58a72ab4d09e74165fe9be0c002a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 22:18:42 +0200
Subject: [PATCH 098/101] improve code

---
 src/pages/Search/AdvancedSearchFilters.tsx | 14 +++++---------
 src/pages/Search/SearchPageBottomTab.tsx   |  7 +++----
 src/pages/Search/SearchTypeMenu.tsx        |  8 ++++++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 2c6fbcd731fd..fa59495d2c8f 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} from '@components/Search/types';
+import type {AdvancedFiltersKeys, SearchQueryJSON} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -227,8 +227,8 @@ function AdvancedSearchFilters() {
     const personalDetails = usePersonalDetails();
     const currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
 
-    const CANNED_SEARCH_QUERY = 'type:expense status:all';
-    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterValues(searchAdvancedFilters), [searchAdvancedFilters]);
+    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterValues(searchAdvancedFilters) || '', [searchAdvancedFilters]);
+    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery()) ?? ({} as SearchQueryJSON), [queryString]);
 
     const applyFiltersAndNavigate = () => {
         SearchActions.clearAllFilters();
@@ -241,11 +241,6 @@ function AdvancedSearchFilters() {
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery());
-        if (!queryJSON) {
-            return;
-        }
-
         SearchActions.saveSearch({
             queryJSON,
         });
@@ -311,7 +306,8 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
-            {queryString !== CANNED_SEARCH_QUERY && (
+
+            {!SearchUtils.isCannedSearchQuery(queryJSON) && (
                 <Button
                     text={translate('search.saveSearch')}
                     onPress={onSaveSearch}
diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 1448f1bb628c..5c19a39a6fa6 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -14,6 +14,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as SearchUtils from '@libs/SearchUtils';
 import TopBar from '@navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
@@ -27,8 +28,6 @@ function SearchPageBottomTab() {
     const {clearSelectedTransactions} = useSearchContext();
     const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
 
-    const EXPENSE_FILTERS_TYPE = 'expense';
-
     const {queryJSON, policyID, isExpenseFilterPage} = useMemo(() => {
         if (activeCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE) {
             return {queryJSON: undefined, policyID: undefined, isExpenseFilterPage: undefined};
@@ -39,7 +38,7 @@ function SearchPageBottomTab() {
         return {
             queryJSON: parsedQuery,
             policyID: parsedQuery && SearchUtils.getPolicyIDFromSearchQuery(parsedQuery),
-            isExpenseFilterPage: parsedQuery?.type === EXPENSE_FILTERS_TYPE,
+            isExpenseFilterPage: parsedQuery?.type === CONST.SEARCH.DATA_TYPES.EXPENSE,
         };
     }, [activeCentralPaneRoute]);
 
@@ -62,7 +61,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={shouldUseNarrowLayout && isExpenseFilterPage && queryJSON?.inputQuery !== SearchUtils.buildCannedSearchQuery()}
+                            isCustomSearchQuery={shouldUseNarrowLayout && isExpenseFilterPage && !SearchUtils.isCannedSearchQuery(queryJSON)}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 427b7df2fe19..ce6068fdeb53 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -223,8 +223,12 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            <ScrollView>{savedSearches && Object.keys(savedSearches).length > 0 && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
-            <DeleteConfirmModal />
+            {savedSearches && Object.keys(savedSearches).length > 0 && (
+                <>
+                    <ScrollView>{renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
+                    <DeleteConfirmModal />
+                </>
+            )}
         </>
     );
 }

From 0b2b8f0e690a0a773535cdff69a23d152ba28b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 22:45:19 +0200
Subject: [PATCH 099/101] fix react compiler

---
 src/pages/Search/SearchPageBottomTab.tsx | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 5c19a39a6fa6..a797fdfb70c1 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react';
+import React from 'react';
 import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -27,20 +27,12 @@ function SearchPageBottomTab() {
     const styles = useThemeStyles();
     const {clearSelectedTransactions} = useSearchContext();
     const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
-
-    const {queryJSON, policyID, isExpenseFilterPage} = useMemo(() => {
-        if (activeCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE) {
-            return {queryJSON: undefined, policyID: undefined, isExpenseFilterPage: undefined};
-        }
-
-        const searchParams = activeCentralPaneRoute?.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
-        const parsedQuery = SearchUtils.buildSearchQueryJSON(searchParams?.q);
-        return {
-            queryJSON: parsedQuery,
-            policyID: parsedQuery && SearchUtils.getPolicyIDFromSearchQuery(parsedQuery),
-            isExpenseFilterPage: parsedQuery?.type === CONST.SEARCH.DATA_TYPES.EXPENSE,
-        };
-    }, [activeCentralPaneRoute]);
+    const searchParams = activeCentralPaneRoute?.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
+    const parsedQuery = SearchUtils.buildSearchQueryJSON(searchParams?.q);
+    const policyIDFromSearchQuery = parsedQuery && SearchUtils.getPolicyIDFromSearchQuery(parsedQuery);
+    const isActiveCentralPaneRoute = activeCentralPaneRoute?.name === SCREENS.SEARCH.CENTRAL_PANE;
+    const queryJSON = isActiveCentralPaneRoute ? parsedQuery : undefined;
+    const policyID = isActiveCentralPaneRoute ? policyIDFromSearchQuery : undefined;
 
     const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
 
@@ -61,7 +53,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={shouldUseNarrowLayout && isExpenseFilterPage && !SearchUtils.isCannedSearchQuery(queryJSON)}
+                            isCustomSearchQuery={shouldUseNarrowLayout && parsedQuery?.type === CONST.SEARCH.DATA_TYPES.EXPENSE && !SearchUtils.isCannedSearchQuery(queryJSON)}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From 2f7162dec553f98fe820ec1b77fc1186cf31edb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 22:50:09 +0200
Subject: [PATCH 100/101] remove unneeded condition

---
 src/pages/Search/SearchPageBottomTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index a797fdfb70c1..a6563e256394 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -53,7 +53,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={shouldUseNarrowLayout && parsedQuery?.type === CONST.SEARCH.DATA_TYPES.EXPENSE && !SearchUtils.isCannedSearchQuery(queryJSON)}
+                            isCustomSearchQuery={shouldUseNarrowLayout && !SearchUtils.isCannedSearchQuery(queryJSON)}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

From b076f54c244ea575a821b12f0ded478b7d36a4eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucien=20Akchot=C3=A9?= <lucien@expensify.com>
Date: Fri, 13 Sep 2024 22:54:13 +0200
Subject: [PATCH 101/101] fix lint

---
 src/pages/Search/SearchPageBottomTab.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index a6563e256394..9226093154ae 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -14,7 +14,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as SearchUtils from '@libs/SearchUtils';
 import TopBar from '@navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';