Skip to content

[CP Staging] Hide Merge Reports functionality behind beta - #100523

Merged
mountiny merged 2 commits into
mainfrom
alberto-block
Sep 7, 2026
Merged

mountiny merged 2 commits into
mainfrom
alberto-block

Conversation

@Gonals

@Gonals Gonals commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

We have a few (small) bugs on staging for this functionality. Instead of reverting the whole thing, which would be a pain,, let's hide it behind a beta:
#100512
#100502
#100497

Fixed Issues

$
PROPOSAL:

Tests

With an account NOT on the beta:

  • Go to workspace chat.
  • Create two reports with an expense each.
  • Go to Spend > Reports.
  • Select both reports via checkbox.
  • Click dropdown menu > Merge reports is not visible

Confirm it is visible if the account is on the beta

  • Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as tests

  • 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 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 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

@Gonals Gonals self-assigned this Sep 7, 2026
@Gonals
Gonals marked this pull request as ready for review September 7, 2026 14:00
@Gonals
Gonals requested review from a team as code owners September 7, 2026 14:00
@melvin-bot
melvin-bot Bot requested review from garrettmknight and removed request for a team September 7, 2026 14:00
@Gonals Gonals changed the title Hide Merge Reports functionality behind beta [HOLD] Hide Merge Reports functionality behind beta Sep 7, 2026
@melvin-bot
melvin-bot Bot requested a review from chiragsalian September 7, 2026 14:00
@melvin-bot

melvin-bot Bot commented Sep 7, 2026

Copy link
Copy Markdown

@chiragsalian Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team September 7, 2026 14:00
@Gonals Gonals changed the title [HOLD] Hide Merge Reports functionality behind beta Hide Merge Reports functionality behind beta Sep 7, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a140934edb

ℹ️ 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".

Comment thread src/hooks/useSearchBulkActions.ts
@codecov

codecov Bot commented Sep 7, 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/CONST/index.ts 91.22% <ø> (ø)
src/hooks/useSearchBulkActions.ts 71.02% <100.00%> (-0.24%) ⬇️
src/pages/Search/SearchReportsMergeReports.tsx 0.00% <0.00%> (ø)
... and 12 files with indirect coverage changes

@mountiny

mountiny commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • 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 verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • 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 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

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

@mountiny mountiny changed the title Hide Merge Reports functionality behind beta [CP Staging] Hide Merge Reports functionality behind beta Sep 7, 2026
@mountiny
mountiny merged commit b662a70 into main Sep 7, 2026
44 of 47 checks passed
@mountiny
mountiny deleted the alberto-block branch September 7, 2026 14:27
@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

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

OSBotify pushed a commit that referenced this pull request Sep 7, 2026
[CP Staging] Hide Merge Reports functionality behind beta

(cherry picked from commit b662a70)

(cherry-picked to staging by mountiny)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Sep 7, 2026
@OSBotify

OSBotify commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@os-botify

os-botify Bot commented Sep 7, 2026

Copy link
Copy Markdown

🔁 Filed a Staging retest request for deploy blockers #100512, #100502, #100497 after this PR was cherry-picked to staging.

@OSBotify

OSBotify commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.73-3 🚀

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

@MelvinBot

MelvinBot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

🤖 No help site changes are required — no draft PR created.

This PR gates the existing "Merge reports" bulk action behind the new reportMerge beta (src/CONST/index.ts:1073, src/hooks/useSearchBulkActions.ts:2439, src/pages/Search/SearchReportsMergeReports.tsx:201-203). It adds no user-facing copy, renames nothing, and removes no generally available behavior.

Merging reports was never documented on the help site, so there is nothing to remove or qualify:

  • grep -ri "merge report" docs/ returns 0 matches across the whole docs/ tree.
  • How-to-Merge-Expenses.md covers merging duplicate expenses only — a different flow, unaffected by this beta.
  • Getting-Started-with-the-Spend-Page.md:54-58 lists the bulk actions as Move to another report, Download, Hold, and Delete. "Merge reports" is not listed, so no correction is needed there either.

Per the authoring guidelines, beta-gated features shouldn't be documented until they're generally available. Once the reportMerge beta is rolled out to everyone, the right follow-up is a new article under docs/articles/new-expensify/reports-and-expenses/ covering the Spend > Reports flow.

@Gonals, no help site PR was needed for this change, so there's nothing for you to review or mark Ready for review. If you'd like the merge-reports article drafted now in anticipation of the beta graduating, reply and I'll create the draft PR.


view run · view recording

@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):

@OSBotify

OSBotify commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.74-0 🚀

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

@MelvinBot

MelvinBot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

🤖 No help site changes are required, so I did not create a docs PR.

This PR only adds a beta gate (reportMerge) around the existing Merge reports flow — it adds no new user-facing feature, copy, or setting:

Why no docs update is needed

Report merging is not documented anywhere on the help site today, so there is nothing to remove or caveat. I searched docs/articles for "merge report", "merge reports", "merging reports", and "combine reports" — zero matches. The only merge-related articles cover different features: How-to-Merge-Expenses.md (merging two expenses) and Merge-Accounts.md (merging accounts). Neither describes the Merge reports bulk action, and no article lists the Reports page bulk-action menu options.

Per HELP_AUTHORING_GUIDELINES.md, help site articles document generally available behavior. Since this feature is now beta-gated and undocumented, the correct time to write an article is when the beta graduates to general availability — it would belong in docs/articles/new-expensify/reports-and-expenses/.

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

(Note: there is no linked help site PR — none was needed. If you'd rather I pre-write the article now so it's ready when the beta ships, reply with @MelvinBot create the docs PR anyway and I'll open a draft.)


view run · view recording

@OSBotify

OSBotify commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.74-2 🚀

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

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

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants