From 43eea6020be5b5bcf233ba40ee9886d5b262e7c9 Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Mon, 17 Mar 2025 16:41:59 +0700 Subject: [PATCH 1/2] fix: workspace not reset after selecting a chat from other policy --- src/components/Search/SearchRouter/SearchRouter.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx index 5281032967cfc..7b6174c68c0c6 100644 --- a/src/components/Search/SearchRouter/SearchRouter.tsx +++ b/src/components/Search/SearchRouter/SearchRouter.tsx @@ -81,7 +81,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps, const styles = useThemeStyles(); const [, recentSearchesMetadata] = useOnyx(ONYXKEYS.RECENT_SEARCHES); const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false}); - const {activeWorkspaceID} = useActiveWorkspace(); + const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const listRef = useRef(null); @@ -273,7 +273,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps, KeyboardUtils.dismiss().then(() => { if (item?.reportID) { - Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(item?.reportID)); + Navigation.navigateToReportWithPolicyCheck({reportID: item?.reportID}); } else if ('login' in item) { navigateToAndOpenReport(item.login ? [item.login] : [], false); } From 573a8591c7e3441c7865a8435349d35831d6c396 Mon Sep 17 00:00:00 2001 From: thelullabyy Date: Mon, 17 Mar 2025 16:43:52 +0700 Subject: [PATCH 2/2] refactor --- src/components/Search/SearchRouter/SearchRouter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx index 7b6174c68c0c6..0b54554132265 100644 --- a/src/components/Search/SearchRouter/SearchRouter.tsx +++ b/src/components/Search/SearchRouter/SearchRouter.tsx @@ -81,7 +81,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps, const styles = useThemeStyles(); const [, recentSearchesMetadata] = useOnyx(ONYXKEYS.RECENT_SEARCHES); const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false}); - const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace(); + const {activeWorkspaceID} = useActiveWorkspace(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const listRef = useRef(null);