From 8c83422a64ff8cb0aae370f8e32e2c83c5d73103 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 18 Mar 2026 13:02:41 +0100
Subject: [PATCH 01/25] feat: add create new group button

---
 src/languages/en.ts                          |  1 +
 src/languages/es.ts                          |  1 +
 src/pages/domain/Groups/DomainGroupsPage.tsx | 24 +++++++++++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 83abd5e42308..3b84e0e1a3e9 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8650,6 +8650,7 @@ const translations = {
             error: {
                 settings: '<rbr>Couldn’t save this change. Please try again or <concierge-link>contact Concierge</concierge-link> for more support.</rbr>',
             },
+            createNewGroupButton: 'New group'
         },
     },
 };
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 738204180bb7..ad92879f67b8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8905,6 +8905,7 @@ ${amount} para ${merchant} - ${date}`,
             error: {
                 settings: '<rbr>No se pudo guardar este cambio. Inténtalo de nuevo o <concierge-link>contacta con Concierge</concierge-link> para obtener más ayuda.</rbr>',
             },
+            createNewGroupButton: 'Crear nuevo grupo',
         },
     },
     gps: {
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index 77c5cde1cc91..d5a0e2ac9552 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -3,6 +3,7 @@ import {defaultSecurityGroupIDSelector, groupsSelector} from '@selectors/Domain'
 import React from 'react';
 import {View} from 'react-native';
 import Badge from '@components/Badge';
+import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
@@ -10,7 +11,7 @@ import TableListItem from '@components/SelectionList/ListItem/TableListItem';
 import type {ListItem} from '@components/SelectionList/ListItem/types';
 import CustomListHeader from '@components/SelectionListWithModal/CustomListHeader';
 import Text from '@components/Text';
-import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -33,7 +34,7 @@ type DomainGroupsPageProps = PlatformStackScreenProps<DomainSplitNavigatorParamL
 
 function DomainGroupsPage({route}: DomainGroupsPageProps) {
     const {domainAccountID} = route.params;
-
+    const icons = useMemoizedLazyExpensifyIcons(['Plus']);
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const illustrations = useMemoizedLazyIllustrations(['Members']);
@@ -72,6 +73,19 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
         );
     };
 
+    const createGroupHeaderButton = (
+        <Button
+            accessibilityLabel={translate('domain.groups.createNewGroupButton')}
+            text={translate('domain.groups.createNewGroupButton')}
+            // sentryLabel={}
+            // onPress={() => Navigation.navigate()}
+            icon={icons.Plus}
+            innerStyles={[shouldUseNarrowLayout && styles.alignItemsCenter]}
+            style={shouldUseNarrowLayout ? [styles.flexGrow1, styles.mb3] : undefined}
+            success
+        />
+    );
+
     return (
         <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
             <ScreenWrapper
@@ -86,7 +100,11 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
                     icon={illustrations.Members}
                     shouldShowBackButton={shouldUseNarrowLayout}
                     shouldUseHeadlineHeader
-                />
+                >
+                    {!shouldUseNarrowLayout && <View style={[styles.flexRow, styles.gap2]}>{createGroupHeaderButton}</View>}
+                </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{createGroupHeaderButton}</View>}
+
                 <SelectionList
                     data={data}
                     ListItem={TableListItem}

From d4b2c6a43734b7eeea6da55d626252df65ef35bb Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 18 Mar 2026 13:52:13 +0100
Subject: [PATCH 02/25] feat: RHP modal routing for new group creating

---
 src/ROUTES.ts                                 |  5 +++
 src/SCREENS.ts                                |  1 +
 .../ModalStackNavigators/index.tsx            |  1 +
 .../linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts  |  2 +-
 src/libs/Navigation/linkingConfig/config.ts   |  3 ++
 src/libs/Navigation/types.ts                  |  3 ++
 .../domain/Groups/DomainGroupCreatePage.tsx   | 34 +++++++++++++++++++
 src/pages/domain/Groups/DomainGroupsPage.tsx  |  2 +-
 8 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/domain/Groups/DomainGroupCreatePage.tsx

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 97cc3ff853b6..7ec04a7633f5 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -4037,6 +4037,11 @@ const ROUTES = {
         route: 'domain/:domainAccountID/groups/:groupID/name',
         getRoute: (domainAccountID: number, groupID: string) => `domain/${domainAccountID}/groups/${groupID}/name` as const,
     },
+
+    DOMAIN_GROUP_CREATE: {
+        route: 'domain/:domainAccountID/groups/new',
+        getRoute: (domainAccountID: number) => `domain/${domainAccountID}/groups/new` as const,
+    }
 } as const;
 
 /**
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index e50aff84ddad..591fef48d3a5 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -963,6 +963,7 @@ const SCREENS = {
         MEMBER_LOCK_ACCOUNT: 'Member_Lock_Account',
         GROUP_DETAILS: 'Domain_Group_Details',
         GROUP_EDIT_NAME: 'Domain_Group_Edit_Name',
+        GROUP_CREATE: 'Domain_Group_Create',
     },
     MULTIFACTOR_AUTHENTICATION: {
         MAGIC_CODE: 'Multifactor_Authentication_Magic_Code',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index bc21f437e2c0..b2e6275c911f 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -923,6 +923,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.DOMAIN.MEMBER_LOCK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/domain/Members/DomainReportSuspiciousActivityPage').default,
     [SCREENS.DOMAIN.GROUP_DETAILS]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupDetailsPage').default,
     [SCREENS.DOMAIN.GROUP_EDIT_NAME]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupEditNamePage').default,
+    [SCREENS.DOMAIN.GROUP_CREATE]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupCreatePage').default,
 });
 
 const TwoFactorAuthenticatorStackNavigator = createModalStackNavigator<EnablePaymentsNavigatorParamList>({
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
index bc28c4cf9742..776a0e4e579a 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
@@ -16,7 +16,7 @@ const DOMAIN_TO_RHP: Partial<Record<keyof DomainSplitNavigatorParamList, string[
         SCREENS.DOMAIN.MEMBER_RESET_TWO_FACTOR_AUTH,
         SCREENS.DOMAIN.MEMBER_LOCK_ACCOUNT,
     ],
-    [SCREENS.DOMAIN.GROUPS]: [SCREENS.DOMAIN.GROUP_DETAILS, SCREENS.DOMAIN.GROUP_EDIT_NAME],
+    [SCREENS.DOMAIN.GROUPS]: [SCREENS.DOMAIN.GROUP_DETAILS, SCREENS.DOMAIN.GROUP_EDIT_NAME, SCREENS.DOMAIN.GROUP_CREATE],
 };
 
 export default DOMAIN_TO_RHP;
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 907a43b4a05f..f54e11d980e6 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1342,6 +1342,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.DOMAIN.GROUP_EDIT_NAME]: {
                             path: ROUTES.DOMAIN_GROUP_EDIT_NAME.route,
                         },
+                        [SCREENS.DOMAIN.GROUP_CREATE]: {
+                            path: ROUTES.DOMAIN_GROUP_CREATE.route,
+                        },
                     },
                 },
                 [SCREENS.RIGHT_MODAL.TWO_FACTOR_AUTH]: {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index b5f2c58c06e0..53623732942e 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1577,6 +1577,9 @@ type SettingsNavigatorParamList = {
         domainAccountID: number;
         groupID: string;
     };
+    [SCREENS.DOMAIN.GROUP_CREATE]: {
+        domainAccountID: number;
+    }
 } & ReimbursementAccountNavigatorParamList;
 
 type DomainCardNavigatorParamList = {
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
new file mode 100644
index 000000000000..50f740ef6911
--- /dev/null
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import Navigation from '@navigation/Navigation';
+import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type DomainGroupCreatePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.GROUP_CREATE>;
+
+function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
+    const {domainAccountID} = route.params;
+    const {translate} = useLocalize();
+    return (
+        <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
+            <ScreenWrapper
+                shouldEnableMaxHeight
+                shouldShowOfflineIndicatorInWideScreen
+                testID=""
+                // testID="DomainGroupCreatePage"
+            >
+                <HeaderWithBackButton
+                    title={translate('domain.groups.createNewGroupButton')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID))}
+                />
+            </ScreenWrapper>
+        </DomainNotFoundPageWrapper>
+    );
+}
+
+export default DomainGroupCreatePage;
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index d5a0e2ac9552..0ea1ad893506 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -78,7 +78,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
             accessibilityLabel={translate('domain.groups.createNewGroupButton')}
             text={translate('domain.groups.createNewGroupButton')}
             // sentryLabel={}
-            // onPress={() => Navigation.navigate()}
+            onPress={() => Navigation.navigate(ROUTES.DOMAIN_GROUP_CREATE.getRoute(domainAccountID))}
             icon={icons.Plus}
             innerStyles={[shouldUseNarrowLayout && styles.alignItemsCenter]}
             style={shouldUseNarrowLayout ? [styles.flexGrow1, styles.mb3] : undefined}

From fb8847c122b6d8f5f0ae1ceddb721bdb27e0000b Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 19 Mar 2026 09:45:54 +0100
Subject: [PATCH 03/25] fix: add missing sentry label

---
 src/CONST/index.ts                           | 5 +++++
 src/pages/domain/Groups/DomainGroupsPage.tsx | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 4bae10319adb..b6dc2369d666 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9131,6 +9131,11 @@ const CONST = {
         PROFILE_PAGE: {
             AVATAR: 'ProfilePage-Avatar',
         },
+        DOMAIN: {
+            GROUPS: {
+                CREATE_GROUP_BUTTON: 'DomainGroups-CreateGroupButton',
+            }
+        }
     },
 
     DOMAIN: {
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index 0ea1ad893506..2be21261e03f 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -20,6 +20,7 @@ import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
 import type {DomainSplitNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -77,7 +78,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
         <Button
             accessibilityLabel={translate('domain.groups.createNewGroupButton')}
             text={translate('domain.groups.createNewGroupButton')}
-            // sentryLabel={}
+            sentryLabel={CONST.SENTRY_LABEL.DOMAIN.GROUPS.CREATE_GROUP_BUTTON}
             onPress={() => Navigation.navigate(ROUTES.DOMAIN_GROUP_CREATE.getRoute(domainAccountID))}
             icon={icons.Plus}
             innerStyles={[shouldUseNarrowLayout && styles.alignItemsCenter]}

From 216c81d29903bfc68a4afb147d92c4a090dc51aa Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 19 Mar 2026 15:54:28 +0100
Subject: [PATCH 04/25] feat: rhp form with security group name input

---
 src/ONYXKEYS.ts                               |  4 ++
 src/languages/en.ts                           |  3 +-
 .../domain/Groups/DomainGroupCreatePage.tsx   | 54 +++++++++++++++++--
 src/types/form/DomainGroupCreateForm.ts       | 28 ++++++++++
 src/types/form/index.ts                       |  1 +
 5 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 src/types/form/DomainGroupCreateForm.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index d4c81d79806e..d39f927470f4 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1028,6 +1028,9 @@ const ONYXKEYS = {
         ADD_DOMAIN_MEMBER_FORM_DRAFT: 'addDomainMemberFormDraft',
         EDIT_DOMAIN_GROUP_NAME_FORM: 'editDomainGroupNameForm',
         EDIT_DOMAIN_GROUP_NAME_FORM_DRAFT: 'editDomainGroupNameFormDraft',
+        CREATE_DOMAIN_GROUP_FORM: 'createDomainGroupForm',
+        CREATE_DOMAIN_GROUP_FORM_DRAFT: 'createDomainGroupFormDraft',
+
     },
     DERIVED: {
         REPORT_ATTRIBUTES: 'reportAttributes',
@@ -1161,6 +1164,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.MERCHANT_RULE_FORM]: FormTypes.MerchantRuleForm;
     [ONYXKEYS.FORMS.ADD_DOMAIN_MEMBER_FORM]: FormTypes.AddDomainMemberForm;
     [ONYXKEYS.FORMS.EDIT_DOMAIN_GROUP_NAME_FORM]: FormTypes.DomainGroupEditNameForm;
+    [ONYXKEYS.FORMS.CREATE_DOMAIN_GROUP_FORM]: FormTypes.DomainGroupCreateForm;
 };
 
 type OnyxFormDraftValuesMapping = {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 3b84e0e1a3e9..5179c957fa35 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8650,7 +8650,8 @@ const translations = {
             error: {
                 settings: '<rbr>Couldn’t save this change. Please try again or <concierge-link>contact Concierge</concierge-link> for more support.</rbr>',
             },
-            createNewGroupButton: 'New group'
+            createNewGroupButton: 'New group',
+            createGroupSubmitButton: 'Create group'
         },
     },
 };
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 50f740ef6911..98d38149867a 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,31 +1,79 @@
+/* eslint-disable */
 import React from 'react';
+import {useRef} from 'react';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import {AnimatedTextInputRef} from '@components/RNTextInput';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {setDefaultSecurityGroup} from '@libs/actions/Domain';
+import {addErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/DomainGroupCreateForm';
 
 type DomainGroupCreatePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.GROUP_CREATE>;
 
 function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
+    const styles = useThemeStyles();
     const {domainAccountID} = route.params;
     const {translate} = useLocalize();
+
+    const inputRef = useRef<AnimatedTextInputRef>(null);
+
     return (
         <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
             <ScreenWrapper
+                onEntryTransitionEnd={() => inputRef.current?.focus()}
                 shouldEnableMaxHeight
-                shouldShowOfflineIndicatorInWideScreen
-                testID=""
-                // testID="DomainGroupCreatePage"
+                shouldUseCachedViewportHeight
+                testID="DomainGroupCreatePage"
+                includeSafeAreaPaddingBottom
             >
                 <HeaderWithBackButton
                     title={translate('domain.groups.createNewGroupButton')}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID))}
                 />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.CREATE_DOMAIN_GROUP_FORM}
+                    validate={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.CREATE_DOMAIN_GROUP_FORM>) => {
+                        const errors = {};
+                        if (!values.name) {
+                            addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.fieldRequired'));
+                        } else if (values.name.length > CONST.FORM_CHARACTER_LIMIT) {
+                            addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.characterLimitExceedCounter', values.name.length, CONST.FORM_CHARACTER_LIMIT));
+                        }
+                        return errors;
+                    }}
+                    onSubmit={() => {}}
+                    submitButtonText={translate('domain.groups.createGroupSubmitButton')}
+                    style={[styles.flex1, styles.ph5, styles.pb3]}
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        label={translate('common.name')}
+                        aria-label={translate('common.name')}
+                        role={CONST.ROLE.PRESENTATION}
+                        inputID={INPUT_IDS.NAME}
+                        defaultValue=""
+                        autoCapitalize="none"
+                        spellCheck={false}
+                        enterKeyHint="done"
+                        ref={inputRef}
+                    />
+                    <ScrollView></ScrollView>
+                </FormProvider>
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>
     );
diff --git a/src/types/form/DomainGroupCreateForm.ts b/src/types/form/DomainGroupCreateForm.ts
new file mode 100644
index 000000000000..5ee39b84e120
--- /dev/null
+++ b/src/types/form/DomainGroupCreateForm.ts
@@ -0,0 +1,28 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    NAME: 'name',
+    DEFAULT_GROUP_FOR_NEW_MEMBERS: 'isDefaultGroup',
+    STRICTLY_ENFORCE_WORKSPACE_RULES: 'enableStrictPolicyRules',
+    RESTRICT_DEFAULT_LOGIN_SELECTION: 'enableRestrictedPrimaryLogin',
+    RESTRICT_EXPENSE_WORKSPACE_CREATION: 'enableRestrictedPolicyCreation',
+    PREFERRED_WORKSPACE: 'enableRestrictedPrimaryPolicy',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type DomainGroupCreateForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.NAME]: string;
+        [INPUT_IDS.DEFAULT_GROUP_FOR_NEW_MEMBERS]: boolean;
+        [INPUT_IDS.STRICTLY_ENFORCE_WORKSPACE_RULES]: boolean;
+        [INPUT_IDS.RESTRICT_DEFAULT_LOGIN_SELECTION]: boolean;
+        [INPUT_IDS.RESTRICT_EXPENSE_WORKSPACE_CREATION]: boolean;
+        [INPUT_IDS.PREFERRED_WORKSPACE]: boolean;
+    }
+>;
+
+export type {DomainGroupCreateForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index f928d1fd414e..188c7c301136 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -113,3 +113,4 @@ export type {AddDomainMemberForm} from './AddDomainMemberForm';
 export type {DomainGroupEditNameForm} from './DomainGroupEditNameForm';
 export type {WorkspaceTimeTrackingDefaultRateForm} from './WorkspaceTimeTrackingDefaultRateForm';
 export type {EditExpensifyCardLimitTypeForm} from './EditExpensifyCardLimitTypeForm';
+export type {DomainGroupCreateForm} from './DomainGroupCreateForm';
\ No newline at end of file

From b4c0e49ecbe3f456d9cf37d1485d78c1d740a027 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Fri, 20 Mar 2026 13:41:21 +0100
Subject: [PATCH 05/25] feat: Add form toggles with state management, prettier
 fix

---
 src/CONST/index.ts                            |  4 +-
 src/ONYXKEYS.ts                               |  1 -
 src/ROUTES.ts                                 |  2 +-
 src/languages/en.ts                           | 16 +++-
 src/languages/es.ts                           | 15 +++-
 src/libs/Navigation/types.ts                  |  2 +-
 src/libs/actions/Domain.ts                    |  4 +-
 .../domain/Groups/DomainGroupCreatePage.tsx   | 80 ++++++++++++++++---
 src/types/form/DomainGroupCreateForm.ts       | 10 ---
 src/types/form/index.ts                       |  2 +-
 10 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index b6dc2369d666..27e7b7025525 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -9134,8 +9134,8 @@ const CONST = {
         DOMAIN: {
             GROUPS: {
                 CREATE_GROUP_BUTTON: 'DomainGroups-CreateGroupButton',
-            }
-        }
+            },
+        },
     },
 
     DOMAIN: {
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index d39f927470f4..beb210f02de4 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -1030,7 +1030,6 @@ const ONYXKEYS = {
         EDIT_DOMAIN_GROUP_NAME_FORM_DRAFT: 'editDomainGroupNameFormDraft',
         CREATE_DOMAIN_GROUP_FORM: 'createDomainGroupForm',
         CREATE_DOMAIN_GROUP_FORM_DRAFT: 'createDomainGroupFormDraft',
-
     },
     DERIVED: {
         REPORT_ATTRIBUTES: 'reportAttributes',
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 7ec04a7633f5..aab562e91b28 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -4041,7 +4041,7 @@ const ROUTES = {
     DOMAIN_GROUP_CREATE: {
         route: 'domain/:domainAccountID/groups/new',
         getRoute: (domainAccountID: number) => `domain/${domainAccountID}/groups/new` as const,
-    }
+    },
 } as const;
 
 /**
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 5179c957fa35..835fe4f15ee9 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8650,8 +8650,22 @@ const translations = {
             error: {
                 settings: '<rbr>Couldn’t save this change. Please try again or <concierge-link>contact Concierge</concierge-link> for more support.</rbr>',
             },
+            permissions: 'Group permissions',
             createNewGroupButton: 'New group',
-            createGroupSubmitButton: 'Create group'
+            createGroupSubmitButton: 'Create group',
+            ExpensifyCardPreferredWorkspace: 'Expensify Card Preferred Workspace',
+            ExpensifyCardPreferredWorkspaceDescription:
+                'All Expensify Card transactions will be created on the Expensify Card Preferred Workspace instead of the Preferred Workspace. Enabling this feature will override the Preferred Workspace setting for Expensify Card transactions only.',
+            RestrictExpenseWorkspaceCreation: 'Restrict expense workspace creation/removal',
+            RestrictExpenseWorkspaceCreationDescription:
+                'Prevent members from being able to create an expense workspace or remove themselves from an expense workspace. This is useful for preventing people from using Expensify to submit reports for use outside your domain when combined with strict workspace enforcement.',
+            RestrictDefaultLoginSelection: 'Restrict default login selection',
+            RestrictDefaultLoginSelectionDescription: 'Prevent members from changing their login email away from their company domain to avoid policy restrictions.',
+            StrictlyEnforceWorkspaceRules: 'Strictly enforce workspace rules',
+            StrictlyEnforceWorkspaceRulesDescription: 'All workspace rules must be met before submitting a report. No manual exceptions allowed.',
+            preferredWorkspace: 'Preferred Workspace',
+            preferredWorkspaceDescription: (enabled: boolean) => `All new reports and expenses will be created on ${enabled ? 'selected preferred' : 'this'} workspace.`,
+            preferredWorkspaceSelectDescription: 'All new expenses and reports will be created on this workspace.',
         },
     },
 };
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ad92879f67b8..e65b58bd373e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8905,7 +8905,20 @@ ${amount} para ${merchant} - ${date}`,
             error: {
                 settings: '<rbr>No se pudo guardar este cambio. Inténtalo de nuevo o <concierge-link>contacta con Concierge</concierge-link> para obtener más ayuda.</rbr>',
             },
