fix: exclude thread reports from isChatUsedForOnboarding admin room fallback by KJ21-ENG · Pull Request #83305 · Expensify/App

KJ21-ENG · 2026-02-24T09:28:47Z

Explanation of Change

When the onboarding NVP exists but lacks a chatReportID (transient state during guided setup), isChatUsedForOnboarding falls back to isAdminRoom(). Thread reports created in the #admins room inherit chatType: POLICY_ADMINS from their parent, so isAdminRoom() returns true for those threads too. This causes the "Register for webinar" button (and other onboarding UI like the LHN tooltip and FreeTrial badge) to incorrectly appear in thread headers.

This PR adds a !isChatThread(optionOrReport) guard to the isAdminRoom fallback path inside isChatUsedForOnboarding(). A thread is never the onboarding chat itself — it is always a child of one — so this change is semantically correct and fixes the root cause at the utility function level rather than patching individual call sites.

A companion unit test is also added to verify that a report with both chatType: POLICY_ADMINS and parentReportID/parentReportActionID set correctly returns false.

Fixed Issues

$ #81069
PROPOSAL: #81069 (comment)

Tests

Log in to the app in your local environment with a new account (or an account that has completed guided setup with the MANAGE_TEAM onboarding choice)
Navigate to the #admins room
Create a new thread by replying to any message in the #admins room
Open the thread
Verify that the "Register for webinar" button does NOT appear in the thread header
Go back to the main #admins room
Verify that the "Register for webinar" button still appears correctly in the main #admins room header

Verify that no errors appear in the JS console

Offline tests

Disconnect from the network
Navigate to a thread in the #admins room
Verify the "Register for webinar" button does not appear in the thread header
Reconnect to the network
Verify the behavior remains consistent

QA Steps

Log in on staging with an account that completed onboarding with the MANAGE_TEAM choice
Navigate to the #admins room
Open any thread in the #admins room
Verify the "Register for webinar" button does NOT appear in the thread header
Go back to the #admins room
Verify the "Register for webinar" button still appears in the main room header

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 & macOS Safari

melvin-bot · 2026-02-24T09:28:55Z

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

github-actions · 2026-02-24T09:29:18Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

KJ21-ENG · 2026-02-24T14:45:43Z

I have read the CLA Document and I hereby sign the CLA

abzokhattab · 2026-02-24T19:09:56Z

@KJ21-ENG

Can you please run npm run prettier and repush...
Also i see that some of the screenshots u attached are from staging, not the current PR ... it doesn't make sense to provide screenshots from staging

…allback When the onboarding NVP has no chatReportID, isChatUsedForOnboarding falls back to isAdminRoom(). Thread reports inherit chatType POLICY_ADMINS from their parent, causing the function to incorrectly return true for threads. This adds a !isChatThread() guard to the isAdminRoom fallback path so that threads inside the admins room are no longer treated as onboarding chats. Also adds a companion unit test to verify this behavior.

KJ21-ENG · 2026-02-24T21:32:31Z

@abzokhattab
Updated.

abzokhattab · 2026-02-26T01:32:16Z

Log in to the staging app with

this step is wrong ... we are not testing this on staging .. can you please change it

abzokhattab · 2026-02-26T01:43:27Z

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 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-02-26.at.02.39.19.mov

Android: mWeb Chrome

Screen.Recording.2026-02-26.at.02.37.20.mov

iOS: HybridApp

Screen.Recording.2026-02-26.at.02.40.08.mov

iOS: mWeb Safari

Screen.Recording.2026-02-26.at.02.42.24.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-26.at.02.34.45.mov

KJ21-ENG · 2026-02-26T07:14:30Z

Updated.

KJ21-ENG · 2026-02-26T07:20:32Z

@abzokhattab
Updated

Log in to the staging app with

this step is wrong ... we are not testing this on staging .. can you please change it

github-actions · 2026-03-05T00:10:26Z

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

OSBotify · 2026-03-05T00:14:29Z

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

github-actions · 2026-03-05T00:14:57Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-9dbab15-34c44ab-559517d484b71b38021b706d5f651f2491e6b44f/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-9dbab15-34c44ab-03677b4667338034365195a66f5f3749c1886768/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-06T04:14:36Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.32-0 🚀

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

OSBotify · 2026-03-06T22:43:49Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

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

KJ21-ENG requested review from a team as code owners February 24, 2026 09:28

melvin-bot bot assigned KJ21-ENG Feb 24, 2026

melvin-bot bot requested review from abzokhattab and heyjennahay February 24, 2026 09:28

melvin-bot bot removed request for a team February 24, 2026 09:28

CLABotify added a commit to Expensify/CLA that referenced this pull request Feb 24, 2026

@KJ21-ENG has signed the CLA in Expensify/App#83305

1f9d33a

KJ21-ENG mentioned this pull request Feb 24, 2026

[due for payment 2026-03-13] [$250] Onboarding -"Register for webinar" appears in the thread header #81069

Closed

7 tasks

KJ21-ENG closed this Feb 24, 2026

KJ21-ENG reopened this Feb 24, 2026

KJ21-ENG force-pushed the fix/81069-exclude-threads-from-onboarding-chat branch from 35aab29 to 4fc08c9 Compare February 24, 2026 21:14

abzokhattab approved these changes Feb 26, 2026

View reviewed changes

melvin-bot bot requested a review from srikarparsi February 26, 2026 01:44

srikarparsi approved these changes Mar 5, 2026

View reviewed changes

srikarparsi merged commit 9dbab15 into Expensify:main Mar 5, 2026
31 checks passed

OSBotify mentioned this pull request Mar 6, 2026

Deploy Checklist: New Expensify 2026-03-06 #84352

Closed

92 tasks

Conversation

KJ21-ENG commented Feb 24, 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!

melvin-bot bot commented Feb 24, 2026

Uh oh!

github-actions bot commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KJ21-ENG commented Feb 24, 2026

Uh oh!

abzokhattab commented Feb 24, 2026

Uh oh!

KJ21-ENG commented Feb 24, 2026

Uh oh!

abzokhattab commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abzokhattab commented Feb 26, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

KJ21-ENG commented Feb 26, 2026

Uh oh!

KJ21-ENG commented Feb 26, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

OSBotify commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

KJ21-ENG commented Feb 24, 2026 •

edited

Loading

github-actions bot commented Feb 24, 2026 •

edited

Loading

abzokhattab commented Feb 26, 2026 •

edited

Loading