Prevent chat searches from redirecting to Approve by ShridharGoel · Pull Request #77388 · Expensify/App

ShridharGoel · 2025-12-11T14:33:35Z

Explanation of Change

The fix stops the app from auto-jumping to the “Approve” suggested search when we start a chat search. It now detects any chat or filter in the query - even if rawFilterList is missing - and blocks the auto-redirect, so chat searches stay on their own results. This started happening after the rawQuery param was dropped from the SearchRouter navigation.

Fixed Issues

$ #76503
PROPOSAL:

Tests

Open the Expensify app.
Sign up with a new account.
Complete onboarding modal selecting "Track and budget expenses"
Once you land on "Inbox", create first workspace.
Open any individual chat. (For example: Self DM)
Send a message to chat.
Tap on the search icon on the top right corner.
Tap on the option to trigger a search within the conversation.
Type the just sent message and trigger a search.
After triggering a search within a conversation, user should automatically land on the search results.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-12-11.at.8.35.16.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-12-11.at.8.10.04.PM.mov

iOS: Native

Screen.Recording.2025-12-11.at.8.32.07.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-12-11.at.8.00.08.PM.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-12-11.at.7.45.37.PM.mov

melvin-bot · 2025-12-11T14:33:42Z

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

codecov · 2025-12-11T14:42:00Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useSearchTypeMenu.tsx	`70.51% <100.00%> (ø)`
src/libs/SearchQueryUtils.ts	`69.73% <90.00%> (+0.27%)`	⬆️
src/pages/Search/SearchTypeMenu.tsx	`0.00% <0.00%> (ø)`
... and 5 files with indirect coverage changes

Krishna2323 · 2025-12-12T17:12:40Z

@ShridharGoel is this ready for review? Could you please add Explanation of Change and why this happened? Thanks!

joekaufmanexpensify

DB fix

ShridharGoel · 2025-12-13T10:48:38Z

Added explanation.

Krishna2323 · 2025-12-18T13:51:09Z

Reviewing...

Krishna2323 · 2025-12-18T15:24:06Z

+        const isChatSearch = queryJSON.type === CONST.SEARCH.DATA_TYPES.CHAT;
+
+        return !!queryJSON.rawFilterList || hasKeywordFilter || hasContextFilter || hasInlineKeywordFilter || hasInlineContextFilter || isChatSearch;
+    }, [queryJSON.flatFilters, queryJSON.rawFilterList, queryJSON.inputQuery, queryJSON.type]);


@ShridharGoel the logic is duplicated, could you please create a helper function?

Krishna2323 · 2025-12-18T15:24:32Z

@ShridharGoel add a regression test that covers a chat or inline-context query with no rawFilterList to ensure we don’t navigate to Approve when the skeleton hides.

ShridharGoel · 2025-12-18T19:57:13Z

@Krishna2323 Updated.

Krishna2323 · 2025-12-27T04:12:30Z

@ShridharGoel could you please merge main and resolve the lint issues?

Krishna2323 · 2025-12-29T09:11:40Z

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

LGTM! 🚀

OSBotify · 2025-12-29T12:02:16Z

✋ 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 · 2025-12-30T15:19:44Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.2.89-1 🚀

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

OSBotify · 2025-12-31T18:33:40Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.2.89-6 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

ShridharGoel added 2 commits December 11, 2025 19:43

Prevent chat searches from redirecting to Approve

a1a8739

Prevent chat searches from redirecting to Approve

47d8ea2

ShridharGoel requested review from a team as code owners December 11, 2025 14:33

melvin-bot Bot assigned ShridharGoel Dec 11, 2025

melvin-bot Bot requested review from Krishna2323 and joekaufmanexpensify and removed request for a team December 11, 2025 14:33

melvin-bot Bot removed the request for review from a team December 11, 2025 14:33

Prettier fixes

95c931c

joekaufmanexpensify previously approved these changes Dec 12, 2025

View reviewed changes

Krishna2323 suggested changes Dec 18, 2025

View reviewed changes

Use common method and add tests

469d39a

ShridharGoel dismissed joekaufmanexpensify’s stale review via 469d39a December 18, 2025 19:57

ShridharGoel added 3 commits December 19, 2025 01:34

Update dependency

4f3c70e

Update dependency

29e9a2c

Update test

599d83b

ShridharGoel added 5 commits December 27, 2025 22:58

Fixes

2e8a68f

Merge main

424ce70

Fixes

b5f7d17

Prettier fix

1f0324b

TS fix

0bdb9ff

ShridharGoel requested a review from Krishna2323 December 27, 2025 19:57

Krishna2323 approved these changes Dec 29, 2025

View reviewed changes

melvin-bot Bot requested a review from JS00001 December 29, 2025 09:12

JS00001 approved these changes Dec 29, 2025

View reviewed changes

JS00001 merged commit b3868e7 into Expensify:main Dec 29, 2025
31 checks passed

OSBotify mentioned this pull request Dec 30, 2025

Deploy Checklist: New Expensify 2025-12-30 #78583

Closed

56 tasks

melvin-bot Bot mentioned this pull request Dec 31, 2025

[Due for payment 2026-01-07] Search - Triggering a search within a conversation for first time leads to "Approve" section #76503

Closed

8 tasks

Conversation

ShridharGoel commented Dec 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Dec 11, 2025

Uh oh!

codecov Bot commented Dec 11, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Krishna2323 commented Dec 12, 2025

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

ShridharGoel commented Dec 13, 2025

Uh oh!

Krishna2323 commented Dec 18, 2025

Uh oh!

Krishna2323 Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Dec 18, 2025

Uh oh!

ShridharGoel commented Dec 18, 2025

Uh oh!

Krishna2323 commented Dec 27, 2025

Uh oh!

Krishna2323 commented Dec 29, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Dec 29, 2025

Uh oh!

OSBotify commented Dec 30, 2025

Uh oh!

OSBotify commented Dec 31, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ShridharGoel commented Dec 11, 2025 •

edited

Loading

codecov Bot commented Dec 11, 2025 •

edited by github-actions Bot

Loading