-            createNewGroupButton: 'Crear nuevo grupo',
+            permissions: 'Permisos de grupo',
+            ExpensifyCardPreferredWorkspace: 'Espacio de trabajo preferido para Expensify Card',
+            ExpensifyCardPreferredWorkspaceDescription:
+                'Todas las transacciones de Expensify Card se crearán en el espacio de trabajo preferido de Expensify Card en lugar del espacio de trabajo preferido. Al habilitar esta función, la configuración de espacio de trabajo preferido se aplicará solo a las transacciones de Expensify Card.',
+            RestrictExpenseWorkspaceCreation: 'Restringir la creación/eliminación de espacios de trabajo de gastos',
+            RestrictExpenseWorkspaceCreationDescription:
+                'Evita que los miembros creen un espacio de trabajo de gastos o se eliminen a sí mismos de uno. Esto, cuando se combina con la aplicación estricta de espacios de trabajo, es útil para evitar que se utilice Expensify para enviar informes destinados a usarse fuera de tu dominio.',
+            RestrictDefaultLoginSelection: 'Restringir el inicio de sesión predeterminado',
+            RestrictDefaultLoginSelectionDescription: 'Evita que los miembros cambien su correo de inicio de sesión fuera del dominio de la empresa para eludir restricciones de políticas.',
+            StrictlyEnforceWorkspaceRules: 'Hacer cumplir estrictamente las reglas del espacio de trabajo',
+            StrictlyEnforceWorkspaceRulesDescription: 'Todas las reglas del espacio de trabajo deben cumplirse antes de enviar un informe. No se permiten excepciones manuales.',
+            preferredWorkspaceDescription: (enabled: boolean) =>
+                `Todos los informes y gastos nuevos se crearán en ${enabled ? 'el espacio de trabajo preferido seleccionado' : 'este'} espacio de trabajo.`,
+            preferredWorkspaceSelectDescription: 'Todos los gastos e informes nuevos se crearán en este espacio de trabajo.',
         },
     },
     gps: {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 53623732942e..074383d50ca6 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1579,7 +1579,7 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.DOMAIN.GROUP_CREATE]: {
         domainAccountID: number;
-    }
+    };
 } & ReimbursementAccountNavigatorParamList;
 
 type DomainCardNavigatorParamList = {
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index b0db84f012ba..fda8b6e853c6 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1705,9 +1705,9 @@ function exportMembersToCSV(domainAccountID: number, onDownloadFailed: () => voi
 function updateDomainSecurityGroup(
     domainAccountID: number,
     groupID: string,
-    currentSecurityGroup: DomainSecurityGroup,
+    currentSecurityGroup: DomainSecurityGroup | null,
     newSettingValue: Partial<DomainSecurityGroup>,
-    settingsName: keyof Pick<DomainSecurityGroup, 'name'>,
+    settingsName: keyof DomainSecurityGroup,
 ) {
     const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
     const newSecurityGroup = {...currentSecurityGroup, ...newSettingValue};
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 98d38149867a..526ba73e3b45 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,22 +1,21 @@
-/* eslint-disable */
-import React from 'react';
-import {useRef} from 'react';
+import React, {useRef, useState} from 'react';
+import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import {FormOnyxValues} from '@components/Form/types';
+import type {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import {AnimatedTextInputRef} from '@components/RNTextInput';
+import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {setDefaultSecurityGroup} from '@libs/actions/Domain';
 import {addErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -32,6 +31,13 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
 
     const inputRef = useRef<AnimatedTextInputRef>(null);
 
+    const [defaultGroupForNewMembers, setDefaultGroupForNewMembers] = useState(false);
+    const [strictlyEnforceWorkspaceRules, setStrictlyEnforceWorkspaceRules] = useState(false);
+    const [restrictDefaultLoginSelection, setRestrictDefaultLoginSelection] = useState(false);
+    const [restrictExpenseWorkspaceCreation, setRestrictExpenseWorkspaceCreation] = useState(false);
+    const [preferredWorkspace, setPreferredWorkspace] = useState(false);
+    const [expensifyCardPreferredWorkspace, setExpensifyCardPreferredWorkspace] = useState(false);
+
     return (
         <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
             <ScreenWrapper
@@ -58,7 +64,8 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                     }}
                     onSubmit={() => {}}
                     submitButtonText={translate('domain.groups.createGroupSubmitButton')}
-                    style={[styles.flex1, styles.ph5, styles.pb3]}
+                    style={[styles.flex1]}
+                    submitButtonStyles={[styles.ph5, styles.pb3]}
                 >
                     <InputWrapper
                         InputComponent={TextInput}
@@ -71,8 +78,63 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         spellCheck={false}
                         enterKeyHint="done"
                         ref={inputRef}
+                        containerStyles={[styles.ph5, styles.mv3]}
+                    />
+                    <ToggleSettingOptionRow
+                        title={translate('domain.groups.defaultGroup')}
+                        switchAccessibilityLabel={translate('domain.groups.defaultGroup')}
+                        isActive={defaultGroupForNewMembers}
+                        onToggle={setDefaultGroupForNewMembers}
+                        wrapperStyle={[styles.ph5, styles.mv3]}
+                    />
+                    <View style={[styles.sectionDividerLine, styles.mh5, styles.mv6]} />
+                    <Text style={[styles.textNormal, styles.textStrong, styles.ph5]}>{translate('domain.groups.permissions')}</Text>
+                    <ToggleSettingOptionRow
+                        title={translate('domain.groups.StrictlyEnforceWorkspaceRules')}
+                        subtitle={translate('domain.groups.StrictlyEnforceWorkspaceRulesDescription')}
+                        switchAccessibilityLabel={translate('domain.groups.StrictlyEnforceWorkspaceRules')}
+                        isActive={strictlyEnforceWorkspaceRules}
+                        onToggle={setStrictlyEnforceWorkspaceRules}
+                        wrapperStyle={[styles.ph5, styles.mv3]}
+                        shouldPlaceSubtitleBelowSwitch
+                    />
+                    <ToggleSettingOptionRow
+                        title={translate('domain.groups.RestrictDefaultLoginSelection')}
+                        subtitle={translate('domain.groups.RestrictDefaultLoginSelectionDescription')}
+                        switchAccessibilityLabel={translate('domain.groups.RestrictDefaultLoginSelection')}
+                        isActive={restrictDefaultLoginSelection}
+                        onToggle={setRestrictDefaultLoginSelection}
+                        wrapperStyle={[styles.ph5, styles.mv3]}
+                        shouldPlaceSubtitleBelowSwitch
+                    />
+                    <ToggleSettingOptionRow
+                        title={translate('domain.groups.RestrictExpenseWorkspaceCreation')}
+                        subtitle={translate('domain.groups.RestrictExpenseWorkspaceCreationDescription')}
+                        switchAccessibilityLabel={translate('domain.groups.RestrictExpenseWorkspaceCreation')}
+                        isActive={restrictExpenseWorkspaceCreation}
+                        onToggle={setRestrictExpenseWorkspaceCreation}
+                        wrapperStyle={[styles.ph5, styles.mv3]}
+                        shouldPlaceSubtitleBelowSwitch
+                    />
+                    {/* temporary no menu item with workspace selection */}
+                    <ToggleSettingOptionRow
+                        title={translate('domain.groups.preferredWorkspace')}
+                        subtitle={translate('domain.groups.preferredWorkspaceDescription', preferredWorkspace)}
+                        switchAccessibilityLabel={translate('domain.groups.preferredWorkspace')}
+                        isActive={preferredWorkspace}
+                        onToggle={setPreferredWorkspace}
+                        wrapperStyle={[styles.ph5, styles.mv3]}
+                        shouldPlaceSubtitleBelowSwitch
+                    />
+                    <ToggleSettingOptionRow
+                        title={translate('domain.groups.ExpensifyCardPreferredWorkspace')}
+                        subtitle={translate('domain.groups.ExpensifyCardPreferredWorkspaceDescription')}
+                        switchAccessibilityLabel={translate('domain.groups.ExpensifyCardPreferredWorkspace')}
+                        isActive={expensifyCardPreferredWorkspace}
+                        onToggle={setExpensifyCardPreferredWorkspace}
+                        wrapperStyle={[styles.ph5, styles.mv3]}
+                        shouldPlaceSubtitleBelowSwitch
                     />
-                    <ScrollView></ScrollView>
                 </FormProvider>
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>
diff --git a/src/types/form/DomainGroupCreateForm.ts b/src/types/form/DomainGroupCreateForm.ts
index 5ee39b84e120..37a06f281b34 100644
--- a/src/types/form/DomainGroupCreateForm.ts
+++ b/src/types/form/DomainGroupCreateForm.ts
@@ -3,11 +3,6 @@ import type Form from './Form';
 
 const INPUT_IDS = {
     NAME: 'name',
-    DEFAULT_GROUP_FOR_NEW_MEMBERS: 'isDefaultGroup',
-    STRICTLY_ENFORCE_WORKSPACE_RULES: 'enableStrictPolicyRules',
-    RESTRICT_DEFAULT_LOGIN_SELECTION: 'enableRestrictedPrimaryLogin',
-    RESTRICT_EXPENSE_WORKSPACE_CREATION: 'enableRestrictedPolicyCreation',
-    PREFERRED_WORKSPACE: 'enableRestrictedPrimaryPolicy',
 } as const;
 
 type InputID = ValueOf<typeof INPUT_IDS>;
@@ -16,11 +11,6 @@ type DomainGroupCreateForm = Form<
     InputID,
     {
         [INPUT_IDS.NAME]: string;
-        [INPUT_IDS.DEFAULT_GROUP_FOR_NEW_MEMBERS]: boolean;
-        [INPUT_IDS.STRICTLY_ENFORCE_WORKSPACE_RULES]: boolean;
-        [INPUT_IDS.RESTRICT_DEFAULT_LOGIN_SELECTION]: boolean;
-        [INPUT_IDS.RESTRICT_EXPENSE_WORKSPACE_CREATION]: boolean;
-        [INPUT_IDS.PREFERRED_WORKSPACE]: boolean;
     }
 >;
 
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index 188c7c301136..8c5bc957d709 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -113,4 +113,4 @@ export type {AddDomainMemberForm} from './AddDomainMemberForm';
 export type {DomainGroupEditNameForm} from './DomainGroupEditNameForm';
 export type {WorkspaceTimeTrackingDefaultRateForm} from './WorkspaceTimeTrackingDefaultRateForm';
 export type {EditExpensifyCardLimitTypeForm} from './EditExpensifyCardLimitTypeForm';
-export type {DomainGroupCreateForm} from './DomainGroupCreateForm';
\ No newline at end of file
+export type {DomainGroupCreateForm} from './DomainGroupCreateForm';

From 99e75aade2ee6988211cf9010ebfde9dc3e5819d Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Fri, 20 Mar 2026 15:51:30 +0100
Subject: [PATCH 06/25] feat: Handle Preferred Workspace setting

---
 src/ONYXKEYS.ts                               |   4 +
 src/ROUTES.ts                                 |   4 +
 src/SCREENS.ts                                |   1 +
 .../ModalStackNavigators/index.tsx            |   1 +
 .../linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts  |   2 +-
 src/libs/Navigation/linkingConfig/config.ts   |   3 +
 src/libs/Navigation/types.ts                  |   3 +
 src/libs/actions/Domain.ts                    |  10 ++
 .../domain/Groups/DomainGroupCreatePage.tsx   |  44 +++++-
 ...omainGroupCreatePreferredWorkspacePage.tsx | 126 ++++++++++++++++++
 src/selectors/Policy.ts                       |   3 +
 11 files changed, 194 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index beb210f02de4..c5469860a443 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -671,6 +671,9 @@ const ONYXKEYS = {
     /** The transaction IDs to be highlighted when opening the Expenses search route page */
     TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE: 'transactionIdsHighlightOnSearchRoute',
 
+    /** The preferred policy ID to be used when creating a group */
+    DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID: 'domainGroupCreatePreferredPolicyID',
+
     /** Collection Keys */
     COLLECTION: {
         DOMAIN: 'domain_',
@@ -1459,6 +1462,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.PERSONAL_POLICY_ID]: string;
     [ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE]: Record<string, Record<string, boolean>>;
     [ONYXKEYS.DEVICE_BIOMETRICS]: OnyxTypes.DeviceBiometrics;
+    [ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID]: string | undefined;
 };
 
 type OnyxDerivedValuesMapping = {
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index aab562e91b28..9696e55f78f8 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -4042,6 +4042,10 @@ const ROUTES = {
         route: 'domain/:domainAccountID/groups/new',
         getRoute: (domainAccountID: number) => `domain/${domainAccountID}/groups/new` as const,
     },
+    DOMAIN_GROUP_CREATE_PREFERRED_WORKSPACE: {
+        route: 'domain/:domainAccountID/groups/new/preferred-workspace',
+        getRoute: (domainAccountID: number) => `domain/${domainAccountID}/groups/new/preferred-workspace` as const,
+    },
 } as const;
 
 /**
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 591fef48d3a5..6cffab3065bf 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -964,6 +964,7 @@ const SCREENS = {
         GROUP_DETAILS: 'Domain_Group_Details',
         GROUP_EDIT_NAME: 'Domain_Group_Edit_Name',
         GROUP_CREATE: 'Domain_Group_Create',
+        GROUP_CREATE_PREFERRED_WORKSPACE: 'Domain_Group_Create_Preferred_Workspace',
     },
     MULTIFACTOR_AUTHENTICATION: {
         MAGIC_CODE: 'Multifactor_Authentication_Magic_Code',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index b2e6275c911f..d189b5500a7a 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -924,6 +924,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.DOMAIN.GROUP_DETAILS]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupDetailsPage').default,
     [SCREENS.DOMAIN.GROUP_EDIT_NAME]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupEditNamePage').default,
     [SCREENS.DOMAIN.GROUP_CREATE]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupCreatePage').default,
+    [SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE]: () => require<ReactComponentModule>('../../../../pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage').default,
 });
 
 const TwoFactorAuthenticatorStackNavigator = createModalStackNavigator<EnablePaymentsNavigatorParamList>({
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
index 776a0e4e579a..28fd18d42fd9 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
@@ -16,7 +16,7 @@ const DOMAIN_TO_RHP: Partial<Record<keyof DomainSplitNavigatorParamList, string[
         SCREENS.DOMAIN.MEMBER_RESET_TWO_FACTOR_AUTH,
         SCREENS.DOMAIN.MEMBER_LOCK_ACCOUNT,
     ],
-    [SCREENS.DOMAIN.GROUPS]: [SCREENS.DOMAIN.GROUP_DETAILS, SCREENS.DOMAIN.GROUP_EDIT_NAME, SCREENS.DOMAIN.GROUP_CREATE],
+    [SCREENS.DOMAIN.GROUPS]: [SCREENS.DOMAIN.GROUP_DETAILS, SCREENS.DOMAIN.GROUP_EDIT_NAME, SCREENS.DOMAIN.GROUP_CREATE, SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE],
 };
 
 export default DOMAIN_TO_RHP;
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index f54e11d980e6..9f31a0b25ddd 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1345,6 +1345,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.DOMAIN.GROUP_CREATE]: {
                             path: ROUTES.DOMAIN_GROUP_CREATE.route,
                         },
+                        [SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE]: {
+                            path: ROUTES.DOMAIN_GROUP_CREATE_PREFERRED_WORKSPACE.route,
+                        },
                     },
                 },
                 [SCREENS.RIGHT_MODAL.TWO_FACTOR_AUTH]: {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 074383d50ca6..8a06e5b44536 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1580,6 +1580,9 @@ type SettingsNavigatorParamList = {
     [SCREENS.DOMAIN.GROUP_CREATE]: {
         domainAccountID: number;
     };
+    [SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE]: {
+        domainAccountID: number;
+    };
 } & ReimbursementAccountNavigatorParamList;
 
 type DomainCardNavigatorParamList = {
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index fda8b6e853c6..4939a9308f97 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1909,6 +1909,14 @@ function setDefaultSecurityGroup(domainAccountID: number, groupID: string, domai
     API.write(WRITE_COMMANDS.SET_DEFAULT_DOMAIN_SECURITY_GROUP, params, {optimisticData, failureData, successData});
 }
 
+function setDomainGroupCreatePreferredPolicyID(policyID: string) {
+    Onyx.set(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID, policyID);
+}
+
+function clearDomainGroupCreatePreferredPolicyID() {
+    Onyx.set(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID, null);
+}
+
 export {
     getDomainValidationCode,
     validateDomain,
@@ -1948,4 +1956,6 @@ export {
     updateDomainSecurityGroup,
     clearDomainSecurityGroupSettingError,
     setDefaultSecurityGroup,
+    setDomainGroupCreatePreferredPolicyID,
+    clearDomainGroupCreatePreferredPolicyID,
 };
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 526ba73e3b45..4174b4a0eaaf 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,14 +1,17 @@
-import React, {useRef, useState} from 'react';
+import {policyNameSelector} from '@selectors/Policy';
+import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {addErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@navigation/Navigation';
@@ -16,6 +19,7 @@ import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import {clearDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -35,8 +39,19 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [strictlyEnforceWorkspaceRules, setStrictlyEnforceWorkspaceRules] = useState(false);
     const [restrictDefaultLoginSelection, setRestrictDefaultLoginSelection] = useState(false);
     const [restrictExpenseWorkspaceCreation, setRestrictExpenseWorkspaceCreation] = useState(false);
-    const [preferredWorkspace, setPreferredWorkspace] = useState(false);
     const [expensifyCardPreferredWorkspace, setExpensifyCardPreferredWorkspace] = useState(false);
+    const [preferredWorkspace, setPreferredWorkspace] = useState(false);
+
+    const [preferredPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
+    const [preferredPolicyName] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${preferredPolicyID}`, {
+        selector: policyNameSelector,
+    });
+
+    useEffect(() => {
+        return () => {
+            clearDomainGroupCreatePreferredPolicyID();
+        };
+    }, []);
 
     return (
         <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
@@ -49,7 +64,9 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
             >
                 <HeaderWithBackButton
                     title={translate('domain.groups.createNewGroupButton')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID))}
+                    onBackButtonPress={() => {
+                        Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID));
+                    }}
                 />
                 <FormProvider
                     formID={ONYXKEYS.FORMS.CREATE_DOMAIN_GROUP_FORM}
@@ -62,7 +79,10 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         }
                         return errors;
                     }}
-                    onSubmit={() => {}}
+                    onSubmit={() => {
+                        // ...
+                        clearDomainGroupCreatePreferredPolicyID();
+                    }}
                     submitButtonText={translate('domain.groups.createGroupSubmitButton')}
                     style={[styles.flex1]}
                     submitButtonStyles={[styles.ph5, styles.pb3]}
@@ -116,16 +136,28 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
-                    {/* temporary no menu item with workspace selection */}
                     <ToggleSettingOptionRow
                         title={translate('domain.groups.preferredWorkspace')}
                         subtitle={translate('domain.groups.preferredWorkspaceDescription', preferredWorkspace)}
                         switchAccessibilityLabel={translate('domain.groups.preferredWorkspace')}
                         isActive={preferredWorkspace}
-                        onToggle={setPreferredWorkspace}
+                        onToggle={(value) => {
+                            setPreferredWorkspace(value);
+                            if (!value) {
+                                clearDomainGroupCreatePreferredPolicyID();
+                            }
+                        }}
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
+                    {preferredWorkspace && (
+                        <MenuItemWithTopDescription
+                            description={translate('domain.groups.preferredWorkspace')}
+                            title={preferredPolicyName ?? ''}
+                            shouldShowRightIcon
+                            onPress={() => Navigation.navigate(ROUTES.DOMAIN_GROUP_CREATE_PREFERRED_WORKSPACE.getRoute(domainAccountID))}
+                        />
+                    )}
                     <ToggleSettingOptionRow
                         title={translate('domain.groups.ExpensifyCardPreferredWorkspace')}
                         subtitle={translate('domain.groups.ExpensifyCardPreferredWorkspaceDescription')}
diff --git a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
new file mode 100644
index 000000000000..932c1bfcb465
--- /dev/null
+++ b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
@@ -0,0 +1,126 @@
+import React, {useState} from 'react';
+import type {OnyxCollection} from 'react-native-onyx';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import UserListItem from '@components/SelectionList/ListItem/UserListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import Text from '@components/Text';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
+import Navigation from '@navigation/Navigation';
+import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+import {setDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Policy} from '@src/types/onyx';
+
+type WorkspaceListItem = {
+    policyID: string;
+} & ListItem;
+
+const createAdminPolicySelector = (currentPolicyID: string | undefined) => (policies: OnyxCollection<Policy>) => {
+    return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL'>>>((acc, [key, policy]) => {
+        if (!policy?.id || !policy?.name) {
+            return acc;
+        }
+        const isCurrentPolicy = policy.id === currentPolicyID;
+        if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
+            return acc;
+        }
+        acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL};
+        return acc;
+    }, {});
+};
+
+type DomainGroupCreatePreferredWorkspacePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE>;
+
+function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePreferredWorkspacePageProps) {
+    const {domainAccountID} = route.params;
+
+    const styles = useThemeStyles();
+    const {translate, localeCompare} = useLocalize();
+    const icons = useMemoizedLazyExpensifyIcons(['FallbackWorkspaceAvatar']);
+
+    const [currentPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPolicySelector(currentPolicyID)});
+    const [selectedPolicyID, setSelectedPolicyID] = useState<string | undefined>(currentPolicyID);
+    const [shouldShowError, setShouldShowError] = useState(false);
+
+    const workspaceOptions: WorkspaceListItem[] = [];
+    for (const policy of Object.values(policies ?? {})) {
+        if (!policy?.name || !policy?.id) {
+            continue;
+        }
+
+        workspaceOptions.push({
+            text: policy.name,
+            policyID: policy.id,
+            keyForList: policy.id,
+            isSelected: selectedPolicyID === policy.id,
+            icons: [
+                {
+                    source: policy.avatarURL ?? getDefaultWorkspaceAvatar(policy.name),
+                    fallbackIcon: icons.FallbackWorkspaceAvatar,
+                    name: policy.name,
+                    type: CONST.ICON_TYPE_WORKSPACE,
+                    id: policy.id,
+                },
+            ],
+        });
+    }
+
+    const handleSubmit = () => {
+        if (!selectedPolicyID) {
+            setShouldShowError(true);
+            return;
+        }
+        setDomainGroupCreatePreferredPolicyID(selectedPolicyID);
+        Navigation.goBack(ROUTES.DOMAIN_GROUP_CREATE.getRoute(domainAccountID));
+    };
+
+    return (
+        <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
+            <ScreenWrapper
+                shouldEnableMaxHeight
+                testID="DomainGroupCreatePreferredWorkspacePage"
+                includeSafeAreaPaddingBottom
+            >
+                <HeaderWithBackButton
+                    title={translate('domain.groups.preferredWorkspace')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.DOMAIN_GROUP_CREATE.getRoute(domainAccountID))}
+                />
+                <Text style={[styles.ph5, styles.mb3]}>{translate('domain.groups.preferredWorkspaceSelectDescription')}</Text>
+                <SelectionList<WorkspaceListItem>
+                    data={workspaceOptions.sort((a, b) => localeCompare(a.text ?? '', b.text ?? ''))}
+                    ListItem={UserListItem}
+                    onSelectRow={(item: WorkspaceListItem) => {
+                        setSelectedPolicyID(item.policyID);
+                        setShouldShowError(false);
+                    }}
+                    initiallyFocusedItemKey={currentPolicyID}
+                    shouldUpdateFocusedIndex
+                    footerContent={
+                        <FormAlertWithSubmitButton
+                            buttonText={translate('common.save')}
+                            onSubmit={handleSubmit}
+                            isAlertVisible={shouldShowError}
+                            containerStyles={[!shouldShowError && styles.mt5]}
+                            message={translate('common.error.pleaseSelectOne')}
+                        />
+                    }
+                />
+            </ScreenWrapper>
+        </DomainNotFoundPageWrapper>
+    );
+}
+
+export default DomainGroupCreatePreferredWorkspacePage;
diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index 5a7aabe7985a..2a55b60d0042 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -87,6 +87,8 @@ const groupPaidPoliciesWithExpenseChatEnabledSelector = (policies: OnyxCollectio
 
 const shouldRedirectToExpensifyClassicSelector = (policies: OnyxCollection<Policy>) => areAllGroupPoliciesExpenseChatDisabled(policies);
 
+const policyNameSelector = (policy: OnyxEntry<Policy>) => policy?.name;
+
 // deepEqual on ~15 fields is cheaper than re-rendering IOURequestStartPage's full hook/memo tree.
 const iouRequestPolicyCollectionSelector = (policies: OnyxCollection<Policy>): OnyxCollection<Policy> => {
     if (!policies) {
@@ -133,4 +135,5 @@ export {
     groupPaidPoliciesWithExpenseChatEnabledSelector,
     iouRequestPolicyCollectionSelector,
     shouldRedirectToExpensifyClassicSelector,
+    policyNameSelector,
 };

From 320576dc045913959a0462926700f1e8efbc31ef Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Tue, 24 Mar 2026 12:27:30 +0100
Subject: [PATCH 07/25] feat: add create group onSubmit functionality and error
 handling

---
 src/languages/en.ts                           |   1 +
 src/languages/es.ts                           |   1 +
 src/libs/actions/Domain.ts                    | 117 ++++++++++++++++++
 .../domain/Groups/DomainGroupCreatePage.tsx   |  26 +++-
 src/pages/domain/Groups/DomainGroupsPage.tsx  |   5 +
 src/types/onyx/DomainErrors.ts                |   5 +
 src/types/onyx/DomainPendingActions.ts        |   5 +
 7 files changed, 157 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 835fe4f15ee9..2b21b528b2a6 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8647,6 +8647,7 @@ const translations = {
                 `Are you sure you want to make ${newName} the default group? New members will be invited to this group instead of the previous default group (${currentName}). `,
             makeDefault: 'Make default',
             nevermind: 'Nevermind',
+            createGroupError: 'Unable to create this group. Please try again.',
             error: {
                 settings: '<rbr>Couldn’t save this change. Please try again or <concierge-link>contact Concierge</concierge-link> for more support.</rbr>',
             },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e65b58bd373e..3c62f6d50da5 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8902,6 +8902,7 @@ ${amount} para ${merchant} - ${date}`,
                 `¿Estás seguro de que quieres establecer ${newName} como el grupo predeterminado? Los nuevos miembros serán invitados a este grupo en lugar del grupo predeterminado anterior (${currentName}). `,
             makeDefault: 'Establecer como predeterminado',
             nevermind: 'No importa',
+            createGroupError: 'No se pudo crear este grupo. Inténtalo de nuevo.',
             error: {
                 settings: '<rbr>No se pudo guardar este cambio. Inténtalo de nuevo o <concierge-link>contacta con Concierge</concierge-link> para obtener más ayuda.</rbr>',
             },
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index 4939a9308f97..0f32a66f2ee2 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1,3 +1,4 @@
+import {Num} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import type {NullishDeep, OnyxUpdate} from 'react-native-onyx';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
@@ -1917,6 +1918,120 @@ function clearDomainGroupCreatePreferredPolicyID() {
     Onyx.set(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID, null);
 }
 
+/**
+ * Creates a new domain security group with the given configuration
+ * @param domainAccountID - The account ID of the domain
+ * @param newSecurityGroup - The security group data to create
+ */
+function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: DomainSecurityGroup) {
+    const groupID = String(Num.generateRandom6DigitID());
+    const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
+
+    const optimisticData: Array<
+        OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS>
+    > = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: newSecurityGroup,
+            } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    errors: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: Array<
+        OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS>
+    > = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: newSecurityGroup,
+            } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    errors: getMicroSecondOnyxErrorWithTranslationKey('domain.groups.createGroupError'),
+                },
+            },
+        },
+    ];
+
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    errors: null,
+                },
+            },
+        },
+    ];
+
+    const params: UpdateDomainSecurityGroupParams = {
+        domainAccountID,
+        name: SECURITY_GROUP_KEY,
+        value: JSON.stringify(newSecurityGroup),
+        settingsName: 'createGroup', // placeholder, waiting for BE
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP, params, {optimisticData, failureData, successData});
+
+    return groupID;
+}
+
+/**
+ * Removes an error and the optimistic security group entry after a failed group creation
+ */
+function clearGroupCreateError(domainAccountID: number, groupID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
+        [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`]: null,
+    });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {
+        [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`]: null,
+    });
+}
+
 export {
     getDomainValidationCode,
     validateDomain,
@@ -1958,4 +2073,6 @@ export {
     setDefaultSecurityGroup,
     setDomainGroupCreatePreferredPolicyID,
     clearDomainGroupCreatePreferredPolicyID,
+    createDomainSecurityGroup,
+    clearGroupCreateError,
 };
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 4174b4a0eaaf..5ed52be3e1a3 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,3 +1,4 @@
+import {defaultSecurityGroupIDSelector, domainNameSelector} from '@selectors/Domain';
 import {policyNameSelector} from '@selectors/Policy';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
@@ -19,7 +20,7 @@ import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import {clearDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
+import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDefaultSecurityGroup} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -46,6 +47,12 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [preferredPolicyName] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${preferredPolicyID}`, {
         selector: policyNameSelector,
     });
+    const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
+        selector: domainNameSelector,
+    });
+    const [defaultSecurityGroupID] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
+        selector: defaultSecurityGroupIDSelector,
+    });
 
     useEffect(() => {
         return () => {
@@ -79,9 +86,22 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         }
                         return errors;
                     }}
