From 5e295a3accda40de9526f4b107a8a72f7c222ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Sun, 1 Feb 2026 23:21:54 +0100
Subject: [PATCH] pl-fe: emojify chat display name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 .../pl-fe/src/features/chats/components/chat-list-item.tsx   | 5 ++++-
 .../src/features/chats/components/chat-list-shoutbox.tsx     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/pl-fe/src/features/chats/components/chat-list-item.tsx b/packages/pl-fe/src/features/chats/components/chat-list-item.tsx
index 215c7e02a..f213fc7fa 100644
--- a/packages/pl-fe/src/features/chats/components/chat-list-item.tsx
+++ b/packages/pl-fe/src/features/chats/components/chat-list-item.tsx
@@ -10,6 +10,7 @@ import Avatar from 'pl-fe/components/ui/avatar';
 import IconButton from 'pl-fe/components/ui/icon-button';
 import VerificationBadge from 'pl-fe/components/verification-badge';
 import { useChatContext } from 'pl-fe/contexts/chat-context';
+import Emojify from 'pl-fe/features/emoji/emojify';
 import { useFeatures } from 'pl-fe/hooks/use-features';
 import { useRelationshipQuery } from 'pl-fe/queries/accounts/use-relationship';
 import { useChatActions } from 'pl-fe/queries/chats';
@@ -96,7 +97,9 @@ const ChatListItem: React.FC<IChatListItemInterface> = ({ chat, onClick }) => {
 
           <div className='⁂-chat-list-item__content'>
             <div className='⁂-chat-list-item__name'>
-              <p>{chat.account?.display_name || `@${chat.account.username}`}</p>
+              <p>
+                <Emojify text={chat.account.display_name} emojis={chat.account.emojis} />
+              </p>
               {chat.account?.verified && <VerificationBadge />}
             </div>
 
diff --git a/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx b/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx
index ce30aa903..b44f7c209 100644
--- a/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx
+++ b/packages/pl-fe/src/features/chats/components/chat-list-shoutbox.tsx
@@ -4,6 +4,7 @@ import { FormattedMessage } from 'react-intl';
 import { useAccount } from 'pl-fe/api/hooks/accounts/use-account';
 import { ParsedContent } from 'pl-fe/components/parsed-content';
 import Avatar from 'pl-fe/components/ui/avatar';
+import Emojify from 'pl-fe/features/emoji/emojify';
 import { useInstance } from 'pl-fe/hooks/use-instance';
 import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config';
 import { useShoutboxMessages } from 'pl-fe/stores/shoutbox';
@@ -52,8 +53,7 @@ const ChatListShoutbox: React.FC<IChatListShoutboxInterface> = ({ onClick }) =>
               <p className='⁂-chat-list-item__message'>
                 {lastMessageAuthor && (
                   <span className='⁂-chat-list-item__message__author'>
-                    {lastMessageAuthor.display_name || `@${lastMessageAuthor.username}`}:
-                    {' '}
+                    <Emojify text={lastMessageAuthor.display_name} emojis={lastMessageAuthor.emojis} />{': '}
                   </span>
                 )}
                 <ParsedContent html={lastMessage.text} />