From 89e58a340f23480c39a60912ea47352d01523f57 Mon Sep 17 00:00:00 2001
From: James Acklin <james.acklin@gmail.com>
Date: Mon, 9 Dec 2024 19:18:57 -0500
Subject: [PATCH] ChannelListItem, channelUtils: fix bare patp display in
 ChatList

---
 packages/ui/src/components/ListItem/ChannelListItem.tsx | 5 +++--
 packages/ui/src/utils/channelUtils.tsx                  | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/components/ListItem/ChannelListItem.tsx b/packages/ui/src/components/ListItem/ChannelListItem.tsx
index 357433072c..4614e435a0 100644
--- a/packages/ui/src/components/ListItem/ChannelListItem.tsx
+++ b/packages/ui/src/components/ListItem/ChannelListItem.tsx
@@ -78,11 +78,12 @@ export function ChannelListItem({
             <ListItem.Title dimmed={dimmed}>{title}</ListItem.Title>
             {customSubtitle ? (
               <ListItem.Subtitle>{customSubtitle}</ListItem.Subtitle>
-            ) : (
+            ) : (model.type === 'dm' || model.type === 'groupDm') &&
+              utils.hasNickname(model.members?.[0]?.contact) ? (
               <ListItem.SubtitleWithIcon icon={subtitleIcon}>
                 {subtitle}
               </ListItem.SubtitleWithIcon>
-            )}
+            ) : null}
             {model.lastPost && !model.isDmInvite && (
               <ListItem.PostPreview
                 post={model.lastPost}
diff --git a/packages/ui/src/utils/channelUtils.tsx b/packages/ui/src/utils/channelUtils.tsx
index 811758c391..99eb19d578 100644
--- a/packages/ui/src/utils/channelUtils.tsx
+++ b/packages/ui/src/utils/channelUtils.tsx
@@ -13,7 +13,7 @@ export function getChannelMemberName(
   if (disableNicknames) {
     return member.contactId;
   }
-  return member.contact?.nickname ?? member.contactId;
+  return member.contact?.nickname || member.contactId;
 }
 
 export function useChannelMemberName(member: db.ChatMember) {
@@ -111,3 +111,7 @@ export function getChannelTypeIcon(type: db.Channel['type']): IconType {
       return 'ChannelTalk';
   }
 }
+
+export function hasNickname(contact: db.Contact | null | undefined): boolean {
+  return 'nickname' in (contact ?? {}) && (contact?.nickname?.length ?? 0) > 0;
+}