[CP STaging] Add a null safety for searchResults.search by bernhardoj · Pull Request #96918 · Expensify/App

bernhardoj · 2026-07-24T01:56:57Z

Explanation of Change

Fixed Issues

$ #96074
PROPOSAL:

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open search page
Verify there is no crash

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-07-24T01:57:03Z

@aimane-chnaif 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]

bernhardoj · 2026-07-24T02:00:04Z

-            }).primaryHash
-    );
+    const queryJSONHash =
+        queryJSON && searchResults?.search


@JS00001 @aimane-chnaif we have a crash report on Sentry because of undefined searchResults.search. It happens on staging for now, reproduced by QA, but I can't reproduce it. The type for search is also not undefined; that's why I removed the null safety before. I added it back now.

I still added QA steps to open the search page since QA can reproduce it.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1f0f8ba052

ℹ️ 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-07-24T02:02:14Z

+              }).primaryHash
+            : queryJSON?.hash;
+
+    return (searchResults?.data != null || searchResults?.errors != null) && searchResults.search?.type === queryJSON?.type && searchResults.search?.hash === queryJSONHash;


Handle data-only snapshots as loaded

When a chat message or task is created while offline, buildOptimisticSnapshotData() is used from Task.ts/Report/index.ts to populate the canned Reports > Chats/Task snapshot with data only, so there is intentionally no search object on that snapshot. With this guard, isSearchDataLoaded() returns false whenever searchResults.search is missing, so useSearchSnapshot never computes sections and the Search screen falls through to EmptySearchView even though the optimistic offline rows are present. Please either write the missing search metadata for those snapshots or treat a data-only snapshot for the current query hash/type as loaded instead of requiring searchResults.search.

Useful? React with 👍 / 👎.

If searchResults.search is missing, queryJSONHash equals queryJSON.hash, which means it will be the same exact logic we had before.

aimane-chnaif · 2026-07-24T03:16:58Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-07-24T03:21:09Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/SearchUIUtils.ts	`64.22% <100.00%> (ø)`
... and 11 files with indirect coverage changes

MelvinBot · 2026-07-24T04:04:41Z

🤖 Review: LGTM — the change is a correct, minimal null-safety fix and all checks pass.

The crash came from unconditionally reading searchResults.search.type / .hash in isSearchDataLoaded. Adding optional chaining (searchResults.search?.type / ?.hash) removes the crash, and behavior in the normal (non-null) path is unchanged.

One nice detail: the queryJSONHash fallback to queryJSON?.hash (rather than leaving it undefined) means that when searchResults.search is missing, the hash comparison is undefined === queryJSON.hash → false, so the function correctly reports "not loaded" instead of a spurious match.

Verification

Normal case (both queryJSON and searchResults.search defined): queryJSONHash computes the same value as before, and both comparisons are identical to the original — no behavior change.
searchResults.search undefined, queryJSON defined: type check undefined === queryJSON.type → false → returns false. ✓ (matches the intent of the new unit test)
queryJSON undefined, searchResults.search concrete: falls to queryJSON?.hash = undefined, concrete hash !== undefined → false. ✓ (still passes the existing "queryJSON undefined" test)
Only true-returning edge is if searchResults.search and queryJSON are both undefined while data/errors exist — an unlikely state, and lower risk than the previous crash. Not blocking.

Checks: all green (typecheck, ESLint, unit test (job 1-8), codecov ✅). The added test should return false when searchResults.search is undefined covers the fixed path.

chatgpt-codex-connector · 2026-07-24T04:07:08Z

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

Reviewed commit: a4b59c80a2

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

github-actions · 2026-07-24T12:27:30Z

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

github-actions · 2026-07-24T12:32:54Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #96918.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-2719a193f3a-d815402-3c26ec2d7cf51545790eb6ceeb73f28918db2907/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-2719a19-d815402-542892bd4141ed3ce118a4e3d86fe47768ee8b54/index.html

Web 🕸️
https://96918.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

aimane-chnaif · 2026-07-24T15:25:29Z

Should we CP this?

JS00001 · 2026-07-24T15:33:02Z

Requested a CP

…esults-search Add a null safety for searchResults.search (cherry picked from commit 2719a19) (cherry-picked to staging by Beamanator)

OSBotify · 2026-07-24T16:30:44Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.4.44-1 🚀

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

MelvinBot · 2026-07-24T16:32:55Z

🤖 I reviewed the changes in this PR and no help site changes are required.

Why: This PR adds null safety to isSearchDataLoaded in SearchUIUtils.ts so the Search page doesn't crash when searchResults.search is undefined. It's a purely internal, defensive code-robustness fix — it does not introduce, remove, or change any user-facing feature, workflow, setting, tab, or UI label. Nothing in App/docs/articles documents this internal loading-state logic, so there is nothing to update.

No draft PR was created.

OSBotify · 2026-07-24T18:32:16Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.4.44-1 🚀

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

add a null safety for searchResults.search

1f0f8ba

bernhardoj requested review from a team as code owners July 24, 2026 01:56

melvin-bot Bot assigned bernhardoj Jul 24, 2026

melvin-bot Bot requested review from aimane-chnaif and joekaufmanexpensify and removed request for a team July 24, 2026 01:57

melvin-bot Bot removed the request for review from a team July 24, 2026 01:57

bernhardoj commented Jul 24, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Jul 24, 2026

View reviewed changes

add test

a4b59c8

aimane-chnaif approved these changes Jul 24, 2026

View reviewed changes

melvin-bot Bot requested a review from JS00001 July 24, 2026 04:02

JS00001 approved these changes Jul 24, 2026

View reviewed changes

JS00001 merged commit 2719a19 into Expensify:main Jul 24, 2026
35 checks passed

This was referenced Jul 24, 2026

Investigate workflow job failing on main: test / test (job 7) #96959

Closed

Investigate workflow job failing on main: test / test (job 7) #96961

Closed

JS00001 changed the title ~~Add a null safety for searchResults.search~~ [CP STaging] Add a null safety for searchResults.search Jul 24, 2026

OSBotify pushed a commit that referenced this pull request Jul 24, 2026

Merge pull request #96918 from bernhardoj/fix/96074-undefined-searchr…

97a9751

…esults-search Add a null safety for searchResults.search (cherry picked from commit 2719a19) (cherry-picked to staging by Beamanator)

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

OSBotify mentioned this pull request Jul 24, 2026

Deploy Checklist: New Expensify 2026-07-23 #96914

Open

51 tasks

MelvinBot mentioned this pull request Jul 24, 2026

Task-App crashes on applying task filter. #96994

Open

7 tasks

yuwenmemon mentioned this pull request Jul 25, 2026

[CP Staging] Revert "Fix empty view shows briefly when sorting" #97015

Closed

34 tasks

Uh oh!

Conversation

bernhardoj commented Jul 24, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 24, 2026

Uh oh!

bernhardoj Jul 24, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 24, 2026

Choose a reason for hiding this comment

Uh oh!

bernhardoj Jul 24, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Jul 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jul 24, 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!

MelvinBot commented Jul 24, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 24, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 24, 2026

Uh oh!

github-actions Bot commented Jul 24, 2026

Uh oh!

aimane-chnaif commented Jul 24, 2026

Uh oh!

JS00001 commented Jul 24, 2026

Uh oh!

OSBotify commented Jul 24, 2026

Uh oh!

MelvinBot commented Jul 24, 2026

Uh oh!

OSBotify commented Jul 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

aimane-chnaif commented Jul 24, 2026 •

edited

Loading

codecov Bot commented Jul 24, 2026 •

edited by github-actions Bot

Loading