-                    onSubmit={() => {
-                        // ...
+                    onSubmit={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.CREATE_DOMAIN_GROUP_FORM>) => {
+                        const groupID = createDomainSecurityGroup(domainAccountID, {
+                            name: values[INPUT_IDS.NAME],
+                            shared: {},
+                            enableRestrictedPolicyCreation: restrictExpenseWorkspaceCreation,
+                            enableRestrictedPrimaryLogin: restrictDefaultLoginSelection,
+                            enableStrictPolicyRules: strictlyEnforceWorkspaceRules,
+                            enableRestrictedPrimaryPolicy: preferredWorkspace,
+                            restrictedPrimaryPolicyID: preferredWorkspace ? (preferredPolicyID ?? '') : '',
+                            overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
+                        });
+                        if (defaultGroupForNewMembers && domainName) {
+                            setDefaultSecurityGroup(domainAccountID, groupID, domainName, defaultSecurityGroupID);
+                        }
                         clearDomainGroupCreatePreferredPolicyID();
+                        Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID));
                     }}
                     submitButtonText={translate('domain.groups.createGroupSubmitButton')}
                     style={[styles.flex1]}
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index 2be21261e03f..fae07a39772b 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -16,10 +16,12 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {getLatestError} from '@libs/ErrorUtils';
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
 import type {DomainSplitNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
+import {clearGroupCreateError} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -43,6 +45,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
 
     const [groups = getEmptyArray<DomainSecurityGroupWithID>()] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: groupsSelector});
     const [defaultGroupID] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: defaultSecurityGroupIDSelector});
+    const [domainErrors] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`);
 
     const data = groups.map((group) => {
         const isDefault = group.id === defaultGroupID;
@@ -50,6 +53,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
             keyForList: group.id,
             groupID: group.id,
             text: group.details.name ?? '',
+            errors: getLatestError(domainErrors?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`]?.errors),
             rightElement: (
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
                     <Text numberOfLines={1}>{translate('domain.groups.memberCount', {count: Object.keys(group.details.shared).length})}</Text>
@@ -110,6 +114,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
                     data={data}
                     ListItem={TableListItem}
                     onSelectRow={(item: GroupOption) => Navigation.navigate(ROUTES.DOMAIN_GROUP_DETAILS.getRoute(domainAccountID, item.groupID))}
+                    onDismissError={(item: GroupOption) => clearGroupCreateError(domainAccountID, item.groupID)}
                     customListHeader={getCustomListHeader()}
                     shouldShowRightCaret
                 />
diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts
index eae764694ac9..49a4793e378a 100644
--- a/src/types/onyx/DomainErrors.ts
+++ b/src/types/onyx/DomainErrors.ts
@@ -45,6 +45,11 @@ type DomainSecurityGroupErrors = {
      * Errors related to the default security group ID setting
      */
     defaultSecurityGroupIDErrors?: OnyxCommon.Errors;
+
+    /**
+     * Base errors related to the security group
+     */
+    errors?: OnyxCommon.Errors; 
 };
 
 /**
diff --git a/src/types/onyx/DomainPendingActions.ts b/src/types/onyx/DomainPendingActions.ts
index 206eecbe380a..934251bae3a3 100644
--- a/src/types/onyx/DomainPendingActions.ts
+++ b/src/types/onyx/DomainPendingActions.ts
@@ -35,6 +35,11 @@ type DomainMemberPendingActions = {
  * Represents the pending actions related to a domain's security group.
  */
 type DomainSecurityGroupPendingActions = {
+    /**
+     * Base pending action for group-level operations (create, delete)
+     */
+    pendingAction?: OnyxCommon.PendingAction;
+
     /**
      * Pending action for the security group name
      */

From 0bc08f8d35208a451e42173ad63f9cb30b8f5549 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Tue, 24 Mar 2026 13:34:36 +0100
Subject: [PATCH 08/25] feat: add tests for createDomainSecurityGroup and
 clearGroupCreateError

---
 tests/actions/DomainTest.ts | 102 ++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
index 1c4705a1874b..da89f31931eb 100644
--- a/tests/actions/DomainTest.ts
+++ b/tests/actions/DomainTest.ts
@@ -5,10 +5,12 @@ import {
     clearDomainErrors,
     clearDomainMemberError,
     clearDomainSecurityGroupSettingError,
+    clearGroupCreateError,
     clearTwoFactorAuthExemptEmailsErrors,
     clearVacationDelegateError,
     closeUserAccount,
     createDomain,
+    createDomainSecurityGroup,
     deleteDomainVacationDelegate,
     resetCreateDomainForm,
     resetDomain,
@@ -959,6 +961,106 @@ describe('actions/Domain', () => {
         });
     });
 
+    describe('createDomainSecurityGroup', () => {
+        it('sends UPDATE_DOMAIN_SECURITY_GROUP with correct optimistic, success, and failure data', () => {
+            const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
+            const domainAccountID = 123;
+            const newSecurityGroup: DomainSecurityGroup = {
+                name: 'New Group',
+                shared: {},
+                enableRestrictedPolicyCreation: false,
+                enableRestrictedPrimaryLogin: false,
+            };
+
+            const groupID = createDomainSecurityGroup(domainAccountID, newSecurityGroup);
+            const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
+
+            expect(apiWriteSpy).toHaveBeenCalledWith(
+                WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP,
+                // placeholder settingsName, waiting for BE
+                {domainAccountID, name: SECURITY_GROUP_KEY, value: JSON.stringify(newSecurityGroup), settingsName: 'createGroup'},
+                {
+                    optimisticData: expect.arrayContaining([
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: newSecurityGroup},
+                        }),
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}},
+                        }),
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: {errors: null}},
+                        }),
+                    ]),
+                    successData: expect.arrayContaining([
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: {pendingAction: null}},
+                        }),
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: {errors: null}},
+                        }),
+                    ]),
+                    failureData: expect.arrayContaining([
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: newSecurityGroup},
+                        }),
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+                            value: {[SECURITY_GROUP_KEY]: {pendingAction: null}},
+                        }),
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                            value: {[SECURITY_GROUP_KEY]: {errors: expect.any(Object)}},
+                        }),
+                    ]),
+                },
+            );
+
+            apiWriteSpy.mockRestore();
+        });
+    });
+
+    describe('clearGroupCreateError', () => {
+        it('removes the optimistic group entry and its errors from Onyx', async () => {
+            const domainAccountID = 123;
+            const groupID = '456';
+            const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
+            const timestamp = 789;
+
+            await Onyx.merge(
+                `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                {[SECURITY_GROUP_KEY]: {name: 'Test Group', shared: {}}} as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
+            );
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {
+                [SECURITY_GROUP_KEY]: {errors: {[timestamp]: 'error'}},
+            });
+
+            clearGroupCreateError(domainAccountID, groupID);
+
+            await TestHelper.getOnyxData({
+                key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                waitForCollectionCallback: false,
+                callback: (domain) => {
+                    expect((domain as Record<string, unknown>)?.[SECURITY_GROUP_KEY]).toBeFalsy();
+                },
+            });
+
+            await TestHelper.getOnyxData({
+                key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+                waitForCollectionCallback: false,
+                callback: (errors) => {
+                    expect((errors as Record<string, unknown>)?.[SECURITY_GROUP_KEY]).toBeFalsy();
+                },
+            });
+        });
+    });
+
     describe('setDefaultSecurityGroup', () => {
         it('sends SET_DEFAULT_DOMAIN_SECURITY_GROUP with correct optimistic, success, and failure data', () => {
             const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());

From ba53b3f4f4aa0818c37cba0da54d150187867cb8 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 8 Apr 2026 12:14:40 +0200
Subject: [PATCH 09/25] fix: add missing translation files

---
 src/languages/de.ts      | 17 +++++++++++++++++
 src/languages/en.ts      |  1 +
 src/languages/es.ts      |  4 ++++
 src/languages/fr.ts      | 17 +++++++++++++++++
 src/languages/it.ts      | 17 +++++++++++++++++
 src/languages/ja.ts      | 15 +++++++++++++++
 src/languages/nl.ts      | 15 +++++++++++++++
 src/languages/pl.ts      | 16 ++++++++++++++++
 src/languages/pt-BR.ts   | 17 +++++++++++++++++
 src/languages/zh-hans.ts | 15 +++++++++++++++
 10 files changed, 134 insertions(+)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2ae352948f0b..336714e81da7 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8886,6 +8886,23 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
                 settings:
                     '<rbr>Diese Änderung konnte nicht gespeichert werden. Bitte versuche es erneut oder <concierge-link>kontaktiere Concierge</concierge-link> für weitere Unterstützung.</rbr>',
             },
+            permissions: 'Gruppenberechtigungen',
+            createNewGroupButton: 'Neue Gruppe',
+            createGroupSubmitButton: 'Gruppe erstellen',
+            ExpensifyCardPreferredWorkspace: 'Expensify Card bevorzugter Arbeitsbereich',
+            ExpensifyCardPreferredWorkspaceDescription:
+                'Alle Expensify Card-Transaktionen werden im bevorzugten Expensify Card-Arbeitsbereich anstelle des bevorzugten Arbeitsbereichs erstellt. Durch Aktivieren dieser Funktion wird die Einstellung des bevorzugten Arbeitsbereichs nur für Expensify Card-Transaktionen überschrieben.',
+            RestrictExpenseWorkspaceCreation: 'Erstellung/Entfernung von Ausgaben-Arbeitsbereichen einschränken',
+            RestrictExpenseWorkspaceCreationDescription:
+                'Verhindert, dass Mitglieder einen Ausgaben-Arbeitsbereich erstellen oder sich selbst aus einem Ausgaben-Arbeitsbereich entfernen können.',
+            RestrictDefaultLoginSelection: 'Standard-Login-Auswahl einschränken',
+            RestrictDefaultLoginSelectionDescription: 'Verhindert, dass Mitglieder ihre Login-E-Mail von ihrer Unternehmensdomäne ändern.',
+            StrictlyEnforceWorkspaceRules: 'Arbeitsbereichsregeln strikt durchsetzen',
+            StrictlyEnforceWorkspaceRulesDescription: 'Alle Arbeitsbereichsregeln müssen vor dem Einreichen eines Berichts erfüllt sein. Keine manuellen Ausnahmen erlaubt.',
+            preferredWorkspace: 'Bevorzugter Arbeitsbereich',
+            preferredWorkspaceDescription: (enabled: boolean) => `Alle neuen Berichte und Ausgaben werden im ${enabled ? 'ausgewählten bevorzugten' : 'diesem'} Arbeitsbereich erstellt.`,
+            preferredWorkspaceSelectDescription: 'Alle neuen Ausgaben und Berichte werden in diesem Arbeitsbereich erstellt.',
+            defaultGroup: 'Standardgruppe',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6227ebae5725..3a4c37e603d6 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8884,6 +8884,7 @@ const translations = {
             preferredWorkspace: 'Preferred Workspace',
             preferredWorkspaceDescription: (enabled: boolean) => `All new reports and expenses will be created on ${enabled ? 'selected preferred' : 'this'} workspace.`,
             preferredWorkspaceSelectDescription: 'All new expenses and reports will be created on this workspace.',
+            defaultGroup: 'Default group',
         },
     },
 };
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e8d9a3e35f71..96783e6bfb9f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9153,6 +9153,8 @@ ${amount} para ${merchant} - ${date}`,
                 settings: '<rbr>No se pudo guardar este cambio. Inténtalo de nuevo o <concierge-link>contacta con Concierge</concierge-link> para obtener más ayuda.</rbr>',
             },
             permissions: 'Permisos de grupo',
+            createNewGroupButton: 'Nuevo grupo',
+            createGroupSubmitButton: 'Crear grupo',
             ExpensifyCardPreferredWorkspace: 'Espacio de trabajo preferido para Expensify Card',
             ExpensifyCardPreferredWorkspaceDescription:
                 'Todas las transacciones de Expensify Card se crearán en el espacio de trabajo preferido de Expensify Card en lugar del espacio de trabajo preferido. Al habilitar esta función, la configuración de espacio de trabajo preferido se aplicará solo a las transacciones de Expensify Card.',
@@ -9165,7 +9167,9 @@ ${amount} para ${merchant} - ${date}`,
             StrictlyEnforceWorkspaceRulesDescription: 'Todas las reglas del espacio de trabajo deben cumplirse antes de enviar un informe. No se permiten excepciones manuales.',
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Todos los informes y gastos nuevos se crearán en ${enabled ? 'el espacio de trabajo preferido seleccionado' : 'este'} espacio de trabajo.`,
+            preferredWorkspace: 'Espacio de trabajo preferido',
             preferredWorkspaceSelectDescription: 'Todos los gastos e informes nuevos se crearán en este espacio de trabajo.',
+            defaultGroup: 'Grupo predeterminado',
         },
     },
     gps: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 9c103acb8889..d0af0e4b8424 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8907,6 +8907,23 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             title: 'Groupes',
             memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`}),
             error: {settings: "<rbr>Impossible d'enregistrer cette modification. Veuillez réessayer ou <concierge-link>contacter Concierge</concierge-link> pour obtenir de l'aide.</rbr>"},
+            permissions: 'Autorisations du groupe',
+            createNewGroupButton: 'Nouveau groupe',
+            createGroupSubmitButton: 'Créer le groupe',
+            ExpensifyCardPreferredWorkspace: "Espace de travail préféré pour l'Expensify Card",
+            ExpensifyCardPreferredWorkspaceDescription:
+                "Toutes les transactions Expensify Card seront créées dans l'espace de travail préféré Expensify Card au lieu de l'espace de travail préféré.",
+            RestrictExpenseWorkspaceCreation: "Restreindre la création/suppression d'espaces de travail de dépenses",
+            RestrictExpenseWorkspaceCreationDescription: "Empêche les membres de créer un espace de travail de dépenses ou de se retirer d'un espace de travail de dépenses.",
+            RestrictDefaultLoginSelection: 'Restreindre la sélection de connexion par défaut',
+            RestrictDefaultLoginSelectionDescription: "Empêche les membres de changer leur e-mail de connexion en dehors du domaine de l'entreprise.",
+            StrictlyEnforceWorkspaceRules: "Appliquer strictement les règles de l'espace de travail",
+            StrictlyEnforceWorkspaceRulesDescription: "Toutes les règles de l'espace de travail doivent être respectées avant de soumettre un rapport. Aucune exception manuelle autorisée.",
+            preferredWorkspace: 'Espace de travail préféré',
+            preferredWorkspaceDescription: (enabled: boolean) =>
+                `Tous les nouveaux rapports et dépenses seront créés dans ${enabled ? "l'espace de travail préféré sélectionné" : 'cet espace de travail'}.`,
+            preferredWorkspaceSelectDescription: 'Toutes les nouvelles dépenses et rapports seront créés dans cet espace de travail.',
+            defaultGroup: 'Groupe par défaut',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0590d51111e5..127103c1ac04 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8873,6 +8873,23 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             title: 'Gruppi',
             memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`}),
             error: {settings: '<rbr>Non è stato possibile salvare questa modifica. Riprova o <concierge-link>contatta Concierge</concierge-link> per ulteriore assistenza.</rbr>'},
