Clear the merge-blocked onboarding flag when choosing Join Workspace by MelvinBot · Pull Request #103537 · Expensify/App

MelvinBot · 2026-10-08T22:35:06Z

Explanation of Change

When a public-domain user's work email merge is blocked (for example, an Expensifail account), AddWorkEmail sets NVP_ONBOARDING.isMergingAccountBlocked = true. Pressing "Got it" with no intent selected clears only the error message and returns to the purpose step, leaving that flag set.

The new "Join my company workspace" path then sends the user back to the work email step. Because the flag is still true, that step renders the blocked view instead of the form, and its "Got it" returns the user to the purpose step again.

This change calls the existing clearOnboardingMergeAccountBlocked() when the user picks Join Workspace, so the work email step opens with a clean form. It also adds a UI test that fails without the fix.

AI tests run locally: tests/ui/OnboardingPurpose.tsx (10/10 pass; the new test fails without the fix), npm run lint on changed files, npm run typecheck, npm run fmt (no changes), react-compiler-compliance-check check on the changed page, and cspell (no issues in changed files). lint-changed and check-changed could not resolve a merge base in the shallow checkout, so the same checks ran on explicit file paths instead. The full Jest suite and Storybook smoke test were not run locally.

Fixed Issues

$ #103528
PROPOSAL: #103528 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".
// Please describe what QA needs to do to validate your changes and what areas do they need to test for regressions.

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

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>

MelvinBot · 2026-10-08T22:47:49Z

🤖 Android test steps verification results: ✅ pass

After a blocked Expensifail merge, tapping "Got it" returns to the intent step, and choosing "Join my company workspace" now opens the clean, editable work email form instead of the blocked "Got it" view. The PR's Tests section is still a TODO, so these steps come from the reproduction steps in the linked issue.

Step	Status
Onboarding is shown and the work email step is reachable From the intent step ("What do you want to do today?"), tapping "Join my company workspace" opened "What's your work email?" with the input, Skip, and Add work email button.	✅
Entering an Expensifail address and tapping Add work email shows the blocked merge message with Got it Entered a random @expensifail.com address and tapped Add work email. The screen changed to "Couldn't add work email … is a domain controlled login for an existing Expensify account." with a "Got it" button.	✅
Tapping Got it opens the onboarding intent step The screen changed to "What do you want to do today?" with the five purpose choices.	✅
Tapping Join my company workspace again opens a clean, editable work email form, not the blocked view "What's your work email?" opened with an editable text field, Skip, and Add work email. This is the standard form, not the blocked view.	✅
No Got it blocked view reappears, and the user is not sent back to the intent step A visibility check and a full screen snapshot found no "Got it" button and no "Couldn't add work email" text. The form stayed in place with no navigation back to the intent step.	✅

view run · view recording

MelvinBot · 2026-10-08T22:52:51Z

The failing ESLint check is unrelated to this PR, so I didn't push a change. main itself currently fails lint. [No QA] Fix ESLint errors in popover save callbacks fixes it. Once that merges, merge main into this branch or re-run the check.

Check independent approval is only waiting on a reviewer approval.

Details

Errors: 3 × @typescript-eslint/no-misused-promises in DateCell.tsx:38, CategoryCell.tsx:35, and TagCell.tsx:42. This PR only changes BaseOnboardingPurpose.tsx and tests/ui/OnboardingPurpose.tsx.
Cause: fix: follow-up #100567 changed EditableProps.onSave to return void | boolean | Promise<boolean> (types.ts:6). usePopoverEditState still types onSave as returning void (usePopoverEditState.ts:119). Every cell that passes its onSave to that hook now fails lint.
Fix: The open fix PR updates usePopoverEditState.ts only. That clears all three errors.

view run

MelvinBot · 2026-10-08T22:54:03Z

🤖 Web test steps verification results: ✅ pass

After an @expensifail.com work email is blocked and you click "Got it", choosing "Join my company workspace" now opens the clean, editable work email form instead of the blocked "Got it" view. The PR's Tests section is still a TODO, so these steps come from the linked issue's reproduction steps; the JS console could not be checked in this run.

Step	Status
Onboarding is shown and the work email step is reachable Onboarding opened directly on "What's your work email?" with an editable Work email field and Skip / Add work email buttons.	✅
Entering an @expensifail.com address and clicking Add work email shows the blocked message with Got it Entered melvintest1791499963@expensifail.com and clicked Add work email. A "Couldn't add work email" message appeared, saying the address is a domain controlled login for an existing Expensify account, with a "Got it" button.	✅
Clicking Got it opens the intent step The screen changed to "What do you want to do today?" with options including "Join my company workspace" and "Manage my team's expenses".	✅
Clicking Join my company workspace opens a clean, editable work email form, not the blocked view The screen showed Back, "What's your work email?", a focused editable Work email field, and Skip / Add work email. This is the normal form, not the blocked view.	✅
No Got it blocked view appears, and the user is not sent back to the intent step The screen snapshot had no "Got it" button, only Back, the heading, the text field, Skip, and Add work email. The bug did not reproduce.	✅

view run · view recording

MelvinBot · 2026-10-09T00:19:38Z

The ESLint check passes now, so this PR needs no code fix. [NoQA] Fix UsePopoverEditStateOptions lint issue fixed the lint errors on main, and this branch already includes that fix through your merge of main.

The only check still failing is Check independent approval. It passes once a reviewer approves.

