[Payment due @abzokhattab] Add the join-workspace onboarding intent and Concierge follow up tasks by carlosmiceli · Pull Request #103652 · Expensify/App

carlosmiceli · 2026-10-09T20:21:38Z

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

Sign up with a private-domain account with a joinable workspace.
Start onboarding and select Join my company workspace.
Verify the joinable-workspaces list opens directly.
Tap Join now and verify onboarding completes.
Verify the account becomes a workspace member.
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

Sign up with a public email.
Select Join my company workspace.
On What's your work email?, tap Skip and complete onboarding.
Open Concierge and verify exactly one Add your work email task appears.
Open the task, then select the Add work email link in its description.
Enter a new private-domain email, and tap Add work email.
Enter the validation code sent to that address.
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

Sign up with a public email.
Select Join my company workspace.
Verify the email-validation screen opens without another work-email prompt.
Tap Skip and complete onboarding.
Open Concierge and verify exactly one Validate your email task appears.
Open the task, then select Validate your account in its description.
Validate the account.
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

Sign up with a public email.
Select Join my company workspace and verify the workspace list opens directly.
Tap Skip and verify onboarding completes.
Open Concierge and verify exactly one Join your company's workspace task appears.
Open the task, then select Join a workspace in its description.
Verify the workspace list opens with a close button.
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

Validate a public-email account, select Join my company workspace, and skip the work-email step.
Verify an Add your work email task is created.
Enter a private-domain email and tap Add work email.
Verify error message appears.
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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…ntent-672346" This reverts commit 960deb1.

…ccountBlockedOnJoinWorkspace" This reverts commit 8b20820.

…ngWorkEmailBackAfterRefresh" This reverts commit 16e4444.

This reverts commit 9d27184.

codecov · 2026-10-09T20:26:57Z

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.14% <100.00%> (+0.32%)`	⬆️
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.50% <100.00%> (ø)`
... and 29 more
... and 54 files with indirect coverage changes

Keep the onboarding route registered during fresh sign-in and gate only the redirect while Validate Login is focused. Allow the initial onboarding reset before the guard's onboarding NVP subscription has loaded, instead of treating missing data as completed and redirecting to Home.

melvin-bot · 2026-10-12T00:06:16Z

@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 · 2026-10-12T00:06:19Z

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 · 2026-10-12T00:10:41Z

