Skip to content

Reduce redundant Onyx subscriptions in SearchPage#83602

Merged
luacmartins merged 1 commit intoExpensify:mainfrom
callstack-internal:decompose-findings-5
Mar 2, 2026
Merged

Reduce redundant Onyx subscriptions in SearchPage#83602
luacmartins merged 1 commit intoExpensify:mainfrom
callstack-internal:decompose-findings-5

Conversation

@adhorodyski
Copy link
Contributor

@adhorodyski adhorodyski commented Feb 26, 2026

@rlinoz @mountiny @luacmartins

Explanation of Change

  • Move filter-sync logic (useFilterFormValues + updateAdvancedFilters) out of SearchPage into a useSearchFilterSync hook called from SearchFiltersBar, which already computes filterFormValues — eliminates ~6 duplicate Onyx subscriptions
  • Use an Onyx selector in useReceiptScanDrop for the POLICY collection, returning a boolean instead of subscribing to the full policy map

Fixed Issues

$ #77174
PROPOSAL:

Tests

  1. Navigate to Search
  2. See the advanced filters sync up correctly as before.

Offline tests

N/A

QA Steps

Same as tests

  • 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
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@adhorodyski adhorodyski changed the title [No QA] Decompose SearchPage: extract SearchFilterSync and useReceiptScanDrop Decompose SearchPage: extract SearchFilterSync and useReceiptScanDrop Feb 26, 2026
@codecov
Copy link

codecov bot commented Feb 26, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...nents/Search/SearchPageHeader/SearchFiltersBar.tsx 67.64% <ø> (ø)
src/hooks/useReceiptScanDrop.tsx 25.00% <100.00%> (ø)
src/hooks/useSearchFilterSync.ts 100.00% <100.00%> (ø)
src/pages/Search/SearchPage.tsx 55.55% <ø> (-1.78%) ⬇️
... and 13 files with indirect coverage changes

@adhorodyski adhorodyski marked this pull request as ready for review February 27, 2026 12:46
@adhorodyski adhorodyski requested review from a team as code owners February 27, 2026 12:47
@melvin-bot melvin-bot bot requested review from trjExpensify and removed request for a team February 27, 2026 12:47
@luacmartins luacmartins requested review from a team and luacmartins and removed request for a team February 27, 2026 15:43
@melvin-bot melvin-bot bot requested review from suneox and removed request for a team February 27, 2026 16:19
@melvin-bot
Copy link

melvin-bot bot commented Feb 27, 2026

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


return (
<Animated.View style={[styles.flex1]}>
<SearchFilterSync queryJSON={queryJSON} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this call in SearchPage? Can we move this to SearchFiltersBar instead? I think that component is always rendered whenever we're on a valid query

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, as low as it makes sense. Filters were all different since I started here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yea, I think we can remove it from SearchPage and centralize it in SearchFiltersBar. We should test for any adverse side effects though

* and syncs them to the advanced filters form whenever the query changes.
* Extracted from SearchPage to isolate re-renders caused by these subscriptions.
*/
function SearchFilterSync({queryJSON}: SearchFilterSyncProps) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this component? Can we just delegate the sync to SearchFiltersBar which already subscribed to the useFilterFormValues hook?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if it has to access all of these internal state variables (onyx), it could do it yes. can we decouple the Filters component from these subscriptions though or do you think that's not possible?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can move this logic to the SearchFiltersBar only, so we don't need this separate component here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That way we'll rerender filters though on all internal subs of this hook

@luacmartins
Copy link
Contributor

@codex review

@chatgpt-codex-connector
Copy link

Codex Review: Didn't find any major issues. Keep them coming!

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

@mountiny
Copy link
Contributor

Conflicts @adhorodyski

@trjExpensify
Copy link
Contributor

PR doesn’t need product input as a performance PR. Unassigning and unsubscribing myself.

@trjExpensify trjExpensify removed their request for review March 2, 2026 10:37
const {isOffline} = useNetwork();
const personalDetails = usePersonalDetails();
const filterFormValues = useFilterFormValues(queryJSON);
useSearchFilterSync(filterFormValues);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@luacmartins went with a named hook for clarity, thanks for the advice

@adhorodyski
Copy link
Contributor Author

Updated the PR with latest main updates.

@adhorodyski
Copy link
Contributor Author

FYI prettier does not give me any diff after running locally (even without the experimental flag). I cannot fix this CI issue yet, will try syncing with main.

@adhorodyski
Copy link
Contributor Author

working on these new conflicts

Move filter sync from SearchPage into a useSearchFilterSync hook called
from SearchFiltersBar (which already computes filterFormValues), avoiding
duplicate useFilterFormValues subscriptions. Also tighten useReceiptScanDrop
to use an Onyx selector for POLICY collection instead of subscribing to
the full map.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@suneox
Copy link
Contributor

suneox commented Mar 2, 2026

I’ve compared this with the latest main. In the current PR, there's an issue where the filter cannot be updated (at 1:45 in the current PR vs. 0:10 & 3:45 on the latest main).

CleanShot.2026-03-02.at.21.28.10.1.mp4

Additionally, based on my comparison, the before-and-after results do not show any reduction in render time at 2:30

CleanShot 2026-03-02 at 21 34 08@2x

@adhorodyski adhorodyski force-pushed the decompose-findings-5 branch from 873273a to b7addc4 Compare March 2, 2026 14:46
@adhorodyski
Copy link
Contributor Author

@suneox this is because over time this PR got more and more reduced from its original shape 😅 I'd still propose merging it, though the only solid improvement is a selector in policies. We won't be able to see reduced rerenders anymore I'm afraid. Updating the description now.

@adhorodyski adhorodyski changed the title Decompose SearchPage: extract SearchFilterSync and useReceiptScanDrop Reduce redundant Onyx subscriptions in SearchPage Mar 2, 2026
@adhorodyski
Copy link
Contributor Author

Much smaller PR now, see the updated body. cc @luacmartins

@suneox
Copy link
Contributor

suneox commented Mar 2, 2026

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
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

Copy link
Contributor

@suneox suneox left a comment

Choose a reason for hiding this comment

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

The filter issue has been fixed — the current change set LGTM

@melvin-bot melvin-bot bot requested a review from luacmartins March 2, 2026 16:04
@luacmartins luacmartins merged commit d3fea82 into Expensify:main Mar 2, 2026
31 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 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.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 2, 2026

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2026

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.28-0 🚀

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

@mitarachim
Copy link

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

@luacmartins
Copy link
Contributor

@mitarachim did you mean #81883?

@mitarachim
Copy link

@luacmartins Sorry , tester just confirm issue found while checking PR #83602 , I also update details in this issue #83951 .

@adhorodyski
Copy link
Contributor Author

@luacmartins ok looks like it's indeed more tangled with the rest of the app, should we simply lift this component up the tree? I don't like doubling the subscriptions, but it is completely renderless so there's little harm in that. Or, we revert it completely.

@luacmartins
Copy link
Contributor

Yea, I'm cool with lifting the subscription up the tree

adhorodyski added a commit to callstack-internal/Expensify-App that referenced this pull request Mar 3, 2026
…ition

The filter sync hook was moved to useSearchFiltersBar in Expensify#83602, which
introduced a race condition where inline filter changes get wiped by the
sync hook before Navigation.setParams fires (deferred by Modal.close()).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.30-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2026

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

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.

7 participants