[carlosmiceli]

Explanation of Change

Adds a Join my company workspace onboarding intent. Public-email accounts add a work email, unvalidated private-domain accounts validate their email, and validated private-domain accounts see joinable workspaces.

When a user skips a step, Concierge creates the matching Add your work email, Validate your email, or Join your company's workspace task. Opening and completing a task resumes the sequence. When no workspace is available, Concierge posts an explanation instead of another task.

Depends on:

• https://github.com/Expensify/Auth/pull/24355
• https://github.com/Expensify/Web-Expensify/pull/56007

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/672346

PROPOSAL:

Tests

Test 1 - Complete joining a workspace during onboarding

1. Sign up with a private-domain account with a joinable workspace.
2. Start onboarding and select Join my company workspace.
3. Verify the joinable-workspaces list opens directly.
4. Tap Join now and verify onboarding completes.
5. Verify the account becomes a workspace member.
6. Verify there are no Concierge tasks created.

Screen.Recording.2026-09-17.at.10.43.36.AM.mov

Test 2 - Start from the Add your work email Concierge task

1. Sign up with a public email.
2. Select Join my company workspace.
3. On What's your work email?, tap Skip and complete onboarding.
4. Open Concierge and verify exactly one Add your work email task appears.
5. Open the task, then select the Add work email link in its description.
6. Enter a new private-domain email, and tap Add work email.
7. Enter the validation code sent to that address.
8. Verify the task completes, the workspace list opens, and you can successfully join a workspace.

Screen.Recording.2026-09-17.at.10.45.07.AM.mov

Test 3 - Start from the Validate your email Concierge task

1. Sign up with a public email.
2. Select Join my company workspace.
3. Verify the email-validation screen opens without another work-email prompt.
4. Tap Skip and complete onboarding.
5. Open Concierge and verify exactly one Validate your email task appears.
6. Open the task, then select Validate your account in its description.
7. Validate the account.
8. Verify the task completes and the workspace list opens.

Screen.Recording.2026-09-17.at.10.46.26.AM.mov

Test 4 - Start from the Join your company's workspace Concierge task

1. Sign up with a public email.
2. Select Join my company workspace and verify the workspace list opens directly.
3. Tap Skip and verify onboarding completes.
4. Open Concierge and verify exactly one Join your company's workspace task appears.
5. Open the task, then select Join a workspace in its description.
6. Verify the workspace list opens with a close button.
7. Close the list and verify the App returns to the task thread without restarting onboarding.

Screen.Recording.2026-09-17.at.11.24.22.AM.mov

Test 5 - Validated public-email account takeover protection

1. Validate a public-email account, select Join my company workspace, and skip the work-email step.
2. Verify an Add your work email task is created.
3. Enter a private-domain email and tap Add work email.
4. Verify error message appears.
5. Tap Confirm and verify the App returns to the task thread.

Screen.Recording.2026-09-17.at.11.25.36.AM.mov

• Verify that no errors appear in the JS console

Offline tests

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 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.
• 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
• If a new CSS style is added I verified that a similar style does not already exist and existing StyleUtils cannot create it
• If new assets were added or existing ones were modified, I verified that they are optimized and load correctly across all supported platforms
• If the PR modifies code that runs when editing or sending messages, I tested all supported markdown
• If the PR modifies a generic component, I verified its other usages
• If the PR modifies a component related to existing Storybook stories, I verified all related stories
• If the PR modifies a directly accessible component or page, I verified logged-in and logged-out deeplinks
• If the PR modifies UI or form styles, I verified form alignment and added the Design label and/or tagged @Expensify/design
• I added unit tests for the new behavior
• If main was merged after review, I tested again according to the Test steps

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

[codecov]

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/CONST/index.ts	95.90% <ø> (ø)
src/ROUTES.ts	32.17% <100.00%> (+0.31%)	⬆️
src/components/Icon/chunks/illustrations.chunk.ts	0.00% <ø> (ø)
src/components/OnboardingHeader.tsx	100.00% <100.00%> (ø)
...components/OnboardingMergingAccountBlockedView.tsx	100.00% <100.00%> (ø)
src/components/ReportActionItem/TaskView.tsx	84.50% <100.00%> (+0.22%)	⬆️
...idateCodeActionModal/ValidateCodeActionContent.tsx	100.00% <100.00%> (ø)
src/hooks/useOnboardingIntent.ts	100.00% <100.00%> (ø)
src/libs/API/types.ts	100.00% <ø> (ø)
src/libs/Navigation/AppNavigator/AuthScreens.tsx	83.83% <100.00%> (ø)
... and 29 more
... and 14 files with indirect coverage changes

[melvin-bot]

@ChavdaSachin 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 Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-12T00:20:14.715410Z	8cd85af	Draft marked ready

ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

[dubielzyk-expensify]

(Sidenote: I'm kinda surprised we're adding this as an intent cause A) we should know this already right? and B) does this give us any useful information to act upon? @dylanexpensify . cc @Expensify/design )

Videos look good though 👍

[carlosmiceli]

(Sidenote: I'm kinda surprised we're adding this as an intent cause A) we should know this already right? and B) does this give us any useful information to act upon? @dylanexpensify . cc @Expensify/design )

Videos look good though 👍

I think @garrettmknight can explain it best.

[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.

[github-actions]

🚧 iwiznia 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 #103652.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f463b45-8aa788d-870f5d81dc9737f1d850da45436ab57fb306b296/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f463b45-8aa788d-6358417681194e411000b157ac11055d99030592/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.5.9-0 🚀

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

[MelvinBot]

Yes, the help site needs an update. This PR adds a new user-facing onboarding option, Join my company workspace, and it isn't behind a beta. I opened a draft docs PR: Docs updates for E/A#103652 Add Join my company workspace onboarding option.

The draft PR changes two articles:

• Join Your Company's Workspace: the article only covered joining by admin invite. I added three short steps for finding the workspace yourself during account setup.
• Troubleshoot adding your work email during account setup: this sentence is now wrong: "Once you click Skip or Got it, the step doesn’t appear again." Choosing Join my company workspace, or opening the Add your work email Concierge task, brings the step back. I edited that sentence to name both cases.

I checked the labels against en.ts and the live web UI.

@carlosmiceli, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

---

view run · view recording

[jponikarchuk]

Deploy Blocker #104001 was identified to be related to this PR.

[jponikarchuk]

Deploy Blocker #104005 was identified to be related to this PR.

[jponikarchuk]

Deploy Blocker #104061 was identified to be related to this PR.

[jponikarchuk]

Deploy Blocker #104062 was identified to be related to this PR.

[jponikarchuk]

Deploy Blocker #104063 was identified to be related to this PR.

[OSBotify]

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.9-4 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[melvin-bot]

🤖 Payment issue created: #104116

[FitseTLT]

This caused #104023 (fixed in #104025). Making work email a second step left OnboardingWorkEmail/index.native.tsx blocking every Android back press since #68077, so back showed "Please finish the setup questions" instead of returning here.