Skip to content

feat: add explicit terminal state to search snapshot#96043

Open
BartekObudzinski wants to merge 9 commits into
Expensify:mainfrom
callstack-internal:feat/search-snapshot-terminal-state
Open

feat: add explicit terminal state to search snapshot#96043
BartekObudzinski wants to merge 9 commits into
Expensify:mainfrom
callstack-internal:feat/search-snapshot-terminal-state

Conversation

@BartekObudzinski

@BartekObudzinski BartekObudzinski commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Today, whether a search snapshot has finished loading is inferred from a mix of fields: whether data is undefined, the isLoading flag, and whether type/status match the current query. This breaks when a request resolves with a 200 response but writes no data at all: nothing marks the snapshot as done, so the page is stuck showing a loading state with nothing left to re-drive it. This is a live production bug.

Search requests are read commands, so they never enter the offline request queue. That means the snapshot itself has to own its own lifecycle instead of relying on the queue to retry or resolve it.

This PR adds an explicit state field (loading / loaded / error) to the search snapshot. getOnyxLoadingData now writes loading optimistically when a request starts, and a new successData branch writes loaded on any successful (jsonCode 200) resolve, even one with no snapshot data. failureData writes error, and finallyData intentionally leaves state alone since it runs after success/failure and would otherwise overwrite the error result. The field is optional so snapshots persisted before this change stay valid, and the writes only apply to real search requests (not the other two callers of this helper) so they can't get stuck in loading with no terminal write to clear it.

This PR is write side only. It does not change any UI or the existing loading/error gates. Those will move over to read the new field in a follow up PR.

Fixed Issues

$ #96061
PROPOSAL:

Tests

  1. On web, run a normal search, then switch between two different saved searches/queries. Verify both render their results exactly as on main.
  2. Force a failed search request (block or throttle the network mid-request). Verify the page reaches the error UI instead of hanging in a loading state.
  • Verify that no errors appear in the JS console

Offline tests

N/A — the search request never fires while offline (useSearchPageSetup returns early on isOffline), so there is no offline behavior to exercise.

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 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 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)
  • 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.
  • 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

Comment thread src/types/onyx/SearchResults.ts Outdated
* Optional because snapshots persisted before this field existed (and snapshots written by
* non-search actions) may not carry it.
*
* TODO: nothing reads this field yet. The existing isLoading/type/status-based loading and error gates

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.

this should already link to an issue, there's nothing that tracks it once we merge a TODO and follow-up PR to code.

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.

Agreed, a TODO without a link dies on merge. The tracking issue for the read side is being created, I will put the link in this TODO before the PR leaves draft.

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.

Went with removing the TODO marker for now since the consistency rule flags it. The follow-up is tracked on our side and the GitHub issue will be created together with the read side PR, I will link it here once it exists.

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.

Dropped the TODO since issues here get created on the fly and there is nothing to link yet. The follow-up is tracked on my side and lands in the next PR together with its issue

@BartekObudzinski BartekObudzinski marked this pull request as ready for review July 14, 2026 13:15
@BartekObudzinski BartekObudzinski requested review from a team as code owners July 14, 2026 13:15
@BartekObudzinski

Copy link
Copy Markdown
Contributor Author

@codex review

@melvin-bot

melvin-bot Bot commented Jul 14, 2026

Copy link
Copy Markdown

@parasharrajat 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 removed request for a team July 14, 2026 13:15
Comment thread src/types/onyx/SearchResults.ts Outdated
* Optional because snapshots persisted before this field existed (and snapshots written by
* non-search actions) may not carry it.
*
* TODO: nothing reads this field yet. The existing isLoading/type/status-based loading and error gates

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.

❌ CONSISTENCY-11 (docs)

This new TODO: comment describes deferred/future work ("nothing reads this field yet... migrate to read it in a follow-up PR"). Per contributingGuides/philosophies/OVERENGINEERING.md, future work should be tracked in a GitHub issue rather than an in-code TODO, which is invisible to planning and tends to rot silently in the codebase.

Remove the TODO marker and capture the follow-up (wiring the read side to consume state) as a GitHub issue. You can keep the explanatory prose without the TODO token:

    /** Explicit terminal lifecycle state of the most recent search request for this snapshot.
     * Optional because snapshots persisted before this field existed (and snapshots written by
     * non-search actions) may not carry it.
     *
     * Nothing reads this field yet; the existing isLoading/type/status-based loading and error gates
     * are migrated to read it separately (tracked in a GitHub issue).
     *
     * Residual limitation: if the app is killed or reloaded mid-request, no cleanup runs, so `loading` can
     * still be stranded on disk. The future read side must treat a `loading` state with no in-flight request
     * as stale. */
    state?: ValueOf<typeof CONST.SEARCH.SNAPSHOT_STATE>;

Reviewed at: d8febfa | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

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.

Removed the TODO marker, the prose stays as a plain description. The read side migration is tracked on our side and will get its own GitHub issue when that PR starts.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: d8febfaa74

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

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.

2 participants