Merge pull request Expensify#63546 from software-mansion-labs/korytko/remove-pay-from-transaction-count

[Better Expense Report Preview] Fix one-expense report view not displaying properly when we have one expense that was paid

Author: mountiny

src/libs/ReportActionsUtils.ts

@@ -1239,7 +1239,9 @@ function getOneTransactionThreadReportID(
 
     const iouRequestActions = [];
     for (const action of reportActionsArray) {
-        if (!isIOUActionMatchingTransactionList(action, reportTransactionIDs, true)) {
+        // If the original message is a 'pay' IOU, it shouldn't be added to the transaction count.
+        // However, it is excluded from the matching function in order to display it properly, so we need to compare the type here.
+        if (!isIOUActionMatchingTransactionList(action, reportTransactionIDs, true) || getOriginalMessage(action)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
             // eslint-disable-next-line no-continue
             continue;
         }

tests/unit/ReportActionsUtilsTest.ts

@@ -2,9 +2,10 @@ import type {KeyValueMapping} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import {isExpenseReport} from '@libs/ReportUtils';
 import {actionR14932 as mockIOUAction, originalMessageR14932 as mockOriginalMessage} from '../../__mocks__/reportData/actions';
+import {iouReportR14932 as mockIOUReport} from '../../__mocks__/reportData/reports';
 import CONST from '../../src/CONST';
 import * as ReportActionsUtils from '../../src/libs/ReportActionsUtils';
-import {isIOUActionMatchingTransactionList} from '../../src/libs/ReportActionsUtils';
+import {getOneTransactionThreadReportID, getOriginalMessage, isIOUActionMatchingTransactionList} from '../../src/libs/ReportActionsUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import type {Report, ReportAction} from '../../src/types/onyx';
 import createRandomReport from '../utils/collections/reports';
@@ -353,6 +354,75 @@ describe('ReportActionsUtils', () => {
         });
     });
 
+    describe('getOneTransactionThreadReportID', () => {
+        const IOUReportID = 'REPORT_IOU';
+        const IOUExpenseReportID = 'REPORT_EXPENSE';
+        const IOUTransactionID = 'TRANSACTION_IOU';
+        const IOUExpenseTransactionID = 'TRANSACTION_EXPENSE';
+
+        const mockedReports: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, Report> = {
+            [`${ONYXKEYS.COLLECTION.REPORT}${IOUReportID}`]: {...mockIOUReport, reportID: IOUReportID},
+            [`${ONYXKEYS.COLLECTION.REPORT}${IOUExpenseReportID}`]: {...mockIOUReport, type: CONST.REPORT.TYPE.EXPENSE, reportID: IOUExpenseReportID},
+        };
+
+        const linkedCreateAction = {
+            ...mockIOUAction,
+            originalMessage: {...getOriginalMessage(mockIOUAction), IOUTransactionID},
+        };
+
+        const unlinkedCreateAction = {
+            ...mockIOUAction,
+            originalMessage: {...getOriginalMessage(mockIOUAction), IOUTransactionID: IOUExpenseTransactionID},
+        };
+
+        const linkedDeleteAction = {
+            ...mockIOUAction,
+            originalMessage: {
+                ...getOriginalMessage(mockIOUAction),
+                IOUTransactionID,
+                type: CONST.IOU.REPORT_ACTION_TYPE.DELETE,
+            },
+        };
+
+        const linkedPayAction = {
+            ...mockIOUAction,
+            originalMessage: {
+                ...getOriginalMessage(mockIOUAction),
+                IOUTransactionID,
+                type: CONST.IOU.REPORT_ACTION_TYPE.PAY,
+            },
+        };
+
+        beforeEach(async () => {
+            await Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, mockedReports);
+        });
+
+        it('should return the childReportID for a valid single IOU action', () => {
+            const result = getOneTransactionThreadReportID(IOUReportID, [linkedCreateAction], false, [IOUTransactionID]);
+            expect(result).toEqual(linkedCreateAction.childReportID);
+        });
+
+        it('should return undefined for action with a transaction that is not linked to it', () => {
+            const result = getOneTransactionThreadReportID(IOUReportID, [unlinkedCreateAction], false, [IOUTransactionID]);
+            expect(result).toBeUndefined();
+        });
+
+        it('should return undefined if multiple IOU actions are present', () => {
+            const result = getOneTransactionThreadReportID(IOUReportID, [linkedCreateAction, linkedCreateAction], false, [IOUTransactionID]);
+            expect(result).toBeUndefined();
+        });
+
+        it('should skip actions where original message type is PAY', () => {
+            const result = getOneTransactionThreadReportID(IOUReportID, [linkedPayAction, linkedCreateAction], false, [IOUTransactionID]);
+            expect(result).toEqual(linkedCreateAction.childReportID);
+        });
+
+        it('should return undefined if no valid IOU actions are present', () => {
+            const result = getOneTransactionThreadReportID(IOUReportID, [unlinkedCreateAction, linkedDeleteAction, linkedPayAction], false, [IOUTransactionID]);
+            expect(result).toBeUndefined();
+        });
+    });
+
     describe('getSortedReportActionsForDisplay', () => {
         it('should filter out non-whitelisted actions', () => {
             const input: ReportAction[] = [
@@ -786,6 +856,8 @@ describe('ReportActionsUtils', () => {
         });
     });
 
+    describe('getOneTransactionThreadReportID', () => {});
+
     describe('shouldShowAddMissingDetails', () => {
         it('should return true if personal detail is not completed', async () => {
             const card = {

tests/unit/ReportPrimaryActionUtilsTest.ts

@@ -236,7 +236,7 @@ describe('getPrimaryAction', () => {
                 },
             ],
             originalMessage: {
-                type: CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
                 IOUTransactionID: TRANSACTION_ID,
             },
         } as unknown as ReportAction;