Fix - Expense - Submit button appears for archived workspace chat if delayed submission is enabled

src/components/MoneyReportHeader.tsx

@@ -118,6 +118,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const hasOnlyHeldExpenses = ReportUtils.hasOnlyHeldExpenses(moneyRequestReport?.reportID ?? '');
     const isPayAtEndExpense = TransactionUtils.isPayAtEndExpense(transaction);
     const isArchivedReport = ReportUtils.isArchivedRoomWithID(moneyRequestReport?.reportID);
+    const isArchivedExpenseReport = ReportUtils.isArchivedExpenseReport(moneyRequestReport);
     const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID ?? '-1'}`, {selector: ReportUtils.getArchiveReason});
 
     const getCanIOUBePaid = useCallback(
@@ -143,6 +144,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const shouldShowSubmitButton =
         !!moneyRequestReport &&
+        !isArchivedReport &&
+        !isArchivedExpenseReport &&
         isDraft &&
         reimbursableSpend !== 0 &&
         !hasAllPendingRTERViolations &&

src/components/ReportActionItem/ReportPreview.tsx

@@ -174,10 +174,14 @@ function ReportPreview({
         formattedMerchant = null;
     }
 
+    const isArchivedExpenseReport = ReportUtils.isArchivedExpenseReport(iouReport);
+    const isArchivedReport = ReportUtils.isArchivedRoomWithID(iouReportID);
     const currentUserAccountID = getCurrentUserAccountID();
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const shouldShowSubmitButton =
         isOpenExpenseReport &&
+        !isArchivedExpenseReport &&
+        !isArchivedReport &&
         reimbursableSpend !== 0 &&
         !showRTERViolationMessage &&
         !shouldShowBrokenConnectionViolation &&
@@ -358,7 +362,6 @@ function ReportPreview({
     const shouldShowPendingSubtitle = numberOfPendingRequests === 1 && numberOfRequests === 1;
 
     const isPayAtEndExpense = ReportUtils.isPayAtEndExpenseReport(iouReportID, allTransactions);
-    const isArchivedReport = ReportUtils.isArchivedRoomWithID(iouReportID);
     const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {selector: ReportUtils.getArchiveReason});
 
     const getPendingMessageProps: () => PendingMessageProps = () => {

src/libs/ReportUtils.ts

@@ -1447,7 +1447,14 @@ function isClosedExpenseReportWithNoExpenses(report: OnyxEntry<Report>): boolean
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function isArchivedRoom(report: OnyxInputOrEntry<Report>, reportNameValuePairs?: OnyxInputOrEntry<ReportNameValuePairs>): boolean {
-    return !!report?.private_isArchived;
+    return !isExpenseReport(report) && !!report?.private_isArchived;
+}
+
+/**
+ * Whether the provided report is an archived expense report
+ */
+function isArchivedExpenseReport(report: OnyxInputOrEntry<Report>): boolean {
+    return isExpenseReport(report) && !!report?.private_isArchived;
 }
 
 /**
@@ -6998,7 +7005,7 @@ function isGroupChatAdmin(report: OnyxEntry<Report>, accountID: number) {
  */
 function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportParticipants: number[], filterDeprecatedTypes = false): IOUType[] {
     // In any thread or task report, we do not allow any new expenses yet
-    if (isChatThread(report) || isTaskReport(report) || isInvoiceReport(report) || isSystemChat(report)) {
+    if (isChatThread(report) || isTaskReport(report) || isInvoiceReport(report) || isSystemChat(report) || isArchivedExpenseReport(report)) {
         return [];
     }
 
@@ -8587,6 +8594,7 @@ export {
     isAllowedToSubmitDraftExpenseReport,
     isAnnounceRoom,
     isArchivedRoom,
+    isArchivedExpenseReport,
     isArchivedRoomWithID,
     isClosedReport,
     isCanceledTaskReport,

src/libs/actions/IOU.ts

@@ -7055,6 +7055,8 @@ function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
     const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
     const reportNameValuePairs = ReportUtils.getReportNameValuePairs(iouReport?.reportID);
     const isArchivedReport = ReportUtils.isArchivedRoom(iouReport, reportNameValuePairs);
+    const isArchivedExpenseReport = ReportUtils.isArchivedExpenseReport(iouReport);
+
     let isTransactionBeingScanned = false;
     const reportTransactions = TransactionUtils.getAllReportTransactions(iouReport?.reportID);
     for (const transaction of reportTransactions) {
@@ -7067,7 +7069,7 @@ function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
         }
     }
 
-    return isCurrentUserManager && !isOpenExpenseReport && !isApproved && !iouSettled && !isArchivedReport && !isTransactionBeingScanned;
+    return isCurrentUserManager && !isOpenExpenseReport && !isApproved && !iouSettled && !isArchivedReport && !isArchivedExpenseReport && !isTransactionBeingScanned;
 }
 
 function canIOUBePaid(