[Domain Control] Clean up domain adminship

[rayane-d]

Explanation of Change

Removes the sharedNVP_private_admin_access_<domainAccountID> Onyx key and derives admin status from the existing expensify_adminPermissions_* entries already present in domain_<domainAccountID>. A new isAdminSelector onyx selector checks whether the current user's account ID appears in any admin permission entry in the domain data.

Fixed Issues

$ #80137
PROPOSAL:

Tests

This PR should not introduce any behavior changes compared to the previous version. Regression tests:

Domain admin accessing domain pages:

1. Log in as a domain admin
2. Go to the Workspaces tab
3. Tap your domain in the list
4. Verify the Domain Initial Page loads showing Members, Admins, and SAML menu items (no loading spinner stuck, no "not found" page)
5. Tap each sub-page (Members, Admins, SAML) and verify they all load correctly
6. Go back to the Domain Initial Page, refresh the browser
7. Verify the page still shows correctly after refresh (admin status is preserved)

1.mov

Non-admin domain member access:
8. Log in as a member (but not an admin) of an unverified domain
9. Go to the Workspaces tab
10. Verify the Domains section does not show a "Not verified" badge, no three-dot menu is visible, and clicking the row is disabled

Screen.Recording.2026-04-06.at.7.21.14.PM.mov

11. Log in as a member (but not an admin) of a verified domain
12. Go to the Workspaces tab and tap the domain
13. Verify you land on the Domain Access Restricted page, not the domain settings

2.mov

Unverified domain admin flow:
14. Log in as an admin of an unverified domain
15. Go to the Workspaces tab
16. Verify you see a "Not verified" badge next to your domain
17. Click the three-dot menu and verify you see "Verify domain"
18. Click "Verify domain" and verify the verification RHP opens with a verification code displayed

4.mov

Domain page deeplink:
19. While logged in as a domain admin, open a direct URL to the domain page (e.g. /domain/<domainAccountID>)
20. Verify the Domain Initial Page loads correctly

5.mov

21. While logged in as a non-admin member, open the same direct URL
22. Verify you see a "not found" view instead of domain settings

6.mov

23. Verify that accessing the domain-verified RHP via URL only works for verified domains, and verify-domain RHP only for non-verified domains
24. Refresh the page while on a domain RHP and verify it reloads with the Workspaces list page still below (web only)

7.mov

Company card assignment:
25. Log in as a domain admin who has access to a workspace "A" with a domain-level card feed
26. Go to that workspace > Company Cards
27. Verify the "Assign card" button is enabled
28. Create another workspace "B"
29. In the new workspace "B", Go to Company Cards
30. Verify the "Assign card" button is not available
31. Log in as another domain admin that is a policy admin of workspace "A"
32. Go to Company Cards
33. Verify the "Assign card" button is enabled

9.mov

Domain creation flow:
34. Log in with an account that has a corporate policy
35. Go to Workspaces tab > Add domain
36. Enter a valid domain name and submit
37. Verify the "Domain Added" confirmation page appears and the "Configure" button navigates to domain settings

10.mov

Add and revoke domain admin:
38. Log in as a domain admin (User A)
39. Go to the domain > Admins page
40. Click "Add admin" and enter a valid email from the domain
41. Click "Invite" and verify the new admin appears in the list
42. In a separate session, log in as the newly added admin (User B)
43. Go to the Workspaces tab, tap the domain, and verify you can access domain settings
44. As User A, click on User B in the admin list and click "Revoke admin access"
45. Confirm the revocation
46. Verify User B is removed from the admin list
47. As User B, refresh and verify you can no longer access domain settings (redirected away or see access restricted page)

12.mov

SAML page admin gate:
48. Log in as a domain admin
49. Go to the domain > SAML page
50. Verify the page loads correctly showing SAML configuration or the feature list (depending on whether the domain is verified)
51. Verify that toggling SAML settings works as expected

13.mov

Domain members (admin gate):
52. Log in as a domain admin
53. Go to the domain > Members page
54. Verify the member list loads with avatars, names, and emails
55. Click on a member row and verify the member details page opens

14.mov

• Verify that no errors appear in the JS console

Offline tests

