fix: offline merge visibility for track distance expenses by Bar-Maz · Pull Request #77862 · Expensify/App

Bar-Maz · 2025-12-17T09:27:59Z

Explanation of Change

Fixed an issue where track distance expenses were not visible in expense reports after merging transactions while offline, causing skeleton loaders and empty reports.

Root Cause:
The transaction filtering logic for expense reports excluded all transactions with pending actions, even when offline. After merging a distance expense offline, the transaction had pendingAction: ADD, which caused it to be filtered out, resulting in skeleton loaders and empty reports.

Solution:

Extracted transaction filtering logic into dedicated functions that properly handle offline mode
Updated filtering to include transactions with ADD pending action when offline (they're excluded when online)
Updated ReportActionsView to use the new filtering logic for expense reports

Result:
Merged expenses are now immediately visible in expense reports when offline, without skeleton loaders or empty reports.

Fixed Issues

$ #75267
PROPOSAL:

Tests

Go to Workspace chat -> Create a distance expense (call ExpenseWS)
Go to Self DM -> Create a distance expense (call ExpenseDM)
Open distance expense in self DM
Tap More button >> Merge option >> select the displayed distance expense >> tap Continue
Select the merchant details of workspace distance expense (ExpenseWS)
Tap on Merge expenses
Merge completes successfully
Select the workspace distance expense in LHN
Report displays correctly with the merged expense, not empty

Offline tests

Go to Workspace chat -> Create a distance expense (call ExpenseWS)
Go to Self DM -> Create a distance expense (call ExpenseDM)
Open distance expense in self DM
Go offline
Tap More button >> Merge option >> select the displayed distance expense >> tap Continue
Select the merchant details of workspace distance expense (ExpenseWS)
Tap on Merge expenses
Merge completes successfully without infinite skeleton loading
No console errors related to missing report data
Report type is preserved (EXPENSE type)
Select the workspace distance expense in LHN
Report displays correctly with the merged expense, not empty
Go back online
Merge syncs with server and data remains consistent

QA Steps

Navigate to staging.new.expensify.com
Go to Workspace chat -> Create a distance expense (call ExpenseWS)
Go to Self DM -> Create a distance expense (call ExpenseDM)
Open distance expense in self DM
Go offline
Tap More button >> Merge option >> select the displayed distance expense >> tap Continue
Select the merchant details of workspace distance expense (ExpenseWS)
Tap on Merge expenses
Merge completes successfully without infinite skeleton loading
Select the workspace distance expense in LHN
Report displays correctly with the merged expense, not empty
Go back online and verify the merge syncs correctly with the server

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

github-actions · 2025-12-17T09:28:17Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

codecov · 2025-12-17T10:04:11Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/libs/ModifiedExpenseMessage.ts	`53.40% <ø> (ø)`
src/libs/ReportNameUtils.ts	`82.23% <ø> (ø)`
src/libs/ReportUtils.ts	`71.98% <ø> (-0.34%)`	⬇️
src/libs/actions/IOU/index.ts	`68.84% <100.00%> (+0.67%)`	⬆️
src/libs/actions/Report.ts	`54.65% <ø> (+0.73%)`	⬆️
src/pages/home/report/ReportActionsList.tsx	`80.72% <100.00%> (ø)`
src/pages/home/report/withReportOrNotFound.tsx	`87.87% <100.00%> (+0.37%)`	⬆️
src/libs/ReportActionsUtils.ts	`55.50% <94.11%> (+0.76%)`	⬆️
src/libs/actions/MergeTransaction.ts	`63.26% <94.52%> (+15.57%)`	⬆️
.../TransactionMerge/MergeTransactionsListContent.tsx	`0.00% <0.00%> (ø)`
... and 1 more
... and 266 files with indirect coverage changes

LukasMod · 2025-12-17T12:09:09Z

package-lock.json

        "electron-builder": "26.0.19",
        "eslint": "^9.36.0",
        "eslint-config-airbnb-typescript": "^18.0.0",
-        "eslint-config-expensify": "^2.0.101",


Why is this change here?

LukasMod · 2025-12-17T12:11:47Z

src/pages/TransactionMerge/MergeTransactionsListContent.tsx

+    const shouldShowLoadingPlaceholder = useMemo(() => {
+        if (isOffline) {
+            return false;
+        }
+        if (Array.isArray(eligibleTransactions)) {
+            return false;
+        }
+        return true;
+    }, [isOffline, eligibleTransactions]);


Will there be any benefit from this instead just
const shouldShowLoadingPlaceholder = !isOffline && !Array.isArray(eligibleTransactions);

LukasMod · 2025-12-17T12:20:24Z

src/pages/home/report/ReportActionsView.tsx

+    const reportTransactionIDs = useMemo(() => {
+        const allTransactions = getAllNonDeletedTransactions(reportTransactions, allReportActions ?? []);
+        return allTransactions.map((transaction) => transaction.transactionID);
+    }, [reportTransactions, allReportActions]);


I don't see a point for creating temporary allTransactions here, I guess it could be a big one. If its the same in result, maybe lets use previous one?

LukasMod · 2025-12-17T12:26:25Z

src/pages/home/report/ReportActionsView.tsx

-            ),
-        [reportActions, isOffline, canPerformWriteAction, reportTransactionIDs, policy],
-    );
+    const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {canBeMissing: true});


