[Onboarding Private Domain] - Show workspace options after adding a work email by allroundexperts · Pull Request #64714 · Expensify/App

allroundexperts · 2025-06-23T01:36:32Z

Explanation of Change

This PR adds the workspace selection screen after user adds a work email in the onboarding flow

Fixed Issues

$ #63795
PROPOSAL: N/A

Tests

Sign up with a public domain.
On the onboarding screen, add a work email that is on a private domain.

Verify that you are shown an OTP

Enter the OTP.

Verify that the list of workspaces are shown

Verify that no errors appear in the JS console

Verify the following issues are resolved:
#64232
#64233

Offline tests

N/A

QA Steps

Sign up with a public domain.
On the onboarding screen, add a work email that is on a private domain.

Verify that you are shown an OTP

Enter the OTP.

Verify that the list of workspaces are shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Unable to build android

Android: mWeb Chrome

Screen.Recording.2025-06-10.at.12.57.58.AM.mov

iOS: Native

Screen.Recording.2025-06-10.at.12.55.25.AM.mov

iOS: mWeb Safari

Screen.Recording.2025-06-10.at.12.53.17.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-10.at.12.46.04.AM.mov

MacOS: Desktop

Screen.Recording.2025-06-10.at.12.50.41.AM.mov

melvin-bot · 2025-06-23T02:47:26Z

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

allroundexperts · 2025-06-23T02:48:06Z

@blimpich Since this is a very critical flow (and a very tricky one as well), can we get proper QA by Applause before merging in this time?

blimpich · 2025-06-23T22:15:07Z

@allroundexperts yeah I can try to get QA to test some onboarding related flows to this.

github-actions · 2025-06-23T22:16:48Z

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

blimpich · 2025-06-23T22:28:12Z

Hmm, looks like there might be an issue related to patches that have been added recently. @allroundexperts can you update this PR with the latest main please? Then I'll re-run the Ad-hoc build.

blimpich · 2025-06-24T17:21:53Z

okay trying to do another ad-hoc build: https://github.com/Expensify/App/actions/runs/15836289690

github-actions · 2025-06-24T17:22:00Z

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

github-actions · 2025-06-24T17:53:32Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/64714/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/64714/index.html

Desktop 💻	Web 🕸️
❌ FAILED ❌	https://64714.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed

👀 View the workflow run that generated this build 👀

blimpich · 2025-06-24T18:31:08Z

Asked for QA to take a look at this here: https://expensify.slack.com/archives/C9YU7BX5M/p1750789545046399

vincdargento · 2025-06-26T17:01:00Z

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

Onboarding - Unable to take a test drive, the modal disappears

Version Number: v9.1.70-5 PR:64714
Reproducible in staging?: No
Reproducible in production?: No
If this was caught during regression testing, add the test name, ID and link from TestRail: N/A
Issue reported by: Applause Internal Team

Action Performed:

Navigate to https://64714.pr-testing.expensify.com/
Create a new user
Select any purpose
Enter any name and click Continue
On the "Take a Test Drive" modal enter an email and click Start Test Drive

Expected Result:

Expense should be sent after clicking on the “Start Test Drive"

Actual Result:

Unable to take a test drive, the modal disappears

Workaround:

Unknown

Platforms:

Screenshots/Videos

bug.mp4

View all open jobs on GitHub

allgandalf · 2025-06-27T05:03:54Z

@vincdargento is the testing complete ?

allroundexperts · 2025-06-29T15:18:40Z

Works after I merged main. @blimpich Can you re-trigger the adhoc build so the QA can verify?

Screen.Recording.2025-06-29.at.8.17.29.PM.mov

github-actions · 2025-06-30T17:29:55Z

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

github-actions · 2025-06-30T18:09:59Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/64714/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/64714/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/64714/NewExpensify.dmg	https://64714.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

blimpich · 2025-06-30T18:58:38Z

@vincdargento can you retest this issue you found with the newest ad-hoc build?

allgandalf · 2025-07-02T19:15:40Z

bump @vincdargento

blimpich · 2025-07-03T17:33:04Z

Asked Applause in slack to test this again: https://expensify.slack.com/archives/C9YU7BX5M/p1751563964699559

m-natarajan · 2025-07-03T18:47:41Z

Passed on Web v9.1.72-0 PR:64714

bandicam.2025-07-03.21-42-06-311.mp4

allroundexperts · 2025-07-03T22:05:25Z

@allgandalf We have a 👍 from QA. Can you finalise the review? TY!

allgandalf · 2025-07-04T06:03:12Z

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
- MacOS: Desktop
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.2025-06-13.at.12.26.12.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-06-13.at.12.27.31.PM.mov