+            permissions: 'Permessi del gruppo',
+            createNewGroupButton: 'Nuovo gruppo',
+            createGroupSubmitButton: 'Crea gruppo',
+            ExpensifyCardPreferredWorkspace: 'Area di lavoro preferita per Expensify Card',
+            ExpensifyCardPreferredWorkspaceDescription:
+                "Tutte le transazioni Expensify Card verranno create nell'area di lavoro preferita Expensify Card anziché nell'area di lavoro preferita.",
+            RestrictExpenseWorkspaceCreation: 'Limita la creazione/rimozione di aree di lavoro spese',
+            RestrictExpenseWorkspaceCreationDescription: "Impedisce ai membri di creare un'area di lavoro spese o di rimuoversi da un'area di lavoro spese.",
+            RestrictDefaultLoginSelection: 'Limita la selezione del login predefinito',
+            RestrictDefaultLoginSelectionDescription: "Impedisce ai membri di cambiare la propria email di accesso dal dominio dell'azienda.",
+            StrictlyEnforceWorkspaceRules: "Applica rigorosamente le regole dell'area di lavoro",
+            StrictlyEnforceWorkspaceRulesDescription: "Tutte le regole dell'area di lavoro devono essere soddisfatte prima di inviare un report. Nessuna eccezione manuale consentita.",
+            preferredWorkspace: 'Area di lavoro preferita',
+            preferredWorkspaceDescription: (enabled: boolean) =>
+                `Tutti i nuovi report e le nuove spese verranno creati ${enabled ? "nell'area di lavoro preferita selezionata" : 'in questa area di lavoro'}.`,
+            preferredWorkspaceSelectDescription: 'Tutte le nuove spese e i nuovi report verranno creati in questa area di lavoro.',
+            defaultGroup: 'Gruppo predefinito',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index ae534158240f..f13ac5722308 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8762,6 +8762,21 @@ ${reportName}
             title: 'グループ',
             memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`}),
             error: {settings: '<rbr>この変更を保存できませんでした。もう一度お試しいただくか、<concierge-link>Conciergeにお問い合わせ</concierge-link>ください。</rbr>'},
+            permissions: 'グループの権限',
+            createNewGroupButton: '新しいグループ',
+            createGroupSubmitButton: 'グループを作成',
+            ExpensifyCardPreferredWorkspace: 'Expensify Card 優先ワークスペース',
+            ExpensifyCardPreferredWorkspaceDescription: 'すべてのExpensify Cardトランザクションは、優先ワークスペースではなくExpensify Card優先ワークスペースで作成されます。',
+            RestrictExpenseWorkspaceCreation: '経費ワークスペースの作成/削除を制限',
+            RestrictExpenseWorkspaceCreationDescription: 'メンバーが経費ワークスペースを作成したり、経費ワークスペースから自分自身を削除したりすることを防ぎます。',
+            RestrictDefaultLoginSelection: 'デフォルトログイン選択を制限',
+            RestrictDefaultLoginSelectionDescription: 'メンバーが会社のドメインからログインメールを変更することを防ぎます。',
+            StrictlyEnforceWorkspaceRules: 'ワークスペースルールを厳格に適用',
+            StrictlyEnforceWorkspaceRulesDescription: 'レポートを提出する前に、すべてのワークスペースルールを満たす必要があります。手動の例外は許可されません。',
+            preferredWorkspace: '優先ワークスペース',
+            preferredWorkspaceDescription: (enabled: boolean) => `すべての新しいレポートと経費は${enabled ? '選択された優先' : 'この'}ワークスペースで作成されます。`,
+            preferredWorkspaceSelectDescription: 'すべての新しい経費とレポートはこのワークスペースで作成されます。',
+            defaultGroup: 'デフォルトグループ',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c63cd552655c..236c2782b0d1 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8851,6 +8851,21 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             title: 'Groepen',
             memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`}),
             error: {settings: '<rbr>Kon deze wijziging niet opslaan. Probeer het opnieuw of <concierge-link>neem contact op met Concierge</concierge-link> voor meer ondersteuning.</rbr>'},
+            permissions: 'Groepsrechten',
+            createNewGroupButton: 'Nieuwe groep',
+            createGroupSubmitButton: 'Groep aanmaken',
+            ExpensifyCardPreferredWorkspace: 'Expensify Card voorkeurswerkruimte',
+            ExpensifyCardPreferredWorkspaceDescription: 'Alle Expensify Card-transacties worden aangemaakt in de Expensify Card-voorkeurswerkruimte in plaats van de voorkeurswerkruimte.',
+            RestrictExpenseWorkspaceCreation: 'Beperking van aanmaken/verwijderen van onkostenwerkruimten',
+            RestrictExpenseWorkspaceCreationDescription: 'Voorkomt dat leden een onkostenwerkruimte aanmaken of zichzelf uit een onkostenwerkruimte verwijderen.',
+            RestrictDefaultLoginSelection: 'Standaard inlogselectie beperken',
+            RestrictDefaultLoginSelectionDescription: 'Voorkomt dat leden hun inlog-e-mail wijzigen van hun bedrijfsdomein.',
+            StrictlyEnforceWorkspaceRules: 'Werkruimteregels strikt handhaven',
+            StrictlyEnforceWorkspaceRulesDescription: 'Alle werkruimteregels moeten worden nageleefd voordat een rapport wordt ingediend. Geen handmatige uitzonderingen toegestaan.',
+            preferredWorkspace: 'Voorkeurswerkruimte',
+            preferredWorkspaceDescription: (enabled: boolean) => `Alle nieuwe rapporten en onkosten worden aangemaakt in ${enabled ? 'de geselecteerde voorkeurs' : 'deze'} werkruimte.`,
+            preferredWorkspaceSelectDescription: 'Alle nieuwe onkosten en rapporten worden in deze werkruimte aangemaakt.',
+            defaultGroup: 'Standaardgroep',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 47d9de5079cb..4161a8b1db3b 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8828,6 +8828,22 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             title: 'Grupy',
             memberCount: () => ({one: '1 członek', other: (count: number) => `${count} członków`}),
             error: {settings: '<rbr>Nie udało się zapisać tej zmiany. Spróbuj ponownie lub <concierge-link>skontaktuj się z Concierge</concierge-link>, aby uzyskać pomoc.</rbr>'},
+            permissions: 'Uprawnienia grupy',
+            createNewGroupButton: 'Nowa grupa',
+            createGroupSubmitButton: 'Utwórz grupę',
+            ExpensifyCardPreferredWorkspace: 'Preferowany obszar roboczy Expensify Card',
+            ExpensifyCardPreferredWorkspaceDescription:
+                'Wszystkie transakcje Expensify Card będą tworzone w preferowanym obszarze roboczym Expensify Card zamiast w preferowanym obszarze roboczym.',
+            RestrictExpenseWorkspaceCreation: 'Ogranicz tworzenie/usuwanie obszarów roboczych wydatków',
+            RestrictExpenseWorkspaceCreationDescription: 'Uniemożliwia członkom tworzenie obszaru roboczego wydatków lub usuwanie się z obszaru roboczego wydatków.',
+            RestrictDefaultLoginSelection: 'Ogranicz wybór domyślnego loginu',
+            RestrictDefaultLoginSelectionDescription: 'Uniemożliwia członkom zmianę adresu e-mail logowania z domeny firmowej.',
+            StrictlyEnforceWorkspaceRules: 'Ściśle egzekwuj reguły obszaru roboczego',
+            StrictlyEnforceWorkspaceRulesDescription: 'Wszystkie reguły obszaru roboczego muszą być spełnione przed przesłaniem raportu. Nie dozwolone są wyjątki ręczne.',
+            preferredWorkspace: 'Preferowany obszar roboczy',
+            preferredWorkspaceDescription: (enabled: boolean) => `Wszystkie nowe raporty i wydatki będą tworzone w ${enabled ? 'wybranym preferowanym' : 'tym'} obszarze roboczym.`,
+            preferredWorkspaceSelectDescription: 'Wszystkie nowe wydatki i raporty będą tworzone w tym obszarze roboczym.',
+            defaultGroup: 'Grupa domyślna',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index be3b788f20b2..8f8cd91e6617 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8838,6 +8838,23 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             title: 'Grupos',
             memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membros`}),
             error: {settings: '<rbr>Não foi possível salvar esta alteração. Tente novamente ou <concierge-link>entre em contato com o Concierge</concierge-link> para mais suporte.</rbr>'},
+            permissions: 'Permissões do grupo',
+            createNewGroupButton: 'Novo grupo',
+            createGroupSubmitButton: 'Criar grupo',
+            ExpensifyCardPreferredWorkspace: 'Espaço de trabalho preferido do Expensify Card',
+            ExpensifyCardPreferredWorkspaceDescription:
+                'Todas as transações do Expensify Card serão criadas no espaço de trabalho preferido do Expensify Card em vez do espaço de trabalho preferido.',
+            RestrictExpenseWorkspaceCreation: 'Restringir criação/remoção de espaços de trabalho de despesas',
+            RestrictExpenseWorkspaceCreationDescription: 'Impede que membros criem um espaço de trabalho de despesas ou se removam de um espaço de trabalho de despesas.',
+            RestrictDefaultLoginSelection: 'Restringir seleção de login padrão',
+            RestrictDefaultLoginSelectionDescription: 'Impede que membros alterem seu e-mail de login do domínio da empresa.',
+            StrictlyEnforceWorkspaceRules: 'Aplicar rigorosamente as regras do espaço de trabalho',
+            StrictlyEnforceWorkspaceRulesDescription: 'Todas as regras do espaço de trabalho devem ser atendidas antes de enviar um relatório. Nenhuma exceção manual permitida.',
+            preferredWorkspace: 'Espaço de trabalho preferido',
+            preferredWorkspaceDescription: (enabled: boolean) =>
+                `Todos os novos relatórios e despesas serão criados no ${enabled ? 'espaço de trabalho preferido selecionado' : 'este espaço de trabalho'}.`,
+            preferredWorkspaceSelectDescription: 'Todas as novas despesas e relatórios serão criados neste espaço de trabalho.',
+            defaultGroup: 'Grupo padrão',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 5054b0517fe6..024ffa3d9fce 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8595,6 +8595,21 @@ ${reportName}
             title: '群组',
             memberCount: () => ({one: '1 名成员', other: (count: number) => `${count} 名成员`}),
             error: {settings: '<rbr>无法保存此更改。请重试或<concierge-link>联系Concierge</concierge-link>获取更多支持。</rbr>'},
+            permissions: '群组权限',
+            createNewGroupButton: '新建群组',
+            createGroupSubmitButton: '创建群组',
+            ExpensifyCardPreferredWorkspace: 'Expensify Card 首选工作区',
+            ExpensifyCardPreferredWorkspaceDescription: '所有Expensify Card交易将在Expensify Card首选工作区而非首选工作区中创建。',
+            RestrictExpenseWorkspaceCreation: '限制费用工作区的创建/删除',
+            RestrictExpenseWorkspaceCreationDescription: '防止成员创建费用工作区或将自己从费用工作区中移除。',
+            RestrictDefaultLoginSelection: '限制默认登录选择',
+            RestrictDefaultLoginSelectionDescription: '防止成员将登录邮箱更改为公司域名以外的地址。',
+            StrictlyEnforceWorkspaceRules: '严格执行工作区规则',
+            StrictlyEnforceWorkspaceRulesDescription: '提交报告前必须满足所有工作区规则。不允许手动例外。',
+            preferredWorkspace: '首选工作区',
+            preferredWorkspaceDescription: (enabled: boolean) => `所有新报告和费用将在${enabled ? '选定的首选' : '此'}工作区中创建。`,
+            preferredWorkspaceSelectDescription: '所有新费用和报告将在此工作区中创建。',
+            defaultGroup: '默认群组',
         },
     },
     proactiveAppReview: {title: '喜欢全新的 Expensify 吗？', description: '请告诉我们，这样我们就能帮助您让报销体验变得更好。', positiveButton: '太棒了！', negativeButton: '不太是'},

From 3d4135cbfa41f836f456efb7e2b490c59e9e72ef Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Fri, 17 Apr 2026 12:36:50 +0200
Subject: [PATCH 10/25] add missing translations, add blocking modal when admin
 has no policies in preferred workspace setting as well as workspace
 preselection

---
 src/languages/de.ts                           |  4 +-
 src/languages/en.ts                           |  3 +-
 src/languages/es.ts                           |  3 +-
 src/languages/fr.ts                           |  4 +-
 src/languages/it.ts                           |  4 +-
 src/languages/ja.ts                           |  4 +-
 src/languages/nl.ts                           |  4 +-
 src/languages/pl.ts                           |  4 +-
 src/languages/pt-BR.ts                        |  4 +-
 src/languages/zh-hans.ts                      |  4 +-
 .../domain/Groups/DomainGroupCreatePage.tsx   | 36 +++++++++--
 ...omainGroupCreatePreferredWorkspacePage.tsx | 23 ++-----
 src/selectors/Policy.ts                       | 17 +++++
 src/types/onyx/DomainErrors.ts                |  2 +-
 tests/actions/DomainTest.ts                   |  8 +--
 tests/unit/PolicySelectorTest.ts              | 64 ++++++++++++++++++-
 16 files changed, 148 insertions(+), 40 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 336714e81da7..ffb18740919d 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8882,6 +8882,7 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
         groups: {
             title: 'Gruppen',
             memberCount: () => ({one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`}),
+            createGroupError: 'Diese Gruppe konnte nicht erstellt werden. Bitte versuche es erneut.',
             error: {
                 settings:
                     '<rbr>Diese Änderung konnte nicht gespeichert werden. Bitte versuche es erneut oder <concierge-link>kontaktiere Concierge</concierge-link> für weitere Unterstützung.</rbr>',
@@ -8902,7 +8903,8 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
             preferredWorkspace: 'Bevorzugter Arbeitsbereich',
             preferredWorkspaceDescription: (enabled: boolean) => `Alle neuen Berichte und Ausgaben werden im ${enabled ? 'ausgewählten bevorzugten' : 'diesem'} Arbeitsbereich erstellt.`,
             preferredWorkspaceSelectDescription: 'Alle neuen Ausgaben und Berichte werden in diesem Arbeitsbereich erstellt.',
-            defaultGroup: 'Standardgruppe',
+            noWorkspacesMessage: 'Es gibt keine Arbeitsbereiche in dieser Domain. Ein Arbeitsbereich ist erforderlich, um diese Einschränkung zu aktivieren.',
+            defaultGroup: 'Standardgruppe für neue Mitglieder',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 44d65ad586a0..d4206e8ce30a 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8885,7 +8885,8 @@ const translations = {
             preferredWorkspace: 'Preferred Workspace',
             preferredWorkspaceDescription: (enabled: boolean) => `All new reports and expenses will be created on ${enabled ? 'selected preferred' : 'this'} workspace.`,
             preferredWorkspaceSelectDescription: 'All new expenses and reports will be created on this workspace.',
-            defaultGroup: 'Default group',
+            noWorkspacesMessage: 'There are no workspaces on this domain. A workspace is required to enable this restriction.',
+            defaultGroup: 'Default group for new members',
         },
     },
 };
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 3c3717bb6fd1..dcdae38827bf 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9170,7 +9170,8 @@ ${amount} para ${merchant} - ${date}`,
                 `Todos los informes y gastos nuevos se crearán en ${enabled ? 'el espacio de trabajo preferido seleccionado' : 'este'} espacio de trabajo.`,
             preferredWorkspace: 'Espacio de trabajo preferido',
             preferredWorkspaceSelectDescription: 'Todos los gastos e informes nuevos se crearán en este espacio de trabajo.',
-            defaultGroup: 'Grupo predeterminado',
+            noWorkspacesMessage: 'No hay espacios de trabajo en este dominio. Se requiere un espacio de trabajo para habilitar esta restricción.',
+            defaultGroup: 'Grupo predeterminado para nuevos miembros',
         },
     },
     gps: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index d0af0e4b8424..eb983862e7a2 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8906,6 +8906,7 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
         groups: {
             title: 'Groupes',
             memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`}),
