From d1b8b9c4ea2236e2a0e67a371052019693866905 Mon Sep 17 00:00:00 2001 From: Jack Senyitko Date: Tue, 3 Jun 2025 08:28:44 -0400 Subject: [PATCH] fix routing to wrong page --- .../Search/SearchAutocompleteInput.tsx | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/Search/SearchAutocompleteInput.tsx b/src/components/Search/SearchAutocompleteInput.tsx index 260d2918d576..87785ee6eee2 100644 --- a/src/components/Search/SearchAutocompleteInput.tsx +++ b/src/components/Search/SearchAutocompleteInput.tsx @@ -174,11 +174,19 @@ function SearchAutocompleteInput( const clearFilters = useCallback(() => { clearAdvancedFilters(); onSearchQueryChange(''); - Navigation.navigate( - ROUTES.SEARCH_ROOT.getRoute({ - query: buildCannedSearchQuery(), - }), - ); + + // Check if we are on the search page before clearing query. If we are using the popup search menu, + // then the clear button is ONLY available when the search is *not* saved, so we don't have to navigate + const currentRoute = Navigation.getActiveRouteWithoutParams(); + const isSearchPage = currentRoute === `/${ROUTES.SEARCH_ROOT.route}`; + + if (isSearchPage) { + Navigation.navigate( + ROUTES.SEARCH_ROOT.getRoute({ + query: buildCannedSearchQuery(), + }), + ); + } }, [onSearchQueryChange]); const inputWidth = isFullWidth ? styles.w100 : {width: variables.popoverWidth};