From 635c5264e126b46210bfb6b7386bf29998f87c64 Mon Sep 17 00:00:00 2001 From: daledah Date: Mon, 26 Jan 2026 11:47:39 +0700 Subject: [PATCH] fix: user can select revoked admin while offline --- .../domain/Admins/DomainAddPrimaryContactPage.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx b/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx index a86ee927a172..a66b5882b0a1 100644 --- a/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx +++ b/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx @@ -1,4 +1,4 @@ -import {adminAccountIDsSelector, technicalContactSettingsSelector} from '@selectors/Domain'; +import {adminAccountIDsSelector, adminPendingActionSelector, technicalContactSettingsSelector} from '@selectors/Domain'; import React from 'react'; import type {OnyxEntry} from 'react-native-onyx'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -36,6 +36,10 @@ function DomainAddPrimaryContactPage({route}: DomainAddPrimaryContactPageProps) canBeMissing: true, selector: adminAccountIDsSelector, }); + const [adminPendingActions] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, { + canBeMissing: true, + selector: adminPendingActionSelector, + }); // eslint-disable-next-line rulesdir/no-inline-useOnyx-selector const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, { canBeMissing: true, @@ -69,6 +73,12 @@ function DomainAddPrimaryContactPage({route}: DomainAddPrimaryContactPageProps) continue; } + // Don't show admins being deleted + const adminPendingAction = adminPendingActions?.[accountID]?.pendingAction; + if (adminPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) { + continue; + } + const details = personalDetails?.[accountID]; let isSelected = false; if (!!details?.login && !!technicalContactSettings?.technicalContactEmail && details.login === technicalContactSettings.technicalContactEmail) {