Merge pull request #88713 from software-mansion-labs/jakubstec/domains/security-group-details-page-group-permissions4

mountiny · web-flow · commit dfe7f599819b · 2026-05-07T12:59:53.000+02:00
[Domain Control] [Release 4] Add `Expensify Card Preferred Workspace` Toggle to DomainGroupDetailsPage
diff --git a/src/languages/de.ts b/src/languages/de.ts
@@ -9236,6 +9236,11 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
             restrictDefaultLoginSelection: 'Standard-Login-Auswahl einschränken',
             restrictDefaultLoginSelectionDescription:
                 'Verhindert, dass Mitglieder ihre Login-E-Mail-Adresse außerhalb der Unternehmensdomäne ändern, um Richtlinienbeschränkungen zu umgehen.',
+            expensifyCardPreferredWorkspace: 'Bevorzugter Workspace für die Expensify Card',
+            expensifyCardPreferredWorkspaceDescription:
+                'Alle Expensify-Card-Transaktionen werden im bevorzugten Workspace für die Expensify Card statt im bevorzugten Workspace erstellt. Die Aktivierung dieser Funktion überschreibt die Einstellung des bevorzugten Workspace ausschließlich für Expensify-Card-Transaktionen.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Um diese Einstellung zu verwenden, muss der bevorzugte Workspace aktiviert und für die Domain die Expensify Card eingerichtet sein.',
             findGroup: 'Gruppe suchen',
         },
     },
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -9241,6 +9241,10 @@ const translations = {
             noWorkspacesMessage: 'There are no workspaces on this domain. A workspace is required to enable this restriction.',
             restrictDefaultLoginSelection: 'Restrict default login selection',
             restrictDefaultLoginSelectionDescription: 'Prevent members from changing their login email away from their company domain to avoid policy restrictions.',
+            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.',
+            expensifyCardPreferredWorkspaceDisabledMessage: 'To use this setting, Preferred Workspace must be enabled and the domain must have Expensify Card set up.',
             findGroup: 'Find group',
         },
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -9476,6 +9476,11 @@ ${amount} para ${merchant} - ${date}`,
             noWorkspacesMessage: 'No hay espacios de trabajo en este dominio. Se requiere un espacio de trabajo para habilitar esta restricción.',
             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.',
+            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.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Para usar esta configuración, el espacio de trabajo preferido debe estar habilitado y el dominio debe tener Expensify Card configurada.',
             findGroup: 'Encontrar grupo',
         },
     },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
@@ -9261,6 +9261,11 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             restrictDefaultLoginSelection: 'Restreindre la sélection de connexion par défaut',
             restrictDefaultLoginSelectionDescription:
                 'Empêche les membres de modifier leur e-mail de connexion en dehors du domaine de leur entreprise afin d’éviter les restrictions de politique.',
+            expensifyCardPreferredWorkspace: 'Espace de travail préféré pour la Expensify Card',
+            expensifyCardPreferredWorkspaceDescription:
+                'Toutes les transactions Expensify Card seront créées dans l’espace de travail préféré pour la Expensify Card au lieu de l’espace de travail préféré. L’activation de cette fonctionnalité remplacera le paramètre d’espace de travail préféré uniquement pour les transactions Expensify Card.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Pour utiliser ce paramètre, l’espace de travail préféré doit être activé et la Expensify Card doit être configurée pour le domaine.',
             findGroup: 'Trouver un groupe',
         },
     },
diff --git a/src/languages/it.ts b/src/languages/it.ts
@@ -9228,6 +9228,11 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             noWorkspacesMessage: 'Non ci sono spazi di lavoro su questo dominio. È necessario uno spazio di lavoro per abilitare questa restrizione.',
             restrictDefaultLoginSelection: 'Limita la selezione di accesso predefinita',
             restrictDefaultLoginSelectionDescription: 'Impedisce ai membri di modificare l’email di accesso al di fuori del dominio aziendale per eludere le restrizioni delle policy.',
+            expensifyCardPreferredWorkspace: 'Area di lavoro preferita per Expensify Card',
+            expensifyCardPreferredWorkspaceDescription:
+                'Tutte le transazioni Expensify Card verranno create nell’area di lavoro preferita per Expensify Card anziché nell’area di lavoro preferita. L’attivazione di questa funzione sostituirà l’impostazione dell’area di lavoro preferita solo per le transazioni Expensify Card.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Per utilizzare questa impostazione, l’area di lavoro preferita deve essere abilitata e la Expensify Card deve essere configurata per il dominio.',
             findGroup: 'Trova gruppo',
         },
     },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
@@ -9112,6 +9112,10 @@ ${reportName}
             noWorkspacesMessage: 'このドメインにワークスペースがありません。この制限を有効にするにはワークスペースが必要です。',
             restrictDefaultLoginSelection: 'デフォルトのログイン選択を制限する',
             restrictDefaultLoginSelectionDescription: 'メンバーがポリシー制限を回避するために、ログイン用のメールアドレスを会社のドメイン以外に変更することを防ぎます。',
+            expensifyCardPreferredWorkspace: 'Expensify Card 優先ワークスペース',
+            expensifyCardPreferredWorkspaceDescription:
+                'すべての Expensify Card トランザクションは、優先ワークスペースではなく Expensify Card 優先ワークスペースで作成されます。この機能を有効にすると、Expensify Card トランザクションに対してのみ優先ワークスペースの設定が上書きされます。',
+            expensifyCardPreferredWorkspaceDisabledMessage: 'この設定を使用するには、優先ワークスペースを有効にし、ドメインに Expensify Card が設定されている必要があります。',
             findGroup: 'グループを検索',
         },
     },
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
@@ -9199,6 +9199,11 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             noWorkspacesMessage: 'Er zijn geen werkruimtes op dit domein. Een werkruimte is vereist om deze beperking in te schakelen.',
             restrictDefaultLoginSelection: 'Standaard login-selectie beperken',
             restrictDefaultLoginSelectionDescription: 'Voorkomt dat leden hun login-e-mail wijzigen naar een adres buiten het bedrijfsdomein om beleidsbeperkingen te omzeilen.',
+            expensifyCardPreferredWorkspace: 'Voorkeurswerkruimte voor Expensify Card',
+            expensifyCardPreferredWorkspaceDescription:
+                'Alle Expensify Card-transacties worden aangemaakt in de voorkeurswerkruimte voor Expensify Card in plaats van de voorkeurswerkruimte. Door deze functie in te schakelen, wordt de instelling voor de voorkeurswerkruimte alleen voor Expensify Card-transacties overschreven.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Om deze instelling te gebruiken, moet de voorkeurswerkruimte zijn ingeschakeld en moet voor het domein een Expensify Card zijn ingesteld.',
             findGroup: 'Groep zoeken',
         },
     },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
@@ -9180,6 +9180,11 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             noWorkspacesMessage: 'W tej domenie nie ma żadnych obszarów roboczych. Obszar roboczy jest wymagany, aby włączyć to ograniczenie.',
             restrictDefaultLoginSelection: 'Ogranicz wybór domyślnego logowania',
             restrictDefaultLoginSelectionDescription: 'Zapobiega zmianie adresu e-mail do logowania przez członków na adres spoza domeny firmowej, aby obejść ograniczenia zasad.',
+            expensifyCardPreferredWorkspace: 'Preferowana przestrzeń robocza dla Expensify Card',
+            expensifyCardPreferredWorkspaceDescription:
+                'Wszystkie transakcje Expensify Card będą tworzone w preferowanej przestrzeni roboczej dla Expensify Card zamiast w preferowanej przestrzeni roboczej. Włączenie tej funkcji zastąpi ustawienie preferowanej przestrzeni roboczej wyłącznie dla transakcji Expensify Card.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Aby korzystać z tego ustawienia, preferowana przestrzeń robocza musi być włączona, a domena musi mieć skonfigurowaną Expensify Card.',
             findGroup: 'Znajdź grupę',
         },
     },
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
@@ -9190,6 +9190,11 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             restrictDefaultLoginSelection: 'Restringir seleção de login padrão',
             restrictDefaultLoginSelectionDescription:
                 'Impede que os membros alterem o e-mail de login para um endereço fora do domínio da empresa, evitando que burlem restrições de políticas.',
+            expensifyCardPreferredWorkspace: 'Espaço de trabalho preferido para o Expensify Card',
+            expensifyCardPreferredWorkspaceDescription:
+                'Todas as transações do Expensify Card serão criadas no espaço de trabalho preferido para o Expensify Card em vez do espaço de trabalho preferido. Ativar este recurso substituirá a configuração do espaço de trabalho preferido apenas para as transações do Expensify Card.',
+            expensifyCardPreferredWorkspaceDisabledMessage:
+                'Para usar esta configuração, o espaço de trabalho preferido deve estar habilitado e o domínio deve ter o Expensify Card configurado.',
             findGroup: 'Encontrar grupo',
         },
     },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
@@ -8958,6 +8958,10 @@ ${reportName}
             noWorkspacesMessage: '此域上没有工作区。启用此限制需要一个工作区。',
             restrictDefaultLoginSelection: '限制默认登录选择',
             restrictDefaultLoginSelectionDescription: '防止成员将登录邮箱更改为公司域名以外的地址，以规避政策限制。',
+            expensifyCardPreferredWorkspace: 'Expensify Card 首选工作区',
+            expensifyCardPreferredWorkspaceDescription:
+                '所有 Expensify Card 交易将在 Expensify Card 首选工作区中创建，而不是在首选工作区中创建。启用此功能将仅覆盖 Expensify Card 交易的首选工作区设置。',
+            expensifyCardPreferredWorkspaceDisabledMessage: '要使用此设置，必须启用首选工作区，并且域必须已设置 Expensify Card。',
             findGroup: '查找群组',
         },
     },
diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts
@@ -1855,10 +1855,7 @@ function updateDomainSecurityGroup(
     groupID: string,
     currentSecurityGroup: DomainSecurityGroup,
     newSettingValue: Partial<DomainSecurityGroup>,
-    settingsName: keyof Pick<
-        DomainSecurityGroup,
-        'name' | 'enableStrictPolicyRules' | 'enableRestrictedPolicyCreation' | 'enableRestrictedPrimaryPolicy' | 'restrictedPrimaryPolicyID' | 'enableRestrictedPrimaryLogin'
-    >,
+    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/DomainGroupDetailsPage.tsx b/src/pages/domain/Groups/DomainGroupDetailsPage.tsx
@@ -20,6 +20,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import DefaultGroupToggle from './DefaultGroupToggle';
 import DeleteGroupRow from './DeleteGroupRow';
+import ExpensifyCardPreferredWorkspaceToggle from './ExpensifyCardPreferredWorkspaceToggle';
 import PreferredWorkspaceToggle from './PreferredWorkspaceToggle';
 import RestrictDefaultLoginSelectionToggle from './RestrictDefaultLoginSelectionToggle';
 import RestrictExpenseWorkspaceCreationToggle from './RestrictExpenseWorkspaceCreationToggle';
@@ -87,6 +88,10 @@ function DomainGroupDetailsPage({route}: DomainGroupDetailsPageProps) {
                         domainAccountID={domainAccountID}
                         groupID={groupID}
                     />
+                    <ExpensifyCardPreferredWorkspaceToggle
+                        domainAccountID={domainAccountID}
+                        groupID={groupID}
+                    />
                     <DeleteGroupRow
                         domainAccountID={domainAccountID}
                         groupID={groupID}
diff --git a/src/pages/domain/Groups/ExpensifyCardPreferredWorkspaceToggle.tsx b/src/pages/domain/Groups/ExpensifyCardPreferredWorkspaceToggle.tsx
@@ -0,0 +1,77 @@
+import {domainSecurityGroupSettingErrorsSelector, domainSecurityGroupSettingPendingActionSelector, selectGroupByID} from '@selectors/Domain';
+import React from 'react';
+import {View} from 'react-native';
+import useConfirmModal from '@hooks/useConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import {clearDomainSecurityGroupSettingError, updateDomainSecurityGroup} from '@userActions/Domain';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+type ExpensifyCardPreferredWorkspaceToggleProps = {
+    /** The account ID of the domain */
+    domainAccountID: number;
+
+    /** The ID of the security group */
+    groupID: string;
+};
+
+function ExpensifyCardPreferredWorkspaceToggle({domainAccountID, groupID}: ExpensifyCardPreferredWorkspaceToggleProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {showConfirmModal} = useConfirmModal();
+
+    const [group] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
+        selector: selectGroupByID(groupID),
+    });
+
+    const [overridePreferredPolicyWithCardPolicyPendingAction] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, {
+        selector: domainSecurityGroupSettingPendingActionSelector('overridePreferredPolicyWithCardPolicy', groupID),
+    });
+    const [overridePreferredPolicyWithCardPolicyErrors] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {
+        selector: domainSecurityGroupSettingErrorsSelector('overridePreferredPolicyWithCardPolicyErrors', groupID),
+    });
+
+    const preferredPolicyID = group?.restrictedPrimaryPolicyID;
+    const isPreferredPolicyEnabled = !!group?.enableRestrictedPrimaryPolicy && !!preferredPolicyID;
+
+    const [domainCardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${domainAccountID}`);
+    const isDomainUsingExpensifyCard = !!domainCardSettings;
+
+    const isActive = !!group?.overridePreferredPolicyWithCardPolicy;
+    const isDisabled = (!isPreferredPolicyEnabled || !isDomainUsingExpensifyCard) && !isActive;
+
+    return (
+        <View style={styles.mv3}>
+            <ToggleSettingOptionRow
+                title={translate('domain.groups.expensifyCardPreferredWorkspace')}
+                subtitle={translate('domain.groups.expensifyCardPreferredWorkspaceDescription')}
+                switchAccessibilityLabel={translate('domain.groups.expensifyCardPreferredWorkspace')}
+                shouldPlaceSubtitleBelowSwitch
+                disabled={isDisabled}
+                disabledAction={() => {
+                    showConfirmModal({
+                        title: translate('workspace.distanceRates.oopsNotSoFast'),
+                        prompt: translate('domain.groups.expensifyCardPreferredWorkspaceDisabledMessage'),
+                        confirmText: translate('common.buttonConfirm'),
+                        shouldShowCancelButton: false,
+                    });
+                }}
+                isActive={isActive}
+                onToggle={(enabled) => {
+                    if (!group) {
+                        return;
+                    }
+                    updateDomainSecurityGroup(domainAccountID, groupID, group, {overridePreferredPolicyWithCardPolicy: enabled}, 'overridePreferredPolicyWithCardPolicy');
+                }}
+                wrapperStyle={styles.ph5}
+                pendingAction={overridePreferredPolicyWithCardPolicyPendingAction}
+                errors={overridePreferredPolicyWithCardPolicyErrors}
+                onCloseError={() => clearDomainSecurityGroupSettingError(domainAccountID, groupID, 'overridePreferredPolicyWithCardPolicyErrors')}
+            />
+        </View>
+    );
+}
+
+export default ExpensifyCardPreferredWorkspaceToggle;
diff --git a/src/pages/domain/Groups/PreferredWorkspaceToggle.tsx b/src/pages/domain/Groups/PreferredWorkspaceToggle.tsx
@@ -82,6 +82,10 @@ function PreferredWorkspaceToggle({domainAccountID, groupID}: PreferredWorkspace
                                     firstAdminPolicy?.id && {
                                         restrictedPrimaryPolicyID: firstAdminPolicy?.id,
                                     }),
+                                ...(!enabled &&
+                                    group?.overridePreferredPolicyWithCardPolicy && {
+                                        overridePreferredPolicyWithCardPolicy: false,
+                                    }),
                             },
                             'enableRestrictedPrimaryPolicy',
                         );
diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts
@@ -79,6 +79,11 @@ type DomainSecurityGroupErrors = {
      * Errors related to the restricted default login selection
      */
     enableRestrictedPrimaryLoginErrors?: OnyxCommon.Errors;
+
+    /**
+     * Errors related to the override preferred policy with card policy setting
+     */
+    overridePreferredPolicyWithCardPolicyErrors?: OnyxCommon.Errors;
 };
 
 /**
diff --git a/src/types/onyx/DomainPendingActions.ts b/src/types/onyx/DomainPendingActions.ts
@@ -79,6 +79,11 @@ type DomainSecurityGroupPendingActions = {
      * Pending action for the restricted default login selection
      */
     enableRestrictedPrimaryLogin?: OnyxCommon.PendingAction;
+
+    /**
+     * Pending action for the override preferred policy with card policy setting
+     */
+    overridePreferredPolicyWithCardPolicy?: OnyxCommon.PendingAction;
 };
 
 /**
