Skip to content

[Release 3.1] [Domain control] Add DomainMembersSettingsPage with force 2FA toggle - #79361

Merged
mountiny merged 59 commits into
Expensify:mainfrom
software-mansion-labs:war-in/domains/add-members-settings-page
Feb 11, 2026
Merged

mountiny merged 59 commits into
Expensify:mainfrom
software-mansion-labs:war-in/domains/add-members-settings-page

Conversation

@war-in

@war-in war-in commented Jan 12, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR adds More (with Settings) button to the DomainMembersPage. It opens RHP where admin can enable/disable 2FA for the entire domain. Additionally, when the Admin has 2FA set up on their accout it requires 2FA verification

Fixed Issues

$ #79542
PROPOSAL:

Tests

  1. Open `domain//members/settings
  2. Verify the RHP opens and has Force two-factor authentication toggle
  3. Enable it and verify there is no error
  4. Try to disable it
    6.1 When your account has 2FA you should be prompted to verify your 2FA code
    6.2 When your account doesn't have 2FA verify there is no error
  5. Go to domain/<domainAccountID>/saml
  6. Enable SAML
  7. Go back to members page
  8. Open settings and verify the toggle is locked with description - Please disable SAML to force two-factor authentication.

Offline tests

  1. Open `domain//members/settings
  2. Verify the RHP opens and has Force two-factor authentication toggle
  3. Enable it and verify it's grayed out
  4. Disable Force offline and make sure request succeded, then enable it again
  5. Try to disable Force two-factor authentication
    7.1 When your account has 2FA you should be prompted to verify your 2FA code
    7.2 When your account doesn't have 2FA verify there is no error
  6. Verify the toggle is grayed out

QA Steps

