Add the ability to create a workspace for a client by huult · Pull Request #81008 · Expensify/App

huult · 2026-01-30T13:37:36Z

Explanation of Change

Fixed Issues

$ #80057
PROPOSAL: #80057 (comment)

Tests

Same QA step

Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition: Set an account as an approved accountant (isApprovedAccountant: true).

Open the Expensify app.
Go to Workspaces and click “New workspace.”
Verify that you can select a plan type and choose an owner user. If the selected owner user is different from the current user, verify that the “Keep me as an admin” option is visible.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-02.at.11.01.16.mp4

Android: mWeb Chrome

Screen.Recording.2026-02-02.at.11.02.33.mp4

iOS: Native

Screen.Recording.2026-02-02.at.11.07.21.mp4

iOS: mWeb Safari

Screen.Recording.2026-02-02.at.11.08.25.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-02-02.at.10.29.46.mp4

melvin-bot · 2026-01-30T13:37:43Z

@QichenZhu 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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f5a2049726

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-01-30T13:48:02Z

src/components/WorkspaceConfirmationForm.tsx

                        onSubmit({
                            name: val[INPUT_IDS.NAME],
                            currency: val[INPUT_IDS.CURRENCY],
+                            planType: val[INPUT_IDS.PLAN_TYPE],


Propagate selected plan type into workspace creation

The form now captures planType, but none of the submit handlers downstream use it (e.g., createWorkspaceWithPolicyDraftAndNavigateToIt/Policy.createWorkspace still default the policy type to TEAM unless shouldCreateControlPolicy is set). That means a user can pick “Control” here and still end up with a Team workspace, so the new selector has no effect. Consider threading this value through the submit handlers and into the draft/creation helpers so the chosen plan type actually drives the policy type.

Useful? React with 👍 / 👎.

…-workspaces

codecov · 2026-01-31T09:47:14Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/ROUTES.ts	`13.79% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`75.00% <ø> (ø)`
...ages/Travel/WorkspaceConfirmationForTravelPage.tsx	`0.00% <ø> (ø)`
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <ø> (ø)`
src/pages/workspace/WorkspaceConfirmationPage.tsx	`0.00% <ø> (ø)`
src/types/form/WorkspaceConfirmationForm.tsx	`100.00% <ø> (ø)`
...gation/AppNavigator/ModalStackNavigators/index.tsx	`7.40% <0.00%> (-0.02%)`	⬇️
src/libs/actions/App.ts	`47.34% <0.00%> (ø)`
src/libs/actions/Policy/Policy.ts	`39.89% <77.77%> (+0.80%)`	⬆️
... and 3 more
... and 15 files with indirect coverage changes

…-workspaces

melvin-bot · 2026-02-01T16:17:11Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

huult · 2026-02-02T04:28:07Z

@trjExpensify @QichenZhu Because we added the Plan type selector and Owner selection with the “Keep me as an admin” option, the screen is no longer tall enough to show the Save button.

Could we enable scrolling (or auto-scroll to the bottom) on the workspace confirmation page so the Save button is visible?

huult · 2026-02-02T04:30:46Z

Screen.Recording.2026-02-02.at.11.29.55.mov

@trjExpensify @QichenZhu We have a case where the user selects a non-existing account as the Owner. Do we show an error for this case?

github-actions · 2026-02-02T04:34:36Z

src/components/WorkspaceConfirmationForm.tsx

    const {inputCallbackRef} = useAutoFocusInput();
+    const scrollViewRef = useRef<RNScrollView>(null);
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
+    const isApprovedAccountant = !!account?.isApprovedAccountant || true;


❌ CONSISTENCY-2 (docs)

The expression \!\!account?.isApprovedAccountant || true will always evaluate to true due to the || true condition. This is a logic bug that defeats the purpose of checking the account status.

Suggested fix:

const isApprovedAccountant = \!\!account?.isApprovedAccountant;

If you need to test this feature while it's in development, consider using a feature flag or environment variable instead of hardcoding true.

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

src/components/PlanTypeSelector.tsx

github-actions · 2026-02-02T04:34:52Z

src/libs/actions/Policy/Policy.ts

    const isCorporateIntegration = userReportedIntegration && (CONST.POLICY.CONNECTIONS.CORPORATE as readonly string[]).includes(userReportedIntegration);
-    const workspaceType = isCorporateFeature || isCorporateIntegration || shouldCreateControlPolicy ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
+
+    const determineWorkspaceType = (): typeof CONST.POLICY.TYPE.TEAM | typeof CONST.POLICY.TYPE.CORPORATE => {


❌ PERF-6 (docs)

The determineWorkspaceType helper function is unnecessary. This value can be computed directly without creating a separate function.

Suggested fix:

const workspaceType = type ?? (isCorporateFeature || isCorporateIntegration || shouldCreateControlPolicy ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM);

This approach:

Eliminates the helper function

Uses the nullish coalescing operator for cleaner logic

Computes the value directly during rendering

Improves readability

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

src/components/WorkspaceConfirmationForm.tsx

src/pages/workspace/WorkspaceConfirmationOwnerSelectorPage.tsx

QichenZhu · 2026-02-24T23:02:53Z

@trjExpensify, sure, on it!

QichenZhu

Reviewer Checklist: #81008 (comment)

blimpich · 2026-02-25T00:55:25Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 45e1b5ac9f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/libs/actions/Policy/Policy.ts

src/pages/workspace/WorkspaceConfirmationOwnerSelectorPage.tsx

blimpich · 2026-02-25T18:46:54Z

@huult @QichenZhu can you look at the above codex comments?

…-workspaces

huult · 2026-02-26T03:37:15Z

@QichenZhu I’ve updated this. Could you please review and re-test? Thanks!

QichenZhu

Replied in the comment threads (#81008 (comment), #81008 (comment)). @huult

huult · 2026-02-27T01:46:10Z

@QichenZhu Thanks, I’ll update it today.

…-workspaces

…r options" This reverts commit 3ec9dd2.

huult · 2026-02-27T07:02:43Z

@QichenZhu Addressed your feedback, thanks.

trjExpensify · 2026-02-27T13:14:33Z

@QichenZhu how's it looking. Can we complete the review today?

QichenZhu · 2026-02-28T01:03:13Z

Look good on my end. @blimpich, can you take a second look?

blimpich

LGTM! Nice job with this!

github-actions · 2026-03-02T03:23:51Z

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

github-actions · 2026-03-02T03:27:59Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-706ef83-39f6ce2-dc822c6f45aa1f84d81f3ae6196f07a4306afb28/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-706ef83-39f6ce2-5afeda3e9e95dc44f14dcf8311028e47894a4193/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-02T03:30:57Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-03-02T23:01:20Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.3.28-0 🚀

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

jponikarchuk · 2026-03-03T07:30:37Z

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

OSBotify · 2026-03-04T03:16:08Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.3.30-0 🚀

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

OSBotify · 2026-03-04T18:06:29Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

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

Add plan type selector

f5a2049

huult requested review from a team as code owners January 30, 2026 13:37

melvin-bot bot assigned huult Jan 30, 2026

melvin-bot bot requested review from QichenZhu and trjExpensify and removed request for a team January 30, 2026 13:37

huult marked this pull request as draft January 30, 2026 13:38

chatgpt-codex-connector bot reviewed Jan 30, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/main' into 80057-create-client…

e6de1f2

…-workspaces

huult added 2 commits February 1, 2026 22:09

Merge remote-tracking branch 'upstream/main' into 80057-create-client…

9297d25

…-workspaces

add workspace owner confirm page

72d0bea

huult added 5 commits February 1, 2026 23:30

Update translations

f4168b9

update label style for plan type

bba1531

Add workspace type to create workspace

a302cfa

update useRef

cbe0b24

Temporarily disable ScrollView import

af5ab0b

huult marked this pull request as ready for review February 2, 2026 04:30

remove code unused

727d0a9

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/components/PlanTypeSelector.tsx Show resolved Hide resolved

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/components/WorkspaceConfirmationForm.tsx Show resolved Hide resolved

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/pages/workspace/WorkspaceConfirmationOwnerSelectorPage.tsx Show resolved Hide resolved

QichenZhu approved these changes Feb 25, 2026

View reviewed changes

melvin-bot bot requested a review from blimpich February 25, 2026 00:21

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

src/libs/actions/Policy/Policy.ts Show resolved Hide resolved

src/pages/workspace/WorkspaceConfirmationOwnerSelectorPage.tsx Outdated Show resolved Hide resolved

huult added 3 commits February 26, 2026 09:50

Merge remote-tracking branch 'upstream/main' into 80057-create-client…

23bd212

…-workspaces

Merge remote-tracking branch 'upstream/main' into 80057-create-client…

0064f2d

…-workspaces

Update workspace role and return early when selecting non-user options

3ec9dd2

QichenZhu suggested changes Feb 26, 2026

View reviewed changes

huult added 3 commits February 27, 2026 13:37

Merge remote-tracking branch 'upstream/main' into 80057-create-client…

88515f4

…-workspaces

Revert "Update workspace role and return early when selecting non-use…

7ffb786

…r options" This reverts commit 3ec9dd2.

update owner draft value

20dfa12

QichenZhu approved these changes Feb 28, 2026

View reviewed changes

blimpich approved these changes Mar 2, 2026

View reviewed changes

blimpich merged commit 706ef83 into Expensify:main Mar 2, 2026
33 checks passed

OSBotify mentioned this pull request Mar 2, 2026

Deploy Checklist: New Expensify 2026-03-02 #83947

Closed

jponikarchuk mentioned this pull request Mar 3, 2026

[$250] Workspace - Not here page appear after toggle of keep me as admin and create WS #83995

Open

7 tasks

Conversation

huult commented Jan 30, 2026 • 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 Jan 30, 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 Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Jan 31, 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 Feb 1, 2026

Uh oh!

huult commented Feb 2, 2026

Uh oh!

huult commented Feb 2, 2026

Uh oh!

github-actions bot Feb 2, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-2 (docs)

Uh oh!

Uh oh!

github-actions bot Feb 2, 2026

Choose a reason for hiding this comment

❌ PERF-6 (docs)

Uh oh!

Uh oh!

Uh oh!

QichenZhu commented Feb 24, 2026

Uh oh!

QichenZhu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blimpich commented Feb 25, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

blimpich commented Feb 25, 2026

Uh oh!

huult commented Feb 26, 2026

Uh oh!

QichenZhu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

huult commented Feb 27, 2026

Uh oh!

huult commented Feb 27, 2026

Uh oh!

trjExpensify commented Feb 27, 2026

Uh oh!

QichenZhu commented Feb 28, 2026

Uh oh!

blimpich left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 2, 2026

Uh oh!

github-actions bot commented Mar 2, 2026

Uh oh!

OSBotify commented Mar 2, 2026

huult commented Jan 30, 2026 •

edited

Loading

codecov bot commented Jan 31, 2026 •

edited by github-actions bot

Loading

QichenZhu left a comment •

edited

Loading

QichenZhu left a comment •

edited

Loading