Skip to content

Fix: Domain admins - "Hidden" is shown for member invited to Domain admins page while offline #81797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 9 commits into from
Feb 20, 2026
Merged

Fix: Domain admins - "Hidden" is shown for member invited to Domain admins page while offline #81797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
051ea33
fix: init
annaweber830 Feb 8, 2026
025b28d
fix: typescript check
annaweber830 Feb 8, 2026
0023e41
fix: prettier fix
annaweber830 Feb 8, 2026
6dd9150
fix: error fix
annaweber830 Feb 11, 2026
7a4d96e
fix: add unit test
annaweber830 Feb 20, 2026
9bbca4e
Merge branch 'main' of https://github.com/annaweber830/App into fix-8…
annaweber830 Feb 20, 2026
4d25b49
Merge branch 'main' into fix-80186
annaweber830 Feb 20, 2026
6b06d30
Merge branch 'main' of https://github.com/annaweber830/App into fix-8…
annaweber830 Feb 20, 2026
3316dfd
Merge branch 'fix-80186' of https://github.com/annaweber830/App into …
annaweber830 Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions src/libs/actions/Domain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,12 @@ function clearToggleConsolidatedDomainBillingErrors(domainAccountID: number) {
});
}

function addAdminToDomain(domainAccountID: number, accountID: number, targetEmail: string, domainName: string) {
function addAdminToDomain(domainAccountID: number, accountID: number, targetEmail: string, domainName: string, isOptimisticAccount: boolean) {

@mountiny mountiny Feb 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you make sure to cover these changes in the unit tests?

@annaweber830 annaweber830 Feb 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hi @mountiny I updated my PR.

const PERMISSION_KEY = `${CONST.DOMAIN.EXPENSIFY_ADMIN_ACCESS_PREFIX}${accountID}`;

const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS>> = [
const optimisticData: Array<
OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS | typeof ONYXKEYS.PERSONAL_DETAILS_LIST>
> = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
Expand Down Expand Up @@ -575,7 +577,24 @@ function addAdminToDomain(domainAccountID: number, accountID: number, targetEmai
},
];

const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS>> = [
if (isOptimisticAccount) {
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.PERSONAL_DETAILS_LIST}`,
value: {
[accountID]: {
accountID,
login: targetEmail,
displayName: targetEmail,
isOptimisticPersonalDetail: true,
},
},
Comment thread
mountiny marked this conversation as resolved.
});
}

const successData: Array<
OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN | typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS | typeof ONYXKEYS.PERSONAL_DETAILS_LIST>
> = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`,
Expand Down Expand Up @@ -605,7 +624,7 @@ function addAdminToDomain(domainAccountID: number, accountID: number, targetEmai
},
];

const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS>> = [
const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS | typeof ONYXKEYS.COLLECTION.DOMAIN_ERRORS | typeof ONYXKEYS.PERSONAL_DETAILS_LIST>> = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`,
Expand All @@ -628,6 +647,18 @@ function addAdminToDomain(domainAccountID: number, accountID: number, targetEmai
},
];

if (isOptimisticAccount) {
const clearOptimisticPersonalDetails: OnyxUpdate<typeof ONYXKEYS.PERSONAL_DETAILS_LIST> = {
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.PERSONAL_DETAILS_LIST}`,
value: {
[accountID]: null,
},
};
successData.push(clearOptimisticPersonalDetails);
failureData.push(clearOptimisticPersonalDetails);
}

const params: AddAdminToDomainParams = {
domainName,
targetEmail,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/domain/Admins/DomainAddAdminPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function DomainAddAdminPage({route}: DomainAddAdminProps) {
}
didInvite.current = true;

addAdminToDomain(domainAccountID, currentlySelectedUser.accountID, currentlySelectedUser.login, domainName);
addAdminToDomain(domainAccountID, currentlySelectedUser.accountID, currentlySelectedUser.login, domainName, !!currentlySelectedUser.isOptimisticAccount);
Navigation.dismissModal();
};

Expand Down
70 changes: 70 additions & 0 deletions tests/actions/DomainTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Onyx from 'react-native-onyx';
import {
addAdminToDomain,
addMemberToDomain,
clearDomainErrors,
clearDomainMemberError,
Expand Down Expand Up @@ -187,6 +188,75 @@ describe('actions/Domain', () => {
apiWriteSpy.mockRestore();
});

it('addAdminToDomain - adds and clears optimistic personal details for optimistic accounts', () => {
const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
const domainAccountID = 123;
const accountID = 456;
const targetEmail = 'test@example.com';
const domainName = 'test.com';

addAdminToDomain(domainAccountID, accountID, targetEmail, domainName, true);

expect(apiWriteSpy).toHaveBeenCalledWith(
WRITE_COMMANDS.ADD_DOMAIN_ADMIN,
{domainName, targetEmail},
{
optimisticData: expect.arrayContaining([
expect.objectContaining({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {
[accountID]: {
accountID,
login: targetEmail,
displayName: targetEmail,
isOptimisticPersonalDetail: true,
},
},
}),
]),
successData: expect.arrayContaining([
expect.objectContaining({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {[accountID]: null},
}),
]),
failureData: expect.arrayContaining([
expect.objectContaining({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: {[accountID]: null},
}),
]),
},
);

apiWriteSpy.mockRestore();
});

it('addAdminToDomain - does not update optimistic personal details for non-optimistic accounts', () => {
const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve());
const domainAccountID = 123;
const accountID = 456;
const targetEmail = 'test@example.com';
const domainName = 'test.com';

addAdminToDomain(domainAccountID, accountID, targetEmail, domainName, false);

expect(apiWriteSpy).toHaveBeenCalledWith(
WRITE_COMMANDS.ADD_DOMAIN_ADMIN,
{domainName, targetEmail},
expect.objectContaining({
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
optimisticData: expect.not.arrayContaining([expect.objectContaining({key: ONYXKEYS.PERSONAL_DETAILS_LIST})]),
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
successData: expect.not.arrayContaining([expect.objectContaining({key: ONYXKEYS.PERSONAL_DETAILS_LIST})]),
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
failureData: expect.not.arrayContaining([expect.objectContaining({key: ONYXKEYS.PERSONAL_DETAILS_LIST})]),
}),
);

apiWriteSpy.mockRestore();
});

it('clearAddMemberError - clears member errors and optimistic data', async () => {
const domainAccountID = 123;
const email = 'test@example.com';
Expand Down
Loading