Merge pull request #42085 from rezkiy37/fix/41306-archive-invoice-room

Fix archived invoice room titles
Expensify · May 30, 2024 · dc17b1b · dc17b1b
2 parents 35386ee + 8f7139b
commit dc17b1b
Showing 1 changed file with 27 additions and 18 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -3216,6 +3216,10 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         formattedName = getMoneyRequestReportName(report, policy);
     }
 
+    if (isInvoiceRoom(report)) {
+        formattedName = getInvoicesChatName(report);
+    }
+
     if (isArchivedRoom(report)) {
         formattedName += ` (${Localize.translateLocal('common.archived')})`;
     }
@@ -3224,10 +3228,6 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         formattedName = getDisplayNameForParticipant(currentUserAccountID, undefined, undefined, true);
     }
 
-    if (isInvoiceRoom(report)) {
-        formattedName = getInvoicesChatName(report);
-    }
-
     if (formattedName) {
         return formattedName;
     }
@@ -3306,7 +3306,15 @@ function getParentNavigationSubtitle(report: OnyxEntry<Report>): ParentNavigatio
     }
 
     if (isInvoiceReport(report) || isInvoiceRoom(parentReport)) {
-        return {reportName: `${getPolicyName(parentReport)} & ${getInvoicePayerName(parentReport)}`};
+        let reportName = `${getPolicyName(parentReport)} & ${getInvoicePayerName(parentReport)}`;
+
+        if (isArchivedRoom(parentReport)) {
+            reportName += ` (${Localize.translateLocal('common.archived')})`;
+        }
+
+        return {
+            reportName,
+        };
     }
 
     return {
@@ -5669,28 +5677,25 @@ function temporary_getMoneyRequestOptions(
  * Invoice sender, invoice receiver and auto-invited admins cannot leave
  */
 function canLeaveInvoiceRoom(report: OnyxEntry<Report>): boolean {
-    if (!isInvoiceRoom(report)) {
-        return false;
-    }
-
-    const invoiceReport = getReport(report?.iouReportID ?? '');
-
-    if (invoiceReport?.ownerAccountID === currentUserAccountID) {
+    if (!report || !report?.invoiceReceiver) {
         return false;
     }
 
-    if (invoiceReport?.managerID === currentUserAccountID) {
+    if (report?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED) {
         return false;
     }
 
-    const isSenderPolicyAdmin = getPolicy(report?.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
+    const isSenderPolicyAdmin = getPolicy(report.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
 
     if (isSenderPolicyAdmin) {
         return false;
     }
 
-    const isReceiverPolicyAdmin =
-        report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS ? getPolicy(report?.invoiceReceiver?.policyID)?.role === CONST.POLICY.ROLE.ADMIN : false;
+    if (report.invoiceReceiver.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
+        return report?.invoiceReceiver?.accountID !== currentUserAccountID;
+    }
+
+    const isReceiverPolicyAdmin = getPolicy(report.invoiceReceiver.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
 
     if (isReceiverPolicyAdmin) {
         return false;
@@ -5714,6 +5719,10 @@ function canLeaveInvoiceRoom(report: OnyxEntry<Report>): boolean {
  */
 function canLeaveRoom(report: OnyxEntry<Report>, isPolicyEmployee: boolean): boolean {
     if (isInvoiceRoom(report)) {
+        if (isArchivedRoom(report)) {
+            return false;
+        }
+
         const invoiceReport = getReport(report?.iouReportID ?? '');
 
         if (invoiceReport?.ownerAccountID === currentUserAccountID) {
@@ -6634,8 +6643,8 @@ function canLeaveChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boo
         return false;
     }
 
-    if (canLeaveInvoiceRoom(report)) {
-        return true;
+    if (isInvoiceRoom(report)) {
+        return canLeaveInvoiceRoom(report);
     }
 
     return (isChatThread(report) && !!report?.notificationPreference?.length) || isUserCreatedPolicyRoom(report) || isNonAdminOrOwnerOfPolicyExpenseChat(report, policy);