Web only

  1. Open `domain//members/settings
  2. Verify the RHP opens and has Force two-factor authentication toggle
  3. Enable it and verify there is no error
  4. Try to disable it
    6.1 When your account has 2FA you should be prompted to verify your 2FA code
    6.2 When your account doesn't have 2FA verify there is no error
  5. Go to domain/<domainAccountID>/saml
  6. Enable SAML
  7. Go back to members page
  8. Open settings and verify the toggle is locked with description - Please disable SAML to force two-factor authentication.

All platforms

  1. Open settings/security
  2. Choose Two-factor authentication
  3. Setup 2FA following propts in RHP (enter the wrong code in step 2 to verify there is an error under the code input)
  4. Once 2FA is enabled click on Two-factor authentication again and disable 2FA
  5. Verify that passing wrong code generates an error
  6. Verify that 2FA can be disabled

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-01-14.at.10.29.47.mov

…page' into war-in/domains/add-members-settings-page

# Conflicts:
#	src/libs/API/parameters/index.ts
#	src/libs/API/types.ts
#	src/libs/actions/Domain.ts
#	src/pages/domain/Admins/DomainAdminsPage.tsx
#	src/pages/domain/Admins/DomainAdminsSettingsPage.tsx
#	src/selectors/Domain.ts
#	src/types/onyx/CardFeeds.ts
#	src/types/onyx/DomainErrors.ts
#	src/types/onyx/DomainPendingActions.ts
#	tests/unit/DomainSelectorsTest.ts
…war-in/domains/add-members-settings-page

# Conflicts:
#	src/pages/domain/Admins/DomainAdminsPage.tsx
…war-in/domains/add-members-settings-page

# Conflicts:
#	src/languages/en.ts
#	src/pages/domain/Members/DomainMembersPage.tsx
#	src/selectors/Domain.ts
…war-in/domains/add-members-settings-page

# Conflicts:
#	src/libs/API/types.ts
#	src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
#	src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
#	src/libs/Navigation/types.ts
#	src/libs/actions/Domain.ts
#	src/pages/domain/Admins/DomainAdminsSettingsPage.tsx
#	src/pages/domain/Members/DomainMembersPage.tsx
…page' into war-in/domains/add-members-settings-page

# Conflicts:
#	src/libs/API/parameters/index.ts
#	src/libs/API/types.ts
#	src/libs/actions/Domain.ts
#	src/selectors/Domain.ts
@melvin-bot

melvin-bot Bot commented Jan 12, 2026

Copy link
Copy Markdown

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

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

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

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

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

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

@codecov

codecov Bot commented Jan 12, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 87.39% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/components/AddressSearch/index.tsx 47.52% <ø> (ø)
src/components/MagicCodeInput.tsx 54.14% <ø> (ø)
src/components/PopoverMenu.tsx 77.31% <ø> (ø)
src/components/TwoFactorAuthForm/index.tsx 100.00% <100.00%> (ø)
...ionModal/ValidateCodeForm/BaseValidateCodeForm.tsx 83.33% <100.00%> (ø)
...CodeActionModal/ValidateCodeForm/index.android.tsx 0.00% <ø> (ø)
...ValidateCodeActionModal/ValidateCodeForm/index.tsx 100.00% <ø> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
... and 25 more
... and 15 files with indirect coverage changes

@mountiny

Copy link
Copy Markdown
Contributor

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6b7c58346e

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

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

validateInsteadOfDisable={validateInsteadOfDisable}
shouldAutoFocusOnMobile={shouldAutoFocusOnMobile}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we unable to predict which parameters are passed here in order to avoid props spreading?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about this question @war-in ?

type BaseTwoFactorAuthFormProps = {
// Set this to true in order to call the validateTwoFactorAuth action which is used when setting up 2FA for the first time.
// Set this to false in order to disable 2FA when a valid code is entered.
validateInsteadOfDisable?: boolean;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of a long comment, we could rename the variable to isFirstTimeTwoFactorSetup to make its purpose immediately clear.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait for input from others, I'd not change too much in the existing code

@sumo-slonik

Copy link
Copy Markdown
Contributor

Well done 🚀

# Conflicts:
#	src/ROUTES.ts
#	src/SCREENS.ts
#	src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
#	src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts
#	src/libs/Navigation/linkingConfig/config.ts
#	src/libs/Navigation/types.ts
#	src/pages/domain/Members/DomainMembersPage.tsx
@OSBotify

This comment has been minimized.

@mountiny

Copy link
Copy Markdown
Contributor

@ZhenjaHorbach @situchan how is this looking?

@ZhenjaHorbach

ZhenjaHorbach commented Feb 10, 2026 •

Copy link
Copy Markdown
Contributor

@ZhenjaHorbach @situchan how is this looking?

Changes look good
But I suppose it's not completely ready
https://expensify.slack.com/archives/C0A1VKRKEE9/p1770714993526299?thread_ts=1770654350.888619&cid=C0A1VKRKEE9

And we have conflicts

@OSBotify

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index d69a1169..6f11a9a4 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8389,7 +8389,8 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
             disableSamlRequired: 'Deaktivierung von SAML erforderlich',
             oktaWarningPrompt: 'Bist du sicher? Dadurch wird auch Okta SCIM deaktiviert.',
             requireWithEmptyMetadataError: 'Bitte fügen Sie unten die Metadaten des Identitätsanbieters hinzu, um dies zu aktivieren',
-            pleaseDisableTwoFactorAuth: 'Bitte deaktivieren Sie die erzwungene Zwei-Faktor-Authentifizierung, um die SAML-Anmeldung zu ermöglichen.',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>Bitte deaktiviere <a href="${twoFactorAuthSettingsUrl}">Zwei-Faktor-Authentifizierung erzwingen</a>, um die SAML-Anmeldung zu aktivieren.</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'SAML-Konfigurationsdetails',
@@ -8474,9 +8475,10 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
                 addMember: 'Dieses Mitglied kann nicht hinzugefügt werden. Bitte versuche es erneut.',
             },
             forceTwoFactorAuth: 'Zwei-Faktor-Authentifizierung erzwingen',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>Bitte deaktiviere <a href="${CONST.SAML_HELP_URL}">SAML</a>, um die Zwei-Faktor-Authentifizierung zu erzwingen.</muted-text>`,