1. Log in as a domain admin and navigate to the Domain Initial Page
2. Turn off network
3. Verify the page keeps showing domain data with the offline indicator
4. Turn network back on
5. Verify the page reconnects and still shows admin content (no redirect to the workspaces list)

15.mov

6. Go to the unverified domain verification RHP while offline
7. Verify the "Verify domain" button is disabled and an offline indicator is shown
8. Verify the validation code shows an error saying fetch failed with a disabled "Retry" button

16.mov

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as tests.

Please perform these regression tests:

• [Domain control] [Release 1] Remove Admins "beta" - add Admins button #79765 (comment)

• [Release 2] Test and release the members page for customers #79901 (comment)

• [Test cases] Domain Control - Release 3 #84809 (comment)

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

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
src/ONYXKEYS.ts	100.00% <ø> (ø)
src/hooks/useIsAllowedToIssueCompanyCard.ts	100.00% <100.00%> (ø)
src/selectors/Domain.ts	92.75% <100.00%> (+0.69%)	⬆️
src/pages/domain/BaseDomainVerifiedPage.tsx	0.00% <0.00%> (ø)
src/pages/workspace/WorkspacesListPage.tsx	71.42% <0.00%> (ø)
src/pages/domain/DomainAddedPage.tsx	0.00% <0.00%> (ø)
src/pages/domain/DomainInitialPage.tsx	0.00% <0.00%> (ø)
src/pages/domain/DomainSamlPage.tsx	0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

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

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 287c733239

ℹ️ 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".

[chatgpt-codex-connector]

Delay domain redirect until current user ID is loaded

isAdmin now depends on currentUserAccountID, which is 0 until session/personal details hydration completes, but this page’s loading gate only checks domainMetadata. On a refresh/deeplink where domain is already loaded but user identity is not, this effect runs with isAdmin === false and immediately calls Navigation.goBack, so real domain admins can be bounced out of Domain Initial before their account ID arrives. Please gate this redirect on user identity readiness (or equivalent admin-status loading) to avoid this startup race.

Useful? React with 👍 / 👎.

[joekaufmanexpensify]

Design doc issue

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

2026-04-15.13.33.35.mov

[ZhenjaHorbach]

@rayane-d
Could you fix the conflicts, please?

[rayane-d]

@rayane-d Could you fix the conflicts, please?

@ZhenjaHorbach - done

[ZhenjaHorbach]

Thanks!
Reviewing

[ZhenjaHorbach]

LGTM!
@rayane-d
But we have conflicts

[mountiny]

@rayane-d sorry more conflicts, can you please ping me in slack when you resolve them?

[rayane-d]

But we have conflicts

Resolved

[mountiny]

Thanks for this clean up and for adding such thorough tests!

[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.

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-28953a6-08b118a-43f34e286f96e608f87216e842a0d11c7a88c9c1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-28953a6-08b118a-baaedaf7ff6a2fd5dc1a5f82542e0e43c9541b84/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

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

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[izarutskaya]

Hi @rayane-d We are checking PR steps and and [Domain control] [Release 1] Remove Admins "beta" - add Admins button #79765 (comment).
Other 2: [Release 2] Test and release the members page for customers and [Test cases] Domain Control - Release 3 we verified during this regression.

[jponikarchuk]

This PR failing (Step 20) because of the issue #88506
This issue is reproducible in: All platforms

Video.mp4

[jponikarchuk]

@rayane-d @ZhenjaHorbach @joekaufmanexpensify @mountiny Could you please confirm if it's WAD? When an admin adds a new member under an unverified domain, the account is immediately suspended, and the new user is unable to log in.

suspended.mp4

[rayane-d]

This PR failing (Step 20) because of the issue #88506 This issue is reproducible in: All platforms

Video.mp4

This is a pre-existing issue, also reproducible in production, and not related to this PR.

[rayane-d]

@rayane-d @ZhenjaHorbach @joekaufmanexpensify @mountiny Could you please confirm if it's WAD? When an admin adds a new member under an unverified domain, the account is immediately suspended, and the new user is unable to log in.

suspended.mp4

@jponikarchuk - Is the email used in this test a valid inbox?

This also seems unrelated to this PR.