Skip to content

Add quick filter search bar for workspace merchant rules#85295

Merged
JS00001 merged 1 commit intoExpensify:mainfrom
ReaperOAK:fix/merchant-rules-quick-filter
Apr 7, 2026
Merged

Add quick filter search bar for workspace merchant rules#85295
JS00001 merged 1 commit intoExpensify:mainfrom
ReaperOAK:fix/merchant-rules-quick-filter

Conversation

@ReaperOAK
Copy link
Copy Markdown
Contributor

@ReaperOAK ReaperOAK commented Mar 14, 2026

Explanation of Change

Adds a quick filter search bar for workspace merchant rules, following the same pattern as approval workflows. The filter appears when there are more than 3 rules and uses tokenized contains matching against the merchant match text (rule.filters?.right).

Fixed Issues

$ #84496
PROPOSAL: #84496 (comment)

Tests

  1. Open workspace settings and go to Rules > Merchant rules.
  2. Ensure there are more than 3 merchant rules configured.
  3. Verify a search input appears with label "Find merchant rule".
  4. Type part of a merchant name present in filters.right and verify matching rules remain visible.
  5. Type a query with no matches and verify a "No results found" empty state appears.
  6. Reduce rules to 3 or fewer and verify search input is hidden and any active query is cleared.
  • Verify that no errors appear in the JS console

Offline tests

  1. Repeat the search interaction while offline.
  2. Verify the list rendering remains stable and no crash occurs when typing in the search input.
  3. Verify existing rules continue to render in the same order when search is empty.

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • 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)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • 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)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • 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
Android.mWeb.Chrome.mp4
iOS: Native
iOS: mWeb Safari
iOS.mWeb.Safari.mp4
MacOS: Chrome / Safari
MacOS.Chrome.Safari.mp4

@ReaperOAK ReaperOAK requested review from a team as code owners March 14, 2026 16:09
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 14, 2026

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

@melvin-bot melvin-bot bot requested review from cristipaval and removed request for a team March 14, 2026 16:09
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 14, 2026

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 14, 2026

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

recheck

CLABotify added a commit to Expensify/CLA that referenced this pull request Mar 14, 2026
@Krishna2323
Copy link
Copy Markdown
Contributor

@ReaperOAK you haven't added platform videos yet, please add that and ping me once done.

Screenshots/Videos

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

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

@Krishna2323 I have added the screenshots

@Krishna2323
Copy link
Copy Markdown
Contributor

@ReaperOAK you'll need to add recordings for all platforms, screenshot doesn't work for this cas since it's not a simple UI change. You need to follow the test steps and record video.

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

ReaperOAK commented Mar 15, 2026

@Krishna2323 I have added the screen recordings (except for ios & android natives)

@Krishna2323
Copy link
Copy Markdown
Contributor

(except for ios & android natives)

@ReaperOAK Any reason for that? Are you not able to run them locally or facing any issues? Let me know and I’ll see if I can help.

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

ReaperOAK commented Mar 16, 2026

@Krishna2323 I'm having trouble setting up adb for Android, as for ios, i don't have xcode as it's only available in mac. Since it's a simple fix, it should definitely run in both without any problems.
Can you help verify native builds given my setup constraints?

@cristipaval cristipaval requested review from Krishna2323 and removed request for cristipaval March 16, 2026 08:48
Copy link
Copy Markdown
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

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

Good for product

@Krishna2323
Copy link
Copy Markdown
Contributor

@ReaperOAK the spacing doesn't seems to be correct, can you please check the attachment in the OP. Other similar components uses styles.mt6.

image

@Krishna2323
Copy link
Copy Markdown
Contributor

@Expensify/design Would you like to test this on an AdHoc build?

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

@Krishna2323 Krishna2323 Fixed the spacing issue. Added styles.mt6 to the SearchBar component style to match the pattern used by similar components. Commit: d393d8c

@shawnborton
Copy link
Copy Markdown
Contributor

