Skip to content

Commit 1ab01f6

Browse files
authored
Merge pull request #44249 from bernhardoj/fix/44202-hide-join-button-in-track-expense
Hide join button in track expense report
2 parents d19a574 + 0f0c83c commit 1ab01f6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libs/ReportUtils.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6845,8 +6845,9 @@ function canJoinChat(report: OnyxInputOrEntry<Report>, parentReportAction: OnyxI
68456845
return false;
68466846
}
68476847

6848+
const isExpenseChat = isMoneyRequestReport(report) || isMoneyRequest(report) || isInvoiceReport(report) || isTrackExpenseReport(report);
68486849
// Anyone viewing these chat types is already a participant and therefore cannot join
6849-
if (isRootGroupChat(report) || isSelfDM(report) || isInvoiceRoom(report) || isSystemChat(report)) {
6850+
if (isRootGroupChat(report) || isSelfDM(report) || isInvoiceRoom(report) || isSystemChat(report) || isExpenseChat) {
68506851
return false;
68516852
}
68526853

src/pages/ReportDetailsPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
446446
const shouldShowHoldAction =
447447
caseID !== CASES.MONEY_REPORT && (canHoldUnholdReportAction.canHoldRequest || canHoldUnholdReportAction.canUnholdRequest) && !ReportUtils.isArchivedRoom(parentReport);
448448

449-
const canJoin = !isExpenseReport && ReportUtils.canJoinChat(report, parentReportAction, policy);
449+
const canJoin = ReportUtils.canJoinChat(report, parentReportAction, policy);
450450

451451
const promotedActions = useMemo(() => {
452452
const result: PromotedAction[] = [];

0 commit comments

Comments
 (0)