[Domain control] [Release 1] Remove Admins "beta" - add Admins button

[war-in]

Explanation of Change

Fixed Issues

$ #79900
PROPOSAL:

Tests

Navigate to Domain Admins Page

1. Sign into NewDot as a domain admin.
2. Go to Workspaces tab from the left-hand navigation.
3. Click on your domain name.
4. Verify you land on the Domain Admins page.
   Verify:

• The page header shows "Admins" with the domain name in the breadcrumb.
• There's a green "Add admin" button in the top right.
• There's a grey "Settings" button in the top right.
• The Domain Admins option appears before SAML in the left navigation.
• You see a list of current domain admins with their avatars and email addresses.
• Search input only appears when there are more than 15 admins.

View Admin Details

1. Click on any admin row in the list.
   Verify:

• A RHP (web) / new page (mobile) opens showing the admin's details.
• The page shows the admin's avatar and name at the top.
• The email address is displayed.
• There's a "Revoke admin access" button at the bottom.
• You can hover over the email to see a copy option.

Add New Domain Admin

1. From the Domain Admins page, click "Add admin" button.
2. Verify you see an input field with placeholder text for entering an email.
3. Enter a valid email address from your domain (e.g., newadmin@yourdomain.com).
4. Verify the email appears as a suggestion below the input.
5. Click on the suggested email or press Enter.
6. Verify a green "Invite" button appears.
7. Click "Invite".
   Verify:

• The RHP/page closes.
• The new admin appears in the admin list with a pending state (if applicable).
• After the API call completes, the admin is shown in the list without errors.

Unable to add yourself as admin again

1. Click "Add admin".
2. Try to add yourself who is already an admin again.

Verify:

• You are not able to select yourself from the list
• So you cannot try to add yourself as admin

Revoke Admin Access

1. Click on an admin row (not yourself, not the primary contact).
2. In the RHP, click "Revoke admin access".
3. Verify a confirmation modal appears asking if you're sure.
4. Click "Revoke admin access" in the modal to confirm.
   Verify:

• The modal closes.
• The admin is removed from the list.
• You cannot revoke your own admin access.

Attempt to Remove Primary Contact

1. Navigate to Settings (gear icon) from the Domain Admins page.
2. Note which admin is set as Primary Contact.
3. Go back to the admins list.
4. Try to click on the primary contact admin row.
5. Try to revoke their access.

Verify:

• You cannot remove the admin who is set as primary contact.
• An error or disabled state prevents this action.

Attempt to Remove Yourself

1. Find your own admin account in the list.
2. Click on your row.
3. Try to click "Revoke admin access".
   Verify:

• You had been removed as admin

Access Domain Settings

1. From the Domain Admins page, click the "Settings" button in the header.
   Verify:

• A RHP (web) / new page (mobile) opens with the title "Settings".
• You see a "Primary contact" row with the current primary contact's email.
• You see a "Consolidated domain billing" toggle switch.
• The toggle shows the current state (on/off).

Change Primary Contact

1. In the Settings RHP, click on the "Primary contact" row.
2. Verify a picker page opens showing all domain admins.
3. Select a different admin from the list.

Verify:

• The picker closes and returns to the Settings page.
• The Primary Contact row now shows the newly selected admin's email.
• When you return to the Domain Admins list, the newly selected admin has a "Primary contact" badge.
• The previous primary contact no longer has the badge.

Enable Consolidated Domain Billing

1. In the Settings RHP, toggle "Consolidated domain billing" ON.
   Verify:

• The toggle switches to the ON position.
• The description text explains: "When enabled, the Primary Contact will be billed for all workspaces owned by expensify.com users and the billing receipt will be routed to the Primary Contact's account."
• Settings are saved automatically.

2. Toggle it OFF.
   Verify:

• The toggle switches to the OFF position.
• Settings are saved automatically.

Settings Error Handling

1. In Settings, attempt to trigger an error (coordinate with dev team if needed).
   Verify:

• An RBR error appears on the Domain Admins Settings page.
• The error appears under the field that failed (e.g., under Primary Contact).
• The error message is displayed in red text.
• Clicking X will dismiss the error

Primary Contact Badge

1. From the Domain Admins list, identify which admin has the "Primary contact" badge.
2. Verify the badge appears to the right of their email address.
3. Go to Settings and change the primary contact to a different admin.
4. Return to the Domain Admins list.
   Verify:

• The badge has moved to the newly selected primary contact.
• Only one admin has the badge at any time.

Search Admins (when 15+ admins exist)