+            createGroupError: 'Impossible de créer ce groupe. Veuillez réessayer.',
             error: {settings: "<rbr>Impossible d'enregistrer cette modification. Veuillez réessayer ou <concierge-link>contacter Concierge</concierge-link> pour obtenir de l'aide.</rbr>"},
             permissions: 'Autorisations du groupe',
             createNewGroupButton: 'Nouveau groupe',
@@ -8923,7 +8924,8 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Tous les nouveaux rapports et dépenses seront créés dans ${enabled ? "l'espace de travail préféré sélectionné" : 'cet espace de travail'}.`,
             preferredWorkspaceSelectDescription: 'Toutes les nouvelles dépenses et rapports seront créés dans cet espace de travail.',
-            defaultGroup: 'Groupe par défaut',
+            noWorkspacesMessage: "Il n'y a aucun espace de travail sur ce domaine. Un espace de travail est requis pour activer cette restriction.",
+            defaultGroup: 'Groupe par défaut pour les nouveaux membres',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 127103c1ac04..cd0f6bced46e 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8872,6 +8872,7 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
         groups: {
             title: 'Gruppi',
             memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`}),
+            createGroupError: 'Impossibile creare questo gruppo. Riprova.',
             error: {settings: '<rbr>Non è stato possibile salvare questa modifica. Riprova o <concierge-link>contatta Concierge</concierge-link> per ulteriore assistenza.</rbr>'},
             permissions: 'Permessi del gruppo',
             createNewGroupButton: 'Nuovo gruppo',
@@ -8889,7 +8890,8 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Tutti i nuovi report e le nuove spese verranno creati ${enabled ? "nell'area di lavoro preferita selezionata" : 'in questa area di lavoro'}.`,
             preferredWorkspaceSelectDescription: 'Tutte le nuove spese e i nuovi report verranno creati in questa area di lavoro.',
-            defaultGroup: 'Gruppo predefinito',
+            noWorkspacesMessage: 'Non ci sono spazi di lavoro su questo dominio. È necessario uno spazio di lavoro per abilitare questa restrizione.',
+            defaultGroup: 'Gruppo predefinito per nuovi membri',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index f13ac5722308..cd1573d4ed95 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8761,6 +8761,7 @@ ${reportName}
         groups: {
             title: 'グループ',
             memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`}),
+            createGroupError: 'このグループを作成できませんでした。もう一度お試しください。',
             error: {settings: '<rbr>この変更を保存できませんでした。もう一度お試しいただくか、<concierge-link>Conciergeにお問い合わせ</concierge-link>ください。</rbr>'},
             permissions: 'グループの権限',
             createNewGroupButton: '新しいグループ',
@@ -8776,7 +8777,8 @@ ${reportName}
             preferredWorkspace: '優先ワークスペース',
             preferredWorkspaceDescription: (enabled: boolean) => `すべての新しいレポートと経費は${enabled ? '選択された優先' : 'この'}ワークスペースで作成されます。`,
             preferredWorkspaceSelectDescription: 'すべての新しい経費とレポートはこのワークスペースで作成されます。',
-            defaultGroup: 'デフォルトグループ',
+            noWorkspacesMessage: 'このドメインにワークスペースがありません。この制限を有効にするにはワークスペースが必要です。',
+            defaultGroup: '新しいメンバーのデフォルトグループ',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 236c2782b0d1..344358d1fc2a 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8850,6 +8850,7 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
         groups: {
             title: 'Groepen',
             memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`}),
+            createGroupError: 'Kan deze groep niet aanmaken. Probeer het opnieuw.',
             error: {settings: '<rbr>Kon deze wijziging niet opslaan. Probeer het opnieuw of <concierge-link>neem contact op met Concierge</concierge-link> voor meer ondersteuning.</rbr>'},
             permissions: 'Groepsrechten',
             createNewGroupButton: 'Nieuwe groep',
@@ -8865,7 +8866,8 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             preferredWorkspace: 'Voorkeurswerkruimte',
             preferredWorkspaceDescription: (enabled: boolean) => `Alle nieuwe rapporten en onkosten worden aangemaakt in ${enabled ? 'de geselecteerde voorkeurs' : 'deze'} werkruimte.`,
             preferredWorkspaceSelectDescription: 'Alle nieuwe onkosten en rapporten worden in deze werkruimte aangemaakt.',
-            defaultGroup: 'Standaardgroep',
+            noWorkspacesMessage: 'Er zijn geen werkruimtes op dit domein. Een werkruimte is vereist om deze beperking in te schakelen.',
+            defaultGroup: 'Standaardgroep voor nieuwe leden',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 4161a8b1db3b..2fe3105f1570 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8827,6 +8827,7 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
         groups: {
             title: 'Grupy',
             memberCount: () => ({one: '1 członek', other: (count: number) => `${count} członków`}),
+            createGroupError: 'Nie udało się utworzyć tej grupy. Spróbuj ponownie.',
             error: {settings: '<rbr>Nie udało się zapisać tej zmiany. Spróbuj ponownie lub <concierge-link>skontaktuj się z Concierge</concierge-link>, aby uzyskać pomoc.</rbr>'},
             permissions: 'Uprawnienia grupy',
             createNewGroupButton: 'Nowa grupa',
@@ -8843,7 +8844,8 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             preferredWorkspace: 'Preferowany obszar roboczy',
             preferredWorkspaceDescription: (enabled: boolean) => `Wszystkie nowe raporty i wydatki będą tworzone w ${enabled ? 'wybranym preferowanym' : 'tym'} obszarze roboczym.`,
             preferredWorkspaceSelectDescription: 'Wszystkie nowe wydatki i raporty będą tworzone w tym obszarze roboczym.',
-            defaultGroup: 'Grupa domyślna',
+            noWorkspacesMessage: 'W tej domenie nie ma żadnych obszarów roboczych. Obszar roboczy jest wymagany, aby włączyć to ograniczenie.',
+            defaultGroup: 'Domyślna grupa dla nowych członków',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 8f8cd91e6617..90f8023a95d6 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8837,6 +8837,7 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
         groups: {
             title: 'Grupos',
             memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membros`}),
+            createGroupError: 'Não foi possível criar este grupo. Tente novamente.',
             error: {settings: '<rbr>Não foi possível salvar esta alteração. Tente novamente ou <concierge-link>entre em contato com o Concierge</concierge-link> para mais suporte.</rbr>'},
             permissions: 'Permissões do grupo',
             createNewGroupButton: 'Novo grupo',
@@ -8854,7 +8855,8 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             preferredWorkspaceDescription: (enabled: boolean) =>
                 `Todos os novos relatórios e despesas serão criados no ${enabled ? 'espaço de trabalho preferido selecionado' : 'este espaço de trabalho'}.`,
             preferredWorkspaceSelectDescription: 'Todas as novas despesas e relatórios serão criados neste espaço de trabalho.',
-            defaultGroup: 'Grupo padrão',
+            noWorkspacesMessage: 'Não há espaços de trabalho neste domínio. Um espaço de trabalho é necessário para ativar esta restrição.',
+            defaultGroup: 'Grupo padrão para novos membros',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 024ffa3d9fce..6e0762159b19 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8594,6 +8594,7 @@ ${reportName}
         groups: {
             title: '群组',
             memberCount: () => ({one: '1 名成员', other: (count: number) => `${count} 名成员`}),
+            createGroupError: '无法创建此群组。请重试。',
             error: {settings: '<rbr>无法保存此更改。请重试或<concierge-link>联系Concierge</concierge-link>获取更多支持。</rbr>'},
             permissions: '群组权限',
             createNewGroupButton: '新建群组',
@@ -8609,7 +8610,8 @@ ${reportName}
             preferredWorkspace: '首选工作区',
             preferredWorkspaceDescription: (enabled: boolean) => `所有新报告和费用将在${enabled ? '选定的首选' : '此'}工作区中创建。`,
             preferredWorkspaceSelectDescription: '所有新费用和报告将在此工作区中创建。',
-            defaultGroup: '默认群组',
+            noWorkspacesMessage: '此域上没有工作区。启用此限制需要一个工作区。',
+            defaultGroup: '新成员的默认群组',
         },
     },
     proactiveAppReview: {title: '喜欢全新的 Expensify 吗？', description: '请告诉我们，这样我们就能帮助您让报销体验变得更好。', positiveButton: '太棒了！', negativeButton: '不太是'},
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 5ed52be3e1a3..4af5a2bb1283 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,7 +1,8 @@
 import {defaultSecurityGroupIDSelector, domainNameSelector} from '@selectors/Domain';
-import {policyNameSelector} from '@selectors/Policy';
+import {createAdminPoliciesSelector, policyNameSelector} from '@selectors/Policy';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
+import ConfirmModal from '@components/ConfirmModal';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
@@ -20,7 +21,7 @@ import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDefaultSecurityGroup} from '@userActions/Domain';
+import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDefaultSecurityGroup, setDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -32,7 +33,7 @@ type DomainGroupCreatePageProps = PlatformStackScreenProps<SettingsNavigatorPara
 function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const styles = useThemeStyles();
     const {domainAccountID} = route.params;
-    const {translate} = useLocalize();
+    const {translate, localeCompare} = useLocalize();
 
     const inputRef = useRef<AnimatedTextInputRef>(null);
 
@@ -42,6 +43,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [restrictExpenseWorkspaceCreation, setRestrictExpenseWorkspaceCreation] = useState(false);
     const [expensifyCardPreferredWorkspace, setExpensifyCardPreferredWorkspace] = useState(false);
     const [preferredWorkspace, setPreferredWorkspace] = useState(false);
+    const [isNoWorkspacesModalVisible, setIsNoWorkspacesModalVisible] = useState(false);
 
     const [preferredPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
     const [preferredPolicyName] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${preferredPolicyID}`, {
@@ -53,6 +55,12 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [defaultSecurityGroupID] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         selector: defaultSecurityGroupIDSelector,
     });
+    const [adminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector()});
+
+    const firstAdminPolicy = Object.values(adminPolicies ?? {})
+        .sort((a, b) => localeCompare(a?.created ?? '', b?.created ?? ''))
+        .at(0);
+    const hasAdminPolicies = !!firstAdminPolicy;
 
     useEffect(() => {
         return () => {
@@ -161,21 +169,37 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         subtitle={translate('domain.groups.preferredWorkspaceDescription', preferredWorkspace)}
                         switchAccessibilityLabel={translate('domain.groups.preferredWorkspace')}
                         isActive={preferredWorkspace}
+                        disabled={!hasAdminPolicies}
+                        disabledAction={() => setIsNoWorkspacesModalVisible(true)}
                         onToggle={(value) => {
                             setPreferredWorkspace(value);
-                            if (!value) {
+                            if (value) {
+                                if (!preferredPolicyID && firstAdminPolicy?.id) {
+                                    setDomainGroupCreatePreferredPolicyID(firstAdminPolicy.id);
+                                }
+                            } else {
                                 clearDomainGroupCreatePreferredPolicyID();
                             }
                         }}
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
-                    {preferredWorkspace && (
+                    <ConfirmModal
+                        onConfirm={() => setIsNoWorkspacesModalVisible(false)}
+                        onCancel={() => setIsNoWorkspacesModalVisible(false)}
+                        isVisible={isNoWorkspacesModalVisible}
+                        title={translate('workspace.distanceRates.oopsNotSoFast')}
+                        prompt={translate('domain.groups.noWorkspacesMessage')}
+                        confirmText={translate('common.buttonConfirm')}
+                        shouldShowCancelButton={false}
+                    />
+                    {hasAdminPolicies && (
                         <MenuItemWithTopDescription
                             description={translate('domain.groups.preferredWorkspace')}
-                            title={preferredPolicyName ?? ''}
+                            title={preferredPolicyName ?? firstAdminPolicy?.name}
                             shouldShowRightIcon
                             onPress={() => Navigation.navigate(ROUTES.DOMAIN_GROUP_CREATE_PREFERRED_WORKSPACE.getRoute(domainAccountID))}
+                            disabled={!preferredWorkspace}
                         />
                     )}
                     <ToggleSettingOptionRow
diff --git a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
index 932c1bfcb465..ac41d5490ea1 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
@@ -1,5 +1,5 @@
+import {createAdminPoliciesSelector} from '@selectors/Policy';
 import React, {useState} from 'react';
-import type {OnyxCollection} from 'react-native-onyx';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -21,26 +21,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy} from '@src/types/onyx';
 
 type WorkspaceListItem = {
     policyID: string;
+    created?: string;
 } & ListItem;
 
-const createAdminPolicySelector = (currentPolicyID: string | undefined) => (policies: OnyxCollection<Policy>) => {
-    return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL'>>>((acc, [key, policy]) => {
-        if (!policy?.id || !policy?.name) {
-            return acc;
-        }
-        const isCurrentPolicy = policy.id === currentPolicyID;
-        if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
-            return acc;
-        }
-        acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL};
-        return acc;
-    }, {});
-};
-
 type DomainGroupCreatePreferredWorkspacePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.GROUP_CREATE_PREFERRED_WORKSPACE>;
 
 function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePreferredWorkspacePageProps) {
@@ -51,7 +37,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
     const icons = useMemoizedLazyExpensifyIcons(['FallbackWorkspaceAvatar']);
 
     const [currentPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
-    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPolicySelector(currentPolicyID)});
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector(currentPolicyID)});
     const [selectedPolicyID, setSelectedPolicyID] = useState<string | undefined>(currentPolicyID);
     const [shouldShowError, setShouldShowError] = useState(false);
 
@@ -64,6 +50,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
         workspaceOptions.push({
             text: policy.name,
             policyID: policy.id,
+            created: policy.created,
             keyForList: policy.id,
             isSelected: selectedPolicyID === policy.id,
             icons: [
@@ -100,7 +87,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
                 />
                 <Text style={[styles.ph5, styles.mb3]}>{translate('domain.groups.preferredWorkspaceSelectDescription')}</Text>
                 <SelectionList<WorkspaceListItem>
-                    data={workspaceOptions.sort((a, b) => localeCompare(a.text ?? '', b.text ?? ''))}
+                    data={workspaceOptions.sort((a, b) => localeCompare(a.created ?? '', b.created ?? ''))}
                     ListItem={UserListItem}
                     onSelectRow={(item: WorkspaceListItem) => {
                         setSelectedPolicyID(item.policyID);
diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index 13df58c69e0e..4ae6aec1655a 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -94,6 +94,22 @@ const shouldRedirectToExpensifyClassicSelector = (policies: OnyxCollection<Polic
 
 const policyNameSelector = (policy: OnyxEntry<Policy>) => policy?.name;
 
+const createAdminPoliciesSelector =
+    (currentPolicyID: string | undefined = undefined) =>
+    (policies: OnyxCollection<Policy>) => {
+        return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL' | 'created'>>>((acc, [key, policy]) => {
+            if (!policy?.id || !policy?.name) {
+                return acc;
+            }
+            const isCurrentPolicy = policy.id === currentPolicyID;
+            if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
+                return acc;
+            }
+            acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL, created: policy.created};
+            return acc;
+        }, {});
+    };
+
 // deepEqual on ~15 fields is cheaper than re-rendering IOURequestStartPage's full hook/memo tree.
 const iouRequestPolicyCollectionSelector = (policies: OnyxCollection<Policy>): OnyxCollection<Policy> => {
     if (!policies) {
@@ -183,4 +199,5 @@ export {
     hasPoliciesConnectedToNetSuiteSelector,
     lastWorkspaceNumberSelector,
     policyNameSelector,
+    createAdminPoliciesSelector,
 };
diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts
index 0b530e52975a..9ff00c1b155d 100644
--- a/src/types/onyx/DomainErrors.ts
+++ b/src/types/onyx/DomainErrors.ts
@@ -44,7 +44,7 @@ type DomainSecurityGroupErrors = {
     /**
      * Base errors related to the security group
      */
-    errors?: OnyxCommon.Errors; 
+    errors?: OnyxCommon.Errors;
 };
 
 /**
diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
index dd1503f50b3f..66084707d0a9 100644
--- a/tests/actions/DomainTest.ts
+++ b/tests/actions/DomainTest.ts
@@ -1032,10 +1032,10 @@ describe('actions/Domain', () => {
             const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
             const timestamp = 789;
 
-            await Onyx.merge(
-                `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
-                {[SECURITY_GROUP_KEY]: {name: 'Test Group', shared: {}}} as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
-            );
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {[SECURITY_GROUP_KEY]: {name: 'Test Group', shared: {}}} as PrefixedRecord<
+                typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX,
+                DomainSecurityGroup
+            >);
             await Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {
                 [SECURITY_GROUP_KEY]: {errors: {[timestamp]: 'error'}},
             });
diff --git a/tests/unit/PolicySelectorTest.ts b/tests/unit/PolicySelectorTest.ts
index 8fd534e5cf77..bda75b65fe2e 100644
--- a/tests/unit/PolicySelectorTest.ts
+++ b/tests/unit/PolicySelectorTest.ts
@@ -1,7 +1,7 @@
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {lastWorkspaceNumberSelector} from '@src/selectors/Policy';
+import {createAdminPoliciesSelector, lastWorkspaceNumberSelector, policyNameSelector} from '@src/selectors/Policy';
 import type {Policy} from '@src/types/onyx';
 
 describe('lastWorkspaceNumberSelector', () => {
@@ -61,3 +61,65 @@ describe('lastWorkspaceNumberSelector', () => {
         expect(lastWorkspaceNumberSelector(policies, email)).toBe(4);
     });
 });
+
+describe('policyNameSelector', () => {
+    it('should return the policy name', () => {
+        expect(policyNameSelector({name: 'My Workspace'} as Policy)).toBe('My Workspace');
+    });
+
+    it('should return undefined for undefined policy', () => {
+        expect(policyNameSelector(undefined)).toBeUndefined();
+    });
+
+    it('should return undefined when policy has no name', () => {
+        expect(policyNameSelector({} as Policy)).toBeUndefined();
+    });
+});
+
+describe('createAdminPoliciesSelector', () => {
+    const P = ONYXKEYS.COLLECTION.POLICY;
+
+    const adminPolicy = {id: '1', name: 'Admin WS', role: CONST.POLICY.ROLE.ADMIN, type: CONST.POLICY.TYPE.TEAM, avatarURL: 'https://img/1', created: '2024-01-01'} as Policy;
+    const memberPolicy = {id: '2', name: 'Member WS', role: CONST.POLICY.ROLE.USER, type: CONST.POLICY.TYPE.TEAM} as Policy;
+    const personalPolicy = {id: '3', name: 'Personal', role: CONST.POLICY.ROLE.ADMIN, type: CONST.POLICY.TYPE.PERSONAL} as Policy;
+    const allPolicies = {
+        [`${P}1`]: adminPolicy,
+        [`${P}2`]: memberPolicy,
+        [`${P}3`]: personalPolicy,
+    };
+
+    it('should return only admin non-personal policies', () => {
+        const result = createAdminPoliciesSelector(undefined)(allPolicies);
+        expect(Object.keys(result)).toEqual([`${P}1`]);
+        expect(result[`${P}1`]).toEqual({id: '1', name: 'Admin WS', avatarURL: 'https://img/1', created: '2024-01-01'});
+    });
+
+    it('should always include the current policy even if not admin', () => {
+        const result = createAdminPoliciesSelector('2')({[`${P}2`]: memberPolicy});
+        expect(Object.keys(result)).toEqual([`${P}2`]);
+    });
+
+    it('should always include the current policy even if personal', () => {
+        const result = createAdminPoliciesSelector('3')({[`${P}3`]: personalPolicy});
+        expect(Object.keys(result)).toEqual([`${P}3`]);
+    });
+
+    it('should return empty object when policies is undefined', () => {
+        expect(createAdminPoliciesSelector(undefined)(undefined)).toEqual({});
+    });
+
+    it('should skip policies without id or name', () => {
+        const policies = {
+            [`${P}4`]: {role: CONST.POLICY.ROLE.ADMIN, type: CONST.POLICY.TYPE.TEAM} as Policy,
+            [`${P}5`]: {id: '5', role: CONST.POLICY.ROLE.ADMIN, type: CONST.POLICY.TYPE.TEAM} as Policy,
+        };
+        expect(createAdminPoliciesSelector(undefined)(policies)).toEqual({});
+    });
+
+    it('should only pick name, id, avatarURL, and created fields', () => {
+        const result = createAdminPoliciesSelector(undefined)({[`${P}1`]: adminPolicy});
+        const entry = result[`${P}1`];
+        expect(entry).toBeDefined();
+        expect(Object.keys(entry ?? {})).toEqual(['id', 'name', 'avatarURL', 'created']);
+    });
+});

