Username component shouldn't show email unless explicitly requested

getfider · Sep 29, 2024 · 4aecc0e · 4aecc0e
1 parent 761cb11
commit 4aecc0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/public/components/common/UserName.tsx b/public/components/common/UserName.tsx
@@ -11,6 +11,7 @@ interface UserNameProps {
     role?: UserRole
     email?: string
   }
+  showEmail?: boolean
 }
 
 export const UserName = (props: UserNameProps) => {
@@ -23,7 +24,7 @@ export const UserName = (props: UserNameProps) => {
   return (
     <div className={className}>
       <span>{props.user.name || "Anonymous"}</span>
-      <>{props.user.email && <span className="c-username--email">({props.user.email})</span>}</>
+      <>{props.showEmail && props.user.email && <span className="c-username--email">({props.user.email})</span>}</>
 
       {isStaff && (
         <div data-tooltip={isStaff ? "Staff" : undefined}>

diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsx
@@ -38,7 +38,7 @@ const UserListItem = (props: UserListItemProps) => {
       <HStack spacing={4}>
         <Avatar user={props.user} />
         <VStack spacing={0}>
-          <UserName user={props.user} />
+          <UserName user={props.user} showEmail={true}/>
           <span className="text-muted">
             {admin} {collaborator} {blocked}
           </span>

diff --git a/public/pages/ShowPost/components/VotesModal.tsx b/public/pages/ShowPost/components/VotesModal.tsx
@@ -70,7 +70,7 @@ export const VotesModal: React.FC<VotesModalProps> = (props) => {
                   <HStack>
                     <Avatar user={x.user} />
                     <VStack spacing={0}>
-                      <UserName user={{ ...x.user, email: "" }} />
+                      <UserName user={x.user} />
                       <span className="text-muted">{x.user.email}</span>
                     </VStack>
                   </HStack>