From 4fa4a91ddc1382245efab7bc0b2aa9fff5bd8487 Mon Sep 17 00:00:00 2001
From: Kirill <mpak8501@yandex.ru>
Date: Thu, 21 May 2026 21:55:10 +0500
Subject: [PATCH] feat: avatars in /me/messages chat

---
 .../src/pages/me/ui/sections/MessagesPage.tsx | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/client/src/pages/me/ui/sections/MessagesPage.tsx b/client/src/pages/me/ui/sections/MessagesPage.tsx
index a2b74ef..220753d 100644
--- a/client/src/pages/me/ui/sections/MessagesPage.tsx
+++ b/client/src/pages/me/ui/sections/MessagesPage.tsx
@@ -10,19 +10,30 @@ import ListItemText from '@mui/material/ListItemText'
 import Stack from '@mui/material/Stack'
 import Typography from '@mui/material/Typography'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useUnit } from 'effector-react'
 import { Link as RouterLink } from 'react-router-dom'
 import { fetchMyOrder, postOrderMessage } from '@/entities/order/api/order-api'
 import { fetchMyConversations, markOrderMessagesRead } from '@/entities/user/api/messages-api'
+import { fetchAdminAvatar } from '@/entities/user/api/user-api'
 import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { $user } from '@/shared/model/auth'
 import { ChatMessageBubble } from '@/shared/ui/ChatMessageBubble'
 import { OrderMessageBody } from '@/shared/ui/OrderMessageBody'
 import { RichTextMessageContent } from '@/shared/ui/RichTextMessageContent'
 import { RichTextMessageEditor } from '@/shared/ui/RichTextMessageEditor'
+import { UserAvatar } from '@/shared/ui/UserAvatar'
 
 export function MessagesPage() {
   const qc = useQueryClient()
   const [selectedId, setSelectedId] = useState<string | null>(null)
   const [text, setText] = useState('')
+  const currentUser = useUnit($user)
+
+  const adminAvatarQuery = useQuery({
+    queryKey: ['admin', 'avatar'],
+    queryFn: fetchAdminAvatar,
+    staleTime: 5 * 60 * 1000,
+  })
 
   const listQuery = useQuery({
     queryKey: ['me', 'conversations'],
@@ -163,14 +174,35 @@ export function MessagesPage() {
                   </Button>
                 </Stack>
                 <Stack spacing={1} sx={{ mb: 2, maxHeight: 360, overflow: 'auto' }}>
-                  {order.messages.map((m) => (
-                    <ChatMessageBubble key={m.id} authorType={m.authorType === 'admin' ? 'admin' : 'user'}>
-                      <Typography variant="caption" color="text.secondary">
-                        {m.authorType === 'admin' ? 'Админ' : 'Вы'} · {new Date(m.createdAt).toLocaleString()}
-                      </Typography>
-                      <OrderMessageBody text={m.text} attachmentUrl={m.attachmentUrl} />
-                    </ChatMessageBubble>
-                  ))}
+                  {order.messages.map((m) => {
+                    const isAdminMsg = m.authorType === 'admin'
+                    const adminAv = adminAvatarQuery.data
+                    const avatarNode = isAdminMsg ? (
+                      <UserAvatar
+                        userId="admin"
+                        avatarUrl={adminAv?.avatar}
+                        avatarType={adminAv?.avatarType}
+                        avatarStyle={adminAv?.avatarStyle}
+                        size={24}
+                      />
+                    ) : currentUser ? (
+                      <UserAvatar
+                        userId={currentUser.id}
+                        avatarUrl={currentUser.avatar}
+                        avatarType={currentUser.avatarType}
+                        avatarStyle={currentUser.avatarStyle}
+                        size={24}
+                      />
+                    ) : null
+                    return (
+                      <ChatMessageBubble key={m.id} authorType={isAdminMsg ? 'admin' : 'user'} avatar={avatarNode}>
+                        <Typography variant="caption" color="text.secondary">
+                          {isAdminMsg ? 'Админ' : 'Вы'} · {new Date(m.createdAt).toLocaleString()}
+                        </Typography>
+                        <OrderMessageBody text={m.text} attachmentUrl={m.attachmentUrl} />
+                      </ChatMessageBubble>
+                    )
+                  })}
                   {order.messages.length === 0 && <Typography color="text.secondary">Нет сообщений.</Typography>}
                 </Stack>
                 <Stack direction={{ xs: 'column', sm: 'row' }} spacing={2} sx={{ alignItems: { sm: 'flex-end' } }}>