Skip to content

[No QA] perf: Search S4 useSearchSnapshot data layer - #93805

Merged
mountiny merged 17 commits into
Expensify:mainfrom
callstack-internal:perf/search-snapshot-data-layer
Jun 23, 2026
Merged

mountiny merged 17 commits into
Expensify:mainfrom
callstack-internal:perf/search-snapshot-data-layer

Conversation

@BartekObudzinski

@BartekObudzinski BartekObudzinski commented Jun 17, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

`` now consumes a single useSearchSnapshot(...) for every variant and feeds the existing `SearchList`. The hook owns the entire projection (both `getSections` stages, group sub-snapshots, sort, columns, defer gating, highlight stamping) and absorbs the two-phase optimistic-row resilience, so the screen runs the live merge and the optimistic lifecycle exactly once. This removes the parallel double-pipeline (and the duplicated optimistic lifecycle on the flat-expense path) that the earlier S4+S5 draft carried.

Behavior-preserving. useSearchSnapshot is a hydrated facade for now: data is the fully sorted + joined rows that SearchList still reads display fields off. Identities-only is deferred to S5/S6, once the rows self-hydrate. searchResults and the highlight keys are passed in transitionally (the snapshot subscription moves into the hook in S6).

Fixed Issues

$ #93940
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

No QA

  • 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: mWeb Safari

MacOS: Chrome / Safari

@BartekObudzinski BartekObudzinski changed the title [Draft] Search snapshot: add useSearchSnapshot data layer (S4 v1 scaffold) [Draft] Search: ExpenseFlatSearchView + useSearchSnapshot data layer (S4+S5 combined) Jun 17, 2026
@BartekObudzinski BartekObudzinski changed the title [Draft] Search: ExpenseFlatSearchView + useSearchSnapshot data layer (S4+S5 combined) [WIP] Search: ExpenseFlatSearchView + useSearchSnapshot data layer (S4+S5 combined) Jun 17, 2026
@codecov

codecov Bot commented Jun 18, 2026 •

Copy link
Copy Markdown

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 Δ
src/components/Search/hooks/useSearchSnapshot.ts 87.35% <87.35%> (ø)
src/components/Search/index.tsx 0.75% <0.00%> (-0.12%) ⬇️
... and 244 files with indirect coverage changes

@BartekObudzinski BartekObudzinski changed the title [WIP] Search: ExpenseFlatSearchView + useSearchSnapshot data layer (S4+S5 combined) [No QA] refactor: Search S4 useSearchSnapshot data layer Jun 18, 2026
@BartekObudzinski BartekObudzinski changed the title [No QA] refactor: Search S4 useSearchSnapshot data layer [No QA] refactor: Search useSearchSnapshot data layer Jun 18, 2026
@BartekObudzinski BartekObudzinski changed the title [No QA] refactor: Search useSearchSnapshot data layer [No QA] perf: Search S4 useSearchSnapshot data layer Jun 18, 2026
@BartekObudzinski
BartekObudzinski marked this pull request as ready for review June 18, 2026 14:21
@BartekObudzinski
BartekObudzinski requested review from a team as code owners June 18, 2026 14:21
@melvin-bot
melvin-bot Bot requested review from a team, Ollyws and trjExpensify and removed request for a team June 18, 2026 14:21
@melvin-bot

melvin-bot Bot commented Jun 18, 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]

@melvin-bot
melvin-bot Bot requested review from FitseTLT and mountiny and removed request for a team June 18, 2026 14:22
@melvin-bot

melvin-bot Bot commented Jun 18, 2026

Copy link
Copy Markdown

@FitseTLT @mountiny One of you needs to 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]

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

@FitseTLT Can you review? Thanks!

@FitseTLT

FitseTLT commented Jun 19, 2026 •

Copy link
Copy Markdown
Contributor

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 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)
  • 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)
  • 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.
  • 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-06-22.19-44-25.mp4
Android: mWeb Chrome
2026-06-22.17-04-11.mp4
iOS: HybridApp
2026-06-22.20-22-38.mp4
iOS: mWeb Safari
2026-06-22.17-06-44.mp4
MacOS: Chrome / Safari
2026-06-22.16-59-32.mp4

@FitseTLT

Copy link
Copy Markdown
Contributor

@BartekObudzinski BUG

2026-06-19.16-13-26.mp4

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

just updated the docs fyi, the bug you mean you can't create track distance? @FitseTLT

@FitseTLT

Copy link
Copy Markdown
Contributor

just updated the docs fyi, the bug you mean you can't create track distance? @FitseTLT

It is crasing when u create an expense while on spend page. It is not happening on main.

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

Thanks I could reproduce that, looking into that

@trjExpensify
trjExpensify removed their request for review June 19, 2026 16:48
@trjExpensify

Copy link
Copy Markdown
Contributor

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

@BartekObudzinski

BartekObudzinski commented Jun 22, 2026 •

Copy link
Copy Markdown
Contributor Author

@FitseTLT I resolved the problem, can be rerevied

Screen.Recording.2026-06-22.at.11.14.33.mov

allDataLength: number;
hasDeletedTransaction: boolean;
}>(() => {
if (!shouldComputeSections || !searchDataWithOptimisticTransaction) {

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.

searchDataWithOptimisticTransaction is redundant

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.

Good catch, removed — shouldComputeSections already includes the !!searchDataWithOptimisticTransaction check.

const groupByTransactionSnapshots = useMultipleSnapshots(groupByTransactionHashes);

const filteredData = useMemo<SearchData>(() => {
if (!validGroupBy || isExpenseReportType) {

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.

It would be better to add shouldDeferHeavySearchWork to be clear though I know in that case baseFilteredData is already empty. WDYT

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.

shouldComputeSections already includes !shouldDeferHeavySearchWork (it's the first term in its definition), so this guard already short-circuits while deferring — adding it explicitly would just duplicate that. Happy to add the explicit form if you'd still prefer it for readability.

@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

@FitseTLT updated

@FitseTLT

Copy link
Copy Markdown
Contributor

Conflicts @BartekObudzinski

…t-data-layer

# Conflicts:
#	src/components/Search/index.tsx
@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

@FitseTLT done

@mountiny
mountiny merged commit 37af627 into Expensify:main Jun 23, 2026
34 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

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

@OSBotify OSBotify mentioned this pull request Jun 23, 2026
48 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.18-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed the changes in this PR against the help site content under App/docs/articles.

Why no docs update is needed: This is a purely internal, behavior-preserving performance refactor of the Search screen's data layer. The diff:

  • Adds a new src/components/Search/hooks/useSearchSnapshot.ts hook that consolidates the existing projection (sort, group, paginate, optimistic-row lifecycle) into a single data layer.
  • Refactors src/components/Search/index.tsx to consume that hook instead of running parallel pipelines.
  • Adds unit tests in tests/unit/Search/useSearchSnapshotTest.ts.

There are no user-facing changes — no new or renamed features, tabs, settings labels, or buttons, and no change in product behavior (the PR is labeled [No QA] and the description explicitly states it is behavior-preserving). The help site documents user-facing product behavior, none of which is altered here.

No draft PR was created since no App/docs/articles content needs updating. If you believe a specific user-facing behavior did change and should be documented, let me know which flow and I'll take another look.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.18-2 🚀

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