-            forceTwoFactorAuthDescription: `<muted-text>Für alle Mitglieder dieser Domäne die Zwei-Faktor-Authentifizierung verlangen. Mitglieder der Domäne werden beim Anmelden dazu aufgefordert, die Zwei-Faktor-Authentifizierung für ihr Konto einzurichten.</muted-text>`,
-            forceTwoFactorAuthError: 'Die Erzwingung der Zwei-Faktor-Authentifizierung konnte nicht geändert werden. Bitte versuche es später noch einmal.',
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>Bitte deaktiviere <a href="${samlPageUrl}">SAML</a>, um die Zwei-Faktor-Authentifizierung zu erzwingen.</muted-text>`,
+            forceTwoFactorAuthDescription: `<muted-text>Zwei-Faktor-Authentifizierung für alle Mitglieder dieser Domain verlangen. Domänenmitglieder werden beim Anmelden aufgefordert, die Zwei-Faktor-Authentifizierung für ihr Konto einzurichten.</muted-text>`,
+            forceTwoFactorAuthError: 'Die Erzwingung der Zwei-Faktor-Authentifizierung konnte nicht geändert werden. Bitte versuche es später erneut.',
         },
         common: {settings: 'Einstellungen'},
     },
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 02fa9d3c..021315bf 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -2037,7 +2037,7 @@ const translations: TranslationDeepObject<typeof en> = {
         whatIsTwoFactorAuth:
             'L’authentification à deux facteurs (2FA) permet de sécuriser votre compte. Lors de la connexion, vous devrez saisir un code généré par votre application d’authentification préférée.',
         disableTwoFactorAuth: 'Désactiver l’authentification à deux facteurs',
-        explainProcessToRemove: 'Pour désactiver l’authentification à deux facteurs (2FA), veuillez saisir un code valide à partir de votre application d’authentification.',
+        explainProcessToRemove: 'Pour désactiver l’authentification à deux facteurs (2FA), veuillez saisir un code valide depuis votre application d’authentification.',
         explainProcessToRemoveWithRecovery: 'Pour désactiver l’authentification à deux facteurs (2FA), veuillez saisir un code de récupération valide.',
         disabled: 'L’authentification à deux facteurs est maintenant désactivée',
         noAuthenticatorApp: 'Vous n’aurez plus besoin d’une application d’authentification pour vous connecter à Expensify.',
@@ -8402,7 +8402,8 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             disableSamlRequired: 'Désactiver SAML obligatoire',
             oktaWarningPrompt: 'Voulez-vous continuer ? Cela désactivera également Okta SCIM.',
             requireWithEmptyMetadataError: "Veuillez ajouter ci-dessous les métadonnées du fournisseur d'identité pour activer",
-            pleaseDisableTwoFactorAuth: 'Veuillez désactiver l’authentification à deux facteurs obligatoire pour activer la connexion SAML.',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>Désactivez <a href="${twoFactorAuthSettingsUrl}">forcer l’authentification à deux facteurs</a> pour activer la connexion SAML.</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'Détails de configuration SAML',
@@ -8487,9 +8488,10 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
                 addMember: 'Impossible d’ajouter ce membre. Veuillez réessayer.',
             },
             forceTwoFactorAuth: 'Imposer l’authentification à deux facteurs',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>Veuillez désactiver <a href="${CONST.SAML_HELP_URL}">SAML</a> pour imposer l’authentification à deux facteurs.</muted-text>`,
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>Veuillez désactiver <a href="${samlPageUrl}">SAML</a> pour imposer l’authentification à deux facteurs.</muted-text>`,
             forceTwoFactorAuthDescription: `<muted-text>Exiger l’authentification à deux facteurs pour tous les membres de ce domaine. Les membres du domaine seront invités à configurer l’authentification à deux facteurs sur leur compte lorsqu’ils se connectent.</muted-text>`,
-            forceTwoFactorAuthError: 'Impossible de modifier l’authentification à deux facteurs forcée. Veuillez réessayer plus tard.',
+            forceTwoFactorAuthError: 'L’activation forcée de l’authentification à deux facteurs n’a pas pu être modifiée. Veuillez réessayer plus tard.',
         },
         common: {settings: 'Paramètres'},
     },
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 74943357..a9c24824 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -2025,8 +2025,8 @@ const translations: TranslationDeepObject<typeof en> = {
         whatIsTwoFactorAuth:
             'L’autenticazione a due fattori (2FA) contribuisce a mantenere il tuo account al sicuro. Quando effettui l’accesso, dovrai inserire un codice generato dalla tua app di autenticazione preferita.',
         disableTwoFactorAuth: 'Disattiva l’autenticazione a due fattori',
-        explainProcessToRemove: 'Per disattivare l’autenticazione a due fattori (2FA), inserisci un codice valido dalla tua app di autenticazione.',
-        explainProcessToRemoveWithRecovery: 'Per disattivare l’autenticazione a due fattori (2FA), inserisci un codice di recupero valido.',
+        explainProcessToRemove: 'Per disabilitare l’autenticazione a due fattori (2FA), inserisci un codice valido dalla tua app di autenticazione.',
+        explainProcessToRemoveWithRecovery: 'Per disabilitare l’autenticazione a due fattori (2FA), inserisci un codice di recupero valido.',
         disabled: "L'autenticazione a due fattori è ora disattivata",
         noAuthenticatorApp: 'Non sarà più necessaria un’app di autenticazione per accedere a Expensify.',
         stepCodes: 'Codici di recupero',
@@ -8368,7 +8368,8 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             disableSamlRequired: 'Disattiva richiesta SAML',
             oktaWarningPrompt: 'Sei sicuro? Questo disabiliterà anche Okta SCIM.',
             requireWithEmptyMetadataError: 'Aggiungi qui sotto i metadati del provider di identità per abilitare',
-            pleaseDisableTwoFactorAuth: 'Disattiva l’autenticazione a due fattori obbligatoria per abilitare l’accesso SAML.',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>Disattiva <a href="${twoFactorAuthSettingsUrl}">l’obbligo dell’autenticazione a due fattori</a> per abilitare l’accesso SAML.</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'Dettagli configurazione SAML',
@@ -8452,9 +8453,10 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
                 addMember: 'Impossibile aggiungere questo membro. Riprova.',
             },
             forceTwoFactorAuth: 'Imponi l’autenticazione a due fattori',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>Disabilita <a href="${CONST.SAML_HELP_URL}">SAML</a> per imporre l’autenticazione a due fattori.</muted-text>`,
