From a50dbf9ce5391fda4374295c28b7db58373d2026 Mon Sep 17 00:00:00 2001 From: war-in Date: Wed, 14 Jan 2026 17:48:16 +0100 Subject: [PATCH 01/10] feat: add `DomainGroupsPage` --- src/ROUTES.ts | 4 + src/SCREENS.ts | 1 + src/languages/en.ts | 9 ++ .../Navigators/DomainSplitNavigator.tsx | 7 ++ .../linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts | 1 + src/libs/Navigation/linkingConfig/config.ts | 3 + src/libs/Navigation/types.ts | 3 + src/pages/domain/Groups/DomainGroupsPage.tsx | 104 ++++++++++++++++++ src/selectors/Domain.ts | 15 +++ 9 files changed, 147 insertions(+) create mode 100644 src/pages/domain/Groups/DomainGroupsPage.tsx diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 16c126be5dfe..6ad09cc2272d 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -3653,6 +3653,10 @@ const ROUTES = { route: 'domain/:domainAccountID/members/:accountID', getRoute: (domainAccountID: number, accountID: number) => `domain/${domainAccountID}/members/${accountID}` as const, }, + DOMAIN_GROUPS: { + route: 'domain/:domainAccountID/groups', + getRoute: (domainAccountID: number) => `domain/${domainAccountID}/groups` as const, + }, } as const; /** diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 989a9ae3fe92..fea8c7c5d493 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -878,6 +878,7 @@ const SCREENS = { ADD_ADMIN: 'Domain_Add_Admin', MEMBERS: 'Domain_Members', MEMBER_DETAILS: 'Member_Details', + GROUPS: 'Domain_Groups', }, } as const; diff --git a/src/languages/en.ts b/src/languages/en.ts index 4eba58e91e09..376375a92dcc 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -7880,6 +7880,15 @@ const translations = { title: 'Members', findMember: 'Find member', }, + groups: { + title: 'Groups', + memberCount: () => { + return { + one: '1 member', + other: (count: number) => `${count} members`, + }; + }, + }, }, }; diff --git a/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx index 649f911492e0..b660b8de4583 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/DomainSplitNavigator.tsx @@ -15,6 +15,7 @@ const loadDomainInitialPage = () => require('../../../../p const loadDomainSamlPage = () => require('../../../../pages/domain/DomainSamlPage').default; const loadDomainAdminsPage = () => require('../../../../pages/domain/Admins/DomainAdminsPage').default; const loadDomainMembersPage = () => require('../../../../pages/domain/Members/DomainMembersPage').default; +const loadDomainGroupsPage = () => require('../../../../pages/domain/Groups/DomainGroupsPage').default; const Split = createSplitNavigator(); @@ -57,6 +58,12 @@ function DomainSplitNavigator({route, navigation}: PlatformStackScreenProps + + diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts index 5a00d2e990fd..a9277ef0c9c7 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts @@ -7,6 +7,7 @@ const DOMAIN_TO_RHP: Partial['config'] = { [SCREENS.DOMAIN.MEMBERS]: { path: ROUTES.DOMAIN_MEMBERS.route, }, + [SCREENS.DOMAIN.GROUPS]: { + path: ROUTES.DOMAIN_GROUPS.route, + }, }, }, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 7854b8717bcd..bdef68b0945f 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -2523,6 +2523,9 @@ type DomainSplitNavigatorParamList = { [SCREENS.DOMAIN.MEMBERS]: { domainAccountID: number; }; + [SCREENS.DOMAIN.GROUPS]: { + domainAccountID: number; + }; }; type OnboardingModalNavigatorParamList = { diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx new file mode 100644 index 000000000000..87efb5b7bdb2 --- /dev/null +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -0,0 +1,104 @@ +import {groupsSelector} from '@selectors/Domain'; +import React from 'react'; +import {View} from 'react-native'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import SelectionList from '@components/SelectionList'; +import TableListItem from '@components/SelectionList/ListItem/TableListItem'; +import Text from '@components/Text'; +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useResponsiveLayout from '@hooks/useResponsiveLayout'; +import useThemeStyles from '@hooks/useThemeStyles'; +import Navigation from '@navigation/Navigation'; +import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types'; +import type {DomainSplitNavigatorParamList} from '@navigation/types'; +import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type SCREENS from '@src/SCREENS'; +import type {DomainSecurityGroup} from '@src/types/onyx'; +import getEmptyArray from '@src/types/utils/getEmptyArray'; + +type DomainSecurityGroupWithID = { + id: string; + details: DomainSecurityGroup; +}; + +type DomainGroupsPageProps = PlatformStackScreenProps; + +function DomainGroupsPage({route}: DomainGroupsPageProps) { + const {domainAccountID} = route.params; + + const styles = useThemeStyles(); + const {translate} = useLocalize(); + const illustrations = useMemoizedLazyIllustrations(['Members']); + const {shouldUseNarrowLayout} = useResponsiveLayout(); + + const [groups = getEmptyArray()] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {canBeMissing: false, selector: groupsSelector}); + + const data = groups.map((group) => { + return { + keyForList: group.id, + text: group.details.name, + rightElement: ( + + + {translate('domain.groups.memberCount', {count: Object.keys(group.details.shared).length})} + + + ), + }; + }); + + const getCustomListHeader = () => { + if (!data || data?.length === 0) { + return null; + } + + const header = ( + + + {translate('common.name')} + + + {translate('common.members')} + + + ); + + return {header}; + }; + + return ( + + + + {}} + customListHeader={getCustomListHeader()} + /> + + + ); +} + +DomainGroupsPage.displayName = 'DomainGroupsPage'; + +export type {DomainSecurityGroupWithID}; +export default DomainGroupsPage; diff --git a/src/selectors/Domain.ts b/src/selectors/Domain.ts index 9109c336b13b..f153968e995e 100644 --- a/src/selectors/Domain.ts +++ b/src/selectors/Domain.ts @@ -1,5 +1,6 @@ import {Str} from 'expensify-common'; import type {OnyxEntry} from 'react-native-onyx'; +import type {DomainSecurityGroupWithID} from '@pages/domain/Groups/DomainGroupsPage'; import CONST from '@src/CONST'; import type {CardFeeds, Domain, DomainPendingActions, DomainSecurityGroup, DomainSettings, SamlMetadata} from '@src/types/onyx'; import getEmptyArray from '@src/types/utils/getEmptyArray'; @@ -93,6 +94,19 @@ const domainEmailSelector = (domain: OnyxEntry) => domain?.email; const adminPendingActionSelector = (pendingAction: OnyxEntry) => pendingAction?.admin ?? {}; +function groupsSelector(domain: OnyxEntry): DomainSecurityGroupWithID[] { + if (!domain) { + return getEmptyArray(); + } + + return Object.entries(domain).reduce((acc, [key, value]) => { + if (key.startsWith(CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX)) { + acc.push({id: key.replace(CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, ''), details: value as DomainSecurityGroup}); + } + return acc; + }, []); +} + export { domainMemberSamlSettingsSelector, domainSettingsPrimaryContactSelector, @@ -104,4 +118,5 @@ export { domainEmailSelector, adminPendingActionSelector, technicalContactSettingsSelector, + groupsSelector, }; From c133275b973de4378dfb0ba444e3fb34b37c10d4 Mon Sep 17 00:00:00 2001 From: war-in Date: Thu, 15 Jan 2026 11:44:41 +0100 Subject: [PATCH 02/10] test: add groupsSelector tests --- tests/unit/DomainSelectorsTest.ts | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/unit/DomainSelectorsTest.ts b/tests/unit/DomainSelectorsTest.ts index 2d9d6e0eecb6..b96a9b3a36ee 100644 --- a/tests/unit/DomainSelectorsTest.ts +++ b/tests/unit/DomainSelectorsTest.ts @@ -3,6 +3,7 @@ import { adminPendingActionSelector, domainEmailSelector, domainSettingsPrimaryContactSelector, + groupsSelector, memberAccountIDsSelector, technicalContactSettingsSelector, } from '@selectors/Domain'; @@ -271,4 +272,40 @@ describe('domainSelectors', () => { expect(memberAccountIDsSelector(domain).sort()).toEqual([123, 456]); }); }); + + describe('groupsSelector', () => { + it('Should return an empty array if the domain object is undefined', () => { + expect(groupsSelector(undefined)).toEqual([]); + }); + + it('Should return an empty array if the domain object is empty', () => { + const domain = {} as OnyxEntry; + expect(groupsSelector(domain)).toEqual([]); + }); + + it('Should return an array of groups when keys start with the security group prefix', () => { + const domain = { + [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}123`]: {name: 'Group 1'}, + [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}456`]: {name: 'Group 2'}, + } as unknown as OnyxEntry; + + const expectedGroups = [ + {id: '123', details: {name: 'Group 1'}}, + {id: '456', details: {name: 'Group 2'}}, + ]; + + expect(groupsSelector(domain)).toEqual(expectedGroups); + }); + + it('Should ignore keys that do not start with the security group prefix', () => { + const domain = { + [`${CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX}123`]: {name: 'Group 1'}, + otherKey: 'value', + } as unknown as OnyxEntry; + + const expectedGroups = [{id: '123', details: {name: 'Group 1'}}]; + + expect(groupsSelector(domain)).toEqual(expectedGroups); + }); + }); }); From d024fa24dc28be8b58446a16db54f78e842037f5 Mon Sep 17 00:00:00 2001 From: war-in Date: Thu, 15 Jan 2026 12:17:10 +0100 Subject: [PATCH 03/10] chore: add spanish translations --- src/languages/es.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/languages/es.ts b/src/languages/es.ts index c3cb5d99ed3f..4e4a4ba402b1 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -8080,6 +8080,15 @@ ${amount} para ${merchant} - ${date}`, title: 'Miembros', findMember: 'Buscar miembro', }, + groups: { + title: 'Grupos', + memberCount: () => { + return { + one: '1 miembro', + other: (count: number) => `${count} miembros`, + }; + }, + }, }, gps: { tooltip: '¡Seguimiento por GPS en curso! Cuando termines, detén el seguimiento a continuación.', From 8be33b5a4109c9ff275719d6bf536734277f4600 Mon Sep 17 00:00:00 2001 From: war-in Date: Thu, 15 Jan 2026 13:34:53 +0100 Subject: [PATCH 04/10] chore: translations --- src/languages/de.ts | 1 + src/languages/fr.ts | 1 + src/languages/it.ts | 1 + src/languages/ja.ts | 1 + src/languages/nl.ts | 2 +- src/languages/pl.ts | 2 +- src/languages/pt-BR.ts | 2 +- src/languages/zh-hans.ts | 2 +- 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index c8b2bc7bc24d..bf41a3adf079 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -7998,6 +7998,7 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`, resetDomainInfo: `Diese Aktion ist dauerhaft und die folgenden Daten werden gelöscht:
  • Firmenkarten-Verbindungen und alle nicht eingereichten Ausgaben von diesen Karten
  • SAML- und Gruppeneinstellungen
Alle Konten, Workspaces, Berichte, Ausgaben und anderen Daten bleiben erhalten.

Hinweis: Sie können diese Domain aus Ihrer Domainliste entfernen, indem Sie die zugehörige E-Mail aus Ihren Kontaktmethoden löschen.`, }, members: {title: 'Mitglieder', findMember: 'Mitglied suchen'}, + groups: {title: 'Gruppen', memberCount: {one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`}}, }, gps: { tooltip: 'GPS-Verfolgung läuft! Wenn du fertig bist, stoppe die Verfolgung unten.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 9a4ec692ed9e..a67d9e9fb339 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -8003,6 +8003,7 @@ Voici un *reçu test* pour vous montrer comment cela fonctionne :`, resetDomainInfo: `Cette action est définitive et les données suivantes seront supprimées :
  • Connexions aux cartes d'entreprise et toutes les dépenses non déclarées de ces cartes
  • Paramètres SAML et de groupe
Tous les comptes, espaces de travail, rapports, dépenses et autres données seront conservés.

Remarque : Vous pouvez supprimer ce domaine de votre liste de domaines en retirant l'adresse e-mail associée de vos méthodes de contact.`, }, members: {title: 'Membres', findMember: 'Rechercher un membre'}, + groups: {title: 'Groupes', memberCount: {one: '1 membre', other: (count: number) => `${count} membres`}}, }, gps: { tooltip: 'Suivi GPS en cours ! Quand vous avez terminé, arrêtez le suivi ci-dessous.', diff --git a/src/languages/it.ts b/src/languages/it.ts index 7267ff29f59e..eb922e32a9df 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -7982,6 +7982,7 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`, resetDomainInfo: `Questa azione è permanente e i seguenti dati verranno eliminati:
  • Connessioni alle carte aziendali e tutte le spese non riportate da tali carte
  • Impostazioni SAML e di gruppo
Tutti gli account, gli spazi di lavoro, i report, le spese e gli altri dati rimarranno.

Nota: puoi rimuovere questo dominio dall'elenco dei tuoi domini eliminando l'email associata dalle tue modalità di contatto.`, }, members: {title: 'Membri', findMember: 'Trova membro'}, + groups: {title: 'Gruppi', memberCount: {one: '1 membro', other: (count: number) => `${count} membri`}}, }, gps: { tooltip: 'Monitoraggio GPS in corso! Quando hai finito, interrompi il monitoraggio qui sotto.', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 2de48223ad31..1dc191c5dce4 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -7919,6 +7919,7 @@ Expensify の使い方をお見せするための*テストレシート*がこ resetDomainInfo: `この操作は永久的であり、次のデータが削除されます:
  • 会社カードの接続およびそれらのカードからの未報告の経費
  • SAML とグループ設定
すべてのアカウント、ワークスペース、レポート、経費、およびその他のデータは保持されます。

注:関連付けられているメールアドレスを連絡先方法から削除することで、このドメインをドメイン一覧から消去できます。`, }, members: {title: 'メンバー', findMember: 'メンバーを検索'}, + groups: {title: 'グループ', memberCount: {one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`}}, }, gps: { tooltip: 'GPS 追跡を進行中です!完了したら、下で追跡を停止してください。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 3d5fbcf93e7c..0520818a45c3 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -7971,6 +7971,7 @@ Hier is een *testbon* om je te laten zien hoe het werkt:`, resetDomainInfo: `Deze actie is definitief en de volgende gegevens worden verwijderd:
  • Bedrijfskaartverbindingen en niet-ingediende uitgaven van die kaarten
  • SAML- en groepsinstellingen
Alle accounts, werkruimten, rapporten, uitgaven en andere gegevens blijven behouden.

Opmerking: je kunt dit domein uit je domeinenlijst verwijderen door het gekoppelde e-mailadres uit je contactmethoden te verwijderen.`, }, members: {title: 'Leden', findMember: 'Lid zoeken'}, + groups: {title: 'Groepen', memberCount: {one: '1 lid', other: (count: number) => `${count} leden`}}, }, gps: { tooltip: 'GPS-tracking bezig! Als je klaar bent, stop dan hieronder met tracken.', @@ -7993,7 +7994,6 @@ Hier is een *testbon* om je te laten zien hoe het werkt:`, confirm: 'Afstandstracking negeren', }, zeroDistanceTripModal: {title: 'Kan geen uitgave aanmaken', prompt: 'Je kunt geen uitgave aanmaken met dezelfde begin- en eindlocatie.'}, - locationRequiredModal: { title: 'Locatietoegang vereist', prompt: 'Sta locatietoegang toe in de instellingen van je apparaat om GPS-afstandsregistratie te starten.', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index bf662880e1c7..47b0ecad3d7d 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -7951,6 +7951,7 @@ Oto *paragon testowy*, który pokazuje, jak to działa:`, resetDomainInfo: `Ta akcja jest trwała i następujące dane zostaną usunięte:
  • Połączenia kart firmowych i wszystkie nierozliczone wydatki z tych kart
  • Ustawienia SAML i grup
Wszystkie konta, przestrzenie robocze, raporty, wydatki i inne dane pozostaną bez zmian.

Uwaga: Możesz usunąć tę domenę z listy swoich domen, usuwając powiązany adres e-mail z metod kontaktu.`, }, members: {title: 'Członkowie', findMember: 'Znajdź członka'}, + groups: {title: 'Grupy', memberCount: {one: '1 członek', other: (count: number) => `${count} członków`}}, }, gps: { tooltip: 'Śledzenie GPS w toku! Gdy skończysz, zatrzymaj śledzenie poniżej.', @@ -7968,7 +7969,6 @@ Oto *paragon testowy*, który pokazuje, jak to działa:`, confirm: 'Odrzuć śledzenie dystansu', }, zeroDistanceTripModal: {title: 'Nie można utworzyć wydatku', prompt: 'Nie możesz utworzyć wydatku z tym samym miejscem początkowym i końcowym.'}, - locationRequiredModal: { title: 'Wymagany dostęp do lokalizacji', prompt: 'Aby rozpocząć śledzenie dystansu GPS, zezwól na dostęp do lokalizacji w ustawieniach swojego urządzenia.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 9fd676b0c7ba..6a0d1a1b723d 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -7956,6 +7956,7 @@ Aqui está um *recibo de teste* para mostrar como funciona:`, resetDomainInfo: `Esta ação é permanente e os seguintes dados serão excluídos:
  • Conexões de cartão corporativo e quaisquer despesas não reportadas desses cartões
  • Configurações de SAML e de grupo
Todas as contas, workspaces, relatórios, despesas e outros dados permanecerão.

Observação: Você pode remover este domínio da sua lista de domínios excluindo o e-mail associado dos seus métodos de contato.`, }, members: {title: 'Membros', findMember: 'Encontrar membro'}, + groups: {title: 'Grupos', memberCount: {one: '1 membro', other: (count: number) => `${count} membros`}}, }, gps: { tooltip: 'Rastreamento por GPS em andamento! Quando terminar, pare o rastreamento abaixo.', @@ -7978,7 +7979,6 @@ Aqui está um *recibo de teste* para mostrar como funciona:`, confirm: 'Descartar rastreamento de distância', }, zeroDistanceTripModal: {title: 'Não é possível criar a despesa', prompt: 'Você não pode criar uma despesa com o mesmo local de partida e de chegada.'}, - locationRequiredModal: { title: 'Acesso à localização necessário', prompt: 'Permita o acesso à localização nas configurações do seu dispositivo para iniciar o rastreamento de distância por GPS.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 77e56f69205c..852ef86fadf2 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -7769,6 +7769,7 @@ ${reportName} resetDomainInfo: `此操作是永久性的,并且以下数据将被删除:
  • 公司卡连接以及这些卡片上所有未报销的费用
  • SAML 和群组设置
所有账户、工作区、报表、费用以及其他数据将会保留。

注意:您可以通过从联系方法中移除关联的邮箱,将此域名从您的域名列表中清除。`, }, members: {title: '成员', findMember: '查找成员'}, + groups: {title: '群组', memberCount: {one: '1 名成员', other: (count: number) => `${count} 名成员`}}, }, gps: { tooltip: 'GPS 跟踪进行中!完成后,请在下方停止跟踪。', @@ -7782,7 +7783,6 @@ ${reportName} stopGpsTrackingModal: {title: '停止 GPS 追踪', prompt: '你确定吗?这将结束你当前的旅程。', cancel: '恢复追踪', confirm: '停止 GPS 追踪'}, discardDistanceTrackingModal: {title: '丢弃距离跟踪', prompt: '您确定吗?这将放弃您当前的流程,且无法撤销。', confirm: '丢弃距离跟踪'}, zeroDistanceTripModal: {title: '无法创建报销', prompt: '你不能创建起点和终点相同的报销。'}, - locationRequiredModal: {title: '需要访问位置信息', prompt: '请在设备设置中允许位置访问以开始 GPS 距离跟踪。', allow: '允许'}, androidBackgroundLocationRequiredModal: {title: '需要后台位置访问权限', prompt: '请在设备设置中允许应用使用“始终允许”位置访问权限,以开始 GPS 距离跟踪。'}, preciseLocationRequiredModal: {title: '需要精确位置', prompt: '请在设备设置中启用“精确位置”以开始 GPS 距离跟踪。'}, From 8d258b7011d0c380d882ebea2524c408a0142467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Fri, 6 Feb 2026 10:44:39 +0100 Subject: [PATCH 05/10] fix typecheck & languages --- src/languages/de.ts | 2 +- src/languages/fr.ts | 2 +- src/languages/it.ts | 2 +- src/languages/ja.ts | 2 +- src/languages/nl.ts | 2 +- src/languages/pl.ts | 2 +- src/languages/pt-BR.ts | 2 +- src/languages/zh-hans.ts | 2 +- src/pages/domain/Groups/DomainGroupsPage.tsx | 12 +++--------- src/selectors/Domain.ts | 8 +++++++- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index a7ced979aea1..56af1637603b 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -8468,7 +8468,7 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`, addMember: 'Dieses Mitglied kann nicht hinzugefügt werden. Bitte versuche es erneut.', }, }, - groups: {title: 'Gruppen', memberCount: {one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`}}, + groups: {title: 'Gruppen', memberCount: () => ({one: '1 Mitglied', other: (count: number) => `${count} Mitglieder`})}, }, }; export default translations; diff --git a/src/languages/fr.ts b/src/languages/fr.ts index fe808ba6f359..ef3a0136c2f0 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -8480,7 +8480,7 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`, addMember: 'Impossible d’ajouter ce membre. Veuillez réessayer.', }, }, - groups: {title: 'Groupes', memberCount: {one: '1 membre', other: (count: number) => `${count} membres`}}, + groups: {title: 'Groupes', memberCount: () => ({one: '1 membre', other: (count: number) => `${count} membres`})}, }, }; export default translations; diff --git a/src/languages/it.ts b/src/languages/it.ts index 5f35b89eb4c3..a34f959ca694 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -8446,7 +8446,7 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`, addMember: 'Impossibile aggiungere questo membro. Riprova.', }, }, - groups: {title: 'Gruppi', memberCount: {one: '1 membro', other: (count: number) => `${count} membri`}}, + groups: {title: 'Gruppi', memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membri`})}, }, }; export default translations; diff --git a/src/languages/ja.ts b/src/languages/ja.ts index bf935b7838cb..3c2c959b2904 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -8377,7 +8377,7 @@ ${reportName} addMember: 'このメンバーを追加できませんでした。もう一度お試しください。', }, }, - groups: {title: 'グループ', memberCount: {one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`}}, + groups: {title: 'グループ', memberCount: () => ({one: 'メンバー 1 人', other: (count: number) => `${count}名のメンバー`})}, }, }; export default translations; diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 13e39f40f0db..9d80980a6316 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -8433,7 +8433,7 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`, addMember: 'Kan dit lid niet toevoegen. Probeer het opnieuw.', }, }, - groups: {title: 'Groepen', memberCount: {one: '1 lid', other: (count: number) => `${count} leden`}}, + groups: {title: 'Groepen', memberCount: () => ({one: '1 lid', other: (count: number) => `${count} leden`})}, }, }; export default translations; diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 321484061312..c001c4c05036 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -8412,7 +8412,7 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`, addMember: 'Nie można dodać tego członka. Spróbuj ponownie.', }, }, - groups: {title: 'Grupy', memberCount: {one: '1 członek', other: (count: number) => `${count} członków`}}, + groups: {title: 'Grupy', memberCount: () => ({one: '1 członek', other: (count: number) => `${count} członków`})}, }, }; export default translations; diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index fe99b21d38b7..5e57f3b2200d 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -8415,7 +8415,7 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`, addMember: 'Não foi possível adicionar este membro. Tente novamente.', }, }, - groups: {title: 'Grupos', memberCount: {one: '1 membro', other: (count: number) => `${count} membros`}}, + groups: {title: 'Grupos', memberCount: () => ({one: '1 membro', other: (count: number) => `${count} membros`})}, }, }; export default translations; diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index fa6e3f2764c2..7ab8a9d61f96 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -8253,7 +8253,7 @@ ${reportName} addMember: '无法添加此成员。请重试。', }, }, - groups: {title: '群组', memberCount: {one: '1 名成员', other: (count: number) => `${count} 名成员`}}, + groups: {title: '群组', memberCount: () => ({one: '1 名成员', other: (count: number) => `${count} 名成员`})}, }, }; export default translations; diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx index 87efb5b7bdb2..59be8c55ee86 100644 --- a/src/pages/domain/Groups/DomainGroupsPage.tsx +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -1,3 +1,4 @@ +import type {DomainSecurityGroupWithID} from '@selectors/Domain'; import {groupsSelector} from '@selectors/Domain'; import React from 'react'; import {View} from 'react-native'; @@ -17,14 +18,8 @@ import type {DomainSplitNavigatorParamList} from '@navigation/types'; import DomainNotFoundPageWrapper from '@pages/domain/DomainNotFoundPageWrapper'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; -import type {DomainSecurityGroup} from '@src/types/onyx'; import getEmptyArray from '@src/types/utils/getEmptyArray'; -type DomainSecurityGroupWithID = { - id: string; - details: DomainSecurityGroup; -}; - type DomainGroupsPageProps = PlatformStackScreenProps; function DomainGroupsPage({route}: DomainGroupsPageProps) { @@ -40,7 +35,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { const data = groups.map((group) => { return { keyForList: group.id, - text: group.details.name, + text: group.details.name ?? '', rightElement: ( {}} + onSelectRow={() => null} customListHeader={getCustomListHeader()} /> @@ -100,5 +95,4 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { DomainGroupsPage.displayName = 'DomainGroupsPage'; -export type {DomainSecurityGroupWithID}; export default DomainGroupsPage; diff --git a/src/selectors/Domain.ts b/src/selectors/Domain.ts index c7aec0dd5b0b..f0e9867262c0 100644 --- a/src/selectors/Domain.ts +++ b/src/selectors/Domain.ts @@ -1,11 +1,15 @@ import {Str} from 'expensify-common'; import type {OnyxEntry} from 'react-native-onyx'; -import type {DomainSecurityGroupWithID} from '@pages/domain/Groups/DomainGroupsPage'; import CONST from '@src/CONST'; import type {CardFeeds, Domain, DomainPendingActions, DomainSecurityGroup, DomainSettings, SamlMetadata} from '@src/types/onyx'; import type {SecurityGroupKey, UserSecurityGroupData} from '@src/types/onyx/Domain'; import getEmptyArray from '@src/types/utils/getEmptyArray'; +type DomainSecurityGroupWithID = { + id: string; + details: DomainSecurityGroup; +}; + const domainMemberSamlSettingsSelector = (domainSettings: OnyxEntry) => domainSettings?.settings; const domainSamlSettingsStateSelector = (domain: OnyxEntry) => @@ -172,3 +176,5 @@ export { isSecurityGroupEntry, groupsSelector, }; + +export {type DomainSecurityGroupWithID}; From d11d6bcb65148842ba9e60efa63d3ea6cea3d6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Fri, 6 Feb 2026 10:49:59 +0100 Subject: [PATCH 06/10] update styling --- src/pages/domain/Groups/DomainGroupsPage.tsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx index 59be8c55ee86..41d23e18e2bb 100644 --- a/src/pages/domain/Groups/DomainGroupsPage.tsx +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -37,10 +37,10 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { keyForList: group.id, text: group.details.name ?? '', rightElement: ( - + {translate('domain.groups.memberCount', {count: Object.keys(group.details.shared).length})} @@ -56,12 +56,8 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { const header = ( - - {translate('common.name')} - - - {translate('common.members')} - + {translate('common.name')} + {translate('common.members')} ); From 8efb480408e682656e2251bf54683d8299f035fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Fri, 6 Feb 2026 10:53:55 +0100 Subject: [PATCH 07/10] update header font --- src/pages/domain/BaseDomainMembersPage.tsx | 1 + src/pages/domain/DomainInitialPage.tsx | 1 + src/pages/domain/Groups/DomainGroupsPage.tsx | 1 + 3 files changed, 3 insertions(+) diff --git a/src/pages/domain/BaseDomainMembersPage.tsx b/src/pages/domain/BaseDomainMembersPage.tsx index 68ece3cb86bb..b8b4cc243747 100644 --- a/src/pages/domain/BaseDomainMembersPage.tsx +++ b/src/pages/domain/BaseDomainMembersPage.tsx @@ -154,6 +154,7 @@ function BaseDomainMembersPage({ onBackButtonPress={Navigation.popToSidebar} icon={headerIcon} shouldShowBackButton={shouldUseNarrowLayout} + shouldUseHeadlineHeader > {!shouldUseNarrowLayout && !!headerContent && {headerContent}} diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx index 5973bba18762..4d72c6147993 100644 --- a/src/pages/domain/DomainInitialPage.tsx +++ b/src/pages/domain/DomainInitialPage.tsx @@ -117,6 +117,7 @@ function DomainInitialPage({route}: DomainInitialPageProps) { title={domainName} onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACES_LIST.route)} shouldDisplayHelpButton={shouldUseNarrowLayout} + shouldUseHeadlineHeader /> diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx index 41d23e18e2bb..af191bd6559d 100644 --- a/src/pages/domain/Groups/DomainGroupsPage.tsx +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -77,6 +77,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { onBackButtonPress={Navigation.popToSidebar} icon={illustrations.Members} shouldShowBackButton={shouldUseNarrowLayout} + shouldUseHeadlineHeader /> Date: Fri, 6 Feb 2026 11:01:16 +0100 Subject: [PATCH 08/10] fix prettier --- tests/unit/DomainSelectorsTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/DomainSelectorsTest.ts b/tests/unit/DomainSelectorsTest.ts index 9e2beb0ea6cc..198d22c3692f 100644 --- a/tests/unit/DomainSelectorsTest.ts +++ b/tests/unit/DomainSelectorsTest.ts @@ -4,8 +4,8 @@ import { defaultSecurityGroupIDSelector, domainEmailSelector, domainSettingsPrimaryContactSelector, - isSecurityGroupEntry, groupsSelector, + isSecurityGroupEntry, memberAccountIDsSelector, selectSecurityGroupForAccount, technicalContactSettingsSelector, From c07497df70ba0956fe2e20bd3007187f6861d7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Musia=C5=82?= Date: Thu, 12 Feb 2026 11:38:40 +0100 Subject: [PATCH 09/10] small fixes --- src/pages/domain/DomainInitialPage.tsx | 1 - src/pages/domain/Groups/DomainGroupsPage.tsx | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/pages/domain/DomainInitialPage.tsx b/src/pages/domain/DomainInitialPage.tsx index 363843df9781..1232407eea35 100644 --- a/src/pages/domain/DomainInitialPage.tsx +++ b/src/pages/domain/DomainInitialPage.tsx @@ -125,7 +125,6 @@ function DomainInitialPage({route}: DomainInitialPageProps) { title={domainName} onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACES_LIST.route)} shouldDisplayHelpButton={shouldUseNarrowLayout} - shouldUseHeadlineHeader /> diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx index af191bd6559d..d1bedaa2bbb0 100644 --- a/src/pages/domain/Groups/DomainGroupsPage.tsx +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -61,7 +61,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { ); - return {header}; + return {header}; }; return ( @@ -70,7 +70,7 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { enableEdgeToEdgeBottomSafeAreaPadding shouldEnableMaxHeight shouldShowOfflineIndicatorInWideScreen - testID={DomainGroupsPage.displayName} + testID="DomainGroupsPage" > Date: Fri, 13 Feb 2026 13:24:52 +0100 Subject: [PATCH 10/10] use CustomListHeader --- .../SelectionListWithModal/CustomListHeader.tsx | 2 +- src/pages/domain/Groups/DomainGroupsPage.tsx | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/SelectionListWithModal/CustomListHeader.tsx b/src/components/SelectionListWithModal/CustomListHeader.tsx index b3ae8a84349e..3264ed3e82b5 100644 --- a/src/components/SelectionListWithModal/CustomListHeader.tsx +++ b/src/components/SelectionListWithModal/CustomListHeader.tsx @@ -44,7 +44,7 @@ function CustomListHeader({ if (canSelectMultiple) { return header; } - return {header}; + return {header}; } export default CustomListHeader; diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx index d1bedaa2bbb0..b1b4752c6a78 100644 --- a/src/pages/domain/Groups/DomainGroupsPage.tsx +++ b/src/pages/domain/Groups/DomainGroupsPage.tsx @@ -6,6 +6,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; import TableListItem from '@components/SelectionList/ListItem/TableListItem'; +import CustomListHeader from '@components/SelectionListWithModal/CustomListHeader'; import Text from '@components/Text'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; @@ -54,14 +55,14 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) { return null; } - const header = ( - - {translate('common.name')} - {translate('common.members')} - + return ( + ); - - return {header}; }; return (