Skip to content

[Payment due @eVoloshchak] Add Vendor filter to expense Search using workspace connections - #104351

Merged
Beamanator merged 6 commits into
Expensify:mainfrom
c3024:chaitanya/681919-reland-vendor-filter
Oct 26, 2026
Merged

Beamanator merged 6 commits into
Expensify:mainfrom
c3024:chaitanya/681919-reland-vendor-filter

Conversation

@c3024

@c3024 c3024 commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Re-lands #101309 (Vendor filter in expense Search), which was reverted in #103211, together with the fix for #103145.

  • The picker lists the synced vendors from each eligible workspace's connections (getMatchingVendors, the same source as the expense Vendor field), plus "No vendor". Members and admins get the same list, so the filter matches the expense Vendor field, which every user can see and edit.
  • The filter no longer loads OpenSearchVendorFiltersPage, which only covers workspaces the user administers and caused the "No vendor" only picker for members.
  • The filter is gated on hasVendorFeature, the same gate as the expense Vendor field.
  • A typed -vendor: is kept in a vendorNot form key, like categoryNot, so the exclusion survives the filter form.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/681919
$ #103145
PROPOSAL:

Tests

  1. As an admin, connect a workspace to QuickBooks Online with "Export company card expenses as" set to Credit card. Make sure it has one non-reimbursable expense with a vendor and one without, and invite a member.
  2. As the admin, go to Spend > Filters. Verify Vendor appears next to Category and Tag.
  3. Open Vendor and verify the workspace's synced vendors are listed once each after "No vendor".
  4. Select one vendor and apply. Verify only expenses with that vendor are returned and the filter chip reads "Vendor: ".
  5. Select "No vendor" and verify only expenses without a vendor are returned.
  6. Click the search icon and type type:expense vendor:<name>. Verify the vendor name is highlighted like other filter values, then press Enter and verify the same results as step 4.
  7. Save the search and verify it re-applies the vendor filter when opened.
  8. Search type:expense -vendor:<name>. Verify the chip reads "-Vendor: " and expenses with that vendor are excluded. Add a Category from Filters and verify the "-Vendor: " chip stays.
  9. Sign in as the member. In Workspaces, create a second workspace and set it as the default workspace from its menu.
  10. Go to Account > Troubleshoot > Clear cache and restart, then go to Workspaces and open the QBO workspace.
  11. Go to Spend > Filters > Vendor. Verify the QBO workspace's synced vendors are listed after "No vendor", with no loading spinner.
  12. In Filters, set Workspace to the member's other workspace, then open Vendor. Verify only "No vendor" is listed.
  • Verify that no errors appear in the JS console

Offline tests

  1. As the member, open the QBO workspace, then go offline.
  2. Open Spend > Filters > Vendor. Verify the synced vendors are still listed.

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 verified any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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 02-admin-vendor-picker 04-admin-vendor-uber-results 05-member-vendor-picker 06-member-other-workspace-no-vendor 08-admin-no-vendor-results 09-router-typed-vendor-highlighted 11-saved-search-vendor-reapplied 13-negated-vendor-kept-after-category 14-member-offline-vendor-picker

@melvin-bot

melvin-bot Bot commented Oct 19, 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 bun ./scripts/generateTranslations.ts --help

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

@codecov

codecov Bot commented Oct 19, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 95.90% <ø> (ø)
...ents/Search/FilterComponents/ListFilterContent.tsx 10.52% <ø> (ø)
src/hooks/useAdvancedSearchFilters.ts 97.50% <100.00%> (+0.20%) ⬆️
src/libs/PolicyUtils/vendor.ts 96.06% <100.00%> (+0.10%) ⬆️
src/libs/SearchAutocompleteUtils.ts 70.04% <100.00%> (+0.13%) ⬆️
src/libs/SearchParser/autocompleteParser.js 62.01% <ø> (+0.17%) ⬆️
src/libs/SearchParser/searchParser.js 85.78% <ø> (+0.06%) ⬆️
src/libs/SearchQueryUtils.ts 91.00% <100.00%> (+0.01%) ⬆️
src/types/form/SearchAdvancedFiltersForm.ts 100.00% <ø> (ø)
...ponents/Search/FilterComponents/VendorSelector.tsx 95.45% <95.45%> (ø)
... and 1 more
... and 8 files with indirect coverage changes

@c3024
c3024 marked this pull request as ready for review October 20, 2026 07:24
@c3024
c3024 requested review from a team as code owners October 20, 2026 07:24
@melvin-bot
melvin-bot Bot requested a review from eVoloshchak October 20, 2026 07:24
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-22T10:25:24.545363Z 63a66f9 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot removed the request for review from a team October 20, 2026 07:24
@melvin-bot

melvin-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

@eVoloshchak 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 garrettmknight and removed request for a team October 20, 2026 07:24

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

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/hooks/useAdvancedSearchFilters.ts Outdated
Comment thread tests/unit/Search/SearchQueryUtilsTest.ts

@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: 5f5317b0a1

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/components/Search/FilterComponents/VendorSelector.tsx Outdated
Comment thread src/components/Search/FilterComponents/VendorSelector.tsx

@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: 377252e7ba

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/libs/SearchUIUtils.ts
c3024 added 2 commits October 22, 2026 07:47
…nd-vendor-filter

# Conflicts:
#	src/libs/SearchParser/autocompleteParser.js
#	src/libs/SearchParser/searchParser.js
@c3024

c3024 commented Oct 22, 2026

Copy link
Copy Markdown
Contributor Author

@eVoloshchak can you please review this?

@eVoloshchak

eVoloshchak commented Oct 25, 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 any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-10-25.at.15.59.39.mov
Screen.Recording.2026-10-25.at.15.56.03.mov

@eVoloshchak eVoloshchak 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.

LGTM!

@melvin-bot melvin-bot Bot changed the title Add Vendor filter to expense Search using workspace connections [Payment due @eVoloshchak] Add Vendor filter to expense Search using workspace connections Oct 25, 2026
@melvin-bot

melvin-bot Bot commented Oct 25, 2026

Copy link
Copy Markdown

🎯 @eVoloshchak, 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/681919.

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.

@garrettmknight garrettmknight 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.

Looks good from a product perspective, but let's get an internal eng review from @Beamanator before we merge.

@Beamanator Beamanator 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.

LGTM

@Beamanator
Beamanator merged commit 8420258 into Expensify:main Oct 26, 2026
39 of 41 checks passed
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.5.24-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR re-lands the Vendor filter, and Use Search Operators to Filter and Analyze already documents it, which [HOLD] [No QA] [Merge 10/7] Docs updates for E/A#101309 Add vendor search operator to search operators article added. That article says vendor: is "Available only when one of your workspaces uses vendor matching," and that is still accurate.


view run

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.

6 participants