-            forceTwoFactorAuthDescription: `<muted-text>Richiedi l’Autenticazione a Due Fattori per tutti i membri di questo dominio. Ai membri del dominio verrà chiesto di configurare l’Autenticazione a Due Fattori sul proprio account al momento dell’accesso.</muted-text>`,
-            forceTwoFactorAuthError: 'Imposibile modificare l’imposizione dell’autenticazione a due fattori. Riprova più tardi.',
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>Disabilita <a href="${samlPageUrl}">SAML</a> per imporre l’autenticazione a due fattori.</muted-text>`,
+            forceTwoFactorAuthDescription: `<muted-text>Richiedi l’autenticazione a due fattori per tutti i membri di questo dominio. Ai membri del dominio verrà chiesto di configurare l’autenticazione a due fattori sul proprio account quando effettuano l’accesso.</muted-text>`,
+            forceTwoFactorAuthError: 'Impossibile modificare l’impostazione “Forza l’autenticazione a due fattori”. Riprova più tardi.',
         },
         common: {settings: 'Impostazioni'},
     },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 6fa5ee3f..383177f3 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -2020,7 +2020,7 @@ const translations: TranslationDeepObject<typeof en> = {
         whatIsTwoFactorAuth: '2要素認証(2FA)は、アカウントを安全に保つのに役立ちます。ログインする際、お好みの認証アプリで生成されたコードを入力する必要があります。',
         disableTwoFactorAuth: '2 要素認証を無効にする',
         explainProcessToRemove: '2要素認証(2FA)を無効にするには、認証アプリから有効なコードを入力してください。',
-        explainProcessToRemoveWithRecovery: '2 要素認証(2FA)を無効にするには、有効な復旧コードを入力してください。',
+        explainProcessToRemoveWithRecovery: '2要素認証(2FA)を無効にするには、有効な復旧コードを入力してください。',
         disabled: '二要素認証は現在無効になっています',
         noAuthenticatorApp: '今後、Expensify にログインする際に認証アプリは不要になります。',
         stepCodes: 'リカバリーコード',
@@ -8299,7 +8299,8 @@ ${reportName}
             disableSamlRequired: '必須なSAMLを無効にする',
             oktaWarningPrompt: 'よろしいですか?これにより Okta SCIM も無効になります。',
             requireWithEmptyMetadataError: '有効にするには、以下にアイデンティティプロバイダーのメタデータを追加してください',
-            pleaseDisableTwoFactorAuth: 'SAML ログインを有効にするには、必須の 2 要素認証を無効にしてください。',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>SAML ログインを有効にするには、<a href="${twoFactorAuthSettingsUrl}">二要素認証の強制</a>を無効にしてください。</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'SAML 設定の詳細',
@@ -8382,10 +8383,11 @@ ${reportName}
                 removeMember: 'このユーザーを削除できません。もう一度お試しください。',
                 addMember: 'このメンバーを追加できませんでした。もう一度お試しください。',
             },
-            forceTwoFactorAuth: '二要素認証を必須にする',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>2 要素認証を必須にするには、<a href="${CONST.SAML_HELP_URL}">SAML</a> を無効にしてください。</muted-text>`,
+            forceTwoFactorAuth: '2要素認証を必須にする',
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>2 要素認証を必須にするには、<a href="${samlPageUrl}">SAML</a> を無効にしてください。</muted-text>`,
             forceTwoFactorAuthDescription: `<muted-text>このドメインのすべてのメンバーに二要素認証を必須にします。ドメインメンバーは、サインイン時に自分のアカウントで二要素認証を設定するよう求められます。</muted-text>`,
-            forceTwoFactorAuthError: '2 要素認証の強制設定を変更できませんでした。後でもう一度お試しください。',
+            forceTwoFactorAuthError: '2要素認証の強制設定を変更できませんでした。後でもう一度お試しください。',
         },
         common: {settings: '設定'},
     },
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index f794f999..0552d2ab 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -2026,8 +2026,8 @@ const translations: TranslationDeepObject<typeof en> = {
         whatIsTwoFactorAuth:
             'Tweestapsverificatie (2FA) helpt je account veilig te houden. Bij het inloggen moet je een code invoeren die is gegenereerd door je voorkeursauthenticator-app.',
         disableTwoFactorAuth: 'Tweefactorauthenticatie uitschakelen',
-        explainProcessToRemove: 'Om tweefactorauthenticatie (2FA) uit te schakelen, voer een geldige code in uit je authenticatie-app.',
-        explainProcessToRemoveWithRecovery: 'Voer een geldige herstelsleutel in om twee-factor-authenticatie (2FA) uit te schakelen.',
+        explainProcessToRemove: 'Voer een geldige code uit je authenticatie-app in om twee-factor-authenticatie (2FA) uit te schakelen.',
+        explainProcessToRemoveWithRecovery: 'Voer een geldige herstelcode in om tweeledige verificatie (2FA) uit te schakelen.',
         disabled: 'Tweeledige verificatie is nu uitgeschakeld',
         noAuthenticatorApp: 'Je hebt geen authenticator-app meer nodig om in te loggen bij Expensify.',
         stepCodes: 'Herstelcodes',
@@ -8356,7 +8356,8 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             disableSamlRequired: 'Uitschakelen SAML vereist',
             oktaWarningPrompt: 'Weet je het zeker? Dit schakelt ook Okta SCIM uit.',
             requireWithEmptyMetadataError: 'Voeg hieronder de Identity Provider-metadata toe om in te schakelen',
-            pleaseDisableTwoFactorAuth: 'Schakel verplichte twee-factor-authenticatie uit om SAML-aanmelding mogelijk te maken.',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>Schakel <a href="${twoFactorAuthSettingsUrl}">het verplicht instellen van twee-factor-authenticatie</a> uit om SAML-aanmelding in te schakelen.</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'SAML-configuratiedetails',
@@ -8439,10 +8440,11 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
                 removeMember: 'Kan deze gebruiker niet verwijderen. Probeer het opnieuw.',
                 addMember: 'Kan dit lid niet toevoegen. Probeer het opnieuw.',
             },
-            forceTwoFactorAuth: 'Tweestapsverificatie afdwingen',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>Schakel <a href="${CONST.SAML_HELP_URL}">SAML</a> uit om tweestapsverificatie af te dwingen.</muted-text>`,
-            forceTwoFactorAuthDescription: `<muted-text>Tweeledige verificatie vereisen voor alle leden van dit domein. Domeinleden wordt gevraagd tweefactorauthenticatie voor hun account in te stellen wanneer ze zich aanmelden.</muted-text>`,
-            forceTwoFactorAuthError: 'Verplichte tweeledige verificatie kon niet worden gewijzigd. Probeer het later opnieuw.',
+            forceTwoFactorAuth: 'Tweeledige verificatie afdwingen',
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>Schakel <a href="${samlPageUrl}">SAML</a> uit om het gebruik van twee-factor-authenticatie af te dwingen.</muted-text>`,
+            forceTwoFactorAuthDescription: `<muted-text>Tweeledige verificatie vereisen voor alle leden van dit domein. Domeinleden worden gevraagd om tweefactorauthenticatie voor hun account in te stellen wanneer ze zich aanmelden.</muted-text>`,
+            forceTwoFactorAuthError: 'Verplichte twee-factor-authenticatie kon niet worden gewijzigd. Probeer het later opnieuw.',
         },
         common: {settings: 'Instellingen'},
     },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index d293f509..8b08aecf 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8335,7 +8335,8 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             disableSamlRequired: 'Wyłącz wymaganie SAML',
             oktaWarningPrompt: 'Na pewno? Spowoduje to również wyłączenie Okta SCIM.',
             requireWithEmptyMetadataError: 'Dodaj poniżej metadane dostawcy tożsamości, aby włączyć',
-            pleaseDisableTwoFactorAuth: 'Aby włączyć logowanie SAML, wyłącz wymuszanie uwierzytelniania dwuskładnikowego.',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>Aby włączyć logowanie SAML, wyłącz najpierw <a href="${twoFactorAuthSettingsUrl}">wymuszanie uwierzytelniania dwuskładnikowego</a>.</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'Szczegóły konfiguracji SAML',
@@ -8419,8 +8420,9 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
                 addMember: 'Nie można dodać tego członka. Spróbuj ponownie.',
             },
             forceTwoFactorAuth: 'Wymuś uwierzytelnianie dwuskładnikowe',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>Wyłącz proszę <a href="${CONST.SAML_HELP_URL}">SAML</a>, aby wymusić uwierzytelnianie dwuskładnikowe.</muted-text>`,