(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 · 2026-10-12T00:17:44Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8cd85afd32

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-10-12T00:20:11Z

    useEffect(() => {
-        if (isLoadingJoinablePolicies || joinablePoliciesLoading !== false || joinablePoliciesLength > 0 || !defaultPolicy?.id) {
+        if (joinablePoliciesLoading !== false || joinablePoliciesLength > 0 || !defaultPolicy?.id) {
            return;
        }

-        finishOnboarding({
+        finishOnboardingFromEffect({


Skip the onboarding fallback for Concierge task flows

When a completed user with an existing default group policy follows a marked Join Workspace task and the lookup returns no joinable policies, this effect still calls finishOnboardingFromEffect. It races the empty-result effect above, which is trying to post the Concierge follow-up and dismiss the modal, and can instead navigate to Personal Details or run completeOnboarding again. Gate this fallback out for isConciergeTaskFlow so it remains limited to unfinished onboarding.

Useful? React with 👍 / 👎.

This looks valid however, i couldnt test it since it needs an empty joinable list .. The domain I have contains many workspaces so I couldn't test it

chatgpt-codex-connector · 2026-10-12T00:20:11Z

+            // AddWorkEmail already made this the account's login, and resending it would merge the account into itself.
+            if (sessionEmail && submittedWorkEmail.toLowerCase() === sessionEmail.toLowerCase()) {
+                setOnboardingShouldValidate(false);
+                return;


Mark same-email submissions as submitted

In the regular Join Workspace flow, going back from private-domain validation leaves the added work email as the current session login and clears shouldValidate. Resubmitting that prefilled email reaches this branch, but it never sets hasSubmittedWorkEmail; consequently the Join Workspace effect returns at its !hasSubmittedWorkEmail guard even after shouldValidate becomes false, leaving the form stuck. Set the submission flag or navigate directly as the Concierge resume branch does.

Useful? React with 👍 / 👎.

melvin-bot · 2026-10-12T00:21:46Z

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

OSBotify · 2026-10-12T00:22:49Z

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

The diff is too large to include in this comment (79KB), so I've created a gist for you:

📋 View the translation diff here 📋

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply, or directly by running gh gist view --raw 51e21b0416c716d20d6ec96b6df22336 | git apply 😉

View workflow run

hungvu193 · 2026-10-12T03:05:31Z

@carlosmiceli Is it expected we will return to company email steps when clicking "Join my company workspace"? In the video below I'm using a brand new account (normal gmail account).

Screen.Recording.2026-10-12.at.10.02.17.mov

hungvu193 · 2026-10-12T03:05:59Z

I can confirm it fixed all the previous blocker btw 👍

carlosmiceli · 2026-10-12T14:46:14Z

@carlosmiceli Is it expected we will return to company email steps when clicking "Join my company workspace"? In the video below I'm using a brand new account (normal gmail account).

Screen.Recording.2026-10-12.at.10.02.17.mov

Yes, if no work email was added in the first screen.

abzokhattab · 2026-10-12T15:01:14Z

reviewing

abzokhattab · 2026-10-12T16:51:17Z

Reviewer Checklist

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

665293203-5b4654ee-7c3f-4f89-95b4-b13f8475e48d.mov

665293177-558fe3d2-866f-4697-8eb3-ccf75149a4ce.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-10-12.at.16.50.06.mov

Screen.Recording.2026-10-12.at.17.06.59.mov

Screen.Recording.2026-10-12.at.17.09.46.mov

Screen.Recording.2026-10-12.at.17.12.06.mov

abzokhattab

LGTM the mentioned blockers were fixed ... i retested and couldnt find other issues

melvin-bot · 2026-10-12T16:53:00Z

🎯 @abzokhattab, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/672346.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

carlosmiceli · 2026-10-12T19:20:41Z

@iwiznia all yours again

carlosmiceli added 4 commits October 9, 2026 17:20

Reapply "Merge pull request #99833 from Expensify/cm-join-workspace-i…

e0e0983

…ntent-672346" This reverts commit 960deb1.

Reapply "Merge pull request #103537 from Expensify/claude-clearMergeA…

4f17175

…ccountBlockedOnJoinWorkspace" This reverts commit 8b20820.

Reapply "Merge pull request #103532 from Expensify/claude-fixOnboardi…

e32e54f

…ngWorkEmailBackAfterRefresh" This reverts commit 16e4444.

Reapply "Merge pull request #103550 from hungvu193/fix-103545"

258693c

This reverts commit 9d27184.

melvin-bot Bot assigned carlosmiceli Oct 9, 2026

carlosmiceli requested a review from a team October 9, 2026 20:21

carlosmiceli added the InternalQA This pull request required internal QA label Oct 9, 2026

This comment has been minimized.

Sign in to view

MelvinBot mentioned this pull request Oct 9, 2026

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

Merged

34 tasks done

carlosmiceli requested review from abzokhattab, garrettmknight, hungvu193 and iwiznia October 12, 2026 00:06

carlosmiceli marked this pull request as ready for review October 12, 2026 00:06

carlosmiceli requested review from a team as code owners October 12, 2026 00:06

melvin-bot Bot requested review from ChavdaSachin and removed request for a team October 12, 2026 00:06

melvin-bot Bot removed the request for review from a team October 12, 2026 00:06

carlosmiceli removed the request for review from ChavdaSachin October 12, 2026 00:07

github-actions Bot reviewed Oct 12, 2026

View reviewed changes

Comment thread src/libs/Navigation/helpers/isJoinWorkspaceTaskPath.ts

github-actions Bot reviewed Oct 12, 2026

View reviewed changes

Comment thread src/languages/en.ts

github-actions Bot reviewed Oct 12, 2026

View reviewed changes

Comment thread src/types/onyx/IntroSelected.ts

docs: describe join-workspace path helpers

662de9c

chatgpt-codex-connector Bot reviewed Oct 12, 2026

View reviewed changes

carlosmiceli added 2 commits October 11, 2026 21:20

fix(copy): use log in as a verb

5aa7c81

docs: remove redundant onboarding choice comment

a9ad3d6

carlosmiceli requested a review from a team as a code owner October 12, 2026 00:21

melvin-bot Bot requested a review from ikevin127 October 12, 2026 00:21

melvin-bot Bot removed the request for review from a team October 12, 2026 00:21

hungvu193 removed the request for review from ikevin127 October 12, 2026 02:38

abzokhattab approved these changes Oct 12, 2026

View reviewed changes

melvin-bot Bot changed the title ~~Add the join-workspace onboarding intent and Concierge follow up tasks~~ [Payment due @abzokhattab] Add the join-workspace onboarding intent and Concierge follow up tasks Oct 12, 2026

Conversation

carlosmiceli commented Oct 9, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

This comment has been minimized.

codecov Bot commented Oct 9, 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 Oct 12, 2026

Uh oh!

chatgpt-codex-connector Bot commented Oct 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

dubielzyk-expensify commented Oct 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

carlosmiceli commented Oct 12, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Oct 12, 2026

Choose a reason for hiding this comment

Uh oh!

abzokhattab Oct 12, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Oct 12, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Oct 12, 2026

Uh oh!

OSBotify commented Oct 12, 2026

🦜 Polyglot Parrot! 🦜

Uh oh!

hungvu193 commented Oct 12, 2026

Uh oh!

hungvu193 commented Oct 12, 2026

Uh oh!

carlosmiceli commented Oct 12, 2026

Uh oh!

abzokhattab commented Oct 12, 2026

Uh oh!

abzokhattab commented Oct 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Oct 12, 2026

Uh oh!

carlosmiceli commented Oct 12, 2026

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Oct 9, 2026 •

edited by github-actions Bot

Loading

chatgpt-codex-connector Bot commented Oct 12, 2026 •

edited

Loading