view run

melvin-bot · 2026-10-09T00:24:54Z

@aimane-chnaif 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-09T00:25:02Z

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-09T00:33:40.168819Z	`3900424`	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.

robertjchen · 2026-10-09T00:27:57Z

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 any copy / text that was added to the app 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)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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 the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

github-actions · 2026-10-09T00:29:22Z

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

OSBotify · 2026-10-09T00:32:39Z

✋ 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-10-09T00:34:39Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1481341-49dee98-cbd703b07b1eda3b0fc80d8bc157c769c300183d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1481341-49dee98-249f3b7e7305b3fae56d1a9af981b0b68bbbacc6/index.html

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

👀 View the workflow run that generated this build 👀

hungvu193 · 2026-10-09T02:49:04Z

@MelvinBot When C+ approve the PR, it still request review from Internal Engineer even when the PR is merged. Create an issue for this and assign it to me.

aimane-chnaif

Confirmed fix

before.fix.mov

after.fix.mov

MelvinBot · 2026-10-09T02:52:56Z

I created Internal engineer review is still requested when a C+ approves an already-merged PR and assigned it to you.

The issue uses this PR as the example. The PR merged at 00:28 UTC, the C+ approval came at 02:43 UTC, and melvin-bot requested reviews from carlosmiceli and iwiznia 13 seconds later.

A related internal issue covered the opposite case, where no internal engineer was requested. That issue is closed, so I didn't treat it as a duplicate.

view run

…ckedOnJoinWorkspace Clear the merge-blocked onboarding flag when choosing Join Workspace (cherry picked from commit 1481341) (cherry-picked to staging by puneetlath)

OSBotify · 2026-10-09T14:41:19Z

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.5.6-2 🚀

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

MelvinBot · 2026-10-09T14:45:24Z

No help site update is needed. This bug fix makes "Join my company workspace" open the normal work email form, which is what you'd expect, and it doesn't make any sentence in Troubleshoot Adding Your Work Email incorrect.

view run

…arMergeAccountBlockedOnJoinWorkspace" This reverts commit 1481341, reversing changes made to d6c4d74.

OSBotify · 2026-10-09T20:32:45Z

🚀 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):

Android
iOS

Clear the merge-blocked onboarding flag when choosing Join Workspace

7edcc02

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>

MelvinBot assigned carlosmiceli Oct 8, 2026

MelvinBot requested a review from a team October 8, 2026 22:35

melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 8, 2026

MelvinBot mentioned this pull request Oct 8, 2026

[$175] Onboarding - Intent step reopens after entering Expensifail account as work email and proceed #103528

Closed

2 of 7 tasks

Merge remote-tracking branch 'origin/main' into tmp/pr-103537

3900424

carlosmiceli marked this pull request as ready for review October 9, 2026 00:24

carlosmiceli requested a review from a team as a code owner October 9, 2026 00:24

melvin-bot Bot requested review from JmillsExpensify and aimane-chnaif and removed request for a team October 9, 2026 00:24

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

robertjchen approved these changes Oct 9, 2026

View reviewed changes

carlosmiceli merged commit 1481341 into main Oct 9, 2026
47 of 48 checks passed

carlosmiceli deleted the claude-clearMergeAccountBlockedOnJoinWorkspace branch October 9, 2026 00:28

aimane-chnaif approved these changes Oct 9, 2026

View reviewed changes

melvin-bot Bot requested review from carlosmiceli and iwiznia October 9, 2026 02:43

aimane-chnaif reviewed Oct 9, 2026

View reviewed changes

MelvinBot mentioned this pull request Oct 9, 2026

Internal engineer review is still requested when a C+ approves an already-merged PR #103544

Closed

MelvinBot mentioned this pull request Oct 9, 2026

Onboarding-Onboarding modal does not appear until clearing cache #103545

Open

1 of 7 tasks

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Oct 9, 2026

OSBotify mentioned this pull request Oct 9, 2026

Deploy Checklist: New Expensify 2026-10-08 #103502

Closed

90 tasks done

This was referenced Oct 9, 2026

Revert "Clear the merge-blocked onboarding flag when choosing Join Workspace" #103647

Closed

Revert join-workspace onboarding changes #103649

Merged

allgandalf pushed a commit to allgandalf/App that referenced this pull request Oct 9, 2026

Revert "Merge pull request Expensify#103537 from Expensify/claude-cle…

8b20820

…arMergeAccountBlockedOnJoinWorkspace" This reverts commit 1481341, reversing changes made to d6c4d74.

Conversation

MelvinBot commented Oct 8, 2026 • edited by carlosmiceli 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!

MelvinBot commented Oct 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented Oct 9, 2026

Uh oh!

melvin-bot Bot commented Oct 9, 2026

Uh oh!

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

Uh oh!

Codex Review Summary

Uh oh!

robertjchen commented Oct 9, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions Bot commented Oct 9, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

github-actions Bot commented Oct 9, 2026

Uh oh!

hungvu193 commented Oct 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aimane-chnaif left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Oct 9, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

MelvinBot commented Oct 9, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MelvinBot commented Oct 8, 2026 •

edited by carlosmiceli

Loading

MelvinBot commented Oct 8, 2026 •

edited

Loading

MelvinBot commented Oct 8, 2026 •

edited

Loading

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

edited

Loading

hungvu193 commented Oct 9, 2026 •

edited

Loading