I'm bit worried about this allTransactions and visibleReportActions. Let's check how it performs with heavy account. I think there could be performance drop if we use it in dep array with such logic like this one

LukasMod · 2025-12-17T12:27:33Z

src/pages/home/report/ReportActionsList.tsx

    }, [canShowHeader, retryLoadNewerChatsError]);

-    const shouldShowSkeleton = isOffline && !sortedVisibleReportActions.some((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
+    const shouldShowSkeleton = isOffline && sortedVisibleReportActions.length === 0;


Is this part of the solution? The previous condition looks like a solution to a specific use case.

LukasMod · 2025-12-17T12:27:47Z

src/pages/home/report/ReportActionsList.tsx


-    const shouldShowSkeleton = isOffline && !sortedVisibleReportActions.some((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
+    const shouldShowSkeleton = isOffline && sortedVisibleReportActions.length === 0;
+


additional empty line

LukasMod · 2025-12-17T12:28:23Z

src/libs/actions/MergeTransaction.ts

+                    [oldIOUAction.reportActionID]: null,
+                },
+            });
+


trailing line

LukasMod · 2025-12-17T12:34:08Z

src/pages/home/report/ReportActionsView.tsx

+                const isIOUReportExpense = isExpenseReport(iouReport);
+
+                if (isIOUReportExpense) {
+                    const expenseReportTransactions = Object.values(allTransactions ?? {}).filter((transaction) => {


There is allTransactions on every filter iteration reportActions.filter((reportAction) and it looks quite complex. Maybe it would be better to create some utility function for it or even few of them (with tests ideally if possible)? I think it will be hard to test and maintain in this shape

narefyev91 · 2025-12-17T14:46:57Z

src/pages/TransactionMerge/MergeTransactionsListContent.tsx

    );

-    if (eligibleTransactions?.length === 0) {
+    const shouldShowLoadingPlaceholder = useMemo(() => {


we should avoid using useMemo - compiler would mark this as an error

VickyStash · 2026-01-08T07:46:26Z

Hey @Bar-Maz, please make sure to resolve all of the checks failures!

Bar-Maz · 2026-01-12T07:50:36Z

I have read the CLA Document and I hereby sign the CLA

…ode review feedback

…line expense merge

dukenv0307 · 2026-01-19T02:51:30Z

src/libs/actions/Report.ts

+    const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const reportExists = !!report;
+
+    if (isOffline && hasReportActions && reportExists) {


why do we need this change? If we want to create an optimistic report, it would be better if we can do it in Transaction_Merge API.

I've moved the optimistic report creation logic from openReport to mergeTransactionRequest in MergeTransaction.ts.

dukenv0307 · 2026-01-19T02:52:51Z

src/libs/actions/Report.ts

-          };
+    const isOffline = NetworkStore.isOffline();
+    const hasReportActions = reportActionsExist(reportID);
+    const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];


Actually, we want to avoid using allReports here. We already had many issues to remove it, like #66411

I've modified this function so it no longer adds any new reliance on allReports.

…ode-distance-merge

…istance-merge

dukenv0307 · 2026-01-20T03:29:29Z

@Bar-Maz Some lints are failing

…ode-distance-merge

dukenv0307 · 2026-01-21T08:22:05Z

src/pages/TransactionMerge/ConfirmationPage.tsx

        }
        const reportID = mergeTransaction.reportID;

+        // Ensure expense report exists in Onyx before merge (required by getUpdateMoneyRequestParams)


Can you please share the steps to reproduce this issue? I think expenseReport appears in the confirmation page.

After testing, I found that the expense report is always present in Onyx at this point. I was worried that it might not be fully loaded if we, for example, just logged in. This part turned out to be unnecessary, so I removed it.

dukenv0307 · 2026-01-21T08:25:29Z

src/libs/ReportActionsUtils.ts

 import Parser from './Parser';
 import {arePersonalDetailsMissing, getEffectiveDisplayName, getPersonalDetailByEmail, getPersonalDetailsByIDs} from './PersonalDetailsUtils';
 import {getPolicy, isPolicyAdmin as isPolicyAdminPolicyUtils} from './PolicyUtils';
+// eslint-disable-next-line import/no-cycle


Let's add the explanation when we want to disable lint rule

Done! I'll also explore the possibility of getting rid of these cycles in a separate proposal.

Can you try @libs/ReportUtils? We used before without any lint error so I think we can keep the same

…anations

…ode-distance-merge

dukenv0307 · 2026-01-22T03:55:46Z

Testing now

dukenv0307 · 2026-01-22T04:04:06Z

Select the merchant details of workspace distance expense (ExpenseWS)

If we select the details of SelfDM, the workspace expense will show infinite loading

Screen.Recording.2026-01-22.at.11.01.44.mov

heyjennahay

Product review not required

Bar-Maz · 2026-01-26T11:48:45Z

Hi, @dukenv0307
Issue 75267 appears to be resolved on the current main branch by this pull request: #78966.
Could you please confirm that this is correct?

However, while working on this issue, I noticed that after the offline merge, the workspace and chat don’t seem to update properly on the current main branch. In fact, most of the changes in this PR are addressing that behavior. I can fix this so that chat updates are reflected correctly as well, based on the work already done here.

After consulting with @VickyStash, I have a clearer idea of a few improvements we could make to the logic.

Do we want to correct this behavior? If so, what’s the preferred approach? Should I continue in this PR, or open a new one?

I’ve attached a video demonstrating the current state and the mentioned issue.

offline_merge_main.mp4

dukenv0307 · 2026-01-27T02:27:04Z

Is it expected to show the loading indicator here?

Track the distance expense in Self DM
Track another distance expense in WS (Workspace)
Go to the WS expense detail
Go offline
Select more
Merge expense
Select the details of WS expense
Complete merging
Go to SelfDM
Observe that the distance expense created from step 1 shows infinite loading

Screen.Recording.2026-01-27.at.09.22.20.mov

dukenv0307 · 2026-01-27T02:29:58Z

Do we want to correct this behavior? If so, what’s the preferred approach? Should I continue in this PR, or open a new one?

I think we should do it in another PR because this one is quite big. Can you please update the tests/expectations to cover the following case

Select all details from the workspace expense
Select all details from the selfDM expense

Bar-Maz · 2026-01-27T10:03:06Z

I think we should do it in another PR because this one is quite big.

I agree that this PR is quite big. However, the original issue (the skeleton loader after merge) already seems to be resolved on main.

What remains (and what most of this PR is addressing) is the inconsistent chat/workspace update behavior after offline merge, which can still be observed on main as well. So at this point the only meaningful work here would be to actually fix and align that chat behavior with the online flow.

If we don’t want to extend the scope of this issue, we could close it as resolved and open a new issue specifically for the offline-merge chat/workspace update behavior, and continue the work there based on the changes already made in this PR.

dukenv0307 · 2026-01-28T02:55:13Z

If we don’t want to extend the scope of this issue

@Bar-Maz I don't think we should add more changes to this PR. Ideally, we can list the improvements in this PR and make the other improvements in separate PRs. cc @VickyStash for more thoughts

VickyStash · 2026-01-28T08:01:25Z

@Bar-Maz I don't think we should add more changes to this PR. Ideally, we can list the improvements in this PR and make the other improvements in separate PRs. cc @VickyStash for more thoughts

I agree that this PR is already quite big and complex.

Do we know for sure that the original issue is fixed (the one was reported in the original issue)?
And besides that we have some additional issues on main that now are visible, right? :

However, while working on this issue, I noticed that after the offline merge, the workspace and chat don’t seem to update properly on the current main branch. In fact, most of the changes in this PR are addressing that behavior. I can fix this so that chat updates are reflected correctly as well, based on the work already done here

@Bar-Maz does the PR fixes this issue right now (without any furthur adjustments?). Does it fix it in a way so optimistic data is aligned with the data received from the BE later? If any adjustments are needed, I think it's maybe better to have a new PR.

I think it worth to check:

if there any issue opened for the additional issue you are trying to fix
is there any open PRs for that/ that can fix that

Cause I see there are some PRs, that are applying fixes in the same area, does any of it fixes the issue you mention?
#72990
#79766

dukenv0307 · 2026-02-21T04:16:59Z

Any updates @Bar-Maz ?

Bar-Maz · 2026-02-23T09:38:12Z

Hi, I'll close it as I'm preparing a separate PR that solves the issue

melvin-bot bot assigned Bar-Maz Dec 17, 2025

Bar-Maz force-pushed the fix/75267-offline-mode-distance-merge branch from ab9d95a to f5aea4e Compare December 17, 2025 09:55

Bar-Maz force-pushed the fix/75267-offline-mode-distance-merge branch from f5aea4e to d179e80 Compare December 17, 2025 10:07

LukasMod reviewed Dec 17, 2025

View reviewed changes

narefyev91 reviewed Dec 17, 2025

View reviewed changes

Bar-Maz force-pushed the fix/75267-offline-mode-distance-merge branch 4 times, most recently from 9a62f9a to 7a6ae71 Compare January 8, 2026 02:02

Bar-Maz mentioned this pull request Jan 8, 2026

[$250] Chat - Skeleton loader when merging self DM distance exp with WS distance exp in offline mode #75267

Closed

16 tasks

CLABotify added a commit to Expensify/CLA that referenced this pull request Jan 12, 2026

@Bar-Maz has signed the CLA in Expensify/App#77862

f402758

Bar-Maz force-pushed the fix/75267-offline-mode-distance-merge branch 2 times, most recently from ad232c3 to d11d715 Compare January 12, 2026 21:46

Bar-Maz added 13 commits January 12, 2026 22:54

fix: offline merge visibility for track distance expenses

574ebd5

refactor: optimize expense report transaction filtering and address c…

7228ff6

…ode review feedback

fix: prevent skeleton loader and empty report after offline merge

c6e12e1

fix: ensure correct report navigation and action visibility after off…

db84cff

…line expense merge

fix: duplicate report expenses after offline merge

6929a80

fix: types for getTransactionIDsForIOUAction test

1dc0349

refactor: clean up imports and fix linting issues

afdc078

refactor: extract filtering logic, remove duplication and improve naming

a8397a4

fix: reset network state in openReport legacy preview test

42c6138

fix: resolve variable shadowing in shouldShowReportAction callback

84bb0b3

fix: rebase fixes

747fc64

fix: preserve report type and data during offline transaction merge

5e8a6aa

fix: lint after rebase

a88f620

fix: ReportActionsUtils tests

e21d81a

dukenv0307 reviewed Jan 19, 2026

View reviewed changes

Bar-Maz added 6 commits January 19, 2026 20:31

Merge remote-tracking branch 'upstream/main' into fix/75267-offline-m…

35b913d

…ode-distance-merge

refactor: move optimistic report creation to mergeTransactionRequest

2ebf5ca

Merge remote-tracking branch 'upstream' into fix/75267-offline-mode-d…

2605993

…istance-merge

fix: conflicts

039f40d

fix: lint

6fb5718

fix: types

d27a04f

Bar-Maz added 3 commits January 20, 2026 08:29

chore: remove outdated report tests and resolve lint issues

81d8f01

fix: lint

b358dbf

Merge remote-tracking branch 'upstream/main' into fix/75267-offline-m…

b05089f

…ode-distance-merge

dukenv0307 reviewed Jan 21, 2026

View reviewed changes

Bar-Maz added 2 commits January 21, 2026 20:18

refactor: remove unnecessary report preload and add cycle import expl…

3a97fe7

…anations

Merge remote-tracking branch 'upstream/main' into fix/75267-offline-m…

648fba6

…ode-distance-merge

fix: infinite loading when merging expenses to DMs

7955f3d

heyjennahay reviewed Jan 23, 2026

View reviewed changes

Bar-Maz closed this Feb 23, 2026


		const shouldShowSkeleton = isOffline && !sortedVisibleReportActions.some((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
		const shouldShowSkeleton = isOffline && sortedVisibleReportActions.length === 0;

Conversation

Bar-Maz commented Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions bot commented Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 17, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VickyStash commented Jan 8, 2026

Uh oh!

Bar-Maz commented Jan 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Jan 20, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Jan 22, 2026

Uh oh!

dukenv0307 commented Jan 22, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

Bar-Maz commented Jan 26, 2026

Uh oh!

dukenv0307 commented Jan 27, 2026

Uh oh!

dukenv0307 commented Jan 27, 2026

Uh oh!

Bar-Maz commented Jan 27, 2026

Uh oh!

dukenv0307 commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VickyStash commented Jan 28, 2026

Uh oh!

Bar-Maz commented Dec 17, 2025 •

edited

Loading

github-actions bot commented Dec 17, 2025 •

edited

Loading

codecov bot commented Dec 17, 2025 •

edited by github-actions bot

Loading

dukenv0307 commented Jan 28, 2026 •

edited

Loading