Merge pull request #61704 from Expensify/cmartins-updateExportLogic

[CP Staging] Update export logic

(cherry picked from commit 2fdd9e4)

(cherry-picked to staging by luacmartins)

Author: luacmartins

src/libs/ReportActionsUtils.ts

@@ -276,11 +276,11 @@ function getOriginalMessage<T extends ReportActionName>(reportAction: OnyxInputO
     return reportAction.originalMessage;
 }
 
-function isExportIntegrationAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+function isExportIntegrationAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION> {
     return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION;
 }
 
-function isIntegrationMessageAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+function isIntegrationMessageAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE> {
     return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE;
 }
 

src/libs/ReportUtils.ts

@@ -10343,23 +10343,17 @@ function isExported(reportActions: OnyxEntry<ReportActions> | ReportAction[]) {
     let exportIntegrationActionsCount = 0;
     let integrationMessageActionsCount = 0;
 
-    if (Array.isArray(reportActions)) {
-        for (const action of reportActions) {
-            if (isExportIntegrationAction(action)) {
-                exportIntegrationActionsCount++;
-            }
-            if (isIntegrationMessageAction(action)) {
-                integrationMessageActionsCount++;
+    const reportActionList = Array.isArray(reportActions) ? reportActions : Object.values(reportActions);
+    for (const action of reportActionList) {
+        if (isExportIntegrationAction(action)) {
+            // We consider any reports marked manually as exported to be exported, so we shortcircuit here.
+            if (getOriginalMessage(action)?.markedManually) {
+                return true;
             }
+            exportIntegrationActionsCount++;
         }
-    } else {
-        for (const action of Object.values(reportActions)) {
-            if (isExportIntegrationAction(action)) {
-                exportIntegrationActionsCount++;
-            }
-            if (isIntegrationMessageAction(action)) {
-                integrationMessageActionsCount++;
-            }
+        if (isIntegrationMessageAction(action)) {
+            integrationMessageActionsCount++;
         }
     }
 

tests/unit/ReportPrimaryActionUtilsTest.ts

@@ -128,6 +128,32 @@ describe('getPrimaryAction', () => {
         expect(getReportPrimaryAction(report, [], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING);
     });
 
+    it('should not return EXPORT TO ACCOUNTING for reports marked manually as exported', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+        } as unknown as Report;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+        const policy = {
+            connections: {
+                intacct: {
+                    config: {
+                        export: {
+                            exporter: CURRENT_USER_EMAIL,
+                        },
+                    },
+                },
+            },
+        };
+        const reportActions = [
+            {actionName: CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION, reportActionID: '1', created: '2025-01-01', originalMessage: {markedManually: true}},
+        ] as unknown as ReportAction[];
+
+        expect(getReportPrimaryAction(report, [], {}, policy as Policy, {}, reportActions)).toBe('');
+    });
+
     it('should return REMOVE HOLD for reports with transactions on hold', async () => {
         const report = {
             reportID: REPORT_ID,