Skip to content

Fix infinite loading after cross-report expense merge#84540

Draft
MelvinBot wants to merge 1 commit intomainfrom
claude-fixInfiniteLoadingAfterCrossReportMerge
Draft

Fix infinite loading after cross-report expense merge#84540
MelvinBot wants to merge 1 commit intomainfrom
claude-fixInfiniteLoadingAfterCrossReportMerge

Conversation

@MelvinBot
Copy link
Contributor

Explanation of Change

When merging expenses across different reports (cross-report merge), the target transaction's reportID was not being optimistically updated to the destination report. After the merge, the UI navigated to the destination report, but from Onyx's perspective the transaction still belonged to its original report. This caused MoneyRequestView to find no valid transactionThreadReport, triggering its skeleton guard at MoneyRequestView.tsx:789 and displaying infinite loading.

Additionally, if the source report was a single-expense report that also happened to be the merge destination, it would be optimistically deleted (SET to null) even though the backend would keep it with the merged expense. This compounded the issue by making the destination report appear as null in Onyx.

This PR makes two changes to src/libs/actions/MergeTransaction.ts:

  1. Pass newTransactionReportID to getUpdateMoneyRequestParams when the destination report differs from the target transaction's current report. This leverages the existing newTransactionReportID parameter (already used in the Split flow) to optimistically update the target transaction's reportID to the destination report, so the derived data and component chain reflect the correct state immediately.

  2. Skip optimistic deletion of the source report when it is the merge destination. The backend will move the merged transaction to that report, so it should not be deleted optimistically.

Fixed Issues

$ #79717
PROPOSAL: #79717 (comment)

Tests

  1. Go to staging.new.expensify.com
  2. Go to a workspace chat
  3. Create two reports with one expense in each report (Report A, Report B)
  4. Open Report A
  5. Click More > Merge
  6. Select expense from Report B > Continue
  7. Select the second option for each detail > Next
  8. Click Merge expenses
  9. Verify the report loads correctly (no infinite loading)
  10. Go back to workspace chat
  11. Create another report with an expense (Report C)
  12. Open Report C
  13. Click More > Merge
  14. Select expense from the other report > Continue
  15. Select the second option for each detail > Next
  16. Click Merge expenses
  17. Verify the report loads correctly after the second merge (no infinite loading)
  • Verify that no errors appear in the JS console

Offline tests

  1. While offline, attempt the merge flow described above
  2. Verify the optimistic data renders correctly (no infinite loading/skeleton)
  3. Go back online and verify the data syncs properly

QA Steps

Same as Tests above. The key verification is step 17 — the second cross-report merge should no longer cause infinite loading.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

When merging expenses across different reports, the target transaction's
reportID was not being optimistically updated to the destination report.
This caused the UI to navigate to a report where the transaction data
hadn't been moved yet, triggering the skeleton guard in MoneyRequestView
indefinitely.

Additionally, if the source report was a single-expense report that
happened to be the merge destination, it would be optimistically deleted
even though the backend would keep it (with the merged expense). This
caused the destination report to appear as null in Onyx.

Two changes:
1. Pass newTransactionReportID to getUpdateMoneyRequestParams during
   merge so the target transaction's reportID is optimistically updated
   to the destination report.
2. Skip optimistic deletion of the source report when it is the merge
   destination.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@situchan
Copy link
Contributor

@MelvinBot close PR. Do you know which PR fixed the original bug?

@MelvinBot
Copy link
Contributor Author

Closing this PR as requested — the linked issue (#79717) is no longer reproducible (confirmed by QA on build 9.3.43-1) and was closed by mallenexpensify.

Which PR fixed the original bug? There is no single PR that directly targeted #79717. The bug was most likely resolved as a side effect of one or more of these merge-related PRs that landed between when the issue was filed and when QA confirmed it was fixed:

  • #72990 — "Report turns to skeleton loader after merging expenses offline" (merged 2026-02-11) — Most likely candidate, as it directly addresses the skeleton loader symptom after merging expenses
  • #82006 — "Refactor mergeTransaction function to pass selfDMreport" (merged 2026-02-11) — Refactored the merge transaction logic
  • #79766 — "Fix incorrect chat opening after merging expense with self DM" (merged 2026-02-23) — Fixed merge navigation issues

My best guess is #72990 since it fixed the same symptom (skeleton/infinite loading after merge) in a closely related scenario.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants