Skip to content

Add the join-workspace onboarding intent and Concierge follow up tasks - #99833

Merged
carlosmiceli merged 218 commits into
mainfrom
cm-join-workspace-intent-672346
Oct 7, 2026
Merged

Add the join-workspace onboarding intent and Concierge follow up tasks#99833
carlosmiceli merged 218 commits into
mainfrom
cm-join-workspace-intent-672346

Conversation

@carlosmiceli

@carlosmiceli carlosmiceli commented Aug 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

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:

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

@carlosmiceli
Add briefcase handshake illustration
260a246
@carlosmiceli
Add the JOIN_WORKSPACE onboarding intent
282a6cb
@carlosmiceli
Route the join workspace intent to the work email screen
0745a15
@carlosmiceli
Offer the join workspace intent to individual signups
30c765d
@carlosmiceli
Treat a skipped work email step as no email provided
344751a
@carlosmiceli
Keep the work email screen open when reached from the join workspace …
28f7758 
…intent
@carlosmiceli
Show a back button on the work email screen when it follows the inten…
548b561 
…t list
@carlosmiceli
Continue onboarding instead of returning to the intent list when skip…
341ec87 
…ping the work email
@carlosmiceli
Return to the work email screen from personal details for the join wo…
992b212 
…rkspace intent
@carlosmiceli
Use the native pop animation when going back in onboarding
3dd5798
@carlosmiceli
Add task type constants for the join workspace flow
5df9de3
@carlosmiceli
Add companyDomain and workEmail onboarding task link params
aaf56f3
@carlosmiceli
Add join-workspace onboarding task titles and descriptions
dd9fe29
@carlosmiceli
Add join-workspace onboarding message copy
4bce103
@carlosmiceli
Thread companyDomain and workEmail through completeOnboarding
7784eff
@carlosmiceli
Add join-workspace onboarding message and task builders
545d316
@carlosmiceli
Keep the work email screen a standalone task destination post-onboarding
1c45409
@carlosmiceli
Pick the join-workspace variant message at completion time
955729b
@carlosmiceli
Branch the join-workspace intent on domain and validation state
83123c5
@carlosmiceli
Complete onboarding instead of returning to the intent list from the …
a99f0cb 
…validate screen
@carlosmiceli
Complete or close instead of returning to the intent list when skippi…
a631d23 
…ng the workspace list
@carlosmiceli
Merge remote-tracking branch 'origin/main' into cm-join-workspace-int…
830b893 
…ent-672346
@carlosmiceli
Merge remote-tracking branch 'origin/main' into cm-join-workspace-int…
f797ebe 
…ent-672346
@carlosmiceli
Merge remote-tracking branch 'origin/main' into cm-join-workspace-int…
0bf9102 
…ent-672346
@carlosmiceli
Link the join-workspace onboarding tasks to the screens they describe
6c6cfea
@carlosmiceli
Always register the onboarding modal navigator
6214f17
@carlosmiceli
Let the join-workspace intent reopen onboarding after setup completes
7eab238
@carlosmiceli
Cross off the add work email task as soon as the email is added
0d1e8f0
@carlosmiceli
Resolve the onboarding intent from the persisted NVP
ff320e7
@carlosmiceli
Do nothing when the completed add work email task is reopened
df488a1
@abzokhattab

abzokhattab commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

I will be OOO tomorrow (Wednesday). I will have a look when I get back ... In the meantime, if @hungvu193 has time to review, that would be great

@hungvu193

hungvu193 commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

Sure I'll be on it today

@hungvu193

hungvu193 commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

All yours @iwiznia

@carlosmiceli
carlosmiceli merged commit a76ba9e into main Oct 7, 2026
45 of 47 checks passed
@carlosmiceli
carlosmiceli deleted the cm-join-workspace-intent-672346 branch October 7, 2026 20:10
@OSBotify

OSBotify commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

✋ 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

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a76ba9e-a57d040-245dd6fcadf4477f52977b9c9c7da4be5d500f51/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a76ba9e-a57d040-ccdc075a04f7221062c0b69eb154b58fcff94ca1/index.html
Android iOS
Web 🕸️
https://99833.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify OSBotify mentioned this pull request Oct 8, 2026
Closed
90 tasks done
@OSBotify

OSBotify commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.5.6-0 🚀

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

@MelvinBot MelvinBot mentioned this pull request Oct 8, 2026
Open
45 tasks done
@MelvinBot

MelvinBot commented Oct 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

A help site update is needed. I opened Docs updates for E/A#99833 Add Join my company workspace option to help article as a draft.

Why: This PR adds a new Join my company workspace onboarding option. It isn't behind a beta, so all new users see it.

Change: Join Your Company's Workspace only described joining through an admin invite. I added one paragraph after the invite steps. It says users can select Join my company workspace during sign-up, verify their work email, and then click Join now or Ask to join.

I confirmed What do you want to do today? and Join my company workspace in the live web app.

@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

@applause-bot applause-bot Bot mentioned this pull request Oct 8, 2026
Closed
2 of 7 tasks
@nlemma

nlemma commented Oct 8, 2026

Copy link
Copy Markdown

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

@applause-bot applause-bot Bot mentioned this pull request Oct 8, 2026
Open
2 of 7 tasks
@nlemma

nlemma commented Oct 8, 2026

Copy link
Copy Markdown

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

@applause-bot applause-bot Bot mentioned this pull request Oct 9, 2026
Open
1 of 7 tasks
@Abdukhamid000 Abdukhamid000 mentioned this pull request Oct 9, 2026
Open
1 of 7 tasks
@mitarachim

mitarachim commented Oct 9, 2026

Copy link
Copy Markdown

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

@hungvu193 hungvu193 mentioned this pull request Oct 9, 2026
Merged
38 tasks done
@IuliiaHerets

IuliiaHerets commented Oct 9, 2026

Copy link
Copy Markdown

Hi @carlosmiceli. Tests 3 and 5 passed by QA team.

bandicam.2026-10-09.14-47-26-215.1.mp4
99833w-4.mp4

Tests 2 and 4 require the email to be received at a private-domain email. But the email is not sent to a temporary email. It's a blocker.

99833w-1.mp4

For Test 1, we don't have a domain that already has workspaces to join.

Could you verify tests 1, 2, and 4 internally?

cc @iwiznia @garrettmknight @abzokhattab @hungvu193

This was referenced Oct 9, 2026
Closed
Merged
allgandalf pushed a commit to allgandalf/App that referenced this pull request Oct 9, 2026
@carlosmiceli
Revert "Merge pull request Expensify#99833 from Expensify/cm-join-wor…
960deb1 
…kspace-intent-672346"

This reverts commit a76ba9e, reversing
changes made to 2328c9a.
@OSBotify

OSBotify commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

OSBotify commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.5.7-0 🚀

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

@MelvinBot

MelvinBot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

No new docs PR is needed, and the existing one should be held: Revert join-workspace onboarding changes removed this feature from main.

I recommend you put the docs PR on hold until the re-land reaches production, or close it. Once the re-land merges, ask me on that PR and I'll check whether the docs edit still matches.

view run

@melvin-bot melvin-bot Bot mentioned this pull request Oct 10, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MelvinBot MelvinBot MelvinBot left review comments
@github-actions github-actions[bot] github-actions[bot] left review comments
@chatgpt-codex-connector chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments
@iwiznia iwiznia iwiznia approved these changes
@garrettmknight garrettmknight Awaiting requested review from garrettmknight
@abzokhattab abzokhattab Awaiting requested review from abzokhattab
+1 more reviewer
@hungvu193 hungvu193 hungvu193 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@carlosmiceli carlosmiceli

@MelvinBot MelvinBot

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.