Skip to content

Hide member 2FA toggle when domain 2FA is not enabled#85241

Merged
mountiny merged 1 commit intomainfrom
claude-hideMemberTwoFactorToggleWhenDomainTwoFactorDisabled
Mar 18, 2026
Merged

Hide member 2FA toggle when domain 2FA is not enabled#85241
mountiny merged 1 commit intomainfrom
claude-hideMemberTwoFactorToggleWhenDomainTwoFactorDisabled

Conversation

@MelvinBot
Copy link
Contributor

@MelvinBot MelvinBot commented Mar 13, 2026

Explanation of Change

The per-member "Force two-factor authentication" toggle on the Domain Member details page was displayed unconditionally — even when the domain itself does not require 2FA (twoFactorAuthRequired is false). This was misleading because the toggle only controls exemptions from the domain-level 2FA requirement and has no functional effect when there is no such requirement.

This PR wraps the ToggleSettingOptionRow component in a conditional that checks domainSettings?.twoFactorAuthRequired before rendering. When domain-level 2FA is not enabled, the toggle is now hidden.

Fixed Issues

$ #85208
PROPOSAL: #85208

Tests

  1. Navigate to a domain's member details page where the domain does NOT have 2FA enabled
  2. Verify the "Force two-factor authentication" toggle is NOT shown
  3. Navigate to a domain's member details page where the domain DOES have 2FA enabled
  4. Verify the "Force two-factor authentication" toggle IS shown and functions correctly
  5. Verify toggling it on/off works as expected (adds/removes from exempt list)
  • Verify that no errors appear in the JS console

Offline tests

N/A — the toggle visibility is based on locally cached Onyx data (domainSettings.twoFactorAuthRequired), so offline behavior is unchanged.

QA Steps

  1. Navigate to a domain's member details page where the domain does NOT have 2FA enabled
  2. Verify the "Force two-factor authentication" toggle is NOT shown
  3. Navigate to a domain's member details page where the domain DOES have 2FA enabled
  4. Verify the "Force two-factor authentication" toggle IS shown and functions correctly
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that 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
    • 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

N/A — conditional rendering change only

Android: mWeb Chrome

N/A — conditional rendering change only

iOS: Native

N/A — conditional rendering change only

iOS: mWeb Safari

N/A — conditional rendering change only

MacOS: Chrome / Safari

N/A — conditional rendering change only

@MelvinBot @situchan
Hide member-level 2FA toggle when domain 2FA is not enabled
0952725 
The per-member "Force two-factor authentication" toggle on the Domain
Member details page was shown unconditionally, even when the domain
itself does not require 2FA. This was misleading because the toggle
only controls exemptions from the domain-level requirement and has
no effect when there is no such requirement.

Wrap the ToggleSettingOptionRow in a conditional that checks
domainSettings.twoFactorAuthRequired before rendering.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 13, 2026 14:59
@MelvinBot MelvinBot mentioned this pull request Mar 13, 2026
Open
@situchan
Copy link
Contributor

situchan commented Mar 13, 2026

@MelvinBot mark as ready for review

@MelvinBot MelvinBot marked this pull request as ready for review March 13, 2026 15:02
@MelvinBot MelvinBot requested a review from a team as a code owner March 13, 2026 15:02
@melvin-bot melvin-bot bot requested review from situchan and removed request for a team March 13, 2026 15:02
@melvin-bot
Copy link

melvin-bot bot commented Mar 13, 2026

@situchan Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 13, 2026 15:02
@MelvinBot
Copy link
Contributor Author

MelvinBot commented Mar 13, 2026

PR has been marked as ready for review. ✅

@codecov
Copy link

codecov bot commented Mar 13, 2026 •
edited by github-actions bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
...c/pages/domain/Members/DomainMemberDetailsPage.tsx 0.00% <0.00%> (ø)
... and 7 files with indirect coverage changes

joekaufmanexpensify
joekaufmanexpensify approved these changes Mar 13, 2026
View reviewed changes
Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

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

Design doc issue

@situchan
Copy link
Contributor

situchan commented Mar 13, 2026

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (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
    • 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 verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • 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
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If 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 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-03-14.at.4.15.26.AM.mov

@melvin-bot melvin-bot bot requested a review from mountiny March 13, 2026 22:16
@mountiny
Copy link
Contributor

mountiny commented Mar 15, 2026

I think the spacing looks wrong
image
@WojtekBoman

mountiny
mountiny requested changes Mar 15, 2026
View reviewed changes
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Based on the screenshot, it looks like there is incorrect margin/ padding now when the row is missing

@war-in
Copy link
Contributor

war-in commented Mar 18, 2026

@mountiny I think it's correct (screenshot from prod)

image

We decided to put the gap here

mountiny
mountiny approved these changes Mar 18, 2026
View reviewed changes
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Cant argue with designers

@mountiny mountiny merged commit a970ca8 into main Mar 18, 2026
45 of 46 checks passed
@mountiny mountiny deleted the claude-hideMemberTwoFactorToggleWhenDomainTwoFactorDisabled branch March 18, 2026 18:39
@OSBotify
Copy link
Contributor

OSBotify commented Mar 18, 2026

✋ 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
Contributor

github-actions bot commented Mar 18, 2026

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

@github-actions
Copy link
Contributor

github-actions bot commented Mar 18, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a970ca8-7c10bda-a51c12ff697dd4f9752a99506f8c1931b9d3415d/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a970ca8-7c10bda-02ea2e7aab87b147feff990ea5fa2eae72ba146d/index.html
Android iOS
Web 🕸️
https://85241.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify OSBotify mentioned this pull request Mar 19, 2026
Closed
@OSBotify
Copy link
Contributor

OSBotify commented Mar 19, 2026

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

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

Bundle Size Analysis (Sentry):

@OSBotify
Copy link
Contributor

OSBotify commented Mar 23, 2026

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

Reviewers

@mountiny mountiny mountiny approved these changes

@joekaufmanexpensify joekaufmanexpensify joekaufmanexpensify approved these changes

+1 more reviewer

@situchan situchan situchan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@situchan situchan

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@MelvinBot @situchan @mountiny @war-in @OSBotify @joekaufmanexpensify