Fix deploy blockers from filters after introducing Bottom Tab Navigator by borys3kk · Pull Request #89082 · Expensify/App

borys3kk · 2026-04-28T11:06:51Z

Explanation of Change

Fixes the first Search filter pill missing after Advanced Filters → Save → View Results. useSearchFilterSync used a per-component ref so a remount (triggered by SearchActionsBarSwitch flipping during startTransition) reset the guard and clobbered fresh Onyx.merge writes with stale URL values. Moved the guard to a module-level lastSyncedQuerySig that survives remounts.

Fixed Issues

$ #88946 (Android & iOS - Spend - Date quick filter is missing when Date filter is applied)
$ #89013 (Filters-Filter chip is still shown in Spend after tapping Reset filters)
$ #89055 (iOS - Spend - The withdrawn filter pill does't appear when selecting the first option)

PROPOSAL:

Tests

$ #88946 and $ #89055

Launch Expensify app.
Go to Spend > All expenses.
Tap Filters button.
Tap Date > Custom range.
Select custom range date that will return some results.
Tap Save > View results.
Ensure the date quick filter is shown on search results page and ensure that the correct option is shown (eg. if last chosen option is "last month" then that should be visible in search).

$ #89013
Prerequisite: above test steps should be done (or any other "Expenses"/advanced filters are applied)

Tap filters button
Tap reset filters
Ensure that no tag chip is displayed on the screen after resetting Advanced filters

Offline tests

Set up the app while online so a query is cached.
Turn off network connection.
Repeat steps 3–6 from the Tests section.
Verify that the Date pill still appears on the Search header (the form sync path is offline-first; only the network search request will be queued).

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

ios-native-pills.mov

iOS: mWeb Safari

Screen.Recording.2026-04-28.at.13.34.23.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-28.at.13.35.16.mov

codecov · 2026-04-28T11:15:28Z

Codecov Report

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

Files with missing lines	Coverage Δ
...h/SearchPageHeader/SearchAdvancedFiltersButton.tsx	`70.00% <ø> (ø)`
src/hooks/useSearchFilterSync.ts	`100.00% <100.00%> (ø)`
... and 20 files with indirect coverage changes

melvin-bot · 2026-04-28T11:51:13Z

@bernhardoj 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: 90f9d66449

ℹ️ 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-04-28T11:58:27Z

+        if (lastSyncedQuerySig === querySig) {
            return;


Re-sync filters when form values change for same query

This guard skips all updates when the query signature is unchanged, but formValues can change independently of the URL because useFilterFormValues is derived from async Onyx data (personal details, reports, policy tags/categories) and buildFilterFormValuesFromQuery() filters against those collections. In cold-load/deeplink flows, the first sync can write an incomplete form; after those collections hydrate, this early return blocks the follow-up updateAdvancedFilters(..., true), leaving SEARCH_ADVANCED_FILTERS_FORM stale and causing active pills/advanced-filter values to remain missing until the URL query changes.

Useful? React with 👍 / 👎.

trjExpensify · 2026-04-28T13:24:12Z

@borys3kk who should be reviewing the code on this?

trjExpensify

Bug fixing for the tab navigator rollout. 👍

ZhenjaHorbach · 2026-04-28T14:31:32Z

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

2026-04-28.16.56.01.mov

Android: mWeb Chrome

2026-04-28.16.57.23.mov

iOS: HybridApp

2026-04-28.16.56.01.mov

iOS: mWeb Safari

2026-04-28.16.57.23.mov

MacOS: Chrome / Safari

2026-04-28.16.50.31.mov

2026-04-28.16.51.55.mov

2026-04-28.16.53.07.mov

…ter-pills-problems Fix deploy blockers from filters after introducing Bottom Tab Navigator (cherry picked from commit 5dbc329) (cherry-picked to staging by arosiclair)

OSBotify · 2026-04-28T15:17:53Z

✋ 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 · 2026-04-28T16:12:02Z

🚀 Cherry-picked to staging by https://github.com/arosiclair in version: 9.3.64-9 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-28T16:13:49Z

No help site changes are required for this PR.

This is a bug fix for filter pill display (race condition in useSearchFilterSync caused by remounts resetting a per-component ref). No user-facing features, labels, workflows, or filter behavior were added or changed — the fix restores the already-documented expected behavior. The existing help site articles (Getting Started with the Spend Page and Export Expenses and Reports) already accurately describe how filters work.

OSBotify · 2026-04-28T17:09:46Z

🚀 Cherry-picked to staging by https://github.com/arosiclair in version: 9.3.64-10 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

fix pills problems

aaaf84f

melvin-bot Bot assigned borys3kk Apr 28, 2026

remove debug logs

90f9d66

borys3kk marked this pull request as ready for review April 28, 2026 11:51

borys3kk requested review from a team as code owners April 28, 2026 11:51

melvin-bot Bot requested review from bernhardoj and trjExpensify and removed request for a team and bernhardoj April 28, 2026 11:51

melvin-bot Bot removed the request for review from a team April 28, 2026 11:51

chatgpt-codex-connector Bot reviewed Apr 28, 2026

View reviewed changes

trjExpensify approved these changes Apr 28, 2026

View reviewed changes

luacmartins requested a review from ZhenjaHorbach April 28, 2026 13:29

luacmartins approved these changes Apr 28, 2026

View reviewed changes

ZhenjaHorbach approved these changes Apr 28, 2026

View reviewed changes

melvin-bot Bot requested a review from luacmartins April 28, 2026 14:58

luacmartins approved these changes Apr 28, 2026

View reviewed changes

luacmartins merged commit 5dbc329 into Expensify:main Apr 28, 2026
54 of 58 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 28, 2026

OSBotify mentioned this pull request Apr 28, 2026

Deploy Checklist: New Expensify 2026-04-23 #88633

Open

arosiclair mentioned this pull request Apr 29, 2026

PR checklist #89226

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix deploy blockers from filters after introducing Bottom Tab Navigator#89082

Fix deploy blockers from filters after introducing Bottom Tab Navigator#89082
luacmartins merged 2 commits intoExpensify:mainfrom
software-mansion-labs:borys3kk-fix-filter-pills-problems

borys3kk commented Apr 28, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 28, 2026 •

edited by github-actions Bot

Loading

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Apr 28, 2026

Uh oh!

trjExpensify commented Apr 28, 2026

Uh oh!

trjExpensify left a comment •

edited

Loading

Uh oh!

ZhenjaHorbach commented Apr 28, 2026 •

edited

Loading

Uh oh!

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

borys3kk commented Apr 28, 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!

codecov Bot commented Apr 28, 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!

melvin-bot Bot commented Apr 28, 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 Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Apr 28, 2026

Uh oh!

trjExpensify left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

borys3kk commented Apr 28, 2026 •

edited

Loading

codecov Bot commented Apr 28, 2026 •

edited by github-actions Bot

Loading

trjExpensify left a comment •

edited

Loading

ZhenjaHorbach commented Apr 28, 2026 •

edited

Loading