-            forceTwoFactorAuthDescription: `<muted-text>Wymagaj uwierzytelniania dwuskładnikowego dla wszystkich członków tej domeny. Członkowie domeny zostaną poproszeni o skonfigurowanie uwierzytelniania dwuskładnikowego na swoim koncie podczas logowania.</muted-text>`,
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>Wyłącz proszę <a href="${samlPageUrl}">SAML</a>, aby wymusić uwierzytelnianie dwuskładnikowe.</muted-text>`,
+            forceTwoFactorAuthDescription: `<muted-text>Wymagaj uwierzytelniania dwuskładnikowego od wszystkich członków tej domeny. Członkowie domeny zostaną poproszeni o skonfigurowanie uwierzytelniania dwuskładnikowego na swoim koncie po zalogowaniu.</muted-text>`,
             forceTwoFactorAuthError: 'Nie udało się zmienić wymuszania uwierzytelniania dwuskładnikowego. Spróbuj ponownie później.',
         },
         common: {settings: 'Ustawienia'},
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index fd1d0017..753b99ea 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -2023,7 +2023,7 @@ const translations: TranslationDeepObject<typeof en> = {
             'A autenticação em duas etapas (2FA) ajuda a manter sua conta segura. Ao fazer login, você precisará inserir um código gerado pelo seu aplicativo autenticador preferido.',
         disableTwoFactorAuth: 'Desativar autenticação em duas etapas',
         explainProcessToRemove: 'Para desativar a autenticação em duas etapas (2FA), insira um código válido do seu app de autenticação.',
-        explainProcessToRemoveWithRecovery: 'Para desativar a autenticação de dois fatores (2FA), insira um código de recuperação válido.',
+        explainProcessToRemoveWithRecovery: 'Para desativar a autenticação em duas etapas (2FA), insira um código de recuperação válido.',
         disabled: 'A autenticação em duas etapas está desativada agora',
         noAuthenticatorApp: 'Você não vai mais precisar de um app autenticador para entrar no Expensify.',
         stepCodes: 'Códigos de recuperação',
@@ -8337,7 +8337,8 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             disableSamlRequired: 'Desativar SAML obrigatório',
             oktaWarningPrompt: 'Tem certeza? Isso também desativará o Okta SCIM.',
             requireWithEmptyMetadataError: 'Adicione abaixo os metadados do Provedor de Identidade para ativar',
-            pleaseDisableTwoFactorAuth: 'Desative a autenticação de dois fatores obrigatória para habilitar o login via SAML.',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>Desative a opção <a href="${twoFactorAuthSettingsUrl}">exigir autenticação em duas etapas</a> para ativar o login SAML.</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'Detalhes da configuração SAML',
@@ -8421,9 +8422,10 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
                 addMember: 'Não foi possível adicionar este membro. Tente novamente.',
             },
             forceTwoFactorAuth: 'Forçar autenticação em duas etapas',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>Desative o <a href="${CONST.SAML_HELP_URL}">SAML</a> para forçar a autenticação em duas etapas.</muted-text>`,
