From 519924c5dc35b6983710f9dca8666cc232fd492b Mon Sep 17 00:00:00 2001 From: I Nyoman Jyotisa Date: Fri, 25 Apr 2025 09:28:10 +0800 Subject: [PATCH 1/3] Fix: Expense Reports tab isn't highlighted anymore after clicking on an report --- src/pages/Search/SearchMoneyRequestReportPage.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/Search/SearchMoneyRequestReportPage.tsx b/src/pages/Search/SearchMoneyRequestReportPage.tsx index 56eca5285ecc..4c9ffc61b3d0 100644 --- a/src/pages/Search/SearchMoneyRequestReportPage.tsx +++ b/src/pages/Search/SearchMoneyRequestReportPage.tsx @@ -19,6 +19,7 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SearchFullscreenNavigatorParamList} from '@libs/Navigation/types'; import {isValidReportIDFromPath} from '@libs/ReportUtils'; +import {buildSearchQueryJSON} from '@libs/SearchQueryUtils'; import Navigation from '@navigation/Navigation'; import ReactionListWrapper from '@pages/home/ReactionListWrapper'; import variables from '@styles/variables'; @@ -65,6 +66,12 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) { openReport(reportIDFromRoute, '', [], undefined, undefined, false, [], undefined, true); }, [reportIDFromRoute]); + const backTo = route.params.backTo ?? ''; + const q = new URLSearchParams(backTo.split('?')[1]).get('q') ?? ''; + const queryJSON = useMemo(() => { + return buildSearchQueryJSON(q); + }, [q]); + // eslint-disable-next-line rulesdir/no-negated-variables const shouldShowNotFoundPage = useMemo( (): boolean => { @@ -134,7 +141,7 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) { shouldDisplaySearch={false} shouldShowLoadingBar={false} /> - + From 17e0cae62a9574613e75a7463db61e1cfc962e76 Mon Sep 17 00:00:00 2001 From: I Nyoman Jyotisa Date: Fri, 25 Apr 2025 10:33:12 +0800 Subject: [PATCH 2/3] ESLint fix --- src/pages/Search/SearchMoneyRequestReportPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Search/SearchMoneyRequestReportPage.tsx b/src/pages/Search/SearchMoneyRequestReportPage.tsx index 4c9ffc61b3d0..c9e3676cdc23 100644 --- a/src/pages/Search/SearchMoneyRequestReportPage.tsx +++ b/src/pages/Search/SearchMoneyRequestReportPage.tsx @@ -67,7 +67,8 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) { }, [reportIDFromRoute]); const backTo = route.params.backTo ?? ''; - const q = new URLSearchParams(backTo.split('?')[1]).get('q') ?? ''; + const queryString = backTo.split('?').at(1) ?? ''; + const q = new URLSearchParams(queryString).get('q') ?? ''; const queryJSON = useMemo(() => { return buildSearchQueryJSON(q); }, [q]); From def699d843b40fe827c0549efb67962391984b7f Mon Sep 17 00:00:00 2001 From: I Nyoman Jyotisa Date: Fri, 25 Apr 2025 16:50:17 +0800 Subject: [PATCH 3/3] minor fix --- src/pages/Search/SearchMoneyRequestReportPage.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Search/SearchMoneyRequestReportPage.tsx b/src/pages/Search/SearchMoneyRequestReportPage.tsx index c9e3676cdc23..6819a92c1a86 100644 --- a/src/pages/Search/SearchMoneyRequestReportPage.tsx +++ b/src/pages/Search/SearchMoneyRequestReportPage.tsx @@ -66,12 +66,12 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) { openReport(reportIDFromRoute, '', [], undefined, undefined, false, [], undefined, true); }, [reportIDFromRoute]); - const backTo = route.params.backTo ?? ''; - const queryString = backTo.split('?').at(1) ?? ''; - const q = new URLSearchParams(queryString).get('q') ?? ''; const queryJSON = useMemo(() => { + const backTo = route.params.backTo ?? ''; + const queryString = backTo.split('?').at(1) ?? ''; + const q = new URLSearchParams(queryString).get('q') ?? ''; return buildSearchQueryJSON(q); - }, [q]); + }, [route.params.backTo]); // eslint-disable-next-line rulesdir/no-negated-variables const shouldShowNotFoundPage = useMemo(