Merge pull request #78136 from dmkt9/fix/77699

Fix/77699 - Duplicate Expense Cards Appear in Report When Adding a Single Expense from Empty State

Author: mollfpr

src/libs/actions/Transaction.ts

@@ -823,6 +823,23 @@ function changeTransactionsReport(
         const oldReportID = isUnreportedExpense ? CONST.REPORT.UNREPORTED_REPORT_ID : transaction.reportID;
         const oldReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${oldReportID}`];
 
+        const isUnreported = reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+        const optimisticMoneyRequestReportActionID = rand64();
+
+        const originalMessage = getOriginalMessage(oldIOUAction) as OriginalMessageIOU;
+        const newIOUAction = {
+            ...oldIOUAction,
+            originalMessage: {
+                ...originalMessage,
+                IOUReportID: reportID,
+                type: isUnreported ? CONST.IOU.REPORT_ACTION_TYPE.TRACK : CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+            },
+            reportActionID: optimisticMoneyRequestReportActionID,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            actionName: oldIOUAction?.actionName ?? CONST.REPORT.ACTIONS.TYPE.MOVED_TRANSACTION,
+            created: oldIOUAction?.created ?? DateUtils.getDBTime(),
+        };
+
         // 1. Optimistically change the reportID on the passed transactions
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
@@ -832,6 +849,7 @@ function changeTransactionsReport(
                 comment: {
                     hold: null,
                 },
+                ...(oldIOUAction ? {linkedTrackedExpenseReportAction: newIOUAction} : {}),
             },
         });
 
@@ -940,7 +958,6 @@ function changeTransactionsReport(
         const allowNegative = shouldEnableNegative(newReport);
 
         // 3. Keep track of the new report totals
-        const isUnreported = reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
         const targetReportID = isUnreported ? selfDMReportID : reportID;
         const {amount: transactionAmount = 0, currency: transactionCurrency} = getTransactionDetails(transaction, undefined, undefined, allowNegative) ?? {};
         const oldReportTotal = oldReport?.total ?? 0;
@@ -974,22 +991,6 @@ function changeTransactionsReport(
         }
 
         // 4. Optimistically update the IOU action reportID
-        const optimisticMoneyRequestReportActionID = rand64();
-
-        const originalMessage = getOriginalMessage(oldIOUAction) as OriginalMessageIOU;
-        const newIOUAction = {
-            ...oldIOUAction,
-            originalMessage: {
-                ...originalMessage,
-                IOUReportID: reportID,
-                type: isUnreported ? CONST.IOU.REPORT_ACTION_TYPE.TRACK : CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-            },
-            reportActionID: optimisticMoneyRequestReportActionID,
-            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-            actionName: oldIOUAction?.actionName ?? CONST.REPORT.ACTIONS.TYPE.MOVED_TRANSACTION,
-            created: oldIOUAction?.created ?? DateUtils.getDBTime(),
-        };
-
         const trackExpenseActionableWhisper = isUnreportedExpense ? getTrackExpenseActionableWhisper(transaction.transactionID, selfDMReportID) : undefined;
 
         if (oldIOUAction) {

src/pages/Search/SearchMoneyRequestReportPage.tsx

@@ -157,7 +157,7 @@ function SearchMoneyRequestReportPage({route}: SearchMoneyRequestPageProps) {
         }
 
         const iouAction = getIOUActionForTransactionID(reportActions, transaction.transactionID);
-        if (iouAction || transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+        if (iouAction || transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || !!transaction.linkedTrackedExpenseReportAction?.childReportID) {
             return;
         }
 

src/pages/home/ReportScreen.tsx

@@ -903,7 +903,7 @@ function ReportScreen({route, navigation, isInSidePanel = false}: ReportScreenPr
         // - IOU action already exists (not a legacy transaction)
         // - Transaction is pending addition (new transaction, not legacy)
         const iouAction = getIOUActionForReportID(reportID, transaction.transactionID);
-        if (iouAction || transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+        if (iouAction || transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || !!transaction.linkedTrackedExpenseReportAction?.childReportID) {
             return;
         }