Merge pull request #52374 from Krishna2323/krishna2323/issue/51416

fix: Search - Workspace switcher resets to Expensify after manually searching via search input.
Expensify · Nov 29, 2024 · 124a444 · 124a444
2 parents eddc533 + 8ab7eb2
commit 124a444
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/components/Search/SearchPageHeaderInput.tsx b/src/components/Search/SearchPageHeaderInput.tsx
@@ -124,6 +124,10 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
                 return;
             }
 
+            if (queryJSON.policyID) {
+                userQueryJSON.policyID = queryJSON.policyID;
+            }
+
             const standardizedQuery = SearchQueryUtils.traverseAndUpdatedQuery(userQueryJSON, SearchQueryUtils.getUpdatedAmountValue);
             const query = SearchQueryUtils.buildSearchQueryString(standardizedQuery);
 
@@ -136,7 +140,7 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
                 setIsAutocompleteListVisible(false);
             }
         },
-        [autocompleteSubstitutions, originalInputQuery],
+        [autocompleteSubstitutions, originalInputQuery, queryJSON.policyID],
     );
 
     const onListItemPress = (item: OptionData | SearchQueryItem) => {

diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx
@@ -12,6 +12,7 @@ import type {SearchQueryString} from '@components/Search/types';
 import {isSearchQueryItem} from '@components/SelectionList/Search/SearchQueryListItem';
 import type {SearchQueryItem} from '@components/SelectionList/Search/SearchQueryListItem';
 import type {SelectionListHandle} from '@components/SelectionList/types';
+import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
@@ -79,6 +80,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
     const [recentSearches, recentSearchesMetadata] = useOnyx(ONYXKEYS.RECENT_SEARCHES);
     const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
     const [autocompleteSubstitutions, setAutocompleteSubstitutions] = useState<SubstitutionMap>({});
+    const {activeWorkspaceID} = useActiveWorkspace();
 
     const personalDetails = usePersonalDetails();
     const [reports = {}] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
@@ -238,7 +240,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
             if (!queryJSON) {
                 return;
             }
-
+            queryJSON.policyID = activeWorkspaceID;
             onRouterClose();
 
             const standardizedQuery = SearchQueryUtils.traverseAndUpdatedQuery(queryJSON, SearchQueryUtils.getUpdatedAmountValue);
@@ -248,7 +250,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
             setTextInputValue('');
             setAutocompleteQueryValue('');
         },
-        [autocompleteSubstitutions, onRouterClose, setTextInputValue],
+        [autocompleteSubstitutions, onRouterClose, setTextInputValue, activeWorkspaceID],
     );
 
     const onListItemPress = (item: OptionData | SearchQueryItem) => {