diff --git a/pkg/interface/src/views/landscape/components/GroupsPane.tsx b/pkg/interface/src/views/landscape/components/GroupsPane.tsx index 3b5090c00..8ce6784d9 100644 --- a/pkg/interface/src/views/landscape/components/GroupsPane.tsx +++ b/pkg/interface/src/views/landscape/components/GroupsPane.tsx @@ -70,6 +70,8 @@ export function GroupsPane(props: GroupsPaneProps) { group={group!} api={api} s3={props.s3} + hideAvatars={props.hideAvatars} + hideNicknames={props.hideNicknames} {...routeProps} baseUrl={baseUrl} /> diff --git a/pkg/interface/src/views/landscape/components/Participants.tsx b/pkg/interface/src/views/landscape/components/Participants.tsx index fb5658285..374c8b6b8 100644 --- a/pkg/interface/src/views/landscape/components/Participants.tsx +++ b/pkg/interface/src/views/landscape/components/Participants.tsx @@ -102,8 +102,10 @@ export function Participants(props: { group: Group; association: Association; api: GlobalApi; + hideAvatars: boolean; + hideNicknames: boolean; }) { - const { api } = props; + const { api, hideAvatars, hideNicknames } = props; const tabFilters: Record< ParticipantsTabId, (p: Participant) => boolean @@ -228,6 +230,8 @@ export function Participants(props: { group={props.group} contact={c} association={props.association} + hideAvatars={hideAvatars} + hideNicknames={hideNicknames} /> )) ) : ( @@ -248,6 +252,8 @@ function Participant(props: { group: Group; role?: RoleTags; api: GlobalApi; + hideAvatars: boolean; + hideNicknames: boolean; }) { const { contact, association, group, api } = props; const { title } = association.metadata; @@ -282,13 +288,24 @@ function Participant(props: { }); }, [api, association]); + const avatar = ( + (contact?.avatar !== null) && !props.hideAvatars) + ? + : ; + + const hasNickname = contact.nickname && !props.hideNicknames; + return ( <> - + {avatar} - {contact.nickname && ( + {hasNickname && ( {contact.nickname} diff --git a/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx b/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx index 983438158..a3e362f83 100644 --- a/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx +++ b/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx @@ -39,6 +39,8 @@ export function PopoverRoutes( association: Association; s3: S3State; api: GlobalApi; + hideAvatars: boolean; + hideNicknames: boolean; } & RouteComponentProps ) { const relativeUrl = (url: string) => `${props.baseUrl}/popover${url}`; @@ -131,6 +133,8 @@ export function PopoverRoutes( contacts={props.contacts} association={props.association} api={props.api} + hideAvatars={props.hideAvatars} + hideNicknames={props.hideNicknames} /> )} {view === "profile" && (