Fix infinite loading and missing error on the workspace add work email pages

[MelvinBot]

Explanation of Change

The workspace "Add your work email" pages hang forever with no error when the backend rejects the request.

AddWorkEmail was written for onboarding and hardcodes onboarding Onyx keys: it writes isLoading to ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM and routes failures to ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY / NVP_ONBOARDING.isMergingAccountBlocked. The two workspace card pages that also call it bind their FormProvider to ONYXKEYS.FORMS.ADD_WORK_EMAIL_FORM, which nothing ever writes. So the press spinner never hands off to a real loading flag and never stops, and the failure lands on keys those pages don't render. On top of that, a failure in a workspace card flow flipped persistent onboarding state, which later renders the onboarding "merge blocked" screen.

This PR routes the request lifecycle to the form that submitted it:

• AddWorkEmail takes an optional formID that defaults to the onboarding form, so onboarding is unchanged. The optimistic/success/failure data write isLoading to that form.
• For a workspace caller, the failure is surfaced inline on ADD_WORK_EMAIL_FORM.errorFields, mapping the specific backend reasons (2FA, SSO, closed work account) to their existing copy and falling back to common.genericErrorMessage for anything else. The backend rejects this command generically in this flow (jsonCode: 666, message: "403 Forbidden"), which is exactly the case that previously produced no feedback at all. Onboarding-only writes are skipped for workspace callers.
• Both WorkspaceCompanyCardAddWorkEmailPage and WorkspaceExpensifyCardAddWorkEmailPage pass their form. FormProvider then stops the spinner and renders the error natively.
• Drive-by on the company card page: the existing-login branch called addErrorMessage({}, …) on a throwaway object, so that error was silently discarded. It now uses setErrorFields, matching the Expensify Card page.

Note on approach: making the action return a promise and handling loading/errors per page was considered but conflicts with DATA-BINDING.md ("Action methods SHOULD not return a promise"), and it would leave both pages coupled to onboarding state.

Added tests/unit/AddWorkEmailTest.ts, which covers both callers. 4 of its 6 cases fail on main and all 6 pass with this change.

Fixed Issues

$ #98664
PROPOSAL: #98664 (comment)

Tests

Same as QA steps

• Verify that no errors appear in the JS console

Offline tests

Same as QA steps

QA Steps

1. Have two workspaces.
2. Connect a company card feed to one of the workspaces.
3. Navigate to the second workspace.
4. Go to Company Cards > Add Card.
5. Select Feed from another workspace.
6. Enter a work email on the Add your work email page.
7. Click Save and observe.
8. Verify that the loading status stops and if the backend returns an error, error message shown.