From e488481f26c6377fc9feff3c742ae567b2ab530a Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Fri, 17 Apr 2026 12:52:52 +0200
Subject: [PATCH 11/25] add setDefaultSecurityGroup function

---
 src/languages/de.ts                           |  4 +
 src/languages/en.ts                           |  4 +
 src/languages/es.ts                           |  4 +
 src/languages/fr.ts                           |  4 +
 src/languages/it.ts                           |  4 +
 src/languages/ja.ts                           |  4 +
 src/languages/nl.ts                           |  4 +
 src/languages/pl.ts                           |  4 +
 src/languages/pt-BR.ts                        |  4 +
 src/languages/zh-hans.ts                      |  3 +
 .../SetDefaultDomainSecurityGroupParams.ts    |  6 ++
 src/libs/API/parameters/index.ts              |  1 +
 src/libs/API/types.ts                         |  2 +
 src/libs/actions/Domain.ts                    | 94 +++++++++++++++++++
 .../domain/Groups/DomainGroupCreatePage.tsx   |  2 +-
 src/types/onyx/DomainErrors.ts                |  5 +
 src/types/onyx/DomainPendingActions.ts        |  5 +
 17 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 src/libs/API/parameters/SetDefaultDomainSecurityGroupParams.ts

diff --git a/src/languages/de.ts b/src/languages/de.ts
index ffb18740919d..d1d396121a5d 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8905,6 +8905,10 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
             preferredWorkspaceSelectDescription: 'Alle neuen Ausgaben und Berichte werden in diesem Arbeitsbereich erstellt.',
             noWorkspacesMessage: 'Es gibt keine Arbeitsbereiche in dieser Domain. Ein Arbeitsbereich ist erforderlich, um diese Einschränkung zu aktivieren.',
             defaultGroup: 'Standardgruppe für neue Mitglieder',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Bist du sicher, dass du ${newName} zur Standardgruppe machen möchtest? Neue Mitglieder werden zu dieser Gruppe statt zur bisherigen Standardgruppe (${currentName}) eingeladen. `,
+            makeDefault: 'Als Standard festlegen',
+            nevermind: 'Egal',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index d4206e8ce30a..17d25750e14b 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8887,6 +8887,10 @@ const translations = {
             preferredWorkspaceSelectDescription: 'All new expenses and reports will be created on this workspace.',
             noWorkspacesMessage: 'There are no workspaces on this domain. A workspace is required to enable this restriction.',
             defaultGroup: 'Default group for new members',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Are you sure you want to make ${newName} the default group? New members will be invited to this group instead of the previous default group (${currentName}). `,
+            makeDefault: 'Make default',
+            nevermind: 'Nevermind',
         },
     },
 };
diff --git a/src/languages/es.ts b/src/languages/es.ts
index dcdae38827bf..2c8c2651623f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9172,6 +9172,10 @@ ${amount} para ${merchant} - ${date}`,
             preferredWorkspaceSelectDescription: 'Todos los gastos e informes nuevos se crearán en este espacio de trabajo.',
             noWorkspacesMessage: 'No hay espacios de trabajo en este dominio. Se requiere un espacio de trabajo para habilitar esta restricción.',
             defaultGroup: 'Grupo predeterminado para nuevos miembros',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `¿Estás seguro de que quieres establecer ${newName} como el grupo predeterminado? Los nuevos miembros serán invitados a este grupo en lugar del grupo predeterminado anterior (${currentName}). `,
+            makeDefault: 'Establecer como predeterminado',
+            nevermind: 'No importa',
         },
     },
     gps: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index eb983862e7a2..69e76492e636 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8926,6 +8926,10 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             preferredWorkspaceSelectDescription: 'Toutes les nouvelles dépenses et rapports seront créés dans cet espace de travail.',
             noWorkspacesMessage: "Il n'y a aucun espace de travail sur ce domaine. Un espace de travail est requis pour activer cette restriction.",
             defaultGroup: 'Groupe par défaut pour les nouveaux membres',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Êtes-vous sûr de vouloir faire de ${newName} le groupe par défaut ? Les nouveaux membres seront invités dans ce groupe au lieu du groupe par défaut précédent (${currentName}). `,
+            makeDefault: 'Définir par défaut',
+            nevermind: 'Peu importe',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index cd0f6bced46e..25dfc1b3e3ac 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8892,6 +8892,10 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             preferredWorkspaceSelectDescription: 'Tutte le nuove spese e i nuovi report verranno creati in questa area di lavoro.',
             noWorkspacesMessage: 'Non ci sono spazi di lavoro su questo dominio. È necessario uno spazio di lavoro per abilitare questa restrizione.',
             defaultGroup: 'Gruppo predefinito per nuovi membri',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Sei sicuro di voler impostare ${newName} come gruppo predefinito? I nuovi membri saranno invitati a questo gruppo invece del precedente gruppo predefinito (${currentName}). `,
+            makeDefault: 'Imposta come predefinito',
+            nevermind: 'Non importa',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index cd1573d4ed95..70b3fb8b83be 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8779,6 +8779,10 @@ ${reportName}
             preferredWorkspaceSelectDescription: 'すべての新しい経費とレポートはこのワークスペースで作成されます。',
             noWorkspacesMessage: 'このドメインにワークスペースがありません。この制限を有効にするにはワークスペースが必要です。',
             defaultGroup: '新しいメンバーのデフォルトグループ',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `${newName}をデフォルトグループに設定してもよろしいですか？新しいメンバーは以前のデフォルトグループ（${currentName}）の代わりにこのグループに招待されます。 `,
+            makeDefault: 'デフォルトに設定',
+            nevermind: 'キャンセル',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 344358d1fc2a..18ffeb568a4c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8868,6 +8868,10 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             preferredWorkspaceSelectDescription: 'Alle nieuwe onkosten en rapporten worden in deze werkruimte aangemaakt.',
             noWorkspacesMessage: 'Er zijn geen werkruimtes op dit domein. Een werkruimte is vereist om deze beperking in te schakelen.',
             defaultGroup: 'Standaardgroep voor nieuwe leden',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Weet je zeker dat je ${newName} de standaardgroep wilt maken? Nieuwe leden worden uitgenodigd voor deze groep in plaats van de vorige standaardgroep (${currentName}). `,
+            makeDefault: 'Standaard instellen',
+            nevermind: 'Laat maar',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 2fe3105f1570..51bd6e7084bc 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8846,6 +8846,10 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             preferredWorkspaceSelectDescription: 'Wszystkie nowe wydatki i raporty będą tworzone w tym obszarze roboczym.',
             noWorkspacesMessage: 'W tej domenie nie ma żadnych obszarów roboczych. Obszar roboczy jest wymagany, aby włączyć to ograniczenie.',
             defaultGroup: 'Domyślna grupa dla nowych członków',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Czy na pewno chcesz ustawić ${newName} jako grupę domyślną? Nowi członkowie zostaną zaproszeni do tej grupy zamiast poprzedniej grupy domyślnej (${currentName}). `,
+            makeDefault: 'Ustaw jako domyślną',
+            nevermind: 'Nieważne',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 90f8023a95d6..4f8332e88c79 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8857,6 +8857,10 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             preferredWorkspaceSelectDescription: 'Todas as novas despesas e relatórios serão criados neste espaço de trabalho.',
             noWorkspacesMessage: 'Não há espaços de trabalho neste domínio. Um espaço de trabalho é necessário para ativar esta restrição.',
             defaultGroup: 'Grupo padrão para novos membros',
+            defaultGroupPrompt: (currentName: string, newName: string) =>
+                `Tem certeza de que deseja tornar ${newName} o grupo padrão? Novos membros serão convidados para este grupo em vez do grupo padrão anterior (${currentName}). `,
+            makeDefault: 'Definir como padrão',
+            nevermind: 'Deixa pra lá',
         },
     },
     proactiveAppReview: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 6e0762159b19..7d8167116e56 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8612,6 +8612,9 @@ ${reportName}
             preferredWorkspaceSelectDescription: '所有新费用和报告将在此工作区中创建。',
             noWorkspacesMessage: '此域上没有工作区。启用此限制需要一个工作区。',
             defaultGroup: '新成员的默认群组',
+            defaultGroupPrompt: (currentName: string, newName: string) => `您确定要将${newName}设为默认群组吗？新成员将被邀请到此群组，而不是之前的默认群组（${currentName}）。 `,
+            makeDefault: '设为默认',
+            nevermind: '算了',
         },
     },
     proactiveAppReview: {title: '喜欢全新的 Expensify 吗？', description: '请告诉我们，这样我们就能帮助您让报销体验变得更好。', positiveButton: '太棒了！', negativeButton: '不太是'},
diff --git a/src/libs/API/parameters/SetDefaultDomainSecurityGroupParams.ts b/src/libs/API/parameters/SetDefaultDomainSecurityGroupParams.ts
new file mode 100644
index 000000000000..dccf381493c4
--- /dev/null
+++ b/src/libs/API/parameters/SetDefaultDomainSecurityGroupParams.ts
@@ -0,0 +1,6 @@
+type SetDefaultDomainSecurityGroupParams = {
+    domainAccountID: number;
+    groupID: string;
+};
+
+export default SetDefaultDomainSecurityGroupParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index ecaa4e7c082a..bfdeaa3e629e 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -507,3 +507,4 @@ export type {default as ChangeCardPINParams} from './ChangeCardPINParams';
 export type {default as ExportDomainMembersCSVParams} from './ExportDomainMembersCSVParams';
 export type {default as InitiateBankAccountUnlockParams} from './InitiateBankAccountUnlockParams';
 export type {default as UpdateDomainSecurityGroupParams} from './UpdateDomainSecurityGroupParams';
+export type {default as SetDefaultDomainSecurityGroupParams} from './SetDefaultDomainSecurityGroupParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 6ba2e5c64f75..d6023bdbb837 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -573,6 +573,7 @@ const WRITE_COMMANDS = {
     EXPORT_DOMAIN_MEMBERS_CSV: 'ExportDomainMembersCSV',
     INITIATE_BANK_ACCOUNT_UNLOCK: 'InitiateBankAccountUnlock',
     UPDATE_DOMAIN_SECURITY_GROUP: 'UpdateDomainSecurityGroupForNewDot',
+    SET_DEFAULT_DOMAIN_SECURITY_GROUP: 'SetDefaultDomainSecurityGroup',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -1163,6 +1164,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.RESET_DOMAIN_MEMBER_TWO_FACTOR_AUTH]: Parameters.ResetDomainMemberTwoFactorAuthParams;
     [WRITE_COMMANDS.EXPORT_DOMAIN_MEMBERS_CSV]: Parameters.ExportDomainMembersCSVParams;
     [WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP]: Parameters.UpdateDomainSecurityGroupParams;
+    [WRITE_COMMANDS.SET_DEFAULT_DOMAIN_SECURITY_GROUP]: Parameters.SetDefaultDomainSecurityGroupParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index 148e249c68c8..e75e56fef1e9 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -10,6 +10,7 @@ import type {
     DeleteDomainParams,
     RemoveDomainAdminParams,
     ResetDomainMemberTwoFactorAuthParams,
+    SetDefaultDomainSecurityGroupParams,
     SetTechnicalContactEmailParams,
     SetTwoFactorAuthExemptEmailForDomainParams,
     SetVacationDelegateParams,
@@ -1938,6 +1939,98 @@ function clearGroupCreateError(domainAccountID: number, groupID: string) {
     });
 }
 
+/**
+ * Sets the default security group for a domain
+ * @param domainAccountID - The account ID of the domain
+ * @param groupID - The ID of the security group to set as default
+ * @param previousGroupID - The ID of the previously default security group
+ */
+function setDefaultSecurityGroup(domainAccountID: number, groupID: string, previousGroupID?: string) {
+    const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
+
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            value: {domain_defaultSecurityGroupID: groupID},
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    defaultSecurityGroupID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    defaultSecurityGroupIDErrors: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            value: {domain_defaultSecurityGroupID: previousGroupID},
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    defaultSecurityGroupID: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    defaultSecurityGroupIDErrors: getMicroSecondOnyxErrorWithTranslationKey('domain.groups.error.settings'),
+                },
+            },
+        },
+    ];
+
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    defaultSecurityGroupID: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
+            value: {
+                [SECURITY_GROUP_KEY]: {
+                    defaultSecurityGroupIDErrors: null,
+                },
+            },
+        },
+    ];
+
+    const params: SetDefaultDomainSecurityGroupParams = {
+        domainAccountID,
+        groupID,
+    };
+
+    API.write(WRITE_COMMANDS.SET_DEFAULT_DOMAIN_SECURITY_GROUP, params, {optimisticData, failureData, successData});
+}
+
 export {
     getDomainValidationCode,
     validateDomain,
@@ -1980,4 +2073,5 @@ export {
     clearDomainGroupCreatePreferredPolicyID,
     createDomainSecurityGroup,
     clearGroupCreateError,
+    setDefaultSecurityGroup,
 };
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 4af5a2bb1283..a736ecce0ae8 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -106,7 +106,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                             overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
                         });
                         if (defaultGroupForNewMembers && domainName) {
-                            setDefaultSecurityGroup(domainAccountID, groupID, domainName, defaultSecurityGroupID);
+                            setDefaultSecurityGroup(domainAccountID, groupID, defaultSecurityGroupID);
                         }
                         clearDomainGroupCreatePreferredPolicyID();
                         Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID));
diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts
index 9ff00c1b155d..bea1d6b9b585 100644
--- a/src/types/onyx/DomainErrors.ts
+++ b/src/types/onyx/DomainErrors.ts
@@ -45,6 +45,11 @@ type DomainSecurityGroupErrors = {
      * Base errors related to the security group
      */
     errors?: OnyxCommon.Errors;
+
+    /**
+     * Errors related to the default security group ID setting
+     */
+    defaultSecurityGroupIDErrors?: OnyxCommon.Errors;
 };
 
 /**
diff --git a/src/types/onyx/DomainPendingActions.ts b/src/types/onyx/DomainPendingActions.ts
index 285aa2942a0e..934251bae3a3 100644
--- a/src/types/onyx/DomainPendingActions.ts
+++ b/src/types/onyx/DomainPendingActions.ts
@@ -44,6 +44,11 @@ type DomainSecurityGroupPendingActions = {
      * Pending action for the security group name
      */
     name?: OnyxCommon.PendingAction;
+
+    /**
+     * Pending action for the default security group ID
+     */
+    defaultSecurityGroupID?: OnyxCommon.PendingAction;
 };
 
 /**

From 710358883554c82e9a057172564c0c343b434734 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Fri, 17 Apr 2026 13:27:58 +0200
Subject: [PATCH 12/25] use CreateDomainSecurityGroup instead of
 UpdateDomainSecurityGroup API command for group creation, enable offline form
 handling

---
 src/libs/API/types.ts                             | 2 ++
 src/libs/actions/Domain.ts                        | 3 ++-
 src/pages/domain/Groups/DomainGroupCreatePage.tsx | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index d6023bdbb837..b70cb141791f 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -573,6 +573,7 @@ const WRITE_COMMANDS = {
     EXPORT_DOMAIN_MEMBERS_CSV: 'ExportDomainMembersCSV',
     INITIATE_BANK_ACCOUNT_UNLOCK: 'InitiateBankAccountUnlock',
     UPDATE_DOMAIN_SECURITY_GROUP: 'UpdateDomainSecurityGroupForNewDot',
+    CREATE_DOMAIN_SECURITY_GROUP: 'CreateDomainSecurityGroup',
     SET_DEFAULT_DOMAIN_SECURITY_GROUP: 'SetDefaultDomainSecurityGroup',
 } as const;
 
@@ -1164,6 +1165,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.RESET_DOMAIN_MEMBER_TWO_FACTOR_AUTH]: Parameters.ResetDomainMemberTwoFactorAuthParams;
     [WRITE_COMMANDS.EXPORT_DOMAIN_MEMBERS_CSV]: Parameters.ExportDomainMembersCSVParams;
     [WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP]: Parameters.UpdateDomainSecurityGroupParams;
+    [WRITE_COMMANDS.CREATE_DOMAIN_SECURITY_GROUP]: Parameters.CreateDomainSecurityGroupParams;
     [WRITE_COMMANDS.SET_DEFAULT_DOMAIN_SECURITY_GROUP]: Parameters.SetDefaultDomainSecurityGroupParams;
 };
 
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index e75e56fef1e9..0e02a8c61161 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1915,11 +1915,12 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
         },
     ];
 
+    // using the same interface as UpdateDomainSecurityGroup to correctly handle errors
     const params: UpdateDomainSecurityGroupParams = {
         domainAccountID,
         name: SECURITY_GROUP_KEY,
         value: JSON.stringify(newSecurityGroup),
-        settingsName: 'createGroup', // placeholder, waiting for BE
+        settingsName: 'createGroup',
     };
 
     API.write(WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP, params, {optimisticData, failureData, successData});
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index a736ecce0ae8..c369b8841b84 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -111,6 +111,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         clearDomainGroupCreatePreferredPolicyID();
                         Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID));
                     }}
+                    enabledWhenOffline
                     submitButtonText={translate('domain.groups.createGroupSubmitButton')}
                     style={[styles.flex1]}
                     submitButtonStyles={[styles.ph5, styles.pb3]}

From d34f2b7f311179123317cffe03071857f47364d4 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Mon, 27 Apr 2026 11:55:58 +0200
Subject: [PATCH 13/25] minor fixes after resolving merge conflict

---
 src/libs/API/parameters/CreateDomainSecurityGroupParams.ts | 7 +++++++
 src/libs/API/parameters/index.ts                           | 1 +
 src/libs/actions/Domain.ts                                 | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/libs/API/parameters/CreateDomainSecurityGroupParams.ts

diff --git a/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts b/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
new file mode 100644
index 000000000000..4e0b2c11fce6
--- /dev/null
+++ b/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
@@ -0,0 +1,7 @@
+type CreateDomainSecurityGroupParams = {
+    domainAccountID: number;
+    name: string;
+    value: string;
+};
+
+export default CreateDomainSecurityGroupParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 9c6b143b15c0..985a3532246d 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -518,4 +518,5 @@ export type {default as ChangeCardPINParams} from './ChangeCardPINParams';
 export type {default as ExportDomainMembersCSVParams} from './ExportDomainMembersCSVParams';
 export type {default as InitiateBankAccountUnlockParams} from './InitiateBankAccountUnlockParams';
 export type {default as UpdateDomainSecurityGroupParams} from './UpdateDomainSecurityGroupParams';
+export type {default as CreateDomainSecurityGroupParams} from './CreateDomainSecurityGroupParams';
 export type {default as SetDefaultDomainSecurityGroupParams} from './SetDefaultDomainSecurityGroupParams';
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index d8cfbdba2363..77343c9db245 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1835,7 +1835,7 @@ function clearDomainMembersSelectedForMove() {
 function updateDomainSecurityGroup(
     domainAccountID: number,
     groupID: string,
-    currentSecurityGroup: DomainSecurityGroup | null,
+    currentSecurityGroup: DomainSecurityGroup,
     newSettingValue: Partial<DomainSecurityGroup>,
     settingsName: keyof DomainSecurityGroup,
 ) {
@@ -1882,7 +1882,7 @@ function updateDomainSecurityGroup(
                 [SECURITY_GROUP_KEY]: {
                     [settingsName]: currentSecurityGroup[settingsName],
                 },
-            } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
+            } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, Partial<DomainSecurityGroup>>,
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2127,7 +2127,7 @@ function setDefaultSecurityGroup(domainAccountID: number, groupID: string, previ
             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    defaultSecurityGroupIDErrors: getMicroSecondOnyxErrorWithTranslationKey('domain.groups.error.settings'),
+                    defaultSecurityGroupIDErrors: getMicroSecondOnyxErrorWithTranslationKey('domain.common.error'),
                 },
             },
         },

From 8d533b7249698298e5908047b48acbc3365c3f61 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 29 Apr 2026 12:24:21 +0200
Subject: [PATCH 14/25] fix: eslint and error handling

---
 src/pages/domain/Groups/DomainGroupCreatePage.tsx | 2 +-
 src/pages/domain/Groups/DomainGroupsPage.tsx      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index c369b8841b84..ca009b071bd0 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -102,7 +102,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                             enableRestrictedPrimaryLogin: restrictDefaultLoginSelection,
                             enableStrictPolicyRules: strictlyEnforceWorkspaceRules,
                             enableRestrictedPrimaryPolicy: preferredWorkspace,
-                            restrictedPrimaryPolicyID: preferredWorkspace ? (preferredPolicyID ?? '') : '',
+                            restrictedPrimaryPolicyID: preferredWorkspace ? preferredPolicyID : undefined,
                             overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
                         });
                         if (defaultGroupForNewMembers && domainName) {
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index 85419f81312b..de9317ee9c1f 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -50,6 +50,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
     const [domainErrors] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`);
 
     const data = groups.map((group) => {
+        const groupPendingActions = pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`];
         return {
             keyForList: group.id,
             groupID: group.id,
@@ -60,7 +61,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
                     <Text numberOfLines={1}>{translate('domain.groups.memberCount', {count: Object.keys(group.details.shared).length})}</Text>
                 </View>
             ),
-            pendingAction: pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`]?.name ?? undefined,
+            pendingAction: groupPendingActions ? Object.values(groupPendingActions).find(Boolean) : undefined,
         };
     });
 