-            forceTwoFactorAuthDescription: `<muted-text>Exigir autenticação em duas etapas para todos os membros deste domínio. Os membros do domínio serão solicitados a configurar a autenticação em duas etapas em suas contas ao fazer login.</muted-text>`,
-            forceTwoFactorAuthError: 'Não foi possível alterar a obrigatoriedade de autenticação em duas etapas. Tente novamente mais tarde.',
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) =>
+                `<muted-text>Desative o <a href="${samlPageUrl}">SAML</a> para forçar a autenticação em duas etapas.</muted-text>`,
+            forceTwoFactorAuthDescription: `<muted-text>Exigir autenticação em duas etapas para todos os membros deste domínio. Os membros do domínio serão solicitados a configurar a autenticação em duas etapas na conta ao fazer login.</muted-text>`,
+            forceTwoFactorAuthError: 'Não foi possível alterar a exigência de autenticação em duas etapas. Tente novamente mais tarde.',
         },
         common: {settings: 'Configurações'},
     },
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index fe48ff11..f53e711e 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -1992,7 +1992,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthEnabled: '已启用双重身份验证',
         whatIsTwoFactorAuth: '双重身份验证(2FA)有助于保护您的账户安全。登录时,您需要输入由首选身份验证应用生成的验证码。',
         disableTwoFactorAuth: '禁用双重身份验证',