• 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. 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)
• 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 (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• 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 new assets were added or existing ones were modified, I verified that:
  • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
  • The assets load correctly across all supported platforms.
• 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.
• I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

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 Δ
...panyCards/WorkspaceCompanyCardAddWorkEmailPage.tsx	0.00% <ø> (ø)
...ifyCard/WorkspaceExpensifyCardAddWorkEmailPage.tsx	0.00% <ø> (ø)
src/libs/actions/Session/index.ts	60.58% <94.73%> (+1.30%)	⬆️
... and 15 files with indirect coverage changes

[MelvinBot]

🤖 Android test steps verification results: ⚠️ partial

I signed in on Android with the gmail.com test account, but I could not exercise the actual fix: both workspace "Add your work email" pages were unreachable on this account. The account has exactly one auto-created Collect workspace with no company card feed, and per the source the work-email step only fires when you select a feed that already exists on another workspace in the same domain. Company cards > "Add cards" hit an account-validation magic-code gate I can't pass, and Expensify Card > "Issue new card" fell through to bank-account setup. The onboarding "What's your work email?" regression check passed.

Step	Status
1. Signed in with public-domain (gmail.com) account, reach Workspaces list, note workspace count and company-card feed status Exactly 1 workspace exists: "Example's Workspace" (Default, Collect plan), auto-created during account setup. Opening it > Company cards shows the BYOC empty state with no feed connected.	✅
2. Workspace > Company cards > Add cards > reach "Add your work email" page Blocked. Tapping "Add cards" first calls useVerifyAccountAndResume() in WorkspaceCompanyCardPageEmptyState.tsx; ONYXKEYS.ACCOUNT.validated is false for this session, so it navigates to a "Validate your account" magic-code screen I cannot complete (no mailbox access). Separately, WorkspaceCompanyCardFeedSelectorPage.tsx:150-153 only navigates to AddWorkEmail when you pick a feed from useOtherFeedsForFeedSelector — a feed on another workspace in the same domain — which this single-workspace account does not have.	❌
3. Enter a brand-new work email on the Company Cards "Add your work email" page and tap Save Not performed — the page was never reached (see step 2).	❌
4. Save button stops spinning and inline error appears under the email field on rejection (Company Cards) Not verified — the page was never reached (see step 2).	❌
5. Workspace > Expensify Card > Add work email: enter work email, tap Save, confirm spinner stops with inline error Blocked. "Get the Expensify Card" > "Learn more" opens the card intro page, but "Issue new card" never reaches the feed selector: with no eligible bank account, WorkspaceExpensifyCardPageEmptyState.tsx routes to bank-account setup instead. The work-email check at WorkspaceExpensifyCardFeedSelectorPage.tsx:171-176 only runs when an existing card feed is selectable.	❌
6. Regression: onboarding "What's your work email?" step still behaves as before Reachable and exercised during account setup. Entered a non-public-domain email and tapped "Add work email": the action completed normally and advanced to the "See if your team's in Expensify" magic-code screen — no infinite spinner, no hang. BaseOnboardingWorkEmail.tsx also runs its own client-side public-domain pre-check before calling the backend, which is a separate pre-existing path this PR does not touch.	✅

To make steps 2-5 testable, the account needs a validated login plus a second workspace on the same domain that already has a linked company card / Expensify Card feed — that "other feeds" selection is the only entry point to the "Add your work email" page.

---

view run · view recording

[MelvinBot]

🤖 Web test steps verification results: ⚠️ partial

I verified the account state (0 workspaces, no company card feed anywhere in its domain) but could not reach either workspace "Add your work email" page, so the fix itself was not exercised on web. Two independent blockers: the feed-selector precondition (a card feed already linked to a different workspace in the same domain) cannot be satisfied on a fresh account, and the "Add cards" entry point is gated behind an email magic-code "Validate your account" wall. The onboarding regression step is not reachable either, because this session's account is already onboarded.

Step	Status
1. Signed in with a public-domain (gmail.com) account, reach Workspaces list, note workspace count and any connected company-card feed Signed in with the gmail.com test account. The Workspaces tab showed "No workspaces yet" — 0 workspaces, so no company card feed connected anywhere.	✅
2. Open a workspace > Company cards > Add cards, reach the "Add your work email" page Blocked. Created a workspace and confirmed Company cards is on, then went Workspace > Company cards > Add cards — which immediately opened a "Validate your account" panel asking for an emailed 6-digit code, with no mailbox access to clear it. Separately, WorkspaceCompanyCardFeedSelectorPage.tsx only navigates to AddWorkEmail when you pick a feed from useOtherFeedsForFeedSelector — a feed already linked to a different workspace in the same domain — and no such feed exists for this account.	❌
3. Enter a brand-new work email on the workspace Company cards "Add your work email" page and click Save Not performed — the page was never reached (see step 2).	❌
4. Save button stops spinning after the request fails, and an inline error appears under the email field Not verified — the page was never reached (see step 2).	❌
5. Same behavior on Workspace > Expensify Card > Add work email Blocked. Enabled the Expensify Card feature (that toggle needed no validation), but the Expensify Card page only offers "Issue new card", which routes into "Add bank account" (Connect manually / Plaid) rather than a feed selector. The work-email check in WorkspaceExpensifyCardFeedSelectorPage.tsx only runs when an existing Expensify Card feed from another workspace is selectable, so WorkspaceExpensifyCardAddWorkEmailPage.tsx has no entry point here.	❌
6. Regression: onboarding "What's your work email?" step still behaves as before Not reachable. This session's account has already completed onboarding, and per src/pages/OnboardingWorkEmail the step only mounts inside the onboarding modal navigator, with no Settings or other in-app entry point. Reporting as not reachable rather than guessing.	❌
7. No errors appear in the JS console during the above No console capture is available in this harness, so this is supporting evidence rather than a definitive check: every API request observed during the drive (OpenPolicyCompanyCardsPage, OpenPolicyMoreFeaturesPage, EnablePolicyExpensifyCards, OpenPolicyExpensifyCardsPage, OpenReimbursementAccountPage, OpenPaymentsPage, Ping) returned 200, and no error toast or crash appeared.	⚠️

Same outcome as the Android run: to make steps 2-5 testable, the account needs a validated login plus a second workspace on the same domain that already has a linked company card / Expensify Card feed — selecting that "other feed" is the only entry point to the "Add your work email" page.

---

view run · no recording available

[eh2077]

@MelvinBot pull main

[MelvinBot]

🤖 Merged main into claude-fixAddWorkEmailFormLoadingAndError and pushed — the branch was 1119 commits behind. No conflicts.

Merge commit: c9c8c43

Verification details

The PR's diff against main is byte-for-byte identical to what it was before the merge, so nothing was lost or silently altered:

 src/libs/actions/Session/index.ts                  | 121 +++++++++++++--------
 .../WorkspaceCompanyCardAddWorkEmailPage.tsx       |   9 +-
 .../WorkspaceExpensifyCardAddWorkEmailPage.tsx     |   2 +-
 tests/unit/AddWorkEmailTest.ts                     | 113 +++++++++++++++++++

Overlap check with what landed on main:

• Both WorkspaceCompanyCardAddWorkEmailPage.tsx and WorkspaceExpensifyCardAddWorkEmailPage.tsx were untouched by main since the merge base.
• src/libs/actions/Session/index.ts did change on main, but only in signIn and signInWithValidateCode — a new optional storedAuthToken param threaded through for the 2FA step. That's a different part of the file from AddWorkEmail, so there's no semantic interaction with this PR.

Tests: I could not run the local test suite (npm test, npm run typecheck, npm run lint) — main bumped package.json / package-lock.json, and this environment blocked both the dependency install and the test commands. CI on this push is the signal to watch. Nothing in the merge touched the code paths tests/unit/AddWorkEmailTest.ts exercises, so I don't expect changes there, but that's reasoning rather than a green run.

mergeStateStatus is still BLOCKED, which is just the unchecked author/reviewer checklists — not the merge.

[MelvinBot]

🤖 Nothing to fix — there's no code failure on this PR.

The only failing check is Check independent approval, and it fails because the PR has no approving review yet:

approvers: [],
independentApprovers: [],
##[error]Expensify/App#100044 does not have enough independent eligible reviewer approvals.

It will go green once an eligible reviewer approves. I didn't push anything.

Full check status on c9c8c43

Every other check passed on the post-merge commit. The ones that were still running when you pinged me have since finished green:

Check	Result
Jest Unit Tests (jobs 1–8)	✅ pass
ESLint check	✅ pass
Reassure Performance Tests	✅ pass
typecheck	✅ pass
Bun tests	✅ pass
Storybook tests	✅ pass
Oxfmt, spellcheck, knip, unused styles, React Compiler	✅ pass
Remote Build Android / iOS	✅ pass
Check independent approval	❌ fail (no approval yet)

Across the branch's whole history, Check independent approval is the only check that has ever failed — it also failed on 35114e21 before the main merge, for the same reason.

---

view run · view recording

[eh2077]

@MelvinBot pull main

[MelvinBot]

🤖 Merged main into claude-fixAddWorkEmailFormLoadingAndError — no conflicts.

• Merge commit: 37e366dcf263649c98434d6a138de69754ee80fc
• Brought in 670 commits from main
• The PR diff is unchanged (4 files, +198/−47), so nothing was lost in the merge

CI is re-running on the updated branch.

---

view run · view recording

[MelvinBot]

No code fix is needed — nothing in the build or test suite is failing.

The single failing check is Check independent approval, whose Verify peer review step failed. That's a process gate, not a code problem: it requires an approving review from someone other than the PR author before it can pass. It will go green once a reviewer approves.

Everything else that has run is passing — typecheck, ESLint check, Oxfmt check, Bun tests, all 8 test jobs, Storybook tests, spellcheck, React Compiler Compliance, Check for unused styles, Compare knip issues against main, verifySignedCommits, and all four build jobs. baseline-perf-tests and branch-perf-tests were still pending at the time of this check.

Since there's no failure attributable to the diff, I haven't pushed anything.

---

view run · view recording

[eh2077]

@MelvinBot apply #100044 (comment) to update PR description and then mark PR ready for review

[melvin-bot]

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

[MelvinBot]

Done — applied your comment and marked the PR ready for review.

• Replaced everything from ### Tests onward with your version: Tests and Offline tests now say "Same as QA steps", the QA steps are your 8-step company card flow, and the full Author Checklist is checked off.
• Kept the ### Explanation of Change and ### Fixed Issues sections unchanged.
• The PR is no longer a draft.

[eh2077]

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 proper code patterns were followed (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. 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)
• 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)
• 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 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.
• 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.2026-09-09.at.8.57.03.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-09-09.at.8.44.48.PM.mov

