Skip to content

[HOLD BE] feat: implement Merge Reports RHP and action menu#95658

Draft
dmkt9 wants to merge 3 commits into
Expensify:mainfrom
dmkt9:feat/merge-reports-RHP-and-merge-action-menu
Draft

[HOLD BE] feat: implement Merge Reports RHP and action menu#95658
dmkt9 wants to merge 3 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@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.00% <ø> (ø)
...onents/SelectionList/ListItem/ListItemRenderer.tsx 85.71% <ø> (ø)
...avigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 76.92% <ø> (ø)
...rc/pages/Search/SearchTransactionsChangeReport.tsx 0.00% <ø> (ø)
...portListItemRow/ExpenseReportListItemRowNarrow.tsx 0.00% <0.00%> (ø)
...gation/AppNavigator/ModalStackNavigators/index.tsx 6.63% <0.00%> (-0.01%) ⬇️
src/hooks/useSearchBulkActions.ts 53.82% <50.00%> (-0.02%) ⬇️
src/ROUTES.ts 20.78% <0.00%> (-0.08%) ⬇️
... and 3 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

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.

3 participants