Domains - Removed admin is not removed from Add primary contact list offline

[nlemma]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: 9.3.6-0
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from BrowserStack: #79765
Email or phone of affected tester (no customers): applausetester@applause.expensifail.com
Issue reported by: Applause Internal Team
Bug source: Exploratory - Significant User Experience Deterioration
Device used: Mac 26.1 / Chrome
App Component: Workspace Settings

Action Performed:

Precondition:

• Log in as domain admin (applausetester@applause.expensifail.com).

1. Go to staging.new.expensify.com
2. Go to Workspaces.
3. Scroll to the bottom.
4. Tap applause.expensifail.com domain.
5. Go offline.
6. Click Add admin.
7. Add a user as domain admin.
8. Click on the admin profile which was added in Step 7.
9. Click Revoke access.
10. Click Remove.
11. Click Settings.
12. Click Primary contact.
13. Search for the removed admin in Step 10.

Expected Result:

Removed admin should no longer appear in Add primary contact list.

Actual Result:

Removed admin is not removed from Add primary contact list offline.

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari

Screenshots/Videos

Bug7055396_1769073074803.13.mp4

View all open jobs on GitHub

Issue Owner

Current Issue Owner: @parasharrajat

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @parasharrajat (External)

[melvin-bot]

Triggered auto assignment to @trjExpensify (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[MobileMage]

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a domain admin is removed while the application is offline, the removed admin still appears in the "Add primary contact" list. The user goes offline, adds a new admin, revokes and removes that admin's access, then navigates to Settings > Primary contact - the removed admin is still visible and selectable in the contact list.

What is the root cause of that problem?

The issue is in DomainAddPrimaryContactPage.tsx. This page builds its list of admins from adminAccountIDs (via adminAccountIDsSelector), but it does not filter out admins who have a pending DELETE action.

Looking at the code in DomainAddPrimaryContactPage.tsx at lines 65-70:

for (const accountID of adminAccountIDs ?? []) {
    // Don't show admins with errors
    const adminErrors = domainErrors?.adminErrors?.[accountID] ?? {};
    if (Object.keys(adminErrors).length !== 0) {
        continue;
    }
    // ... builds data array

The page correctly filters out admins with errors, but it does NOT check for pending DELETE actions stored in DOMAIN_PENDING_ACTIONS.

In contrast, DomainAdminsPage.tsx handles this correctly - it reads domainPendingAction via adminPendingActionSelector and passes it to BaseDomainMembersPage, which then marks rows with pending DELETE action as disabled (line 89 of BaseDomainMembersPage.tsx):

const isPendingActionDelete = customProps?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;

When revokeDomainAdminAccess is called in src/libs/actions/Domain.ts, the optimistic data only updates DOMAIN_PENDING_ACTIONS to mark the admin with a DELETE pending action (lines 652-664) - it does NOT remove the admin from the domain object itself. This is intentional for proper offline handling (rollback on failure). However, DomainAddPrimaryContactPage doesn't read this pending action data to filter out admins being deleted.

What changes do you think we should make in order to solve the problem?

We need to filter out admins with pending DELETE action in DomainAddPrimaryContactPage.tsx, similar to how we already filter out admins with errors.

File: src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx

1. Import the adminPendingActionSelector:

-import {adminAccountIDsSelector, technicalContactSettingsSelector} from '@selectors/Domain';
+import {adminAccountIDsSelector, adminPendingActionSelector, technicalContactSettingsSelector} from '@selectors/Domain';

2. Add a new useOnyx hook to read the pending actions:

     const [domainErrors] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, {canBeMissing: true});
+    const [adminPendingActions] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, {
+        canBeMissing: true,
+        selector: adminPendingActionSelector,
+    });

3. Filter out admins with pending DELETE action in the loop:

     for (const accountID of adminAccountIDs ?? []) {
         // Don't show admins with errors
         const adminErrors = domainErrors?.adminErrors?.[accountID] ?? {};
         if (Object.keys(adminErrors).length !== 0) {
             continue;
         }
+        // Don't show admins with pending DELETE action
+        if (adminPendingActions?.[accountID]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            continue;
+        }

4. Add the missing CONST import if not already present.

This approach follows the exact same pattern used by DomainAdminsPage.tsx for reading pending actions

What alternative solutions did you explore? (Optional)

[nkdengineer]

Dupe of #80185

[parasharrajat]

WE can close this @trjExpensify

[trjExpensify]

Dope.