decompose ReportScreen 6c: extract not-found guards

[adhorodyski]

Explanation of Change

PR 6c in the ReportScreen decomposition series (6a → 6b → 6c → 6d).

Extracts two guard wrapper components from ReportScreen.tsx and simplifies them:

• ReportNotFoundGuard — report-level not-found logic, wraps children in FullPageNotFoundView when the report does not exist or is inaccessible. Uses shared isLoadingInitialReportActionsSelector instead of subscribing to the full reportMetadata object. Deduplicates route param extraction.

• LinkedActionNotFoundGuard — linked action not-found with a cheap outer gate (skips the heavy check when no reportActionID is in the route) and a heavy inner gate (verifies the linked action actually exists in the report). Simplified with:

  • key={reportActionIDFromRoute} on the inner gate — React-idiomatic remount per linked action, replacing the manual firstRender state + lastReportActionIDFromRoute tracking
  • Removed isLinkingToMessage state, its InteractionManager effect, and its render-time guard — vestigial since the outer gate already ensures the inner gate only mounts when reportActionIDFromRoute is truthy, and !isLoadingInitialReportActions already suppresses not-found during loading
  • Removed isNavigatingToDeletedAction state — replaced with wasEverVisible, a one-way flag set during render (React-supported pattern for adjusting state based on props)
  • Removed usePrevious — replaced by wasEverVisible which tracks the same semantic ("was the action ever loaded and visible during this mount?") without reading refs during render
  • Replaced usePaginatedReportActions (pagination, sorting, continuous-chain computation) with a direct useOnyx selector that looks up the linked action by ID — the guard only needs the action itself, not the full paginated view
  • Replaced branch 2 (sortedAllReportActions.length > 0 && reportActions.length === 0) with a direct !linkedAction null check — the old check incorrectly showed "comment not found" for existing, visible actions when the filtered paginated window happened to be empty (a pagination artifact, not a linked-action-not-found concern)
  • Added PERF-15 async cleanup to the whisper effect

UX differences from main:

1. Not-found shows slightly faster after loading (no InteractionManager delay) — the action data arrives in the same Onyx batch as isLoadingInitialReportActions: false, so the delay was unnecessary
2. No longer shows "comment not found" for actions that exist in the collection but have an empty paginated/filtered view (pagination artifact fix)
3. Now correctly shows "comment not found" when the linked action genuinely doesn't exist in the collection (which main could miss if other actions made the filtered view non-empty)

Fixed Issues

$ #84895
PROPOSAL:

Tests

General regression — report loads normally

1. Open the app and navigate to any existing report.
2. Verify the report loads and renders correctly with no console errors.
3. Send a message and verify it appears in the thread.

Report not-found — invalid report ID

1. In the browser address bar (or via deep link), navigate to a report URL with a non-existent report ID (e.g. /r/000000000).
2. Verify the "Not found" full-page view is shown.
3. Verify no crash or blank screen occurs.

Report not-found — deleted/inaccessible report

1. Have a second account create a private report that your account has no access to.
2. Navigate to that report URL directly.
3. Verify the "Not found" full-page view is shown.

Linked action not-found — deleted comment

1. Open a report that has a linked action in the URL (e.g. a deep link to a specific comment: /r/<reportID>/<reportActionID>).
2. Delete the comment from another session or device so the action no longer exists.
3. Reload the page with the original deep link URL still in the address bar.
4. Verify the "Not found" view for the linked action is shown (not a crash or blank screen).

Linked action not-found — inaccessible whisper

1. Open a report where a whisper was sent to a different user (one your account cannot see).
2. Construct a deep link URL pointing to that whisper's reportActionID.
3. Navigate to the URL.
4. Verify the "Not found" view for the linked action is shown.

Linked action not-found — no reportActionID in route (cheap gate)

1. Navigate to a report URL without any reportActionID query param.
2. Verify the report loads normally — the heavy linked-action check is skipped entirely, and no "Not found" view is shown.

Offline behavior

1. Open a report while online and confirm it loads.
2. Disconnect from the network.
3. Navigate away and back to the same report.
4. Verify the report still renders from cache with no "Not found" flicker or crash.
5. Reconnect and verify the report is still intact.

• Verify that no errors appear in the JS console

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]

@codex review

[codecov]

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/pages/inbox/ReportNotFoundGuard.tsx	100.00% <100.00%> (ø)
src/pages/inbox/report/ReportFooter.tsx	42.10% <ø> (-1.49%)	⬇️
src/selectors/ReportAction.ts	33.33% <100.00%> (+13.33%)	⬆️
src/selectors/ReportMetaData.ts	100.00% <100.00%> (ø)
src/pages/inbox/LinkedActionNotFoundGuard.tsx	92.85% <92.85%> (ø)
src/pages/inbox/ReportScreen.tsx	64.20% <72.72%> (-4.72%)	⬇️
... and 197 files with indirect coverage changes

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e45e5af046

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

[adhorodyski]

@codex review

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d2f196aaa1

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

[melvin-bot]

@DylanDylann 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: ce5ec3f7ea

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

[DylanDylann]

@codex review

[DylanDylann]

@MelvinBot review

[MelvinBot]

🤖 Code Review — ReportScreen 6c: Extract Not-Found Guards

Nice decomposition. The extraction is clean, and the new guard components are well-structured with clear separation of concerns. Here's my detailed analysis:

---

What's Good

1. Bug fix in the linked-action not-found logic. The old second branch of shouldShowNotFoundLinkedAction:

   sortedAllReportActions?.length > 0 && reportActions.length === 0

   confused "the paginated/filtered view is empty" with "the linked action doesn't exist." The new direct Onyx key lookup (reportActions[reportActionID]) correctly checks whether the specific action exists in the collection, not whether the paginated window is empty. This is a genuine bug fix.

