Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e9af0c3
add possibility to adding admins to domain
sumo-slonik Dec 12, 2025
c8ae641
add not found page for RHP
sumo-slonik Dec 12, 2025
a5c0e8f
add not found page for RHP
sumo-slonik Dec 12, 2025
12e377a
prettier
sumo-slonik Dec 12, 2025
ea5d28c
Merge branch 'war-in/domains/add-admin-page' into war-in/domains/add-…
war-in Dec 12, 2025
3ba3736
chore: post-merge fixes
war-in Dec 12, 2025
5ee9f29
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 16, 2025
5f59d95
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 17, 2025
36a378c
feat: add offline & error handling
war-in Dec 17, 2025
8bbc6e0
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 17, 2025
11879a8
chore: post-merge fixes
war-in Dec 17, 2025
521a305
feat: add error handling for primary contact page
war-in Dec 17, 2025
1da2f4d
chore: remove unnecessary code
war-in Dec 17, 2025
38e1990
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 19, 2025
ca1df82
feat: add email validation & list header message
war-in Dec 19, 2025
148d3d6
refactor: clean up the code
war-in Dec 19, 2025
55a232e
chore: fix lint
war-in Dec 19, 2025
3ab8986
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 19, 2025
17160a4
chore: add translations
war-in Dec 19, 2025
5102246
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 22, 2025
d206756
feat: don't show admins with errors on primary contact page
war-in Dec 22, 2025
deddce7
chore: fix prettier
war-in Dec 22, 2025
955f5b7
chore: fix styles for primary contact error
war-in Dec 22, 2025
587d3ae
feat: don't allow inviting special accounts (e.g., concierge)
war-in Dec 22, 2025
7df52ab
Merge branch 'refs/heads/main' into war-in/domains/add-addAdmin-page
war-in Dec 22, 2025
ed2926a
test: add domainEmailSelector tests
war-in Dec 22, 2025
5ae9894
chore: fix lint
war-in Dec 22, 2025
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
4 changes: 4 additions & 0 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3543,6 +3543,10 @@ const ROUTES = {
route: 'domain/:domainAccountID/admins/settings/primary-contact',
getRoute: (domainAccountID: number) => `domain/${domainAccountID}/admins/settings/primary-contact` as const,
},
DOMAIN_ADD_ADMIN: {
route: 'domain/:domainAccountID/admins/invite',
getRoute: (domainAccountID: number) => `domain/${domainAccountID}/admins/invite` as const,
},
} as const;

