Skip to content

feat: implement Merge Reports RHP and action menu - #95658

Merged
Gonals merged 33 commits into
Expensify:mainfrom
dmkt9:feat/merge-reports-RHP-and-merge-action-menu
Sep 4, 2026
Merged

Gonals merged 33 commits into
Expensify:mainfrom
dmkt9:feat/merge-reports-RHP-and-merge-action-menu

Conversation

@dmkt9

@dmkt9 dmkt9 commented Jul 9, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

  1. Use the canMergeReports helper from [NoQA] feat: add canMergeReports eligibility helper for the Merge Reports project #94939 to determine whether the Merge reports option should be displayed in the search bulk action menu.
  2. Implement the Merge reports right-hand panel (RHP) UI according to the design.
  3. Use the mergeReports action from [NoQA] feat: implement mergeReports() action #95182 to complete the report merge flow.
  4. After the reports are merged, navigate to the destination report.

Fixed Issues

$ #94873
$ #94874
PROPOSAL:

Tests

Same as QA steps

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Prerequisites: The user has multiple workspaces containing reports in different states.

Test 1:

  1. Open the app.
  2. Navigate to Spend > Reports.
  3. Select any two reports.
  4. Click the "x selected" button.
  5. Verify that the "Merge reports" option is available only when both reports:
    • Belong to the same workspace.
    • Have the same submitter.
    • Are expense reports.
    • Are not archived.
    • And satisfy one of the following conditions:
      • If the current user is an admin, both reports are draft or outstanding, and if they are outstanding, they are assigned to the same manager.
      • If the current user is the submitter, both reports are draft or outstanding (the first approver has not approved either report yet).
      • If the current user is a manager, both reports are outstanding.

Test 2:

  1. Select any valid reports that can be merged.
  2. Click the "x selected" button.
  3. Select the "Merge reports" option.
  4. Verify that the Merge reports RHP displays the selected reports.
  5. Verify that the "Confirm" button is disabled until a destination report is selected.
  6. Go offline.
  7. Select a destination report.
  8. Click the "Confirm" button.
  9. Verify that the user is navigated to the destination report containing all transactions from the source reports.
  10. Close the RHP and verify that all source reports are marked as deleted in Spend > Reports.
  11. Go online.
  12. Verify that no error appears.
  • 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 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)
  • 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)
  • 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.
  • 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.hybrid.mp4
Android: mWeb Chrome
android.chrome.mp4
iOS: Native
ios.hybrid.mp4
iOS: mWeb Safari
ios.safari.mp4
MacOS: Chrome / Safari
mac.safari.1.mp4
mac.safari.2.mp4

@melvin-bot

melvin-bot Bot commented Jul 9, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@codecov

codecov Bot commented Jul 9, 2026 •

Copy link
Copy Markdown

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/SCREENS.ts 100.00% <ø> (ø)
src/components/SelectionList/BaseSelectionList.tsx 83.11% <ø> (ø)
...onents/SelectionList/ListItem/ListItemRenderer.tsx 85.71% <ø> (ø)
...avigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 71.42% <ø> (ø)
...rc/pages/Search/SearchTransactionsChangeReport.tsx 0.00% <ø> (ø)
...portListItemRow/ExpenseReportListItemRowNarrow.tsx 0.00% <0.00%> (ø)
...gation/AppNavigator/ModalStackNavigators/index.tsx 6.25% <0.00%> (-0.01%) ⬇️
src/libs/actions/Report/index.ts 71.39% <83.33%> (-0.09%) ⬇️
src/hooks/useSearchBulkActions.ts 71.25% <72.72%> (+0.01%) ⬆️
... and 4 more
... and 10 files with indirect coverage changes

@dmkt9 dmkt9 changed the title [HOLD] feat: implement Merge Reports RHP and action menu [HOLD BE] feat: implement Merge Reports RHP and action menu Jul 17, 2026
@dmkt9

dmkt9 commented Jul 17, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: 6319951c43

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@dmkt9

dmkt9 commented Jul 17, 2026

Copy link
Copy Markdown
Contributor Author

@ShridharGoel When the MergeReports API is ready, could you please let me know? Thanks!

cc @garrettmknight @situchan

@garrettmknight

Copy link
Copy Markdown
Contributor

@dmkt9 looks like MergeReports is on prod.

@ShridharGoel