2. hasSeenLoadingCycle is more robust than isLinkingToMessage + InteractionManager. The old isLinkingToMessage was a race-condition patch — it suppressed not-found during the window between route change and openReport() optimistic data. The new hasSeenLoadingCycle gates the condition structurally: no "not found" until isLoadingInitialReportActions has gone through a true → false cycle. This handles the stale-metadata-for-previously-loaded-reports case elegantly.

3. wasEverVisible + key={reportActionIDFromRoute} is a clean replacement for the interplay of isNavigatingToDeletedAction, prevIsLinkedActionDeleted, lastReportActionIDFromRoute, and firstRender. The key-based remount resets state on action navigation, and the one-way flag tracks the "was this action ever visible" semantic without any effect-based bookkeeping.

4. PERF-15 async cleanup on the whisper effect is a good catch — the old code had no cleanup for the Navigation.isNavigationReady() promise.

5. Shared isLoadingInitialReportActionsSelector moved to selectors/ReportMetaData.ts — consolidates the selector that was duplicated in ReportFooter.tsx.

---

Items Worth Confirming

1. ReportNotFoundGuard does not have hasSeenLoadingCycle — is the firstRender removal fully safe?

LinkedActionNotFoundGuard explicitly handles the stale-metadata edge case with hasSeenLoadingCycle. ReportNotFoundGuard does not have an equivalent — it relies on default values (isLoadingReportData = true, isLoadingInitialReportActions = true, isLoadingApp being undefined) to suppress false not-found on first render.

For a previously loaded report where Onyx synchronously delivers cached values (IS_LOADING_REPORT_DATA: false, IS_LOADING_APP: false, isLoadingInitialReportActions: false), all three loading defaults could be overridden before the openReport() optimistic update fires. The protection then depends on isLoadingApp !== false holding true (it starts as undefined before Onyx connects, and undefined !== false is true).

In practice, isLoadingApp should always protect the first render since it's one of the last values Onyx resolves on app startup. But this is more fragile than an explicit hasSeenLoadingCycle guard. If you've tested this specific case (deep link to a previously loaded report, hot Onyx cache) and confirmed no flash, then this is fine. Just flagging it for awareness.

2. visibleReportActionsData subscription in LinkedActionNotFoundGate

The ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS subscription (line 70) feeds into the isReportActionVisible check. Since LinkedActionNotFoundGate remounts via key={reportActionIDFromRoute}, this re-subscribes each time the linked action changes. This should be fine given Onyx's subscription management, but worth confirming there's no performance concern with this derived key re-subscription on every linked-action navigation.

3. Removal of the render-time early return (return null)

The old code had:

if ((lastRoute !== route || lastReportActionIDFromRoute !== reportActionIDFromRoute)
    && isLinkingToMessage !== !!reportActionIDFromRoute) {
    setIsLinkingToMessage(!!reportActionIDFromRoute);
    return null;
}

This rendered nothing during route transitions to a new linked action. The new code removes this, which should be fine — showing stale content briefly is better UX than a blank screen, and hasSeenLoadingCycle prevents premature "not found." Just confirming this is intentional.

---

Nit

navigateToEndOfReport in LinkedActionNotFoundGate (line 137) isn't wrapped in useCallback, so it creates a new function reference each render. Low impact since it's only passed to FullPageNotFoundView props, but could be memoized for consistency with the old code's useCallback version.

---

Summary

This is a well-executed refactor that fixes a genuine bug in the linked-action not-found logic and simplifies complex state management. The hasSeenLoadingCycle + wasEverVisible patterns are clean and idiomatic. The only concern worth double-checking is whether ReportNotFoundGuard needs its own loading-cycle guard for the stale-metadata edge case (item #1 above).

Looks good overall 👍

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0c0dfd215d

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

[adhorodyski]

Answering Melvin:

ReportNotFoundGuard does not have hasSeenLoadingCycle — is the firstRender removal fully safe?

The only dangerous scenario would be: stale metadata cached (isLoadingInitialReportActions=false) but report data NOT cached. That can't happen in normal Onyx usage, both are written in the same openReport() response, and Onyx doesn't selectively evict keys.

For a never-loaded report: no metadata exists → isLoadingInitialReportActions defaults to true → isLoading=true → protected.

[DylanDylann]

@adhorodyski I overlooked the PR description in my initial review. Your refactor looks great

[DylanDylann]

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
  • MacOS: Desktop
• 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 there are no new alerts related to the canBeMissing param for useOnyx
• 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

Screen.Recording.2026-04-02.at.21.01.35.mov

Android: mWeb Chrome

Screen.Recording.2026-04-02.at.20.53.59.mov

iOS: HybridApp

Screen.Recording.2026-04-02.at.20.56.31.mov

iOS: mWeb Safari

Screen.Recording.2026-04-02.at.20.45.59.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-02.at.20.42.33.mov

[DylanDylann]

LGTM

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-0120163-1a9ab5e-ff406f39e96bc879e8c6bc26784f17ec36fb3e46/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-0120163-1a9ab5e-b7f84fadda57a8e95a446b77609b50daddd0f50a/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

✋ 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]

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[MelvinBot]

No help site changes are required for this PR.

This is a code-level refactoring that extracts guard components from ReportScreen.tsx. It does not introduce, rename, or modify any user-facing features, settings, labels, or workflows. The minor UX differences (faster not-found display, pagination artifact fix) are correctness improvements to existing behavior, not documentable feature changes.

[OSBotify]

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀

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