From 39ed07173e8b9e0f573aa30f7f80d3cae6449f60 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 6 May 2026 13:03:09 +0200
Subject: [PATCH 15/25] fix: add missing API parameter

---
 src/libs/API/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 9ce314e46444..256fb01ef204 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -1190,6 +1190,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP]: Parameters.UpdateDomainSecurityGroupParams;
     [WRITE_COMMANDS.CREATE_DOMAIN_SECURITY_GROUP]: Parameters.CreateDomainSecurityGroupParams;
     [WRITE_COMMANDS.SET_DEFAULT_DOMAIN_SECURITY_GROUP]: Parameters.SetDefaultDomainSecurityGroupParams;
+    [WRITE_COMMANDS.DELETE_DOMAIN_SECURITY_GROUP]: Parameters.DeleteDomainSecurityGroupParams;
 };
 
 const READ_COMMANDS = {

From 5843328b43bcb2cc947068e1e5de61f44b1d38b0 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 6 May 2026 16:01:57 +0200
Subject: [PATCH 16/25] fix: use CREATE_DOMAIN_SECURITY_GROUP API command, add
 shouldSetAsDefaultGroup parameter, distinguish pending actions for group
 deletion and creation

---
 .../CreateDomainSecurityGroupParams.ts        |  1 +
 src/libs/actions/Domain.ts                    | 18 +++++++------
 .../domain/Groups/DomainGroupCreatePage.tsx   | 27 ++++++++++---------
 src/pages/domain/Groups/DomainGroupsPage.tsx  | 22 +++++++++++----
 src/types/onyx/DomainErrors.ts                |  2 +-
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts b/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
index 4e0b2c11fce6..d522f84b4d7e 100644
--- a/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
+++ b/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
@@ -2,6 +2,7 @@ type CreateDomainSecurityGroupParams = {
     domainAccountID: number;
     name: string;
     value: string;
+    shouldSetAsDefaultGroup: boolean;
 };
 
 export default CreateDomainSecurityGroupParams;
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index ac9189c4b600..8f9b86db94c5 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -7,6 +7,7 @@ import type {
     AddAdminToDomainParams,
     AddMemberToDomainParams,
     ChangeDomainSecurityGroupParams,
+    CreateDomainSecurityGroupParams,
     DeleteDomainMemberParams,
     DeleteDomainParams,
     DeleteDomainSecurityGroupParams,
@@ -2173,8 +2174,9 @@ function clearDomainGroupCreatePreferredPolicyID() {
  * Creates a new domain security group with the given configuration
  * @param domainAccountID - The account ID of the domain
  * @param newSecurityGroup - The security group data to create
+ * @param shouldSetAsDefaultGroup - Whether we want to set newly created security group as the default
  */
-function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: DomainSecurityGroup) {
+function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: DomainSecurityGroup, shouldSetAsDefaultGroup = false) {
     const groupID = String(Num.generateRandom6DigitID());
     const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
 
@@ -2223,7 +2225,7 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: null,
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
             },
         },
@@ -2259,17 +2261,14 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
         },
     ];
 
-    // using the same interface as UpdateDomainSecurityGroup to correctly handle errors
-    const params: UpdateDomainSecurityGroupParams = {
+    const params: CreateDomainSecurityGroupParams = {
         domainAccountID,
         name: SECURITY_GROUP_KEY,
         value: JSON.stringify(newSecurityGroup),
-        settingsName: 'createGroup',
+        shouldSetAsDefaultGroup,
     };
 
-    API.write(WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP, params, {optimisticData, failureData, successData});
-
-    return groupID;
+    API.write(WRITE_COMMANDS.CREATE_DOMAIN_SECURITY_GROUP, params, {optimisticData, failureData, successData});
 }
 
 /**
@@ -2282,6 +2281,9 @@ function clearGroupCreateError(domainAccountID: number, groupID: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {
         [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`]: null,
     });
+    Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, {
+        [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`]: null,
+    });
 }
 
 export {
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 6a13ae8c99ae..856d0bce8401 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -95,19 +95,20 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         return errors;
                     }}
                     onSubmit={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.CREATE_DOMAIN_GROUP_FORM>) => {
-                        const groupID = createDomainSecurityGroup(domainAccountID, {
-                            name: values[INPUT_IDS.NAME],
-                            shared: {},
-                            enableRestrictedPolicyCreation: restrictExpenseWorkspaceCreation,
-                            enableRestrictedPrimaryLogin: restrictDefaultLoginSelection,
-                            enableStrictPolicyRules: strictlyEnforceWorkspaceRules,
-                            enableRestrictedPrimaryPolicy: preferredWorkspace,
-                            restrictedPrimaryPolicyID: preferredWorkspace ? preferredPolicyID : undefined,
-                            overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
-                        });
-                        if (defaultGroupForNewMembers && domainName) {
-                            setDefaultSecurityGroup(domainAccountID, groupID, defaultSecurityGroupID);
-                        }
+                        createDomainSecurityGroup(
+                            domainAccountID,
+                            {
+                                name: values[INPUT_IDS.NAME],
+                                shared: {},
+                                enableRestrictedPolicyCreation: restrictExpenseWorkspaceCreation,
+                                enableRestrictedPrimaryLogin: restrictDefaultLoginSelection,
+                                enableStrictPolicyRules: strictlyEnforceWorkspaceRules,
+                                enableRestrictedPrimaryPolicy: preferredWorkspace,
+                                restrictedPrimaryPolicyID: preferredWorkspace ? preferredPolicyID : undefined,
+                                overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
+                            },
+                            defaultGroupForNewMembers,
+                        );
                         clearDomainGroupCreatePreferredPolicyID();
                         Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID));
                     }}
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index 237c9fad04c3..046dbee3cb7d 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -22,11 +22,12 @@ import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
 import type {DomainSplitNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
-import {clearGroupDeleteError} from '@userActions/Domain';
+import {clearGroupCreateError, clearGroupDeleteError} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import {isEmptyValueObject} from '@src/types/utils/EmptyObject';
 import getEmptyArray from '@src/types/utils/getEmptyArray';
 
 type GroupOption = Omit<ListItem, 'groupID'> & {
@@ -54,19 +55,23 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
     const data = groups.map((group) => {
         const isDefault = group.id === defaultGroupID;
         const groupPendingActions = pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`];
+        const groupErrorMessage = getLatestError(domainErrors?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`]?.errors);
+        const isPendingAdd = groupPendingActions?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+        const isFailedCreate = isPendingAdd && !isEmptyValueObject(groupErrorMessage);
+        const visiblePendingAction = isPendingAdd ? undefined : Object.values(groupPendingActions ?? {}).find(Boolean);
         return {
             keyForList: group.id,
             groupID: group.id,
             text: group.details.name ?? '',
-            errors: getLatestError(domainErrors?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`]?.errors),
+            errors: groupErrorMessage,
             rightElement: (
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
                     <Text numberOfLines={1}>{translate('domain.groups.memberCount', {count: Object.keys(group.details.shared).length})}</Text>
                     {isDefault && <Badge text={translate('common.default')} />}
                 </View>
             ),
-            pendingAction: Object.values(pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`] ?? {}).find(Boolean),
-            isDisabled: isSecurityGroupPendingDeleteSelector(group.id)(pendingActions),
+            pendingAction: visiblePendingAction,
+            isDisabled: isSecurityGroupPendingDeleteSelector(group.id)(pendingActions) || isFailedCreate,
         };
     });
 
@@ -122,7 +127,14 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
                     data={data}
                     ListItem={TableListItem}
                     onSelectRow={(item: GroupOption) => Navigation.navigate(ROUTES.DOMAIN_GROUP_DETAILS.getRoute(domainAccountID, item.groupID))}
-                    onDismissError={(item: GroupOption) => clearGroupDeleteError(domainAccountID, item.groupID)}
+                    onDismissError={(item: GroupOption) => {
+                        const groupPendingAction = pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${item.groupID}`]?.pendingAction;
+                        if (groupPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+                            clearGroupCreateError(domainAccountID, item.groupID);
+                            return;
+                        }
+                        clearGroupDeleteError(domainAccountID, item.groupID);
+                    }}
                     customListHeader={getCustomListHeader()}
                     shouldShowRightCaret
                     addBottomSafeAreaPadding
diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts
index 580783683d71..77200980ecea 100644
--- a/src/types/onyx/DomainErrors.ts
+++ b/src/types/onyx/DomainErrors.ts
@@ -61,7 +61,7 @@ type DomainSecurityGroupErrors = {
     enableRestrictedPolicyCreationErrors?: OnyxCommon.Errors;
 
     /**
-     * Errors related to deleting the security group
+     * Errors related to group-level operations (create, delete) on the security group
      */
     errors?: OnyxCommon.Errors;
 

From 495c43fac059e8e33c746b4c154fb09b7f54e906 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Wed, 6 May 2026 16:12:53 +0200
Subject: [PATCH 17/25] fix: refactor pending actions for group creation and
 deletion

---
 src/libs/actions/Domain.ts                   | 12 ++++++------
 src/pages/domain/Groups/DomainGroupsPage.tsx |  9 +++------
 src/types/onyx/DomainPendingActions.ts       |  9 +++++++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index 8f9b86db94c5..7b13ab637395 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -1971,7 +1971,7 @@ function deleteDomainSecurityGroup(domainAccountID: number, groupID: string) {
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    deleteGroup: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 },
             },
         },
@@ -1992,7 +1992,7 @@ function deleteDomainSecurityGroup(domainAccountID: number, groupID: string) {
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: null,
+                    deleteGroup: null,
                 },
             },
         },
@@ -2022,7 +2022,7 @@ function deleteDomainSecurityGroup(domainAccountID: number, groupID: string) {
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: null,
+                    deleteGroup: null,
                 },
             },
         },
@@ -2195,7 +2195,7 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    createGroup: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
             },
         },
@@ -2225,7 +2225,7 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    createGroup: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
             },
         },
@@ -2246,7 +2246,7 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: {
-                    pendingAction: null,
+                    createGroup: null,
                 },
             },
         },
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index 046dbee3cb7d..fd26d2884095 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -56,9 +56,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
         const isDefault = group.id === defaultGroupID;
         const groupPendingActions = pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`];
         const groupErrorMessage = getLatestError(domainErrors?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${group.id}`]?.errors);
-        const isPendingAdd = groupPendingActions?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
-        const isFailedCreate = isPendingAdd && !isEmptyValueObject(groupErrorMessage);
-        const visiblePendingAction = isPendingAdd ? undefined : Object.values(groupPendingActions ?? {}).find(Boolean);
+        const isFailedCreate = groupPendingActions?.createGroup === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyValueObject(groupErrorMessage);
         return {
             keyForList: group.id,
             groupID: group.id,
@@ -70,7 +68,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
                     {isDefault && <Badge text={translate('common.default')} />}
                 </View>
             ),
-            pendingAction: visiblePendingAction,
+            pendingAction: Object.values(groupPendingActions ?? {}).find(Boolean),
             isDisabled: isSecurityGroupPendingDeleteSelector(group.id)(pendingActions) || isFailedCreate,
         };
     });
@@ -128,8 +126,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
                     ListItem={TableListItem}
                     onSelectRow={(item: GroupOption) => Navigation.navigate(ROUTES.DOMAIN_GROUP_DETAILS.getRoute(domainAccountID, item.groupID))}
                     onDismissError={(item: GroupOption) => {
-                        const groupPendingAction = pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${item.groupID}`]?.pendingAction;
-                        if (groupPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+                        if (pendingActions?.[`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${item.groupID}`]?.createGroup) {
                             clearGroupCreateError(domainAccountID, item.groupID);
                             return;
                         }
diff --git a/src/types/onyx/DomainPendingActions.ts b/src/types/onyx/DomainPendingActions.ts
index ead0960beaaa..7fe170f5fd4a 100644
--- a/src/types/onyx/DomainPendingActions.ts
+++ b/src/types/onyx/DomainPendingActions.ts
@@ -41,9 +41,14 @@ type DomainMemberPendingActions = {
  */
 type DomainSecurityGroupPendingActions = {
     /**
-     * Base pending action for group-level operations (create, delete)
+     * Pending action for creating a new security group
      */
-    pendingAction?: OnyxCommon.PendingAction;
+    createGroup?: OnyxCommon.PendingAction;
+
+    /**
+     * Pending action for deleting a security group
+     */
+    deleteGroup?: OnyxCommon.PendingAction;
 
     /**
      * Pending action for the security group name

From 49eacaeb0eb60cbd5e6c7fb5c5c92726c81cbf41 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 7 May 2026 13:27:57 +0200
Subject: [PATCH 18/25] refactor: make changes related to previously merged PRs
 that Create Group functionality bases on

---
 .../domain/Groups/DomainGroupCreatePage.tsx   | 15 ++++++++++
 ...omainGroupCreatePreferredWorkspacePage.tsx | 29 +++----------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 856d0bce8401..2fdbb288a124 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -44,6 +44,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [expensifyCardPreferredWorkspace, setExpensifyCardPreferredWorkspace] = useState(false);
     const [preferredWorkspace, setPreferredWorkspace] = useState(false);
     const [isNoWorkspacesModalVisible, setIsNoWorkspacesModalVisible] = useState(false);
+    const [isExpensifyCardDisabledModalVisible, setIsExpensifyCardDisabledModalVisible] = useState(false);
 
     const [preferredPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
     const [preferredPolicyName] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${preferredPolicyID}`, {
@@ -56,6 +57,8 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
         selector: defaultSecurityGroupIDSelector,
     });
     const [adminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector()});