Copy link
Copy Markdown
Contributor

Web-E deployment is still pending

@ShridharGoel

Copy link
Copy Markdown
Contributor

Web-E changes are on staging, so this can proceed

@dmkt9

dmkt9 commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Thanks @ShridharGoel @garrettmknight

@dmkt9 dmkt9 changed the title [HOLD BE] feat: implement Merge Reports RHP and action menu feat: implement Merge Reports RHP and action menu Jul 22, 2026
@OSBotify

This comment has been minimized.

@dmkt9

dmkt9 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

Add MergeReportsParams to WriteCommandParameters:

  • destinationReportID: string
  • sourceReportIDs: string[] (a real array, derived as selected minus destination)

@ShridharGoel What are the expected parameters for MergeReports here?

image image

@ShridharGoel

ShridharGoel commented Jul 23, 2026 •

Copy link
Copy Markdown
Contributor

MergeReports(authToken, reportID, sourceReportIDList, [transactionIDToReportActionAndThreadData])

reportID is the destination report (kept).

sourceReportIDList is a comma-separated list of the source reports to merge in and delete.

transactionIDToReportActionAndThreadData carries the frontend's optimistic IDs (money request preview action, transaction thread, moved action) keyed by transactionID.

The shape of the parameter is as follows (all IDs are optional strings):

{ 
    [transactionID]: { 
         "moneyRequestPreviewReportActionID": "111", 
         "transactionThreadReportID": "222",
         "transactionThreadCreatedReportActionID": "333", 
         "movedReportActionID": "444", 
     } 
  }

@dmkt9

dmkt9 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

Thanks, @ShridharGoel, for the details. However, I think this differs from the original design.

Add MergeReportsParams to WriteCommandParameters:

  • destinationReportID: string
  • sourceReportIDs: string[] (a real array, derived as selected minus destination)

That's fine. I'll update the FE accordingly.

@dmkt9
dmkt9 marked this pull request as ready for review July 23, 2026 18:52
@dmkt9
dmkt9 requested review from a team as code owners July 23, 2026 18:52
@melvin-bot
melvin-bot Bot requested a review from situchan July 23, 2026 18:52
@github-actions

github-actions Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

🚧 Gonals has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

OSBotify commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 9.4.73-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 failure ❌

@MelvinBot

MelvinBot commented Sep 7, 2026 •

Copy link
Copy Markdown
Contributor

🤖 Help site changes are required. Draft PR: #100485

This PR added the Merge reports bulk action in Spend > Reports plus the Merge reports right-hand panel, and nothing under docs/articles covered it. How-to-Merge-Expenses.md only covers merging two duplicate expenses, which is a different workflow.

What the docs PR does

  1. Adds docs/articles/new-expensify/reports-and-expenses/How-to-Merge-Reports.md — who can merge reports, the steps from Spend > Reports, what happens after the merge, and an FAQ for when Merge reports doesn't appear.
  2. Adds one FAQ entry to How-to-Merge-Expenses.md pointing to the new article, since "merge expenses" and "merge reports" are easy to confuse.
Where the documented behavior came from

Applied docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md: one # title plus # FAQ, task-based ## headings only, bolded UI labels in sentence case, relative cross-links, and one screenshot suggestion inside a non-rendered HTML comment. npm run spell-changed passes on both files.

One thing to double-check: I verified the Spend tab and its Expenses / Reports sub-tabs against the live web UI, but the test account has no expense reports, so I could not open the selection menu or the Merge reports panel. The labels for the green selected button, the Merge reports menu item, the panel description, and the Confirm button come from the merged code rather than from a live screen.

@dmkt9, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review


view run · no recording available

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #100493 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #100497 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #100499 was identified to be related to this PR.

@jponikarchuk

jponikarchuk commented Sep 7, 2026 •

Copy link
Copy Markdown

Deploy Blocker #100502 was identified to be related to this PR.

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #100512 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #100599 was identified to be related to this PR.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #100600 was identified to be related to this PR.

@OSBotify

OSBotify commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.73-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@dmkt9 dmkt9 mentioned this pull request Sep 13, 2026
45 tasks done
const selectedMergeReports = areAllMatchingItemsSelected
? []
: selectedReports
.map(({reportID}) => currentSearchResults?.data[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`])

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not having optional chaining here on data let to the following issue / app crashing: #103775.

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.