Merge pull request #3677 from urbit/mp/groups/restore-calmness

groups: pass hideAvatars / nicknames to participants list

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}
         />

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)
+    ? <img src={contact.avatar} height={32} width={32} className="dib" />
+    : <Sigil
+      ship={contact.patp}
+      size={32}
+      color={`#${color}`}
+    />;
+
+  const hasNickname = contact.nickname && !props.hideNicknames;
+
   return (
     <>
       <Box>
-        <Sigil ship={contact.patp} size={32} color={`#${color}`} />
+        {avatar}
       </Box>
       <Col justifyContent="center" gapY="1" height="100%">
-        {contact.nickname && (
+        {hasNickname && (
           <TruncText title={contact.nickname} maxWidth="85%" color="black">
             {contact.nickname}
           </TruncText>

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" && (