[CP Staging] fix: deploy blocker #91087 — blank workspace page on invalid URL with RHP by WojtekBoman · Pull Request #91100 · Expensify/App

WojtekBoman · 2026-05-19T16:40:44Z

Explanation of Change

Gates the workspace not-found view on a new useIsWorkspacesTabFocused hook instead of useIsFocused(). The previous gate (added in #89750) hid the not-found page when an RHP was open over a workspace screen, leaving a blank background for invalid workspace URLs. The new hook checks WORKSPACE_NAVIGATOR is the active tab — true even with an RHP overlay — preserving #89750's tab-bar bleed-through fix.

the app behaviour after being fixed:
https://github.com/user-attachments/assets/e387912d-4343-4e2f-b4ff-b27b00de80ac

Fixed Issues

$ #91087
PROPOSAL:

Tests

Sign in on web (https://dev.new.expensify.com:8082/).
Open any workspace's Overview, then click "Workspace name" to open the RHP form.
In the URL bar, change the policyID segment to an invalid value (e.g. nope) and press Enter.
Verify that the full-screen "Not here" page is displayed (instead of a blank background page).

Sign in to the same account on two devices/sessions.
On device A, open a workspace settings page, then switch to a different tab (e.g. Search) so the workspace screen is in the background.
On device B, delete that workspace.
On device A, verify the "Not here" page does NOT bleed through the Search tab content or hide the tab bar.
Switch back to the Workspaces tab on device A and verify the "Not here" page is now displayed correctly.

Open a valid workspace and navigate to any settings page that opens an RHP (e.g. Workflows → Approval).
Verify the RHP renders normally with no spurious "Not here" page underneath, and that closing the RHP returns the user to the valid workspace settings page.

Verify that no errors appear in the JS console

Offline tests

N/A — changes are render-gate only and do not involve API calls or Onyx writes.

QA Steps

Same as tests.

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

codecov · 2026-05-19T16:51:01Z

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/workspace/AccessOrNotFoundWrapper.tsx	`75.00% <100.00%> (+0.39%)`	⬆️
src/pages/workspace/WorkspacePageWithSections.tsx	`71.23% <100.00%> (-0.99%)`	⬇️
src/hooks/useIsWorkspacesTabFocused.ts	`60.00% <60.00%> (ø)`
src/pages/workspace/WorkspaceInitialPage.tsx	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

melvin-bot · 2026-05-19T16:53:23Z

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

WojtekBoman · 2026-05-19T16:55:34Z

cc: @ZhenjaHorbach @mountiny

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6e5b043481

ℹ️ 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-05-19T16:57:38Z


    const isPolicyNotAccessible = !isPolicyAccessible(policy, login);
-    const shouldShowNotFoundPage = isFocused && ((!isMoneyRequest && !isFromGlobalCreate && isPolicyNotAccessible) || !isPageAccessible || shouldBeBlocked);
+    const shouldShowNotFoundPage = isWorkspacesTabFocused && ((!isMoneyRequest && !isFromGlobalCreate && isPolicyNotAccessible) || !isPageAccessible || shouldBeBlocked);


Keep access-denied fallback independent of Workspaces tab

shouldShowNotFoundPage now depends on isWorkspacesTabFocused, but AccessOrNotFoundWrapper is also used by non-Workspaces flows (for example src/pages/iou/request/IOURequestStartPage.tsx wraps create-expense routes with accessVariants={[CONST.IOU.ACCESS_VARIANTS.CREATE]}). When those screens are opened from Reports/Search tabs, isWorkspacesTabFocused is false, so failed access checks (!isPageAccessible, blocked policy, etc.) no longer show the not-found fallback and the protected content can still render. This changes permission/error behavior outside the Workspaces tab.

Useful? React with 👍 / 👎.

Should work fine now :)

… URL with RHP

ZhenjaHorbach · 2026-05-19T17:11:09Z

Does it really work? 😅
For some reason, even after a minute, I have an endless loading

2026-05-19.19.10.07.mov

ZhenjaHorbach · 2026-05-19T17:22:50Z

But it works now

The only thing that confuses me is the order of actions
First, we show "not here" in a modal
Then, in the background
And only then, full-screen "not here"

I think we should immediately show it in full screen after loading

2026-05-19.19.18.10.mov

ZhenjaHorbach · 2026-05-19T17:34:25Z

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

2026-05-19.19.36.35.mov

2026-05-19.19.39.03.mov

iOS: mWeb Safari

2026-05-19.19.36.35.mov

2026-05-19.19.39.03.mov

MacOS: Chrome / Safari

2026-05-19.19.18.10.mov

2026-05-19.19.32.24.mov

ZhenjaHorbach · 2026-05-19T17:38:54Z

Small visual glitch
And I suppose it's not related to this PR
But probably it came from the original issue

2026-05-19.19.37.54.mov

ZhenjaHorbach · 2026-05-19T17:40:19Z

LGTM!

mountiny · 2026-05-19T17:41:44Z

@WojtekBoman can you add unit test for this please?

github-actions · 2026-05-19T17:46:25Z

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

github-actions · 2026-05-19T17:50:58Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d5c5511-fdf8a2c-5e7c0434144e798272a0ed8d1325b8e7651cca29/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d5c5511-fdf8a2c-aa8900a6f1265a5b311c560613bdf2f375c98d72/index.html

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

👀 View the workflow run that generated this build 👀

…ab-not-found-page [CP Staging] fix: deploy blocker #91087 — blank workspace page on invalid URL with RHP (cherry picked from commit d5c5511) (cherry-picked to staging by mountiny)

OSBotify · 2026-05-19T18:01:56Z

✋ 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 · 2026-05-19T18:28:23Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.77-3 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-19T18:30:21Z

No help site changes are needed for this PR. The changes are purely internal navigation/rendering logic (replacing useIsFocused() with a new useIsWorkspacesTabFocused hook to fix blank workspace page behavior). No user-facing features, settings, workflows, or terminology were added or modified.

OSBotify · 2026-05-19T22:03:24Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.77-3 🚀

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

OSBotify · 2026-05-19T22:08:55Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.78-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-19T22:14:56Z

After reviewing the changes in this PR, no help site documentation updates are required.

This PR is an internal bug fix that changes how the "Not Found" page is gated when navigating workspace screens. It replaces useIsFocused() with a new useIsWorkspacesTabFocused hook in three workspace components to correctly show the error page when an RHP overlay is open. There are no user-facing feature changes, new settings, terminology changes, or workflow modifications that would need to be reflected in help site articles.

melvin-bot Bot assigned WojtekBoman May 19, 2026

WojtekBoman marked this pull request as ready for review May 19, 2026 16:52

WojtekBoman requested review from a team as code owners May 19, 2026 16:52

melvin-bot Bot requested review from ShridharGoel and removed request for a team May 19, 2026 16:53

WojtekBoman mentioned this pull request May 19, 2026

[Due for payment 2026-05-26] Workspace - Blank workspace details page opens in the background when link is invalid #91087

Closed

7 tasks

chatgpt-codex-connector Bot reviewed May 19, 2026

View reviewed changes

fix: deploy blocker Expensify#91087 — blank workspace page on invalid…

c0d511f

… URL with RHP

WojtekBoman force-pushed the fix/workspaces-tab-not-found-page branch from 6e5b043 to c0d511f Compare May 19, 2026 17:04

mountiny self-requested a review May 19, 2026 17:25

mountiny changed the title ~~fix: deploy blocker #91087 — blank workspace page on invalid URL with RHP~~ [CP Staging] fix: deploy blocker #91087 — blank workspace page on invalid URL with RHP May 19, 2026

ZhenjaHorbach approved these changes May 19, 2026

View reviewed changes

mountiny approved these changes May 19, 2026

View reviewed changes

Comment thread src/hooks/useIsWorkspacesTabFocused.ts

Copy link
Copy Markdown

Contributor

mountiny May 19, 2026

Choose a reason for hiding this comment

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

@WojtekBoman can you add unit test for this please?

mountiny merged commit d5c5511 into Expensify:main May 19, 2026
41 of 42 checks passed

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

OSBotify mentioned this pull request May 19, 2026

Deploy Checklist: New Expensify 2026-05-19 #91039

Closed

75 tasks

Conversation

WojtekBoman commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented May 19, 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!

melvin-bot Bot commented May 19, 2026

Uh oh!

WojtekBoman commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 19, 2026

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach May 19, 2026

Choose a reason for hiding this comment

Uh oh!

WojtekBoman May 19, 2026

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented May 19, 2026

Uh oh!

ZhenjaHorbach commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented May 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented May 19, 2026

Uh oh!

mountiny May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 19, 2026

Uh oh!

github-actions Bot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

WojtekBoman commented May 19, 2026 •

edited

Loading

codecov Bot commented May 19, 2026 •

edited by github-actions Bot

Loading

WojtekBoman commented May 19, 2026 •

edited

Loading

ZhenjaHorbach commented May 19, 2026 •

edited

Loading

ZhenjaHorbach commented May 19, 2026 •

edited

Loading

ZhenjaHorbach commented May 19, 2026 •

edited

Loading