[CP Staging] Revert "Fix #admin room visibility in LHN for Track Workspace onboarding" by mountiny · Pull Request #94805 · Expensify/App

mountiny · 2026-06-29T08:01:04Z

Fixed issues

…ing"

melvin-bot · 2026-06-29T08:01:11Z

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

robertjchen · 2026-06-29T08:04:38Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b2c008cead

ℹ️ 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-06-29T08:06:26Z

        requiresAttention ||
        (report.isOwnPolicyExpenseChat && !isReportArchived);


Preserve the admin-room hidden override

When the #admins report's current-user notification preference is HIDDEN or missing (which isHiddenForCurrentUser(report) treats as hidden), this gate now returns {shouldDisplay: false} before shouldReportBeInOptionList gets a chance to allow admin rooms. That makes the onboarding/admin room disappear from the LHN for users whose admin room is still hidden/defaulted, even though onboarding can still navigate them to that report.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-06-29T08:06:26Z

        isChatReport(report) &&
        !isPolicyExpenseChat(report) &&
-        !isAdminRoom(report) &&
        !isTripRoom(report) &&


Exclude #admins from empty-chat hiding

When a #admins report is otherwise visible but has no last message yet and is not pinned/focused, it now satisfies this generic empty-chat predicate because the admin-room exemption was removed. New workspace admin rooms can be empty until the server/welcome actions arrive, so excludeEmptyChats: true in the LHN path drops the room and users lose the expected entry point.

Useful? React with 👍 / 👎.

OSBotify · 2026-06-29T08:12:35Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…-workspace-admin-lhn [CP Staging] Revert "Fix #admin room visibility in LHN for Track Workspace onboarding" (cherry picked from commit fd2b949) (cherry-picked to staging by mountiny)

OSBotify · 2026-06-29T08:22:18Z

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

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

MelvinBot · 2026-06-29T08:25:27Z

🤖 Help site review: no changes required.

This PR reverts #94104 — an internal change to LHN (left-hand navigation / inbox) display logic. It removes the special-casing that forced an empty #admins room to always appear in the inbox during Track Workspace onboarding.

This is purely internal code behavior (reasonForReportToBeInOptionList / shouldDisplayReportInLHN) and is not documented on the help site:

The only relevant article, Expensify Chat Rooms for Admins, states that the #admins room is visible to Workspace Admins — which remains true after this revert.
No help article describes the edge-case condition for whether an empty room is shown in the inbox, so nothing in docs/articles becomes inaccurate as a result of this change.

No draft docs PR was created since there is nothing to update.

@mountiny, flagging for your confirmation — let me know if you'd still like a docs PR opened for anything I may have missed.

github-actions · 2026-06-29T08:37:05Z

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

github-actions · 2026-06-29T08:42:38Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-fd2b949c56b-83b6c36-d38c2be6f02551f6121bdbcde74c4ea5bedbcbec/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-fd2b949-83b6c36-12530e3bfec7640623f87860f61beed876799384/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-29T12:38:37Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.21-9 🚀

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

Bundle Size Analysis (Sentry):

Android

OSBotify · 2026-06-29T12:48:28Z

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

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

OSBotify · 2026-06-29T19:38:13Z

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

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

OSBotify · 2026-06-30T11:51:02Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.4.24-0 🚀

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

Bundle Size Analysis (Sentry):

Android

OSBotify · 2026-06-30T12:34:05Z

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

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

Revert "Fix #admin room visibility in LHN for Track Workspace onboard…

b2c008c

…ing"

mountiny requested review from a team as code owners June 29, 2026 08:01

melvin-bot Bot assigned mountiny Jun 29, 2026

melvin-bot Bot requested review from JmillsExpensify and mkhutornyi and removed request for a team June 29, 2026 08:01

melvin-bot Bot requested review from a team and trjExpensify and removed request for a team June 29, 2026 08:01

robertjchen approved these changes Jun 29, 2026

View reviewed changes

mountiny merged commit fd2b949 into main Jun 29, 2026
36 checks passed

mountiny deleted the revert-94104-fix-92431-track-workspace-admin-lhn branch June 29, 2026 08:06

chatgpt-codex-connector Bot reviewed Jun 29, 2026

View reviewed changes

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

OSBotify mentioned this pull request Jun 29, 2026

Deploy Checklist: New Expensify 2026-06-26 #94730

Closed

55 tasks

MelvinBot mentioned this pull request Jul 6, 2026

[$250] Workspace Creation - Admin room doesn't pinned by default #95435

Open

7 tasks

		requiresAttention \|\|
		(report.isOwnPolicyExpenseChat && !isReportArchived);

Uh oh!

Conversation

mountiny commented Jun 29, 2026

Fixed issues

Uh oh!

melvin-bot Bot commented Jun 29, 2026

Uh oh!

robertjchen commented Jun 29, 2026

Reviewer Checklist

Screenshots/Videos

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 Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 29, 2026

Uh oh!

MelvinBot commented Jun 29, 2026

Uh oh!

github-actions Bot commented Jun 29, 2026

Uh oh!

github-actions Bot commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 29, 2026

Uh oh!

OSBotify commented Jun 30, 2026

Uh oh!

OSBotify commented Jun 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants