fix: offline merge visibility for track distance expenses

src/libs/ModifiedExpenseMessage.ts

@@ -17,6 +17,10 @@ import Log from './Log';
 import Parser from './Parser';
 import {getPersonalDetailByEmail} from './PersonalDetailsUtils';
 import {getCleanedTagName, getPolicy, getSortedTagKeys, isPolicyAdmin} from './PolicyUtils';
+// This cycle import is safe because the functions imported here don't create initialization-time dependencies.
+// ModifiedExpenseMessage imports utility functions from ReportActionsUtils, and ReportActionsUtils imports utility functions from ModifiedExpenseMessage (via ReportUtils).
+// The imported functions (getOriginalMessage, isModifiedExpenseAction) are pure utility functions that don't use module-level variables.
+// eslint-disable-next-line import/no-cycle
 import {getOriginalMessage, isModifiedExpenseAction} from './ReportActionsUtils';
 // This cycle import is safe because ReportNameUtils was extracted from ReportUtils to separate report name computation logic.
 // The functions imported here are pure utility functions that don't create initialization-time dependencies.

src/libs/ReportActionsUtils.ts

@@ -7,13 +7,12 @@
 import type {ValueOf} from 'type-fest';
 import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleContextProvider';
 import usePrevious from '@hooks/usePrevious';
-import {isHarvestCreatedExpenseReport, isPolicyExpenseChat} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Card, OnyxInputOrEntry, OriginalMessageIOU, PersonalDetails, Policy, PrivatePersonalDetails, ReportMetadata, ReportNameValuePairs} from '@src/types/onyx';
+import type {Card, OnyxInputOrEntry, OriginalMessageIOU, PersonalDetails, Policy, PrivatePersonalDetails, ReportMetadata, ReportNameValuePairs, Transaction} from '@src/types/onyx';
 import type {
     JoinWorkspaceResolution,
     OriginalMessageChangeLog,
@@ -43,6 +42,12 @@
 import Parser from './Parser';
 import {arePersonalDetailsMissing, getEffectiveDisplayName, getPersonalDetailByEmail, getPersonalDetailsByIDs} from './PersonalDetailsUtils';
 import {getPolicy, isPolicyAdmin as isPolicyAdminPolicyUtils} from './PolicyUtils';
+// This cycle import is safe because the functions imported here don't create initialization-time dependencies.
+// ReportActionsUtils imports utility functions from ReportUtils, and ReportUtils imports utility functions from ReportActionsUtils.
+// Some functions use module-level variables (e.g., allReports, allReportActions) that are initialized asynchronously via Onyx.connect(), so there's no circular dependency during module initialization.
+// eslint-disable-next-line import/no-cycle
+import {getReportOrDraftReport, isExpenseReport, isHarvestCreatedExpenseReport, isPolicyExpenseChat} from './ReportUtils';
+// eslint-disable-next-line import/no-cycle
 import type {getReportName, OptimisticIOUReportAction, PartialReportAction} from './ReportUtils';
 import StringUtils from './StringUtils';
 import {getReportFieldTypeTranslationKey} from './WorkspaceReportFieldUtils';
@@ -66,7 +71,7 @@
 type MemberChangeMessageElement = MessageTextElement | MemberChangeMessageUserMentionElement | MemberChangeMessageRoomReferenceElement;
 
 let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
     callback: (actions) => {
@@ -78,7 +83,7 @@
 });
 
 let allReports: OnyxCollection<Report>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -87,13 +92,13 @@
 });
 
 let isNetworkOffline = false;
 Onyx.connect({
     key: ONYXKEYS.NETWORK,
     callback: (val) => (isNetworkOffline = val?.isOffline ?? false),
 });
 
 let deprecatedCurrentUserAccountID: number | undefined;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         // When signed out, value is undefined
@@ -1523,6 +1528,82 @@
     return !!IOUTransactionID && reportTransactionIDs.includes(IOUTransactionID);
 };
 