Sure, I can spin up some builds.

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@Krishna2323
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
    • MacOS: Desktop
  • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (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 shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • 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)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • 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)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • 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
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • 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 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 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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • 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_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: HybridApp
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4

@Krishna2323
Copy link
Copy Markdown
Contributor

Krishna2323 commented Mar 28, 2026

@ReaperOAK please merge main and let me know once you have added the translations. I'll approve once both are done.

JS00001
JS00001 previously approved these changes Mar 30, 2026
@JS00001
Copy link
Copy Markdown
Contributor

JS00001 commented Mar 30, 2026

@ReaperOAK it looks like your commits are not signed

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 30, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 93.65% <ø> (ø)
src/components/SearchBar.tsx 0.00% <ø> (ø)
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx 0.00% <0.00%> (ø)
src/pages/workspace/rules/MerchantRulesSection.tsx 0.00% <0.00%> (ø)
... and 154 files with indirect coverage changes

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

@JS00001 @Krishna2323 I'll have to force push to sign the commits, should I go ahead?

@Krishna2323
Copy link
Copy Markdown
Contributor

@ReaperOAK checks are still failing and there are conflicts also.

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

@Krishna2323 Conflicts resolved... merged main in commit 65740a9. Translations were already added in commit 9852414.
The ESLint warnings in CI are all in unchanged files (pre-existing issues in main). Our changed files pass lint locally.
The only persistent failing check is "Verify signed commits" ... 8 older commits are unsigned, and since force push was asked to be avoided, those can't be re-signed. A squash merge would resolve this. Let me know if there's anything else needed!

@Krishna2323
Copy link
Copy Markdown
Contributor

@JS00001 could you please the comment above? I'm not sure how to handle this. Thanks!

@JS00001
Copy link
Copy Markdown
Contributor

JS00001 commented Apr 3, 2026

@ReaperOAK you'll probably need to force push to fix this

@ReaperOAK ReaperOAK force-pushed the fix/merchant-rules-quick-filter branch from 65740a9 to eb4ed17 Compare April 3, 2026 12:56
@ReaperOAK
Copy link
Copy Markdown
Contributor Author

ReaperOAK commented Apr 3, 2026

@Krishna2323 @JS00001 Done... force pushed a single signed commit (eb4ed17). All 11 commits squashed into one. CI should be green now.

@Krishna2323
Copy link
Copy Markdown
Contributor

@JS00001 I think you forgot to merge this 👀

@JS00001
Copy link
Copy Markdown
Contributor

JS00001 commented Apr 7, 2026

Oops sorry!

@JS00001
Copy link
Copy Markdown
Contributor

JS00001 commented Apr 7, 2026

@Krishna2323 if you reviewed, can you please approve?

Copy link
Copy Markdown
Contributor

@Krishna2323 Krishna2323 left a comment

Choose a reason for hiding this comment

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

LGTM!

Sorry, I forgot to approve too 🤣

@melvin-bot melvin-bot bot requested a review from JS00001 April 7, 2026 11:59
@Krishna2323
Copy link
Copy Markdown
Contributor

Krishna2323 commented Apr 7, 2026

@JS00001 please wait

@JS00001 JS00001 merged commit 2cbefdd into Expensify:main Apr 7, 2026
33 checks passed
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 7, 2026

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

@ReaperOAK
Copy link
Copy Markdown
Contributor Author

Hey @Krishna2323, this was my first time contributing to Expensify. Could you kindly let me know what the next steps are?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 7, 2026

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 8, 2026

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

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

I reviewed the changes in this PR against the existing help site article at docs/articles/new-expensify/workspaces/Workspace-Merchant-Rules.md.

No help site changes are required.

The "Find merchant rule" search bar is a self-explanatory UI filter that appears automatically when a workspace has more than 3 merchant rules. The existing article focuses on creating, understanding, and using merchant rules — not on navigating the rules list. Adding documentation for a standard search/filter input would over-document a discoverable UI element and go against the Help Authoring Guidelines principle of keeping articles focused on one primary workflow.

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 9, 2026

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.54-7 🚀

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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants