[Retract] fix reopen report bugs

src/libs/NextStepUtils.ts

@@ -116,9 +116,16 @@ function buildOptimisticNextStepForPreventSelfApprovalsEnabled() {
  * @param predictedNextStatus - a next expected status of the report
  * @param shouldFixViolations - whether to show `fix the issue` next step
  * @param isUnapprove - whether a report is being unapproved
+ * @param isReopen - whether a report is being reopened
  * @returns nextStep
  */
-function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<typeof CONST.REPORT.STATUS_NUM>, shouldFixViolations?: boolean, isUnapprove?: boolean): ReportNextStep | null {
+function buildNextStep(
+    report: OnyxEntry<Report>,
+    predictedNextStatus: ValueOf<typeof CONST.REPORT.STATUS_NUM>,
+    shouldFixViolations?: boolean,
+    isUnapprove?: boolean,
+    isReopen?: boolean,
+): ReportNextStep | null {
     if (!isExpenseReport(report)) {
         return null;
     }
@@ -209,6 +216,33 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                 };
                 break;
             }
+            if (isReopen) {
+                optimisticNextStep = {
+                    type,
+                    icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
+                    message: [
+                        {
+                            text: 'Waiting for ',
+                        },
+                        {
+                            text: `${ownerDisplayName}`,
+                            type: 'strong',
+                            clickToCopyText: ownerAccountID === currentUserAccountID ? currentUserEmail : '',
+                        },
+                        {
+                            text: ' to ',
+                        },
+                        {
+                            text: 'submit',
+                        },
+                        {
+                            text: ' %expenses.',
+                        },
+                    ],
+                };
+                break;
+            }
+
             // Self review
             optimisticNextStep = {
                 type,

src/libs/ReportActionsUtils.ts

@@ -380,6 +380,10 @@ function isRenamedAction(reportAction: OnyxEntry<ReportAction>): reportAction is
     return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.RENAMED);
 }
 
+function isReopenedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REOPENED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REOPENED);
+}
+
 function isRoomChangeLogAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>> {
     return isActionOfType(reportAction, ...Object.values(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG));
 }
@@ -2581,6 +2585,7 @@ export {
     getLeaveRoomMessage,
     getRetractedMessage,
     getReportActionFromExpensifyCard,
+    isReopenedAction,
     getIntegrationSyncFailedMessage,
 };
 

src/libs/ReportPrimaryActionUtils.ts

@@ -20,6 +20,7 @@ import {
     getParentReport,
     hasExportError as hasExportErrorUtil,
     hasOnlyHeldExpenses,
+    hasReportBeenReopened as hasReportBeenReopenedUtils,
     isArchivedReport,
     isClosedReport as isClosedReportUtils,
     isCurrentUserSubmitter,
@@ -53,7 +54,7 @@ function isAddExpenseAction(report: Report, reportTransactions: Transaction[]) {
     return isExpenseReport && canAddTransaction && isReportSubmitter && reportTransactions.length === 0;
 }
 
-function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy, reportNameValuePairs?: ReportNameValuePairs) {
+function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy, reportNameValuePairs?: ReportNameValuePairs, reportActions?: ReportAction[]) {
     if (isArchivedReport(reportNameValuePairs)) {
         return false;
     }
@@ -63,7 +64,7 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
     const isOpenReport = isOpenReportUtils(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
     const transactionAreComplete = reportTransactions.every((transaction) => transaction.amount !== 0 || transaction.modifiedAmount !== 0);
-
+    const hasReportBeenReopened = hasReportBeenReopenedUtils(reportActions);
     const isAnyReceiptBeingScanned = reportTransactions?.some((transaction) => isReceiptBeingScanned(transaction));
 
     if (isAnyReceiptBeingScanned) {
@@ -76,7 +77,12 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
         return false;
     }
 
-    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransactions.length !== 0 && transactionAreComplete;
+    const baseIsSubmit = isExpenseReport && isReportSubmitter && isOpenReport && reportTransactions.length !== 0 && transactionAreComplete;
+    if (hasReportBeenReopened && baseIsSubmit) {
+        return true;
+    }
+
+    return isManualSubmitEnabled && baseIsSubmit;
 }
 
 function isApproveAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
@@ -299,7 +305,7 @@ function getReportPrimaryAction(
         return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
     }
 
-    if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs)) {
+    if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs, reportActions)) {
         return CONST.REPORT.PRIMARY_ACTIONS.SUBMIT;
     }
 

