Skip to content

Rework search input to be a keyword search only - #93543

Merged
JS00001 merged 45 commits into
Expensify:mainfrom
bernhardoj:feat/92924-rework-search-input
Jun 25, 2026
Merged

JS00001 merged 45 commits into
Expensify:mainfrom
bernhardoj:feat/92924-rework-search-input

Conversation

@bernhardoj

@bernhardoj bernhardoj commented Jun 14, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #92924
PROPOSAL:

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

  1. Go to Spend
  2. Press the search input and search for anything
  3. Verify it applies a keyword filter
  4. Press the Filters button > Keyword
  5. Verify that the keyword on the search input is shown in the Keyword filter
  6. Enter anything in the Keyword filter
  7. Verify the new value is reflected in the search input
  8. Press "X" button on the search input
  9. Verify the input is cleared, and the keyword filter is removed
  • 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
    • 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
iOS: Native
ios.mp4
iOS: mWeb Safari
ios.mweb.mp4
MacOS: Chrome / Safari
web.mp4

@bernhardoj
bernhardoj requested review from a team as code owners June 14, 2026 09:40
@melvin-bot
melvin-bot Bot requested review from Ollyws and trjExpensify and removed request for a team June 14, 2026 09:40
@melvin-bot

melvin-bot Bot commented Jun 14, 2026

Copy link
Copy Markdown

@Ollyws 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: 587eb7ac8e

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

const keywordQuery = buildFilterValuesString(CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, keywordFilters).trim();

function submitSearch(query: string) {
const queryWithContext = getKeywordQueryWithCurrentSearchContext(query, queryJSON);

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve keyword-only semantics before parsing input

When the new search-page input receives text that is valid search syntax, such as type:expense, merchant:Amazon, or amount>10, it is passed directly into getKeywordQueryWithCurrentSearchContext and then parsed by getQueryWithUpdatedValues, so the text becomes root fields or filters instead of the keyword filter this field is supposed to edit. In those cases the search can switch type/add filters or carry stale context rather than applying the entered text as a keyword; escape/wrap the user text as a keyword value (or otherwise keep explicit syntax out of this path) before composing the query.

Useful? React with 👍 / 👎.

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.

Oh, interesting, but this is probably out of scope. This is happening on prod too.

@trjExpensify should we handle the keyword escaping here?

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.

Is it out of scope? 🤔 On production right now the search input above the table accepts syntax doesn't it? Whereas this change is it to move the query search input to the top right, and make the search input above the table keyword only.

So with that, I think we probably do need to do something about this here to accommodate the desired change.

CC: @JS00001 @Expensify/design

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.

On prod, we can replicate it by typing the keyword in the keyword filter.

web.mp4

@codecov

codecov Bot commented Jun 14, 2026 •

Copy link
Copy Markdown

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Videos look good to me 👍 Shall we run an adhoc?

@shawnborton

Copy link
Copy Markdown
Contributor

Let's run it 🚀 will build now

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

@shawnborton

Copy link
Copy Markdown
Contributor

I don't think I would expect needing to press enter to actually trigger this search, I would think we'd start searching pretty much as you type?

CleanShot.2026-06-15.at.09.56.51.mp4

Also, note that we get a little jumping of the table when the skeleton comes in - the skeleton is not located at the same exact point as the table is so we get the vertical shifting.

@trjExpensify

Copy link
Copy Markdown
Contributor

I don't think I would expect needing to press enter to actually trigger this search, I would think we'd start searching pretty much as you type?

Oh hm, isn't that going to result in us needing to call the Search API after every letter typed or something though? 🤔

@trjExpensify
trjExpensify requested a review from JS00001 June 15, 2026 10:38
@JS00001

JS00001 commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

I think we should search on enter rather than basing it on the input changing (debounced or not)

@bernhardoj

Copy link
Copy Markdown
Contributor Author

Done

@JS00001

JS00001 commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Types are failing

@bernhardoj

Copy link
Copy Markdown
Contributor Author

Fixed

@JS00001

JS00001 commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@aimane-chnaif back to you

@JS00001
JS00001 merged commit 93f7d05 into Expensify:main Jun 25, 2026
34 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

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

@OSBotify OSBotify mentioned this pull request Jun 25, 2026
60 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

📝 Help site review

This PR reworks the Spend page search input, which has a documented user-facing effect, so I opened a draft HelpDot PR.

What changed (user-facing):

  • The Spend page inline search bar is now keyword-only — typing filters the current results by keyword (operator-looking text like type:expense is matched literally), and the X clears just the keyword while keeping the rest of the current filters.
  • Operator-based search with autocomplete now opens from the Search icon (🔍) in the top-right corner of the Spend page.

Docs impact: Use Search Operators to Filter and Analyze told users operators work "directly from the search bar" without distinguishing these two entry points — now potentially confusing. The draft PR clarifies where operator queries are entered and notes the Spend page bar is keyword-only.

Draft help site PR: #94638

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

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #94649 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.20-1 🚀

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

Bundle Size Analysis (Sentry):


function submitSearch(query: string) {
const queryWithContext = getKeywordQueryWithCurrentSearchContext(query, queryJSON);
const updatedQuery = getQueryWithUpdatedValues(queryWithContext);

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.

Came from this issue
We had an issue where the Amount filter value was multiplied by 100x after accepting filters
More context here

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.