Skip to content

Commit 5d45147

Browse files
authored
Merge pull request Expensify#85303 from marufsharifi/fix/invoice-room-subheader-receiver-name
Fix: Invoice Room subheader shows receiver name instead of workspace
2 parents 3af02fc + ac26e49 commit 5d45147

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

src/libs/ReportUtils.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6189,7 +6189,16 @@ function getParentNavigationSubtitle(
61896189
}
61906190

61916191
if (isInvoiceReport(report) || isInvoiceRoom(parentReport)) {
6192-
let reportName = `${getPolicyName({report: parentReport})} & ${getInvoicePayerName(parentReport)}`;
6192+
const senderWorkspaceName = getPolicyName({report: parentReport});
6193+
const invoiceReceiverPolicyID = parentReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS ? parentReport.invoiceReceiver.policyID : undefined;
6194+
const invoiceReceiverPolicy = invoiceReceiverPolicyID ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`] : undefined;
6195+
const isCurrentUserReceiver = isCurrentUserInvoiceReceiver(parentReport);
6196+
const invoicePayerName = getInvoicePayerName(parentReport, invoiceReceiverPolicy);
6197+
6198+
let reportName = senderWorkspaceName;
6199+
if (!isCurrentUserReceiver && invoicePayerName) {
6200+
reportName = `${senderWorkspaceName} & ${invoicePayerName}`;
6201+
}
61936202

61946203
if (isArchivedNonExpenseReport(parentReport, isParentReportArchived)) {
61956204
// eslint-disable-next-line @typescript-eslint/no-deprecated

0 commit comments

Comments
 (0)