From a78a6e907f80065dd5145f9fd0cde7070f942627 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 16 Sep 2024 11:47:31 +0900
Subject: [PATCH 1/4] fix saved search names

---
 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 3ef8188a3a43..4c34b6a6e505 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -98,9 +98,10 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
     const createSavedSearchMenuItem = useCallback(
         (item: SaveSearchItem, key: string, isNarrow: boolean) => {
+            const jsonQuery = SearchUtils.buildSearchQueryJSON(item.query) ?? ({} as SearchQueryJSON);
             const baseMenuItem: SavedSearchMenuItem = {
                 key,
-                title: item.name,
+                title: SearchUtils.getSearchHeaderTitle(jsonQuery, personalDetails, cardList, reports, taxRates),
                 hash: key,
                 query: item.query,
                 shouldShowRightComponent: true,

From d345e83472516336ff3969d508d5a9c90ac84047 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 16 Sep 2024 12:02:04 +0900
Subject: [PATCH 2/4] fix dependencies

---
 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 4c34b6a6e505..1020884aed14 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -152,7 +152,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
 
             return baseMenuItem;
         },
-        [hash, styles, getOverflowMenu, translate, shouldHideSavedSearchRenameTooltip],
+        [hash, styles, getOverflowMenu, translate, shouldHideSavedSearchRenameTooltip, personalDetails, cardList, reports, taxRates],
     );
 
     const savedSearchesMenuItems = () => {

From 820f26474d726d8f26ef25d0bf8ec7a23505d2aa Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 16 Sep 2024 12:18:10 +0900
Subject: [PATCH 3/4] fix compile errors

---
 src/pages/Search/SearchTypeMenu.tsx | 107 ++++++++++++++--------------
 1 file changed, 52 insertions(+), 55 deletions(-)

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
index 1020884aed14..46e3439e847c 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -96,64 +96,61 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
         [showDeleteModal],
     );
 
-    const createSavedSearchMenuItem = useCallback(
-        (item: SaveSearchItem, key: string, isNarrow: boolean) => {
-            const jsonQuery = SearchUtils.buildSearchQueryJSON(item.query) ?? ({} as SearchQueryJSON);
-            const baseMenuItem: SavedSearchMenuItem = {
-                key,
-                title: SearchUtils.getSearchHeaderTitle(jsonQuery, personalDetails, cardList, reports, taxRates),
-                hash: key,
-                query: item.query,
-                shouldShowRightComponent: true,
-                focused: Number(key) === hash,
-                onPress: () => {
-                    SearchActions.clearAllFilters();
-                    Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query ?? ''}));
+    const createSavedSearchMenuItem = (item: SaveSearchItem, key: string, isNarrow: boolean) => {
+        const jsonQuery = SearchUtils.buildSearchQueryJSON(item.query) ?? ({} as SearchQueryJSON);
+        const baseMenuItem: SavedSearchMenuItem = {
+            key,
+            title: SearchUtils.getSearchHeaderTitle(jsonQuery, personalDetails, cardList, reports, taxRates),
+            hash: key,
+            query: item.query,
+            shouldShowRightComponent: true,
+            focused: Number(key) === hash,
+            onPress: () => {
+                SearchActions.clearAllFilters();
+                Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: item?.query ?? ''}));
+            },
+            rightComponent: (
+                <ThreeDotsMenu
+                    menuItems={getOverflowMenu(item.name, Number(key), item.query)}
+                    anchorPosition={{horizontal: 0, vertical: 380}}
+                    anchorAlignment={{
+                        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+                    }}
+                />
+            ),
+            styles: [styles.alignItemsCenter],
+        };
+
+        if (!isNarrow) {
+            return {
+                ...baseMenuItem,
+                shouldRenderTooltip: !shouldHideSavedSearchRenameTooltip,
+                tooltipAnchorAlignment: {
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                },
+                tooltipShiftHorizontal: -32,
+                tooltipShiftVertical: 15,
+                tooltipWrapperStyle: [styles.bgPaleGreen, styles.mh4, styles.pv2],
+                renderTooltipContent: () => {
+                    SearchActions.dismissSavedSearchRenameTooltip();
+                    return (
+                        <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                            <Expensicons.Lightbulb
+                                width={16}
+                                height={16}
+                                fill={styles.colorGreenSuccess.color}
+                            />
+                            <Text style={[styles.ml1, styles.quickActionTooltipSubtitle]}>{translate('search.saveSearchTooltipText')}</Text>
+                        </View>
+                    );
                 },
-                rightComponent: (
-                    <ThreeDotsMenu
-                        menuItems={getOverflowMenu(item.name, Number(key), item.query)}
-                        anchorPosition={{horizontal: 0, vertical: 380}}
-                        anchorAlignment={{
-                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
-                        }}
-                    />
-                ),
-                styles: [styles.alignItemsCenter],
             };
+        }
 
-            if (!isNarrow) {
-                return {
-                    ...baseMenuItem,
-                    shouldRenderTooltip: !shouldHideSavedSearchRenameTooltip,
-                    tooltipAnchorAlignment: {
-                        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                    },
-                    tooltipShiftHorizontal: -32,
-                    tooltipShiftVertical: 15,
-                    tooltipWrapperStyle: [styles.bgPaleGreen, styles.mh4, styles.pv2],
-                    renderTooltipContent: () => {
-                        SearchActions.dismissSavedSearchRenameTooltip();
-                        return (
-                            <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                                <Expensicons.Lightbulb
-                                    width={16}
-                                    height={16}
-                                    fill={styles.colorGreenSuccess.color}
-                                />
-                                <Text style={[styles.ml1, styles.quickActionTooltipSubtitle]}>{translate('search.saveSearchTooltipText')}</Text>
-                            </View>
-                        );
-                    },
-                };
-            }
-
-            return baseMenuItem;
-        },
-        [hash, styles, getOverflowMenu, translate, shouldHideSavedSearchRenameTooltip, personalDetails, cardList, reports, taxRates],
-    );
+        return baseMenuItem;
+    };
 
     const savedSearchesMenuItems = () => {
         if (!savedSearches) {

From 6eb8e2787e4df088662a02cb6053fcc56bb23091 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 16 Sep 2024 12:29:47 +0900
Subject: [PATCH 4/4] include if conditional

---
 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 46e3439e847c..ce30c0a8d782 100644
--- a/src/pages/Search/SearchTypeMenu.tsx
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -97,10 +97,14 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
     );
 
     const createSavedSearchMenuItem = (item: SaveSearchItem, key: string, isNarrow: boolean) => {
-        const jsonQuery = SearchUtils.buildSearchQueryJSON(item.query) ?? ({} as SearchQueryJSON);
+        let title = item.name;
+        if (title === item.query) {
+            const jsonQuery = SearchUtils.buildSearchQueryJSON(item.query) ?? ({} as SearchQueryJSON);
+            title = SearchUtils.getSearchHeaderTitle(jsonQuery, personalDetails, cardList, reports, taxRates);
+        }
         const baseMenuItem: SavedSearchMenuItem = {
             key,
-            title: SearchUtils.getSearchHeaderTitle(jsonQuery, personalDetails, cardList, reports, taxRates),
+            title,
             hash: key,
             query: item.query,
             shouldShowRightComponent: true,