Skip to content

[Payment due @suneox] Fix exact merchant group exports - #97046

Merged
JS00001 merged 6 commits into
Expensify:mainfrom
ShridharGoel:fix/exact-merchant-group-exports
Jul 27, 2026
Merged

JS00001 merged 6 commits into
Expensify:mainfrom
ShridharGoel:fix/exact-merchant-group-exports

Conversation

@ShridharGoel

@ShridharGoel ShridharGoel commented Jul 26, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Merchant group expansion and exports now keep generated merchant filters as exact matches. Normal merchant and description searches still use partial matching.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/643664
PROPOSAL:

Tests

  1. Create expenses with merchants Amazon and Amazon Marketplace
  2. Navigate to Spend and group expenses by merchant
  3. Select only the collapsed Amazon group
  4. Export it with Basic Export
  5. Verify the selected count and exported rows only include the exact Amazon group
  6. Expand the groups and repeat with Export Current View
  7. Select both merchant groups and verify both groups are exported
  8. Search for merchant:Amazon and verify partial merchant matching still works
  • Verify that no errors appear in the JS console

Offline tests

  1. Group expenses by merchant and select a group
  2. Go offline
  3. Try to export the selected group
  4. Verify the offline message appears and no export starts

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 the component works 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

MacOS: Chrome / Safari

Groups list had both "Amazon" and "Amazon Marketplace" and the export was done only for "Amazon":

Screenshot 2026-07-26 at 3 24 00 PM

@codecov

codecov Bot commented Jul 26, 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/libs/SearchQueryUtils.ts 87.34% <100.00%> (+0.11%) ⬆️
src/libs/SearchUIUtils.ts 64.52% <100.00%> (+0.04%) ⬆️
src/libs/actions/Search.ts 44.56% <100.00%> (ø)
src/hooks/useSearchBulkActions.ts 53.87% <33.33%> (-0.25%) ⬇️
... and 13 files with indirect coverage changes

@ShridharGoel
ShridharGoel marked this pull request as ready for review July 26, 2026 09:57
@ShridharGoel
ShridharGoel requested review from a team as code owners July 26, 2026 09:57
@melvin-bot

melvin-bot Bot commented Jul 26, 2026

Copy link
Copy Markdown

@suneox 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 requested review from a team and thelullabyy and removed request for a team July 26, 2026 09:57
@melvin-bot

melvin-bot Bot commented Jul 26, 2026

Copy link
Copy Markdown

@thelullabyy 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]

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

ℹ️ 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/libs/SearchUIUtils.ts Outdated
@suneox

suneox commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

@ShridharGoel Could you please provide more context for this PR since it's an internal issue?

@ShridharGoel

Copy link
Copy Markdown
Contributor Author

If you try steps 1-4, you'll see that both groups get exported even after selecting just "Amazon" one. This was happening because the logic was based on "includes" instead of equality.

@suneox

suneox commented Jul 27, 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
az_recorder_20260727_175308.2.mp4
Android: mWeb Chrome

Uploading CleanShot 2026-07-27 at 17.54.58.mp4…

iOS: HybridApp
CleanShot.2026-07-27.at.17.54.58.5.mp4
iOS: mWeb Safari
CleanShot.2026-07-27.at.17.47.14.4.mp4
MacOS: Chrome / Safari
CleanShot.2026-07-27.at.17.43.40.3.mp4

@suneox suneox left a comment

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.

Changeset LGTM, functionality works as expected. The test failure is flaky and unrelated to these changes.

@melvin-bot melvin-bot Bot changed the title Fix exact merchant group exports [Payment due @suneox] Fix exact merchant group exports Jul 27, 2026
@melvin-bot

melvin-bot Bot commented Jul 27, 2026

Copy link
Copy Markdown

🎯 @suneox, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/643664.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@ShridharGoel
ShridharGoel requested review from JS00001 and removed request for thelullabyy July 27, 2026 11:15
const filterSet = new Set<string>(orderedQuery);
const exactMatchFilterKeys = [...(query.exactMatchFilterKeys ?? [])].sort();
if (exactMatchFilterKeys.length > 0) {
const exactMatchIdentity = `exactMatch:${exactMatchFilterKeys.join(',')}`;

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.

What is this new key 🤔

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Just internal, to have different hashes (not user-facing)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

These queries will have different hashes:

merchant:Amazon
merchant:Amazon exactMatch:merchant

@ShridharGoel
ShridharGoel requested review from JS00001 July 27, 2026 18:41
@JS00001
JS00001 merged commit 3f92c2e into Expensify:main Jul 27, 2026
37 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.4.46-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — no docs changes required

I reviewed the changes in this PR against the help site under docs/articles and no updates are needed.

Why: This PR is a bug fix. It makes merchant-group exports use exact-match semantics so that exporting the Amazon group no longer also pulls in Amazon Marketplace expenses. It does not introduce or change any user-facing behavior that the help site documents:

  • The most relevant article, Export Expenses and Reports ("Export grouped expenses"), already states that each exported group is "kept intact" with "each group as its own section." That is exactly the behavior this fix restores — the docs describe the correct outcome, and never documented the buggy partial-match behavior being fixed here.
  • Normal merchant: and description: searches still use partial matching, so Use Search Operators to Filter and Analyze remains accurate.
  • The remaining changes (query serialization, hashing, exact-match filter keys) are internal implementation details with no help-site-facing surface.

Since no documentation is inaccurate or missing as a result of this change, I did not open a help site PR.

ShridharGoel, please confirm you agree no help site update is warranted. If you believe a doc should call out the exact-match behavior for merchant-group exports, reply with @MelvinBot and the specifics and I'll draft a PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.46-10 🚀

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

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Jul 31, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #97532

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.

5 participants