+/**
+ * Checks if a transaction has a valid pending action for expense report filtering.
+ * When online, transactions with ADD or UPDATE pending action are included (to keep them visible during optimistic edits).
+ * When offline, transactions with ADD pending action are included.
+ */
+function hasValidPendingActionForExpenseReport(transaction: Transaction, isOffline: boolean): boolean {
+    return (
+        !transaction.pendingAction ||
+        transaction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD ||
+        (!isOffline && transaction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE)
+    );
+}
+
+/**
+ * Filters transactions for an expense report and returns their transaction IDs.
+ * When online, excludes transactions with pending actions (except ADD when offline).
+ *
+ * @param allTransactions - Collection of all transactions from Onyx
+ * @param iouReportID - The expense report ID to filter transactions for
+ * @param transactionID - Optional specific transaction ID to include if it matches the report
+ * @param isOffline - Whether the app is currently offline (affects which pending actions are considered valid)
+ * @returns Array of transaction IDs that belong to the expense report
+ */
+function getExpenseReportTransactionIDs(allTransactions: OnyxCollection<Transaction>, iouReportID: string, transactionID: string | undefined, isOffline: boolean): string[] {
+    if (!iouReportID) {
+        return [];
+    }
+
+    const expenseReportTransactions = Object.values(allTransactions ?? {}).filter((transaction) => {
+        if (!transaction) {
+            return false;
+        }
+        const matchesReportID = transaction.reportID === iouReportID;
+        return matchesReportID && hasValidPendingActionForExpenseReport(transaction, isOffline);
+    });
+
+    const transactionIDsToCheck = expenseReportTransactions.map((transaction) => transaction?.transactionID).filter((id): id is string => !!id);
+
+    if (transactionID) {
+        const transactionInOnyx = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+        if (transactionInOnyx && transactionInOnyx.reportID === iouReportID && !transactionIDsToCheck.includes(transactionID)) {
+            if (hasValidPendingActionForExpenseReport(transactionInOnyx, isOffline)) {
+                transactionIDsToCheck.push(transactionID);
+            }
+        }
+    }
+
+    return transactionIDsToCheck;
+}
+
+/**
+ * Determines which transaction IDs should be checked for an IOU action.
+ */
+function getTransactionIDsForIOUAction(reportAction: ReportAction, reportTransactionIDs: string[], allTransactions: OnyxCollection<Transaction>, isOffline: boolean): string[] {
+    if (!isMoneyRequestAction(reportAction)) {
+        return reportTransactionIDs;
+    }
+
+    const originalMessage = getOriginalMessage(reportAction);
+    const iouReportID = originalMessage?.IOUReportID;
+    const transactionID = originalMessage?.IOUTransactionID;
+
+    if (!iouReportID || !transactionID) {
+        return reportTransactionIDs;
+    }
+
+    const iouReport = getReportOrDraftReport(iouReportID);
+    const isIOUReportExpense = isExpenseReport(iouReport);
+
+    if (isIOUReportExpense) {
+        return getExpenseReportTransactionIDs(allTransactions, iouReportID, transactionID, isOffline);
+    }
+
+    return reportTransactionIDs;
+}
+
 /**
  * Gets the report action for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions.
  * Returns a report action if there is exactly one transaction thread for the report, and undefined otherwise.
@@ -3331,11 +3412,11 @@
     return connectionName ? translate('report.actions.type.removedConnection', {connectionName}) : '';
 }
 
-function getRenamedAction(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.RENAMED>>, isExpenseReport: boolean, actorName?: string) {
+function getRenamedAction(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.RENAMED>>, isExpenseReportParam: boolean, actorName?: string) {
     const originalMessage = getOriginalMessage(reportAction);
     return translate('newRoomPage.renamedRoomAction', {
         actorName,
-        isExpenseReport,
+        isExpenseReport: isExpenseReportParam,
         oldName: originalMessage?.oldName ?? '',
         newName: originalMessage?.newName ?? '',
     });
@@ -3712,6 +3793,7 @@
     getAllReportActions,
     getCombinedReportActions,
     getDismissedViolationMessageText,
+    getExpenseReportTransactionIDs,
     getFirstVisibleReportActionID,
     getIOUActionForReportID,
     getIOUActionForTransactionID,
@@ -3744,6 +3826,7 @@
     getSortedReportActions,
     getSortedReportActionsForDisplay,
     getTextFromHtml,
+    getTransactionIDsForIOUAction,
     getTrackExpenseActionableWhisper,
     getWhisperedTo,
     hasRequestFromCurrentAccount,

src/libs/ReportNameUtils.ts

@@ -30,6 +30,10 @@
 import Parser from './Parser';
 import {getDisplayNameOrDefault} from './PersonalDetailsUtils';
 import {getCleanedTagName, getPolicy, isPolicyAdmin} from './PolicyUtils';
+// This cycle import is safe because the functions imported here don't create initialization-time dependencies.
+// ReportNameUtils imports utility functions from ReportActionsUtils, and ReportActionsUtils imports utility functions from ReportNameUtils (via ReportUtils).
+// Some functions may use module-level variables that are initialized asynchronously via Onyx.connect(), so there's no circular dependency during module initialization.
+// eslint-disable-next-line import/no-cycle
 import {
     getActionableCardFraudAlertResolutionMessage,
     getCardIssuedMessage,
@@ -121,7 +125,7 @@
     isTripRoom,
     isUserCreatedPolicyRoom,
 } from './ReportUtils';
 
 let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 
 Onyx.connect({

src/libs/ReportUtils.ts

@@ -124,6 +124,8 @@ import {formatPhoneNumber as formatPhoneNumberPhoneUtils} from './LocalePhoneNum
 import {translateLocal} from './Localize';
 import Log from './Log';
 import {isEmailPublicDomain} from './LoginUtils';
+// This cycle import is safe because the functions imported here are pure utility functions that don't create initialization-time dependencies.
+// ReportUtils imports message formatting functions from ModifiedExpenseMessage, and ModifiedExpenseMessage imports utility functions from ReportUtils.
 // eslint-disable-next-line import/no-cycle
 import {getForReportAction, getMovedReportID} from './ModifiedExpenseMessage';
 import getReportURLForCurrentContext from './Navigation/helpers/getReportURLForCurrentContext';
@@ -171,6 +173,10 @@ import {
     isSubmitAndClose,
     shouldShowPolicy,
 } from './PolicyUtils';
+// This cycle import is safe because the functions imported here don't create initialization-time dependencies.
+// ReportUtils imports utility functions from ReportActionsUtils, and ReportActionsUtils imports utility functions from ReportUtils.
+// Some functions use module-level variables (e.g., allReports, allReportActions) that are initialized asynchronously via Onyx.connect(), so there's no circular dependency during module initialization.
+// eslint-disable-next-line import/no-cycle
 import {
     formatLastMessageText,
     getActionableCardFraudAlertResolutionMessage,

src/libs/actions/IOU/index.ts

@@ -758,7 +758,7 @@
     isASAPSubmitBetaEnabled: boolean;
     currentUserAccountIDParam: number;
     currentUserEmailParam: string;
     introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
     activePolicyID: string | undefined;
     quickAction: OnyxEntry<OnyxTypes.QuickAction>;
     allBetas: OnyxEntry<OnyxTypes.Beta[]>;
@@ -836,7 +836,7 @@
     isInvoice?: boolean;
     transactionThreadReportID: string | undefined;
 };
 
 type DeleteTrackExpenseParams = {
     chatReportID: string | undefined;
     chatReport: OnyxEntry<OnyxTypes.Report> | undefined;
@@ -850,7 +850,7 @@
     isChatReportArchived: boolean | undefined;
     isChatIOUReportArchived: boolean | undefined;
     allTransactionViolationsParam: OnyxCollection<OnyxTypes.TransactionViolations>;
 };
 
 type DeleteMoneyRequestFunctionParams = {
     transactionID: string | undefined;
@@ -859,7 +859,7 @@
     violations: OnyxCollection<OnyxTypes.TransactionViolations>;
     iouReport: OnyxEntry<OnyxTypes.Report>;
     chatReport: OnyxEntry<OnyxTypes.Report>;
     isChatIOUReportArchived?: boolean | undefined;
     isSingleTransactionView?: boolean;
     transactionIDsPendingDeletion?: string[];
     selectedTransactionIDs?: string[];
@@ -873,7 +873,7 @@
     waitForCollectionCallback: true,
     callback: (value) => {
         if (!value) {
             allTransactions = {};
             return;
         }
 
@@ -4301,6 +4301,13 @@
             true,
             isTransactionOnHold,
         );
+        // Set default type for reports with parentReportID and chatReportID but no type
+        if (!updatedMoneyRequestReport?.type && iouReport?.parentReportID && iouReport?.chatReportID) {
+            updatedMoneyRequestReport = {
+                ...updatedMoneyRequestReport,
+                type: CONST.REPORT.TYPE.EXPENSE,
+            };
+        }
     }
 
     optimisticData.push(