src/libs/ReportSecondaryActionUtils.ts

@@ -25,6 +25,7 @@ import {
     canHoldUnholdReportAction,
     getTransactionDetails,
     hasOnlyHeldExpenses,
+    hasReportBeenReopened as hasReportBeenReopenedUtils,
     isArchivedReport,
     isAwaitingFirstLevelApproval,
     isClosedReport as isClosedReportUtils,
@@ -102,7 +103,7 @@ function isSplitAction(report: Report, reportTransactions: Transaction[], policy
     return isSubmitter || isAdmin || isManager;
 }
 
-function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy, reportNameValuePairs?: ReportNameValuePairs): boolean {
+function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy, reportNameValuePairs?: ReportNameValuePairs, reportActions?: ReportAction[]): boolean {
     if (isArchivedReport(reportNameValuePairs)) {
         return false;
     }
@@ -135,6 +136,11 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
         return false;
     }
 
+    const hasReportBeenReopened = hasReportBeenReopenedUtils(reportActions);
+    if (hasReportBeenReopened && isReportSubmitter) {
+        return false;
+    }
+
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isManager = report.managerID === getCurrentUserAccountID();
     if (isAdmin || isManager) {
@@ -502,7 +508,7 @@ function getSecondaryReportActions(
         options.push(CONST.REPORT.SECONDARY_ACTIONS.ADD_EXPENSE);
     }
 
-    if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs)) {
+    if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs, reportActions)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT);
     }
 

src/libs/ReportUtils.ts

@@ -191,6 +191,7 @@ import {
     isPolicyChangeLogAction,
     isReimbursementQueuedAction,
     isRenamedAction,
+    isReopenedAction,
     isReportActionAttachment,
     isReportPreviewAction,
     isReversedTransaction,
@@ -10810,6 +10811,16 @@ function findReportIDForAction(action?: ReportAction): string | undefined {
         })
         ?.replace(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}`, '');
 }
+
+function hasReportBeenReopened(reportActions: OnyxEntry<ReportActions> | ReportAction[]): boolean {
+    if (!reportActions) {
+        return false;
+    }
+
+    const reportActionList = Array.isArray(reportActions) ? reportActions : Object.values(reportActions);
+    return reportActionList.some((action) => isReopenedAction(action));
+}
+
 export {
     addDomainToShortMention,
     completeShortMention,
@@ -11185,6 +11196,7 @@ export {
     findReportIDForAction,
     isWorkspaceEligibleForReportChange,
     navigateOnDeleteExpense,
+    hasReportBeenReopened,
 };
 
 export type {

src/libs/actions/IOU.ts

@@ -9436,7 +9436,7 @@ function reopenReport(expenseReport: OnyxEntry<OnyxTypes.Report>) {
     const predictedNextState = CONST.REPORT.STATE_NUM.OPEN;
     const predictedNextStatus = CONST.REPORT.STATUS_NUM.OPEN;
 
-    const optimisticNextStep = buildNextStep(expenseReport, predictedNextStatus);
+    const optimisticNextStep = buildNextStep(expenseReport, predictedNextStatus, undefined, undefined, true);
     const optimisticReportActionsData: OnyxUpdate = {
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
@@ -9497,7 +9497,6 @@ function reopenReport(expenseReport: OnyxEntry<OnyxTypes.Report>) {
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
             value: {
                 [optimisticReopenedReportAction.reportActionID]: {
-                    pendingAction: null,
                     errors: getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
                 },
             },