+    const [domainCardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${domainAccountID}`);
+    const isDomainUsingExpensifyCard = !!domainCardSettings;
 
     const firstAdminPolicy = Object.values(adminPolicies ?? {})
         .sort((a, b) => localeCompare(a?.created ?? '', b?.created ?? ''))
@@ -181,6 +184,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                                 }
                             } else {
                                 clearDomainGroupCreatePreferredPolicyID();
+                                setExpensifyCardPreferredWorkspace(false);
                             }
                         }}
                         wrapperStyle={[styles.ph5, styles.mv3]}
@@ -209,10 +213,21 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         subtitle={translate('domain.groups.expensifyCardPreferredWorkspaceDescription')}
                         switchAccessibilityLabel={translate('domain.groups.expensifyCardPreferredWorkspace')}
                         isActive={expensifyCardPreferredWorkspace}
+                        disabled={!preferredWorkspace || !isDomainUsingExpensifyCard}
+                        disabledAction={() => setIsExpensifyCardDisabledModalVisible(true)}
                         onToggle={setExpensifyCardPreferredWorkspace}
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
+                    <ConfirmModal
+                        onConfirm={() => setIsExpensifyCardDisabledModalVisible(false)}
+                        onCancel={() => setIsExpensifyCardDisabledModalVisible(false)}
+                        isVisible={isExpensifyCardDisabledModalVisible}
+                        title={translate('workspace.distanceRates.oopsNotSoFast')}
+                        prompt={translate('domain.groups.expensifyCardPreferredWorkspaceDisabledMessage')}
+                        confirmText={translate('common.buttonConfirm')}
+                        shouldShowCancelButton={false}
+                    />
                 </FormProvider>
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>
diff --git a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
index ac41d5490ea1..7daeab4c9eb3 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
@@ -1,6 +1,5 @@
 import {createAdminPoliciesSelector} from '@selectors/Policy';
-import React, {useState} from 'react';
-import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import React from 'react';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
@@ -38,8 +37,6 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
 
     const [currentPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: createAdminPoliciesSelector(currentPolicyID)});
-    const [selectedPolicyID, setSelectedPolicyID] = useState<string | undefined>(currentPolicyID);
-    const [shouldShowError, setShouldShowError] = useState(false);
 
     const workspaceOptions: WorkspaceListItem[] = [];
     for (const policy of Object.values(policies ?? {})) {
@@ -52,7 +49,7 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
             policyID: policy.id,
             created: policy.created,
             keyForList: policy.id,
-            isSelected: selectedPolicyID === policy.id,
+            isSelected: currentPolicyID === policy.id,
             icons: [
                 {
                     source: policy.avatarURL ?? getDefaultWorkspaceAvatar(policy.name),
@@ -65,15 +62,6 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
         });
     }
 
-    const handleSubmit = () => {
-        if (!selectedPolicyID) {
-            setShouldShowError(true);
-            return;
-        }
-        setDomainGroupCreatePreferredPolicyID(selectedPolicyID);
-        Navigation.goBack(ROUTES.DOMAIN_GROUP_CREATE.getRoute(domainAccountID));
-    };
-
     return (
         <DomainNotFoundPageWrapper domainAccountID={domainAccountID}>
             <ScreenWrapper
@@ -90,20 +78,11 @@ function DomainGroupCreatePreferredWorkspacePage({route}: DomainGroupCreatePrefe
                     data={workspaceOptions.sort((a, b) => localeCompare(a.created ?? '', b.created ?? ''))}
                     ListItem={UserListItem}
                     onSelectRow={(item: WorkspaceListItem) => {
-                        setSelectedPolicyID(item.policyID);
-                        setShouldShowError(false);
+                        setDomainGroupCreatePreferredPolicyID(item.policyID);
+                        Navigation.goBack(ROUTES.DOMAIN_GROUP_CREATE.getRoute(domainAccountID));
                     }}
                     initiallyFocusedItemKey={currentPolicyID}
                     shouldUpdateFocusedIndex
-                    footerContent={
-                        <FormAlertWithSubmitButton
-                            buttonText={translate('common.save')}
-                            onSubmit={handleSubmit}
-                            isAlertVisible={shouldShowError}
-                            containerStyles={[!shouldShowError && styles.mt5]}
-                            message={translate('common.error.pleaseSelectOne')}
-                        />
-                    }
                 />
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>

From 86e49c54446b211d6a15a9d1818a3d8a7f449ff4 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 7 May 2026 13:31:22 +0200
Subject: [PATCH 19/25] fix: update tests to call CREATE_DOMAIN_SECURITY_GROUP
 command

---
 tests/actions/DomainTest.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
index d7bb9e876f27..ec06d30c5491 100644
--- a/tests/actions/DomainTest.ts
+++ b/tests/actions/DomainTest.ts
@@ -1333,9 +1333,8 @@ describe('actions/Domain', () => {
             const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
 
             expect(apiWriteSpy).toHaveBeenCalledWith(
-                WRITE_COMMANDS.UPDATE_DOMAIN_SECURITY_GROUP,
-                // placeholder settingsName, waiting for BE
-                {domainAccountID, name: SECURITY_GROUP_KEY, value: JSON.stringify(newSecurityGroup), settingsName: 'createGroup'},
+                WRITE_COMMANDS.CREATE_DOMAIN_SECURITY_GROUP,
+                {domainAccountID, name: SECURITY_GROUP_KEY, value: JSON.stringify(newSecurityGroup), shouldSetAsDefaultGroup: false},
                 {
                     optimisticData: expect.arrayContaining([
                         expect.objectContaining({
@@ -1344,7 +1343,7 @@ describe('actions/Domain', () => {
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
-                            value: {[SECURITY_GROUP_KEY]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}},
+                            value: {[SECURITY_GROUP_KEY]: {createGroup: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
@@ -1354,7 +1353,7 @@ describe('actions/Domain', () => {
                     successData: expect.arrayContaining([
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
-                            value: {[SECURITY_GROUP_KEY]: {pendingAction: null}},
+                            value: {[SECURITY_GROUP_KEY]: {createGroup: null}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
@@ -1368,7 +1367,7 @@ describe('actions/Domain', () => {
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
-                            value: {[SECURITY_GROUP_KEY]: {pendingAction: null}},
+                            value: {[SECURITY_GROUP_KEY]: {createGroup: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,

From ec24dd16d5d636d259f31b1734eec2104fb6215d Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 7 May 2026 13:47:44 +0200
Subject: [PATCH 20/25] fix: Optimistically mark the new default group

---
 src/libs/actions/Domain.ts                    |  7 ++-
 .../domain/Groups/DomainGroupCreatePage.tsx   |  1 +
 tests/actions/DomainTest.ts                   | 52 +++++++++++++++++--
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index 7b13ab637395..dd66d3f0e7ba 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -2175,8 +2175,9 @@ function clearDomainGroupCreatePreferredPolicyID() {
  * @param domainAccountID - The account ID of the domain
  * @param newSecurityGroup - The security group data to create
  * @param shouldSetAsDefaultGroup - Whether we want to set newly created security group as the default
+ * @param previousDefaultGroupID - The current default group ID, used to revert on failure when shouldSetAsDefaultGroup is true
  */
-function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: DomainSecurityGroup, shouldSetAsDefaultGroup = false) {
+function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: DomainSecurityGroup, shouldSetAsDefaultGroup = false, previousDefaultGroupID?: string) {
     const groupID = String(Num.generateRandom6DigitID());
     const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
 
@@ -2188,6 +2189,8 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: newSecurityGroup,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                ...(shouldSetAsDefaultGroup && {domain_defaultSecurityGroupID: groupID}),
             } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
         },
         {
@@ -2218,6 +2221,8 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: newSecurityGroup,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                ...(shouldSetAsDefaultGroup && {domain_defaultSecurityGroupID: previousDefaultGroupID}),
             } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
         },
         {
diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 2fdbb288a124..d478ac950f90 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -111,6 +111,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                                 overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
                             },
                             defaultGroupForNewMembers,
+                            defaultSecurityGroupID,
                         );
                         clearDomainGroupCreatePreferredPolicyID();
                         Navigation.goBack(ROUTES.DOMAIN_GROUPS.getRoute(domainAccountID));
diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
index ec06d30c5491..98620b5f951a 100644
--- a/tests/actions/DomainTest.ts
+++ b/tests/actions/DomainTest.ts
@@ -1319,7 +1319,17 @@ describe('actions/Domain', () => {
     });
 
     describe('createDomainSecurityGroup', () => {
-        it('sends UPDATE_DOMAIN_SECURITY_GROUP with correct optimistic, success, and failure data', () => {
+        const FIXED_GROUP_ID = '123456';
+
+        beforeEach(() => {
+            jest.spyOn(require('expensify-common').Num, 'generateRandom6DigitID').mockReturnValue(Number(FIXED_GROUP_ID));
+        });
+
+        afterEach(() => {
+            jest.restoreAllMocks();
+        });
+
+        it('sends CREATE_DOMAIN_SECURITY_GROUP with correct optimistic, success, and failure data', () => {
             const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
             const domainAccountID = 123;
             const newSecurityGroup: DomainSecurityGroup = {
@@ -1328,9 +1338,9 @@ describe('actions/Domain', () => {
                 enableRestrictedPolicyCreation: false,
                 enableRestrictedPrimaryLogin: false,
             };
+            const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${FIXED_GROUP_ID}`;
 
-            const groupID = createDomainSecurityGroup(domainAccountID, newSecurityGroup);
-            const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${groupID}`;
+            createDomainSecurityGroup(domainAccountID, newSecurityGroup);
 
             expect(apiWriteSpy).toHaveBeenCalledWith(
                 WRITE_COMMANDS.CREATE_DOMAIN_SECURITY_GROUP,
@@ -1377,8 +1387,42 @@ describe('actions/Domain', () => {
                     ]),
                 },
             );
+        });
 
-            apiWriteSpy.mockRestore();
+        it('optimistically sets domain_defaultSecurityGroupID to the new group when shouldSetAsDefaultGroup is true and reverts it on failure', () => {
+            const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
+            const domainAccountID = 123;
+            const previousDefaultGroupID = '999';
+            const newSecurityGroup: DomainSecurityGroup = {
+                name: 'Default Group',
+                shared: {},
+                enableRestrictedPolicyCreation: false,
+                enableRestrictedPrimaryLogin: false,
+            };
+            const SECURITY_GROUP_KEY = `${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}${FIXED_GROUP_ID}`;
+
+            createDomainSecurityGroup(domainAccountID, newSecurityGroup, true, previousDefaultGroupID);
+
+            expect(apiWriteSpy).toHaveBeenCalledWith(
+                WRITE_COMMANDS.CREATE_DOMAIN_SECURITY_GROUP,
+                {domainAccountID, name: SECURITY_GROUP_KEY, value: JSON.stringify(newSecurityGroup), shouldSetAsDefaultGroup: true},
+                expect.objectContaining({
+                    optimisticData: expect.arrayContaining([
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            value: expect.objectContaining({domain_defaultSecurityGroupID: FIXED_GROUP_ID}),
+                        }),
+                    ]),
+                    failureData: expect.arrayContaining([
+                        expect.objectContaining({
+                            key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            value: expect.objectContaining({domain_defaultSecurityGroupID: previousDefaultGroupID}),
+                        }),
+                    ]),
+                }),
+            );
         });
     });
 

From 4aec51e5652d13de2f127833cd17006e9e46facd Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 7 May 2026 20:26:34 +0200
Subject: [PATCH 21/25] apply review changes, update tests, reorder policy
 selectors, lint fixes

---
 .../domain/Groups/DomainGroupCreatePage.tsx   | 47 ++++++++-----------
 src/selectors/Policy.ts                       | 36 +++++++-------
 tests/actions/DomainTest.ts                   |  9 ++--
 3 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index d478ac950f90..4726c570525c 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -2,7 +2,6 @@ import {defaultSecurityGroupIDSelector, domainNameSelector} from '@selectors/Dom
 import {createAdminPoliciesSelector, policyNameSelector} from '@selectors/Policy';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
-import ConfirmModal from '@components/ConfirmModal';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
@@ -12,6 +11,7 @@ import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import useConfirmModal from '@hooks/useConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -21,7 +21,7 @@ import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDefaultSecurityGroup, setDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
+import {clearDomainGroupCreatePreferredPolicyID, createDomainSecurityGroup, setDomainGroupCreatePreferredPolicyID} from '@userActions/Domain';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -43,16 +43,13 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
     const [restrictExpenseWorkspaceCreation, setRestrictExpenseWorkspaceCreation] = useState(false);
     const [expensifyCardPreferredWorkspace, setExpensifyCardPreferredWorkspace] = useState(false);
     const [preferredWorkspace, setPreferredWorkspace] = useState(false);
-    const [isNoWorkspacesModalVisible, setIsNoWorkspacesModalVisible] = useState(false);
-    const [isExpensifyCardDisabledModalVisible, setIsExpensifyCardDisabledModalVisible] = useState(false);
+
+    const {showConfirmModal} = useConfirmModal();
 
     const [preferredPolicyID] = useOnyx(ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID);
     const [preferredPolicyName] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${preferredPolicyID}`, {
         selector: policyNameSelector,
     });
-    const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
-        selector: domainNameSelector,
-    });
     const [defaultSecurityGroupID] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         selector: defaultSecurityGroupIDSelector,
     });
@@ -176,7 +173,14 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         switchAccessibilityLabel={translate('domain.groups.preferredWorkspace')}
                         isActive={preferredWorkspace}
                         disabled={!hasAdminPolicies}
-                        disabledAction={() => setIsNoWorkspacesModalVisible(true)}
+                        disabledAction={() => {
+                            showConfirmModal({
+                                title: translate('workspace.distanceRates.oopsNotSoFast'),
+                                prompt: translate('domain.groups.noWorkspacesMessage'),
+                                confirmText: translate('common.buttonConfirm'),
+                                shouldShowCancelButton: false,
+                            });
+                        }}
                         onToggle={(value) => {
                             setPreferredWorkspace(value);
                             if (value) {
@@ -191,15 +195,6 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
-                    <ConfirmModal
-                        onConfirm={() => setIsNoWorkspacesModalVisible(false)}
-                        onCancel={() => setIsNoWorkspacesModalVisible(false)}
-                        isVisible={isNoWorkspacesModalVisible}
-                        title={translate('workspace.distanceRates.oopsNotSoFast')}
-                        prompt={translate('domain.groups.noWorkspacesMessage')}
-                        confirmText={translate('common.buttonConfirm')}
-                        shouldShowCancelButton={false}
-                    />
                     {hasAdminPolicies && (
                         <MenuItemWithTopDescription
                             description={translate('domain.groups.preferredWorkspace')}
@@ -215,20 +210,18 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                         switchAccessibilityLabel={translate('domain.groups.expensifyCardPreferredWorkspace')}
                         isActive={expensifyCardPreferredWorkspace}
                         disabled={!preferredWorkspace || !isDomainUsingExpensifyCard}
-                        disabledAction={() => setIsExpensifyCardDisabledModalVisible(true)}
+                        disabledAction={() => {
+                            showConfirmModal({
+                                title: translate('workspace.distanceRates.oopsNotSoFast'),
+                                prompt: translate('domain.groups.expensifyCardPreferredWorkspaceDisabledMessage'),
+                                confirmText: translate('common.buttonConfirm'),
+                                shouldShowCancelButton: false,
+                            });
+                        }}
                         onToggle={setExpensifyCardPreferredWorkspace}
                         wrapperStyle={[styles.ph5, styles.mv3]}
                         shouldPlaceSubtitleBelowSwitch
                     />
-                    <ConfirmModal
-                        onConfirm={() => setIsExpensifyCardDisabledModalVisible(false)}
-                        onCancel={() => setIsExpensifyCardDisabledModalVisible(false)}
-                        isVisible={isExpensifyCardDisabledModalVisible}
-                        title={translate('workspace.distanceRates.oopsNotSoFast')}
-                        prompt={translate('domain.groups.expensifyCardPreferredWorkspaceDisabledMessage')}
-                        confirmText={translate('common.buttonConfirm')}
-                        shouldShowCancelButton={false}
-                    />
                 </FormProvider>
             </ScreenWrapper>
         </DomainNotFoundPageWrapper>
diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts
index d91d7e592f7e..4eb964754c0b 100644
--- a/src/selectors/Policy.ts
+++ b/src/selectors/Policy.ts
@@ -106,24 +106,6 @@ const policyMapper = (policy: OnyxEntry<Policy>): PolicySelector =>
         areInvoicesEnabled: policy.areInvoicesEnabled,
     }) as PolicySelector;
 
-const policyNameSelector = (policy: OnyxEntry<Policy>) => policy?.name;
-
-const createAdminPoliciesSelector =
-    (currentPolicyID: string | undefined = undefined) =>
-    (policies: OnyxCollection<Policy>) => {
-        return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL' | 'created'>>>((acc, [key, policy]) => {
-            if (!policy?.id || !policy?.name) {
-                return acc;
-            }
-            const isCurrentPolicy = policy.id === currentPolicyID;
-            if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
-                return acc;
-            }
-            acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL, created: policy.created};
-            return acc;
-        }, {});
-    };
-
 // deepEqual on ~15 fields is cheaper than re-rendering IOURequestStartPage's full hook/memo tree.
 const iouRequestPolicyCollectionSelector = (policies: OnyxCollection<Policy>): OnyxCollection<Policy> => {
     if (!policies) {
@@ -230,6 +212,24 @@ function lastWorkspaceNumberSelector(policies: OnyxCollection<Policy>, email: st
     return lastWorkspaceNumber;
 }
 
+const policyNameSelector = (policy: OnyxEntry<Policy>) => policy?.name;
+
+const createAdminPoliciesSelector =
+    (currentPolicyID: string | undefined = undefined) =>
+    (policies: OnyxCollection<Policy>) => {
+        return Object.entries(policies ?? {}).reduce<Record<string, Pick<Policy, 'name' | 'id' | 'avatarURL' | 'created'>>>((acc, [key, policy]) => {
+            if (!policy?.id || !policy?.name) {
+                return acc;
+            }
+            const isCurrentPolicy = policy.id === currentPolicyID;
+            if (!isCurrentPolicy && (policy.type === CONST.POLICY.TYPE.PERSONAL || policy.role !== CONST.POLICY.ROLE.ADMIN)) {
+                return acc;
+            }
+            acc[key] = {id: policy.id, name: policy.name, avatarURL: policy.avatarURL, created: policy.created};
+            return acc;
+        }, {});
+    };
+
 export type {PolicySelector};
 export {
     activePolicySelector,
diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts
index 98620b5f951a..a2eb9f7f2cee 100644
--- a/tests/actions/DomainTest.ts
+++ b/tests/actions/DomainTest.ts
@@ -1,3 +1,4 @@
+import {Num} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import {
     addAdminToDomain,
@@ -1114,7 +1115,7 @@ describe('actions/Domain', () => {
                     optimisticData: expect.arrayContaining([
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
-                            value: {[SECURITY_GROUP_KEY]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
+                            value: {[SECURITY_GROUP_KEY]: {deleteGroup: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
@@ -1139,7 +1140,7 @@ describe('actions/Domain', () => {
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
-                            value: {[SECURITY_GROUP_KEY]: {pendingAction: null}},
+                            value: {[SECURITY_GROUP_KEY]: {deleteGroup: null}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
@@ -1160,7 +1161,7 @@ describe('actions/Domain', () => {
                     failureData: expect.arrayContaining([
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`,
-                            value: {[SECURITY_GROUP_KEY]: {pendingAction: null}},
+                            value: {[SECURITY_GROUP_KEY]: {deleteGroup: null}},
                         }),
                         expect.objectContaining({
                             key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
@@ -1322,7 +1323,7 @@ describe('actions/Domain', () => {
         const FIXED_GROUP_ID = '123456';
 
         beforeEach(() => {
-            jest.spyOn(require('expensify-common').Num, 'generateRandom6DigitID').mockReturnValue(Number(FIXED_GROUP_ID));
+            jest.spyOn(Num, 'generateRandom6DigitID').mockReturnValue(Number(FIXED_GROUP_ID));
         });
 
         afterEach(() => {

From 70c0ed11c64786129cd96167c3a4df3a576ff264 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 7 May 2026 20:30:58 +0200
Subject: [PATCH 22/25] fix: fall back to the default workspace ID on submit

---
 src/pages/domain/Groups/DomainGroupCreatePage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index 4726c570525c..dca30dc2ead1 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -104,7 +104,7 @@ function DomainGroupCreatePage({route}: DomainGroupCreatePageProps) {
                                 enableRestrictedPrimaryLogin: restrictDefaultLoginSelection,
                                 enableStrictPolicyRules: strictlyEnforceWorkspaceRules,
                                 enableRestrictedPrimaryPolicy: preferredWorkspace,
-                                restrictedPrimaryPolicyID: preferredWorkspace ? preferredPolicyID : undefined,
+                                restrictedPrimaryPolicyID: preferredPolicyID ?? firstAdminPolicy?.id,
                                 overridePreferredPolicyWithCardPolicy: expensifyCardPreferredWorkspace,
                             },
                             defaultGroupForNewMembers,

From 6319af55a9afa58827ed317dfe1934f52d6b6fb1 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Thu, 7 May 2026 20:54:38 +0200
Subject: [PATCH 23/25] fix: lint

---
 src/pages/domain/Groups/DomainGroupCreatePage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/domain/Groups/DomainGroupCreatePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
index dca30dc2ead1..acff04c78b95 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePage.tsx
@@ -1,4 +1,4 @@
-import {defaultSecurityGroupIDSelector, domainNameSelector} from '@selectors/Domain';
+import {defaultSecurityGroupIDSelector} from '@selectors/Domain';
 import {createAdminPoliciesSelector, policyNameSelector} from '@selectors/Policy';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';

From 4040e336bfe15c23d9da4d80e1a49e6a6950bba8 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Fri, 8 May 2026 12:25:30 +0200
Subject: [PATCH 24/25] fix: add eslint justification

---
 src/libs/actions/Domain.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
index dd66d3f0e7ba..160a2218dec9 100644
--- a/src/libs/actions/Domain.ts
+++ b/src/libs/actions/Domain.ts
@@ -2189,6 +2189,7 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: newSecurityGroup,
+                // backend API uses snake_case for domain_defaultSecurityGroupID
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 ...(shouldSetAsDefaultGroup && {domain_defaultSecurityGroupID: groupID}),
             } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,
@@ -2221,6 +2222,7 @@ function createDomainSecurityGroup(domainAccountID: number, newSecurityGroup: Do
             key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
             value: {
                 [SECURITY_GROUP_KEY]: newSecurityGroup,
+                // backend API uses snake_case for domain_defaultSecurityGroupID
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 ...(shouldSetAsDefaultGroup && {domain_defaultSecurityGroupID: previousDefaultGroupID}),
             } as PrefixedRecord<typeof CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, DomainSecurityGroup>,

From 3e46b2b4a5580c7353b8db935ebfd0dd085dd549 Mon Sep 17 00:00:00 2001
From: jakubstec <jakub.stec@swmansion.com>
Date: Mon, 11 May 2026 17:54:55 +0200
Subject: [PATCH 25/25] fix: add docs

---
 src/libs/API/parameters/CreateDomainSecurityGroupParams.ts | 7 +++++++
 .../Groups/DomainGroupCreatePreferredWorkspacePage.tsx     | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts b/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
index d522f84b4d7e..6efbc440db67 100644
--- a/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
+++ b/src/libs/API/parameters/CreateDomainSecurityGroupParams.ts
@@ -1,7 +1,14 @@
 type CreateDomainSecurityGroupParams = {
+    /** Account ID of the domain */
     domainAccountID: number;
+
+    /** Security group key, prefixed with the domain security group prefix */
     name: string;
+
+    /** Stringified JSON of the new security group */
     value: string;
+
+    /** Whether to set the newly created group as the default security group */
     shouldSetAsDefaultGroup: boolean;
 };
 
diff --git a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
index 7daeab4c9eb3..20d27b6a8fd3 100644
--- a/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
+++ b/src/pages/domain/Groups/DomainGroupCreatePreferredWorkspacePage.tsx
@@ -22,7 +22,10 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 type WorkspaceListItem = {
+    /** The ID of the policy/workspace */
     policyID: string;
+
+    /** The timestamp of when the policy was created */
     created?: string;
 } & ListItem;