fix: change message when reimbursementChoice is reimburseNo

Expensify · Sep 27, 2024 · c1ce94a · c1ce94a
1 parent 4c76858
commit c1ce94a
Showing 1 changed file with 20 additions and 33 deletions.
diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
@@ -98,6 +98,16 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
     const type: ReportNextStep['type'] = 'neutral';
     let optimisticNextStep: ReportNextStep | null;
 
+    const noActionRequired = {
+        icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
+        type,
+        message: [
+            {
+                text: 'No further action required!',
+            },
+        ],
+    };
+
     switch (predictedNextStatus) {
         // Generates an optimistic nextStep once a report has been opened
         case CONST.REPORT.STATUS_NUM.OPEN:
@@ -126,6 +136,12 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                 ],
             };
 
+            if (policy.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO) {
+                optimisticNextStep = noActionRequired;
+
+                break;
+            }
+
             // Scheduled submit enabled
             if (harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL) {
                 optimisticNextStep.message = [
@@ -217,16 +233,10 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
         }
 
         // Generates an optimistic nextStep once a report has been closed for example in the case of Submit and Close approval flow
+        // or when a report has been paid
         case CONST.REPORT.STATUS_NUM.CLOSED:
-            optimisticNextStep = {
-                icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
-                type,
-                message: [
-                    {
-                        text: 'No further action required!',
-                    },
-                ],
-            };
+        case CONST.REPORT.STATUS_NUM.REIMBURSED:
+            optimisticNextStep = noActionRequired;
 
             break;
 
@@ -242,15 +252,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                     report,
                 )
             ) {
-                optimisticNextStep = {
-                    type,
-                    icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
-                    message: [
-                        {
-                            text: 'No further action required!',
-                        },
-                    ],
-                };
+                optimisticNextStep = noActionRequired;
                 break;
             }
             // Self review
@@ -278,21 +280,6 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
             };
             break;
 
-        // Generates an optimistic nextStep once a report has been paid
-        case CONST.REPORT.STATUS_NUM.REIMBURSED:
-            // Paid with wallet
-            optimisticNextStep = {
-                type,
-                icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
-                message: [
-                    {
-                        text: 'No further action required!',
-                    },
-                ],
-            };
-
-            break;
-
         // Resets a nextStep
         default:
             optimisticNextStep = null;