Skip to content

Commit aefefde

Browse files
authored
Merge pull request Expensify#64719 from truph01/fix/63581
fix: Go to workspace on invited workspace chat opens not here page
2 parents 10a3755 + a154420 commit aefefde

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/pages/ReportDetailsPage.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import useOnyx from '@hooks/useOnyx';
3030
import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
3131
import usePermissions from '@hooks/usePermissions';
3232
import useReportIsArchived from '@hooks/useReportIsArchived';
33+
import useResponsiveLayout from '@hooks/useResponsiveLayout';
3334
import useThemeStyles from '@hooks/useThemeStyles';
3435
import getBase62ReportID from '@libs/getBase62ReportID';
3536
import Navigation from '@libs/Navigation/Navigation';
@@ -161,6 +162,8 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail
161162
const {removeTransaction} = useSearchContext();
162163

163164
const transactionThreadReportID = useMemo(() => getOneTransactionThreadReportID(report, chatReport, reportActions ?? [], isOffline), [reportActions, isOffline, report, chatReport]);
165+
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
166+
const {isSmallScreenWidth} = useResponsiveLayout();
164167

165168
/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
166169
const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`, {canBeMissing: true});
@@ -472,7 +475,11 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail
472475
if (!report?.policyID) {
473476
return;
474477
}
475-
Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(report?.policyID, Navigation.getActiveRoute()));
478+
if (isSmallScreenWidth) {
479+
Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(report?.policyID, Navigation.getActiveRoute()));
480+
} else {
481+
Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW.getRoute(report?.policyID));
482+
}
476483
},
477484
isAnonymousAction: false,
478485
shouldShowRightIcon: true,
@@ -541,6 +548,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail
541548
isTaskActionable,
542549
isRootGroupChat,
543550
leaveChat,
551+
isSmallScreenWidth,
544552
]);
545553

546554
const displayNamesWithTooltips = useMemo(() => {

0 commit comments

Comments
 (0)