Skip onboarding tasks in new workspace for already-onboarded users by wildan-m · Pull Request #89000 · Expensify/App

wildan-m · 2026-04-27T22:10:09Z

Explanation of Change

After a user signs up, picks "Track and Budget" at the onboarding purpose step, then later creates a new workspace, the full set of onboarding tasks (testDriveAdminTask, createReportTask, setupCategoriesTask) is posted to that new workspace's #admins room. The expected behavior is that the #admins room stays empty of onboarding tasks for users who already completed onboarding.

The root cause is in buildPolicyData. The guard for "should we add onboarding tasks to this new workspace?" uses !introSelected?.createWorkspace to mean "the user has not completed onboarding yet" — but only the MANAGE_TEAM flow ever stores that field. Every Concierge-based flow (PERSONAL_SPEND → TRACK_WORKSPACE, EMPLOYER, SUBMIT, CHAT_SPLIT, LOOKING_AROUND) leaves createWorkspace undefined, so the guard wrongly evaluates to truthy and posts the onboarding tasks into the new workspace's #admins room.

The fix replaces !introSelected?.createWorkspace with !introSelected?.choice — the field that is actually populated by every completeOnboarding call. After the change:

MANAGE_TEAM users who already went through guided onboarding still skip the block (their choice is MANAGE_TEAM), preserving today's behavior for their second-or-later workspace.
TRACK_WORKSPACE / PERSONAL_SPEND / EMPLOYER / SUBMIT / CHAT_SPLIT / LOOKING_AROUND users now also skip the block — this fixes the reported #admins leak.
TEST_DRIVE_RECEIVER still falls into the block via the first disjunct, so the downstream special-case (completing the createWorkspace task in Concierge) keeps working.
A pre-onboarding user with choice undefined still enters the block, preserving the fallback branch.

Fixed Issues

$ #88689
PROPOSAL: #88689 (comment)

Tests

Reproduces the OP repro from the bug report:

Open https://dev.new.expensify.com:8082 (or https://staging.new.expensify.com).
Create a new account with an unused email that does not contain a + (e.g. useronboarding@onboarding<unique-number>.com). Plus-aliases route the tasks to Concierge instead of #admins, which would mask the bug.
Sign up and choose Track and Budget.
Create a new workspace (Workspaces → + New workspace → Confirm).
Navigate to the #admins room of the new workspace.
Expected: the #admins room contains only the workspace-created system message — no testDriveAdminTask, createReportTask, or setupCategoriesTask cards. (Before the fix: those onboarding tasks appear here.)

Verify that no errors appear in the JS console

Offline tests

Same as Tests, but disable network before step 4. The optimistic Onyx update creates the new workspace locally; verify the #admins room is still empty of onboarding tasks while offline. Re-enable network and confirm the server response matches.

QA Steps

Same as Tests, run on staging.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

https://github.com/user-attachments/assets/27f66f9f-4fa4-4247-bbd5-7855b5f851e1

Android: mWeb Chrome

https://github.com/user-attachments/assets/7529e374-3db9-4060-b26f-2e356118cfdf

iOS: Native

https://github.com/user-attachments/assets/68ee9d53-65ef-424d-b9b7-6db315396db7

iOS: mWeb Safari

https://github.com/user-attachments/assets/9eec499c-4e58-477c-a78d-ec991fb3ac4e

MacOS: Chrome / Safari

Kapture.2026-04-28.at.21.56.47.mp4

…ding-tasks-admins-room

codecov · 2026-04-27T22:25:30Z

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/libs/actions/Policy/Policy.ts	`69.18% <ø> (-1.05%)`	⬇️
... and 107 files with indirect coverage changes

…ding-tasks-admins-room

melvin-bot · 2026-04-28T23:05:30Z

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

truph01 · 2026-04-29T09:53:27Z

@codex review

chatgpt-codex-connector · 2026-04-29T10:07:35Z