iOS: HybridApp

Screen.Recording.2025-06-13.at.12.22.26.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-06-13.at.12.23.41.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-13.at.12.10.23.PM.mov

MacOS: Desktop

Screen.Recording.2025-06-13.at.12.14.47.PM.mov

OSBotify · 2025-07-04T21:15:26Z

✋ 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 · 2025-07-07T11:31:16Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.1.77-1 🚀

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

github-actions · 2025-07-08T21:00:58Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.77-2 🚀

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

situchan · 2026-04-04T23:38:42Z

        }

+        if (!onboardingValues?.isMergeAccountStepSkipped) {
+            Navigation.navigate(ROUTES.ONBOARDING_WORKSPACES.getRoute(), {forceReplace: true});


This navigates to ONBOARDING_WORKSPACES with forceReplace: true but without passing the backTo parameter so it caused Add work email - Back button not working on Join workspace screen.
As forceReplace: true is expected, we ended up hiding back button on Join workspace screen.

allroundexperts added 2 commits June 23, 2025 06:35

re-add private domain onboarding commits

ab31e09

fix bugs

48a2f57

allroundexperts marked this pull request as ready for review June 23, 2025 02:47

allroundexperts requested a review from a team as a code owner June 23, 2025 02:47

melvin-bot Bot requested a review from allgandalf June 23, 2025 02:47

melvin-bot Bot removed the request for review from a team June 23, 2025 02:47

blimpich assigned allroundexperts Jun 23, 2025

blimpich added the Ready To Build label Jun 23, 2025

This comment has been minimized.

Sign in to view

allroundexperts added 3 commits June 24, 2025 04:03

remove mobile exfy changes

19387b0

Merge branch 'main' into fix-56708-2

4844a46

add conditional chaining

b170a45

Merge branch 'main' into fix-56708-2

9f5ea3d

allgandalf approved these changes Jul 4, 2025

View reviewed changes

melvin-bot Bot requested a review from blimpich July 4, 2025 06:03

blimpich approved these changes Jul 4, 2025

View reviewed changes

blimpich merged commit 92e6f90 into Expensify:main Jul 4, 2025
19 checks passed

github-actions Bot mentioned this pull request Jul 7, 2025

Deploy Checklist: New Expensify 2025-07-07 #65549

Closed

54 tasks

melvin-bot Bot mentioned this pull request Jul 8, 2025

[Due for payment 2025-07-15] [$250] Onboarding private domain check improvement: add workspace surfacing after adding work email (not pre-existing) #63795

Closed

allroundexperts mentioned this pull request Jul 16, 2025

[$250] Onboarding private domain check improvement: add workspace surfacing post-merge #63794

Closed

MelvinBot mentioned this pull request Apr 4, 2026

[Due for payment 2026-04-02] [$250] Add work email - Back button not working on Join workspace screen #75978

Closed

8 tasks

situchan reviewed Apr 4, 2026

View reviewed changes

Conversation

allroundexperts commented Jun 23, 2025 • 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 Jun 23, 2025

Uh oh!

allroundexperts commented Jun 23, 2025

Uh oh!

blimpich commented Jun 23, 2025

Uh oh!

github-actions Bot commented Jun 23, 2025

Uh oh!

blimpich commented Jun 23, 2025

Uh oh!

This comment has been minimized.

blimpich commented Jun 24, 2025

Uh oh!

github-actions Bot commented Jun 24, 2025

Uh oh!

github-actions Bot commented Jun 24, 2025

Uh oh!

blimpich commented Jun 24, 2025

Uh oh!

vincdargento commented Jun 26, 2025

Onboarding - Unable to take a test drive, the modal disappears

Action Performed:

Expected Result:

Actual Result:

Workaround:

Platforms:

Screenshots/Videos

Uh oh!

allgandalf commented Jun 27, 2025

Uh oh!

allroundexperts commented Jun 29, 2025

Uh oh!

github-actions Bot commented Jun 30, 2025

Uh oh!

github-actions Bot commented Jun 30, 2025

Uh oh!

blimpich commented Jun 30, 2025

Uh oh!

allgandalf commented Jul 2, 2025

Uh oh!

blimpich commented Jul 3, 2025

Uh oh!

m-natarajan commented Jul 3, 2025

Uh oh!

allroundexperts commented Jul 3, 2025

Uh oh!

allgandalf commented Jul 4, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Jul 4, 2025

Uh oh!

github-actions Bot commented Jul 7, 2025

Uh oh!

github-actions Bot commented Jul 8, 2025

Uh oh!

situchan Apr 4, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

allroundexperts commented Jun 23, 2025 •

edited

Loading