-        explainProcessToRemove: '要停用双重身份验证(2FA),请输入身份验证应用中的有效验证码。',
+        explainProcessToRemove: '要禁用双重身份验证(2FA),请输入来自您身份验证应用的有效验证码。',
         explainProcessToRemoveWithRecovery: '要禁用双重身份验证(2FA),请输入有效的恢复代码。',
         disabled: '已关闭双重身份验证',
         noAuthenticatorApp: '你今后登录 Expensify 时将不再需要验证器应用程序。',
@@ -8173,7 +8173,8 @@ ${reportName}
             disableSamlRequired: '禁用 SAML 要求',
             oktaWarningPrompt: '确定要这样做吗?这也会禁用 Okta SCIM。',
             requireWithEmptyMetadataError: '请在下方添加身份提供商元数据以启用',
-            pleaseDisableTwoFactorAuth: '请先禁用强制启用的双重身份验证以启用 SAML 登录。',
+            pleaseDisableTwoFactorAuth: (twoFactorAuthSettingsUrl: string) =>
+                `<muted-text>请先停用<a href="${twoFactorAuthSettingsUrl}">强制启用双重验证</a>,然后再启用 SAML 登录。</muted-text>`,
         },
         samlConfigurationDetails: {
             title: 'SAML 配置详情',
@@ -8257,9 +8258,9 @@ ${reportName}
                 addMember: '无法添加此成员。请重试。',
             },
             forceTwoFactorAuth: '强制启用双重身份验证',