Codex Review: Didn't find any major issues. What shall we delve into next?

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

truph01 · 2026-04-29T10:50:00Z

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

Screen.Recording.2026-04-29.at.17.40.12.mov

Android: mWeb Chrome

Screen.Recording.2026-04-29.at.17.44.47.mov

iOS: HybridApp

Screen.Recording.2026-04-29.at.17.46.50.mov

iOS: mWeb Safari

Screen.Recording.2026-04-29.at.17.49.35.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-29.at.17.32.34.mov

francoisl

LGTM

OSBotify · 2026-04-29T17:31:43Z

✋ 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-04-29T18:45:28Z

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

github-actions · 2026-04-29T18:53:10Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-84c0a6b-802f150-079198f8602e3c83a38b6a683696444b3195a455/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-84c0a6b-802f150-1ef2501acb165ea20c345f4fe1ff0a37dbc4d7dc/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-30T23:08:47Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.3.65-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-30T23:10:00Z

No help site changes are required for this PR. The change is a purely internal bug fix to the onboarding-tasks guard condition in buildPolicyData — it doesn't alter any user-facing features, settings, labels, or workflows that are documented in the help site.

Skip onboarding tasks in new workspace for already-onboarded users

34559cc

melvin-bot Bot assigned wildan-m Apr 27, 2026

wildan-m added 2 commits April 28, 2026 05:10

Merge remote-tracking branch 'upstream/main' into wildan/88689-onboar…

a51f9d9

…ding-tasks-admins-room

Add unit tests for buildPolicyData onboarding-tasks guard

3bcaf48

Merge remote-tracking branch 'upstream/main' into wildan/88689-onboar…

94e34b9

…ding-tasks-admins-room

wildan-m marked this pull request as ready for review April 28, 2026 23:05

wildan-m requested review from a team as code owners April 28, 2026 23:05

melvin-bot Bot requested review from heyjennahay and truph01 and removed request for a team April 28, 2026 23:05

melvin-bot Bot removed the request for review from a team April 28, 2026 23:05

Add coverage test for prepareOnboardingOnyxData early-return path

c2c3dbe

wildan-m mentioned this pull request Apr 28, 2026

[$250] Onboard - Onboarding tasks appear on #admins room of the new workspace #88689

Open

7 tasks

truph01 approved these changes Apr 29, 2026

View reviewed changes

melvin-bot Bot requested a review from francoisl April 29, 2026 10:50

francoisl approved these changes Apr 29, 2026

View reviewed changes

francoisl merged commit 84c0a6b into Expensify:main Apr 29, 2026
40 checks passed

OSBotify mentioned this pull request Apr 30, 2026

Deploy Checklist: New Expensify 2026-04-30 #89315

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skip onboarding tasks in new workspace for already-onboarded users#89000

Skip onboarding tasks in new workspace for already-onboarded users#89000
francoisl merged 5 commits intoExpensify:mainfrom
wildan-m:wildan/88689-onboarding-tasks-admins-room

wildan-m commented Apr 27, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 27, 2026 •

edited by github-actions Bot

Loading

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

truph01 commented Apr 29, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 29, 2026

Uh oh!

truph01 commented Apr 29, 2026

Uh oh!

francoisl left a comment

Uh oh!

Uh oh!

OSBotify commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026

Uh oh!

OSBotify commented Apr 30, 2026

Uh oh!

MelvinBot commented Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

wildan-m commented Apr 27, 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 Apr 27, 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 Apr 28, 2026

Uh oh!

truph01 commented Apr 29, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 29, 2026

Uh oh!

truph01 commented Apr 29, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

francoisl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026

Uh oh!

OSBotify commented Apr 30, 2026

Uh oh!

MelvinBot commented Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

wildan-m commented Apr 27, 2026 •

edited

Loading

codecov Bot commented Apr 27, 2026 •

edited by github-actions Bot

Loading