1. If you have 15 or fewer admins, skip this test.
2. If you have more than 15 admins, verify a search input appears at the top of the list.
3. Type a partial email address or name in the search field.
   Verify:

• The list filters to show only matching admins.
• Clearing the search shows all admins again.

Offline tests

Same as tests

QA Steps

same as tests

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

[melvin-bot]

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 Report

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

Files with missing lines	Coverage Δ
...rc/components/Icon/chunks/expensify-icons.chunk.ts	0.00% <ø> (ø)
...n/AppNavigator/Navigators/DomainSplitNavigator.tsx	0.00% <ø> (ø)
src/pages/domain/Admins/DomainAdminDetailsPage.tsx	0.00% <ø> (ø)
.../pages/domain/BaseDomainMemberDetailsComponent.tsx	0.00% <ø> (ø)
src/pages/domain/DomainInitialPage.tsx	0.00% <0.00%> (ø)
src/pages/domain/Admins/DomainAddAdminPage.tsx	0.00% <0.00%> (ø)
... and 10 files with indirect coverage changes

[sumo-slonik]

good job 🔥

[github-actions]

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

[melvin-bot]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-4c9be3737cd1374687cda7c106d0c83f559443c6/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-86266e3774c3b5cb2136459539ec9373225f0cf0/index.html

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

---

👀 View the workflow run that generated this build 👀

[ZhenjaHorbach]

Minor comment
But shouldn't the first element be selected by default?

2026-01-19.16.16.47.mov

[mountiny]

@codex review

[mountiny]

I agree with @ZhenjaHorbach

[ZhenjaHorbach]

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
• 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

Uploading Запись экрана 2026-01-20 в 21.07.39.mov…

Android: mWeb Chrome

2026-01-20.21.07.39.mov

iOS: HybridApp

2026-01-20.20.58.03.mov

iOS: mWeb Safari

2026-01-20.21.01.28.mov

MacOS: Chrome / Safari

2026-01-20.20.29.23.mov

[mountiny]

Can you describe the steps exactly to get this issue please @situchan

[situchan]

I have no specific step. Just logged in account with domain admin invited and go to domain admins page.

[ZhenjaHorbach]

LGTM!

[mountiny]

Thank you @war-in @situchan @ZhenjaHorbach!!!

Great job on the project so far. @dubielzyk-expensify I see that you have reviewed and the feedback has been applied, but please feel free to give this another look design wise and we can follow up quickly in case there are some changes needed still

[OSBotify]

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

[OSBotify]

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

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

[m-natarajan]

@war-in @mountiny Unable to trigger errror for this scenario Settings Error Handling, Any workaround to trigger the error?

[m-natarajan]

@war-in @mountiny

The description for the Consolidated Billing toggle does not match what’s described in the PR.
PR description:
When enabled, the Primary Contact will be billed for all workspaces owned by expensify.com users, and the billing receipt will be routed to the Primary Contact’s account.
Actual result:
When enabled, the primary contact will pay for all workspaces owned by applausecard.expensifail.com members and receive all billing receipts.
Could you please confirm which behavior/description is correct?

[war-in]

Unable to trigger errror for this scenario Settings Error Handling, Any workaround to trigger the error?

@m-natarajan you can block request URL in the network panel

Screen.Recording.2026-01-22.at.11.22.08.mov

[war-in]

The description for the Consolidated Billing toggle does not match what’s described in the PR.

@m-natarajan it probably changed during development. This is how it's described in figma

When enabled, the primary contact will pay for all workspaces owned by boulderdev.com members and receive all billing receipts. 

So it matches the Actual result:

[m-natarajan]

@war-in
For Settings Error Handling scenario, No error message displayed in RHP, RBR displayed only in settings page. Is this expected?

Recording.2268.mp4

[war-in]

@m-natarajan is that a correct video? It shows an admin error

[m-natarajan]

@war-in These are the steps:
Settings Error Handling
In Settings, attempt to trigger an error (coordinate with dev team if needed).
Verify:
An RBR error appears on the Domain Admins page.
Clicking the error navigates to the Settings RHP.
The error appears under the field that failed (e.g., under Primary Contact).
The error message is displayed in red text.

How to execute this scenario?

[m-natarajan]

@war-in

An RBR error appears on the Domain Admins page.

No error displayed in Domain admin page, Only in settings. Is this expected?

Recording.2269.mp4

[war-in]

@m-natarajan good question let me ask Vit

[mountiny]

@m-natarajan I think that is expected! thanks for noticing, we will update the tests

[OSBotify]

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.6-4 🚀

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