/**
Expand Down
1 change: 1 addition & 0 deletions src/SCREENS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,7 @@ const SCREENS = {
ADMIN_DETAILS: 'Domain_Admin_Details',
ADMINS_SETTINGS: 'Admins_Settings',
ADD_PRIMARY_CONTACT: 'Add_Primary_Contact',
ADD_ADMIN: 'Domain_Add_Admin',
},
} as const;

Expand Down
4 changes: 4 additions & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8007,11 +8007,15 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
findAdmin: 'Admin finden',
primaryContact: 'Hauptansprechpartner',
addPrimaryContact: 'Primären Kontakt hinzufügen',
setPrimaryContactError: 'Primären Kontakt kann nicht festgelegt werden. Bitte versuchen Sie es später erneut.',
settings: 'Einstellungen',
consolidatedDomainBilling: 'Konsolidierte Domain-Abrechnung',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Wenn diese Option aktiviert ist, bezahlt der Hauptansprechpartner für alle Workspaces, die Mitgliedern von <strong>${domainName}</strong> gehören, und erhält alle Rechnungsbelege.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'Die konsolidierte Domain-Abrechnung konnte nicht geändert werden. Bitte versuche es später erneut.',
addAdmin: 'Admin hinzufügen',
invite: 'Einladen',
addAdminError: 'Dieser Benutzer kann nicht als Admin hinzugefügt werden. Bitte versuche es erneut.',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7860,11 +7860,15 @@ const translations = {
findAdmin: 'Find admin',
primaryContact: 'Primary contact',
addPrimaryContact: 'Add primary contact',
setPrimaryContactError: 'Unable to set primary contact. Please try again later.',
settings: 'Settings',
consolidatedDomainBilling: 'Consolidated domain billing',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>When enabled, the primary contact will pay for all workspaces owned by <strong>${domainName}</strong> members and receive all billing receipts.</muted-text-label></comment>`,
consolidatedDomainBillingError: "Consolidated domain billing couldn't be changed. Please try again later.",
addAdmin: 'Add admin',
invite: 'Invite',
addAdminError: 'Unable to add this member as an admin. Please try again.',
},
},
};
Expand Down
4 changes: 4 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8030,11 +8030,15 @@ ${amount} para ${merchant} - ${date}`,
findAdmin: 'Encontrar administrador',
primaryContact: 'Contacto principal',
addPrimaryContact: 'Añadir contacto principal',
setPrimaryContactError: 'No se pudo establecer el contacto principal. Por favor, inténtalo de nuevo más tarde.',
settings: 'Configuración',
consolidatedDomainBilling: 'Facturación consolidada del dominio',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Cuando está habilitada, el contacto principal pagará todos los espacios de trabajo propiedad de los miembros de <strong>${domainName}</strong> y recibirá todos los recibos de facturación.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'No se pudo cambiar la facturación consolidada del dominio. Por favor, inténtalo de nuevo más tarde.',
addAdmin: 'Añadir administrador',
invite: 'Invitar',
addAdminError: 'No se pudo añadir a este miembro como administrador. Por favor, inténtalo de nuevo.',
},
},
};
Expand Down
4 changes: 4 additions & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8012,11 +8012,15 @@ Voici un *reçu test* pour vous montrer comment cela fonctionne :`,
findAdmin: 'Trouver un admin',
primaryContact: 'Contact principal',
addPrimaryContact: 'Ajouter un contact principal',
setPrimaryContactError: 'Impossible de définir le contact principal. Veuillez réessayer plus tard.',
settings: 'Paramètres',
consolidatedDomainBilling: 'Facturation consolidée du domaine',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Lorsque cette option est activée, le contact principal paiera pour tous les espaces de travail appartenant aux membres de <strong>${domainName}</strong> et recevra tous les reçus de facturation.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'La facturation de domaine consolidée n’a pas pu être modifiée. Veuillez réessayer plus tard.',
addAdmin: 'Ajouter un administrateur',
invite: 'Inviter',
addAdminError: 'Impossible d’ajouter ce membre en tant qu’administrateur. Veuillez réessayer.',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7989,11 +7989,15 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
findAdmin: 'Trova amministratore',
primaryContact: 'Contatto principale',
addPrimaryContact: 'Aggiungi contatto principale',
setPrimaryContactError: 'Impossibile impostare il contatto principale. Riprova più tardi.',
settings: 'Impostazioni',
consolidatedDomainBilling: 'Fatturazione consolidata del dominio',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Quando abilitata, il contatto principale pagherà per tutti gli spazi di lavoro di proprietà dei membri di <strong>${domainName}</strong> e riceverà tutte le ricevute di fatturazione.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'La fatturazione dominio consolidata non può essere modificata. Riprova più tardi.',
addAdmin: 'Aggiungi amministratore',
invite: 'Invita',
addAdminError: 'Impossibile aggiungere questo membro come amministratore. Riprova.',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7926,11 +7926,15 @@ Expensify の使い方をお見せするための*テストレシート*がこ
findAdmin: '管理者を検索',
primaryContact: '主要連絡先',
addPrimaryContact: '主要連絡先を追加',
setPrimaryContactError: 'メインの連絡先を設定できませんでした。後でもう一度お試しください。',
settings: '設定',
consolidatedDomainBilling: '統合ドメイン請求',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>有効にすると、<strong>${domainName}</strong> メンバーが所有するすべてのワークスペースの支払いを代表連絡先が行い、すべての請求書の領収書を受け取ります。</muted-text-label></comment>`,
consolidatedDomainBillingError: '統合ドメイン請求を変更できませんでした。後でもう一度お試しください。',
addAdmin: '管理者を追加',
invite: '招待',
addAdminError: 'このメンバーを管理者として追加できません。もう一度お試しください。',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7975,11 +7975,15 @@ Hier is een *testbon* om je te laten zien hoe het werkt:`,
findAdmin: 'Beheerder zoeken',
primaryContact: 'Primair contactpersoon',
addPrimaryContact: 'Primair contactpersoon toevoegen',
setPrimaryContactError: 'Kan de primaire contactpersoon niet instellen. Probeer het later opnieuw.',
settings: 'Instellingen',
consolidatedDomainBilling: 'Geconsolideerde domeinfacturering',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Indien ingeschakeld, betaalt de primaire contactpersoon voor alle werkruimten die eigendom zijn van leden van <strong>${domainName}</strong> en ontvangt hij/zij alle factuurbewijzen.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'Geconsolideerde domeinfacturering kon niet worden gewijzigd. Probeer het later opnieuw.',
addAdmin: 'Beheerder toevoegen',
invite: 'Uitnodigen',
addAdminError: 'Kan dit lid niet als beheerder toevoegen. Probeer het opnieuw.',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7959,11 +7959,15 @@ Oto *paragon testowy*, który pokazuje, jak to działa:`,
findAdmin: 'Znajdź administratora',
primaryContact: 'Główny kontakt',
addPrimaryContact: 'Dodaj główny kontakt',
setPrimaryContactError: 'Nie można ustawić głównego kontaktu. Spróbuj ponownie później.',
settings: 'Ustawienia',
consolidatedDomainBilling: 'Skonsolidowane rozliczanie domen',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Gdy ta opcja jest włączona, główny kontakt będzie opłacać wszystkie przestrzenie robocze należące do członków <strong>${domainName}</strong> i otrzymywać wszystkie potwierdzenia rozliczeń.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'Nie udało się zmienić zbiorczego rozliczania domeny. Spróbuj ponownie później.',
addAdmin: 'Dodaj administratora',
invite: 'Zaproś',
addAdminError: 'Nie można dodać tego członka jako administratora. Spróbuj ponownie.',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7966,11 +7966,15 @@ Aqui está um *recibo de teste* para mostrar como funciona:`,
findAdmin: 'Encontrar administrador',
primaryContact: 'Contato principal',
addPrimaryContact: 'Adicionar contato principal',
setPrimaryContactError: 'Não foi possível definir o contato principal. Tente novamente mais tarde.',
settings: 'Configurações',
consolidatedDomainBilling: 'Cobrança consolidada de domínio',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>Quando ativado, o contato principal pagará por todos os espaços de trabalho pertencentes aos membros de <strong>${domainName}</strong> e receberá todos os recibos de cobrança.</muted-text-label></comment>`,
consolidatedDomainBillingError: 'A cobrança de domínio consolidada não pôde ser alterada. Tente novamente mais tarde.',
addAdmin: 'Adicionar administrador',
invite: 'Convidar',
addAdminError: 'Não foi possível adicionar este membro como administrador. Tente novamente.',
},
},
desktopAppRetiredPage: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7787,11 +7787,15 @@ ${reportName}
findAdmin: '查找管理员',
primaryContact: '主要联系人',
addPrimaryContact: '添加主要联系人',
setPrimaryContactError: '无法设置主要联系人。请稍后重试。',
settings: '设置',
consolidatedDomainBilling: '合并域名结算',
consolidatedDomainBillingDescription: (domainName: string) =>
`<comment><muted-text-label>启用后,主要联系人将为<strong>${domainName}</strong>成员拥有的所有工作区付款,并接收所有账单收据。</muted-text-label></comment>`,
consolidatedDomainBillingError: '无法更改合并域账单。请稍后重试。',
addAdmin: '添加管理员',
invite: '邀请',
addAdminError: '无法将此成员添加为管理员。请重试。',
},
},
desktopAppRetiredPage: {title: '桌面应用程序已停用', body: '新的 Expensify Mac 桌面应用已停用。今后,请使用网页版应用访问您的账户。', goToWeb: '前往网页'},
Expand Down
7 changes: 7 additions & 0 deletions src/libs/API/parameters/AddAdminToDomainParams.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
type AddAdminToDomainParams = {
authToken?: string | null;
domainName: string;
targetEmail: string;
};

export default AddAdminToDomainParams;
1 change: 1 addition & 0 deletions src/libs/API/parameters/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ export type {default as DomainParams} from './DomainParams';
export type {default as GetScimTokenParams} from './GetScimTokenParams';
export type {default as SetSamlIdentityParams} from './SetSamlIdentityParams';
export type {default as UpdateSamlEnabledParams} from './UpdateSamlEnabledParams';
export type {default as AddAdminToDomainParams} from './AddAdminToDomainParams';
export type {default as UpdateSamlRequiredParams} from './UpdateSamlRequiredParams';
export type {default as SetPolicyRequireCompanyCardsEnabledParams} from './SetPolicyRequireCompanyCardsEnabled';
export type {default as SetTechnicalContactEmailParams} from './SetTechnicalContactEmailParams';
Expand Down
2 changes: 2 additions & 0 deletions src/libs/API/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ const WRITE_COMMANDS = {
CREATE_DOMAIN: 'CreateDomain',
SET_TECHNICAL_CONTACT_EMAIL: 'SetTechnicalContactEmail',
TOGGLE_CONSOLIDATED_DOMAIN_BILLING: 'ToggleConsolidatedDomainBilling',
ADD_DOMAIN_ADMIN: 'AddDomainAdmin',
} as const;

type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
Expand Down Expand Up @@ -1079,6 +1080,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.CREATE_DOMAIN]: Parameters.DomainParams;
[WRITE_COMMANDS.SET_TECHNICAL_CONTACT_EMAIL]: Parameters.SetTechnicalContactEmailParams;
[WRITE_COMMANDS.TOGGLE_CONSOLIDATED_DOMAIN_BILLING]: Parameters.ToggleConsolidatedDomainBillingParams;
[WRITE_COMMANDS.ADD_DOMAIN_ADMIN]: Parameters.AddAdminToDomainParams;
};

const READ_COMMANDS = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
[SCREENS.DOMAIN.ADMIN_DETAILS]: () => require<ReactComponentModule>('../../../../pages/domain/Admins/DomainAdminDetailsPage').default,
[SCREENS.DOMAIN.ADMINS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/domain/Admins/DomainAdminsSettingsPage').default,
[SCREENS.DOMAIN.ADD_PRIMARY_CONTACT]: () => require<ReactComponentModule>('../../../../pages/domain/Admins/DomainAddPrimaryContactPage').default,
[SCREENS.DOMAIN.ADD_ADMIN]: () => require<ReactComponentModule>('../../../../pages/domain/Admins/DomainAddAdminPage').default,
});

const TwoFactorAuthenticatorStackNavigator = createModalStackNavigator<EnablePaymentsNavigatorParamList>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SCREENS from '@src/SCREENS';
const DOMAIN_TO_RHP: Partial<Record<keyof DomainSplitNavigatorParamList, string[]>> = {
[SCREENS.DOMAIN.INITIAL]: [],
[SCREENS.DOMAIN.SAML]: [SCREENS.DOMAIN.VERIFY, SCREENS.DOMAIN.VERIFIED],
[SCREENS.DOMAIN.ADMINS]: [SCREENS.DOMAIN.ADMIN_DETAILS, SCREENS.DOMAIN.ADMINS_SETTINGS, SCREENS.DOMAIN.ADD_PRIMARY_CONTACT],
[SCREENS.DOMAIN.ADMINS]: [SCREENS.DOMAIN.ADMIN_DETAILS, SCREENS.DOMAIN.ADMINS_SETTINGS, SCREENS.DOMAIN.ADD_PRIMARY_CONTACT, SCREENS.DOMAIN.ADD_ADMIN],
};

export default DOMAIN_TO_RHP;
3 changes: 3 additions & 0 deletions src/libs/Navigation/linkingConfig/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
[SCREENS.DOMAIN.VERIFY]: {
path: ROUTES.DOMAIN_VERIFY.route,
},
[SCREENS.DOMAIN.ADD_ADMIN]: {
path: ROUTES.DOMAIN_ADD_ADMIN.route,
},
[SCREENS.DOMAIN.VERIFIED]: {
path: ROUTES.DOMAIN_VERIFIED.route,
},
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1371,6 +1371,9 @@ type SettingsNavigatorParamList = {
[SCREENS.DOMAIN.ADD_PRIMARY_CONTACT]: {
domainAccountID: number;
};
[SCREENS.DOMAIN.ADD_ADMIN]: {
domainAccountID: number;
};
} & ReimbursementAccountNavigatorParamList;

type DomainCardNavigatorParamList = {
Expand Down
Loading
Loading