-            forceTwoFactorAuthSAMLEnabledDescription: `<muted-text>请先禁用<a href="${CONST.SAML_HELP_URL}">SAML</a>,以强制启用双重身份验证。</muted-text>`,
-            forceTwoFactorAuthDescription: `<muted-text>要求此域中的所有成员启用双重身份验证。域成员在登录其账户时将被提示设置双重身份验证。</muted-text>`,
-            forceTwoFactorAuthError: '无法更改强制两步验证设置。请稍后重试。',
+            forceTwoFactorAuthSAMLEnabledDescription: (samlPageUrl: string) => `<muted-text>请禁用<a href="${samlPageUrl}">SAML</a>以强制启用双重身份验证。</muted-text>`,
+            forceTwoFactorAuthDescription: `<muted-text>要求此域的所有成员使用双重身份验证。域成员在登录时将被提示为其账户设置双重身份验证。</muted-text>`,
+            forceTwoFactorAuthError: '无法更改强制启用双重身份验证设置。请稍后再试。',
         },
         common: {settings: '设置'},
     },

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

@war-in

war-in commented Feb 10, 2026

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach we decided to hide settings button for now and proceed with what we have. There are some backend changes required to improve the error handling, so I'll prepare a follow-up PR once they're ready.

Could you review the changes one last time 🙏

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

Okay then
Changes look good!

@melvin-bot
melvin-bot Bot requested a review from mountiny February 11, 2026 08:46

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

validateInsteadOfDisable={validateInsteadOfDisable}
shouldAutoFocusOnMobile={shouldAutoFocusOnMobile}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about this question @war-in ?

);
}

DomainMembersSettingsPage.displayName = 'DomainMembersSettingsPage';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this for the correct name to show up?

Suggested change
DomainMembersSettingsPage.displayName = 'DomainMembersSettingsPage';

Comment on lines +109 to +110

DomainRequireTwoFactorAuthPage.displayName = 'DomainRequireTwoFactorAuthPage';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this for the correct name to show up?

Suggested change
DomainRequireTwoFactorAuthPage.displayName = 'DomainRequireTwoFactorAuthPage';

@mountiny
mountiny merged commit 0d830cf into Expensify:main Feb 11, 2026
32 checks passed
@github-project-automation github-project-automation Bot moved this from Ready for Review to Done in Bring Domain Control to NewDot Feb 11, 2026
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.18-0 🚀

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

@jponikarchuk

Copy link
Copy Markdown

This PR failing because of the issue
This issue is reproducible in: All platforms

1.mp4

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.18-8 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Development

Successfully merging this pull request may close these issues.

9 participants