fix: report field is not editable for invoice/track expense

Author: mkzie2

src/libs/ReportUtils.ts

@@ -4300,7 +4300,7 @@ function canEditFieldOfMoneyRequest(
     }
 
     if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.REPORT) {
-        if (!isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID)) {
+        if (!isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID) && isExpenseReport(moneyRequestReport)) {
             return false;
         }
 

tests/unit/canEditFieldOfMoneyRequestTest.ts

@@ -103,22 +103,14 @@ describe('canEditFieldOfMoneyRequest', () => {
                 return waitForBatchedUpdates();
             });
 
-            it('should return false for invoice report action if it is not outstanding report', async () => {
+            // Then the user should be able to move the invoice to the outstanding expense report
+            it('should return true for invoice report action given that there is a minimum of one outstanding report', async () => {
                 const outstandingReportsByPolicyID = await OnyxUtils.get(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
 
                 const canEditReportField = canEditFieldOfMoneyRequest(reportAction, CONST.EDIT_REQUEST_FIELD.REPORT, undefined, undefined, outstandingReportsByPolicyID);
-                expect(canEditReportField).toBe(false);
-            });
-
-            it('should return true for invoice report action when there are outstanding reports', async () => {
-                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${IOUReportID}`, outstandingExpenseReport);
-                await waitForBatchedUpdates();
-                const outstandingReportsByPolicyID = await OnyxUtils.get(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
-
-                const canEditReportField = canEditFieldOfMoneyRequest(reportAction, CONST.EDIT_REQUEST_FIELD.REPORT, undefined, undefined, outstandingReportsByPolicyID);
-
                 expect(canEditReportField).toBe(true);
             });
+
         });
 
         describe('type is expense', () => {
@@ -260,6 +252,21 @@ describe('canEditFieldOfMoneyRequest', () => {
                 // Then they should not be able to move the expense since there's only one outstanding report
                 expect(canEditReportField).toBe(false);
             });
+
+            it('should return false when the expense report is not outstanding report', async () => {
+                // Given that there are multiple outstanding expense reports in the same policy
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${IOUReportID}`, {...expenseReport, stateNum: CONST.REPORT.STATE_NUM.APPROVED, statusNum: CONST.REPORT.STATUS_NUM.APPROVED});
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${EXPENSE_OUTSTANDING_REPORT_1_ID}`, outstandingExpenseReport1);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${EXPENSE_OUTSTANDING_REPORT_2_ID}`, outstandingExpenseReport2);
+                await waitForBatchedUpdates();
+                const outstandingReportsByPolicyID = await OnyxUtils.get(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
+
+                // When the submitter tries to move an expense between reports
+                const canEditReportField = canEditFieldOfMoneyRequest(reportAction, CONST.EDIT_REQUEST_FIELD.REPORT, undefined, undefined, outstandingReportsByPolicyID);
+
+                // Then they should be able to move the expense since there are multiple outstanding expense reports
+                expect(canEditReportField).toBe(false);
+            });
         });
     });
 });