iOS: HybridApp

Screen.Recording.2026-09-09.at.8.52.46.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-09-09.at.8.42.58.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-09-09.at.8.26.09.PM.mov

[github-actions]

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

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

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-3f3f81e-108ff9c-00bcf8cae9915521b1b671600bfbe0f357915959/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-3f3f81e-108ff9c-b5c183ca2afc949dd54e4f28c2c48b9ec6382917/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Deployed to staging by https://github.com/Gonals in version: 9.4.77-0 🚀

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

[MelvinBot]

No help site changes are required for this PR, so no draft docs PR was created.

This is a behind-the-scenes bug fix. It routes the AddWorkEmail loading flag and errors to the form that actually submitted the request (src/libs/actions/Session/index.ts), so the Save spinner stops and the failure renders inline instead of hanging forever.

Nothing user-facing changed that the help site documents:

• No new page, feature, or setting — the Add your work email page already existed.
• No copy changes. The PR reuses existing strings (onboarding.workEmail2FAError, onboarding.singleSignOnError, common.genericErrorMessage); src/languages/*.ts is untouched.
• No flow or navigation change. The steps in Share a Company Card Feed Across Workspaces are still accurate.
• The fix restores intended behavior — the old behavior was a silent hang, which no article described.

Separate pre-existing docs gap (not caused by this PR)

No article under docs/articles mentions the Add your work email step at all. Share-a-Company-Card-Connection-Across-Workspaces.md only lists "Your email is not on a private domain" as a reason the From other workspaces section is hidden — it doesn't tell the admin they can add a work email to unblock themselves.

That gap exists on main today and is unrelated to this fix. @eh2077 let me know if you want a separate docs PR for it and I'll open one.

---

view run · no recording available

[OSBotify]

🚀 Deployed to production by https://github.com/luacmartins in version: 9.4.77-4 🚀

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

Bundle Size Analysis (Sentry):

• Android