Fix/search saved tab native highlight by neerajbachani · Pull Request #90138 · Expensify/App

neerajbachani · 2026-05-11T03:16:28Z

Explanation of Change

The main interactive narrow saved-search highlight path was fixed on main separately (#89112 via useSearchTypeMenuSections / activeTypeMenuKey). This PR polishes the remaining gaps:

Pending-delete while online: when a saved search is pending delete, it is hidden from the tab strip, but active-tab logic still treated its hash as an active saved search, so no tab was highlighted. We now ignore pending-delete entries (while online) in useSearchTypeMenuSections so the matching built-in tab (e.g. Expenses) highlights instead.
Static narrow header: StaticSearchTypeMenu only knew about built-in tabs and similarSearchHash, so during the static loading phase a built-in tab could flash as active for a saved search. It now includes the active saved search (when not pending-delete online) and highlights it.
Regression tests: adds SearchTypeMenuSavedSearchHighlightTest for static + interactive narrow menus, including the pending-delete case.

Fixed Issues

$ #87769
PROPOSAL: #87769 (comment)

Tests

On iOS or Android native, open Search and select a saved search whose query differs from a built-in tab only in fields that do not change similarSearchHash (e.g. expense search with a custom sort). Confirm the saved search tab is highlighted (not Expenses/Reports).
Repeat on narrow web (viewport at or below ~800px). Confirm the saved search tab highlights correctly.
Pending-delete (online): while online, delete a saved search so it is pending delete, then open Search on that query. Confirm the pending-delete saved search is not shown as active (and is not in the strip while online), and the matching built-in tab (e.g. Expenses) is highlighted.
Static header: open a saved search on a slow network or heavy result set so the static header is visible briefly. Confirm the saved search tab is highlighted during the static phase (not Expenses/Reports as the wrong final highlight).
Run npx jest --runTestsByPath tests/ui/components/SearchTypeMenuSavedSearchHighlightTest.tsx --watchman=false --runInBand and confirm all tests pass.

Verify that no errors appear in the JS console

Offline tests

While online, mark a saved search for deletion (pending delete) and open Search on native/narrow layout. Confirm the saved search is not shown as the active tab and a built-in tab matching the query shape is highlighted.
Go offline with a pending-delete saved search still in Onyx. Confirm interactive narrow still follows existing product rules (pending-delete saved searches remain visible/usable offline, same as before this PR).

QA Steps

On native (iOS/Android) or narrow mWeb (≤ ~800px), open Search and select a saved search that only differs from Expenses/Reports by sort (or similar). Confirm the saved search tab is highlighted in the horizontal tab strip.
While online, delete a saved search (pending delete) and open Search for that query. Confirm the saved search is not highlighted as active and the related built-in tab (e.g. Expenses) is highlighted.
Open a saved search and watch the tab strip while the page loads (static → interactive), ideally on a slow network. Confirm the saved search stays highlighted and you do not end on the wrong built-in tab.
Optional regression: Spend → select a saved search → Inbox → Spend again. Confirm the correct tab is still highlighted.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

lv_0_20260511213849.mp4

Android: mWeb Chrome

iOS: Native

lv_0_20260511220701.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-05-11T03:16:35Z

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: febd1229e0

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

chatgpt-codex-connector · 2026-05-11T03:19:44Z

+    const isSavedSearchActive = hash !== undefined && !!savedSearches && Object.keys(savedSearches).some((key) => Number(key) === hash);
+
+    if (isSavedSearchActive) {
+        return -1;


Ignore pending-delete saved searches when determining active tab

getActiveItemIndex() now returns -1 whenever the current hash exists in savedSearches, but this does not exclude entries with pendingAction: DELETE while online. In narrow search, those pending-delete saved searches are filtered out of the rendered tabs, so this branch leaves activeItemKey empty and no tab is selected; previously the built-in tab matching similarSearchHash stayed highlighted. This regression appears when opening a query whose saved search is pending deletion while online.

Useful? React with 👍 / 👎.

codecov · 2026-05-11T03:25:16Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useSearchTypeMenuSections.ts	`88.33% <85.71%> (+1.29%)`	⬆️
...s/Search/SearchPageNarrow/StaticSearchTypeMenu.tsx	`97.43% <94.73%> (+97.43%)`	⬆️
... and 17 files with indirect coverage changes

eh2077 · 2026-05-12T12:15:15Z

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

Screen.Recording.2026-07-10.at.4.30.26.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-07-10.at.4.34.13.PM.mov

iOS: HybridApp

Screen.Recording.2026-07-10.at.4.39.25.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-07-10.at.4.37.19.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-10.at.4.24.51.PM.mov

neerajbachani · 2026-05-14T19:45:07Z

@eh2077 friendly bump. thanks

eh2077 · 2026-05-15T14:25:46Z

Bug: can't go back to saved search if back from inbox

open Spend tab from mobile (app or mobile browser)
select a saved search label
open Inbox tab
open Spend tab again
Highlight a different filter label than the previous one

Screen.Recording.2026-05-15.at.10.18.04.PM.mov

Screen.Recording.2026-05-15.at.10.19.10.PM.mov

eh2077

Please refer original steps for QA Steps.

eh2077 · 2026-05-14T14:34:44Z

+    const flattenedTypeMenuItems = useMemo(() => typeMenuSections.flatMap((section) => section.menuItems), [typeMenuSections]);
+    const activeItemKey = useMemo(() => flattenedTypeMenuItems.at(activeItemIndex)?.key, [flattenedTypeMenuItems, activeItemIndex]);


I don't think we need useMemo anymore as we already have React Compiler CI.

eh2077 · 2026-05-21T14:53:48Z

@neerajbachani friendly bump!

neerajbachani · 2026-05-22T06:52:32Z

@eh2077 Thanks for the bump, sorry for the delay. Removed the extra useMemos for activeKey per your note. Also fixed the pending-delete online mismatch in getActiveItemIndex + static narrow menu (with tests). Native-only appearance is because native always hits narrow Search layout where similarSearchHash was overriding saved search highlight

neerajbachani · 2026-05-28T13:59:13Z

@eh2077 friendly bump, thanks

eh2077 · 2026-05-28T16:20:49Z

thanks for the update! I'll recheck shortly

neerajbachani · 2026-06-03T15:24:35Z

@eh2077 friendly bump

eh2077 · 2026-06-03T15:29:32Z

looking into it

eh2077 · 2026-06-04T13:43:34Z

confirmed #90138 (comment) was fixed

Screen.Recording.2026-06-04.at.9.42.44.PM.mov

eh2077

looks good

neerajbachani · 2026-06-10T04:41:56Z

@AndrewGable @flaviadefaria friendly bump, thx

eh2077 · 2026-06-15T15:05:20Z

@neerajbachani please take care of the conflicts, thx!

eh2077 · 2026-06-23T01:55:36Z

@neerajbachani friendly bump!

neerajbachani · 2026-06-23T05:36:30Z

@eh2077

Since this PR has been open for a while, I re-tested the original flow on production and the saved search tab now highlights correctly on native (and narrow web) without our changes merged.

From what I can tell, the interactive narrow path was likely fixed on main (SearchTypeMenuNarrow now uses useSearchTypeMenuSections / activeTypeMenuKey, same SSOT approach as wide layout).

Could you please take a look and let me know if you think anything is still worth covering here? A few gaps I noticed on current main that this PR still addresses:

Pending-delete saved search while online (no tab highlighted)
StaticSearchTypeMenu brief wrong highlight during static loading
Regression tests (SearchTypeMenuSavedSearchHighlightTest)

Happy to close as superseded, or rebase/trim the PR to only the remaining items if you think those are still needed. Thanks!

neerajbachani · 2026-06-24T17:47:16Z

@eh2077

Since this PR has been open for a while, I re-tested the original flow on production and the saved search tab now highlights correctly on native (and narrow web) without our changes merged.

From what I can tell, the interactive narrow path was likely fixed on main (SearchTypeMenuNarrow now uses useSearchTypeMenuSections / activeTypeMenuKey, same SSOT approach as wide layout).

Could you please take a look and let me know if you think anything is still worth covering here? A few gaps I noticed on current main that this PR still addresses:

Pending-delete saved search while online (no tab highlighted)

StaticSearchTypeMenu brief wrong highlight during static loading

Regression tests (SearchTypeMenuSavedSearchHighlightTest)

Happy to close as superseded, or rebase/trim the PR to only the remaining items if you think those are still needed. Thanks!

@eh2077 friendly bump, could you please guide me to proceed from here?

eh2077 · 2026-06-25T13:18:28Z

Sorry for late response. Yes, let's proceed with polishing these flaws and update QA test accordingly, thx!

eh2077 · 2026-07-02T18:00:03Z

@neerajbachani friendly bump

neerajbachani · 2026-07-04T09:49:59Z

@eh2077 Rebased onto latest main, trimmed to pending-delete and done with static menu and tests. Ready for review!!

eh2077 · 2026-07-07T16:03:12Z

checking

neerajbachani · 2026-07-08T09:31:31Z

@eh2077 friendly bump

eh2077 · 2026-07-08T14:14:44Z

@neerajbachani Can you update test steps? Btw, I don't think it's necessary to mention unit test in QA steps.

neerajbachani · 2026-07-08T16:26:48Z

@eh2077 Updated Tests / Offline / QA steps in the PR description. QA steps are manual only (no unit test mention). Thanks!

eh2077

works well, checklist #90138 (comment)

neerajbachani · 2026-07-14T18:10:33Z

@AndrewGable @flaviadefaria gentle bump, thanks

neerajbachani requested review from a team as code owners May 11, 2026 03:16

melvin-bot Bot assigned neerajbachani May 11, 2026

melvin-bot Bot requested review from eh2077 and flaviadefaria and removed request for a team May 11, 2026 03:16

melvin-bot Bot removed the request for review from a team May 11, 2026 03:16

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

neerajbachani mentioned this pull request May 11, 2026

[$250] Saved search is not visually highlighted as active when selected #87769

Open

7 tasks

eh2077 reviewed May 15, 2026

View reviewed changes

eh2077 approved these changes Jun 4, 2026

View reviewed changes

melvin-bot Bot requested a review from AndrewGable June 4, 2026 13:43

Polish saved search tab highlight edge cases on narrow Search

1124418

neerajbachani force-pushed the fix/search-saved-tab-native-highlight branch from e7db793 to 1124418 Compare July 4, 2026 09:11

Apply oxfmt and fix eslint unsafe type assertions

364f634

eh2077 approved these changes Jul 10, 2026

View reviewed changes

		const flattenedTypeMenuItems = useMemo(() => typeMenuSections.flatMap((section) => section.menuItems), [typeMenuSections]);
		const activeItemKey = useMemo(() => flattenedTypeMenuItems.at(activeItemIndex)?.key, [flattenedTypeMenuItems, activeItemIndex]);

Uh oh!

Conversation

neerajbachani commented May 11, 2026 • 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 May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 11, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

eh2077 commented May 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

neerajbachani commented May 14, 2026

Uh oh!

eh2077 commented May 15, 2026

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

eh2077 May 14, 2026

Choose a reason for hiding this comment

Uh oh!

eh2077 commented May 21, 2026

Uh oh!

neerajbachani commented May 22, 2026

Uh oh!

neerajbachani commented May 28, 2026

Uh oh!

eh2077 commented May 28, 2026

Uh oh!

neerajbachani commented Jun 3, 2026

Uh oh!

eh2077 commented Jun 3, 2026

Uh oh!

eh2077 commented Jun 4, 2026

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

neerajbachani commented Jun 10, 2026

Uh oh!

eh2077 commented Jun 15, 2026

Uh oh!

eh2077 commented Jun 23, 2026

Uh oh!

neerajbachani commented Jun 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

neerajbachani commented Jun 24, 2026

Uh oh!

eh2077 commented Jun 25, 2026

Uh oh!

eh2077 commented Jul 2, 2026

Uh oh!

neerajbachani commented Jul 4, 2026

Uh oh!

eh2077 commented Jul 7, 2026

Uh oh!

neerajbachani commented Jul 8, 2026

Uh oh!

eh2077 commented Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

neerajbachani commented May 11, 2026 •

edited

Loading

codecov Bot commented May 11, 2026 •

edited by github-actions Bot

Loading

eh2077 commented May 12, 2026 •

edited

Loading

neerajbachani commented Jun 23, 2026 •

edited

Loading

eh2077 commented Jul 8, 2026 •

edited

Loading