base commit

client/src/pages/admin-orders/ui/AdminOrdersPage.tsx

@@ -30,6 +30,7 @@ import { formatPriceRub } from '@/shared/lib/format-price'
 import { groupOrdersByStatus } from '@/shared/lib/group-orders-by-status'
 import { invalidateQueryKeys } from '@/shared/lib/invalidate-query-keys'
 import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { RichTextMessageContent } from '@/shared/ui/RichTextMessageContent'
 import { RichTextMessageEditor } from '@/shared/ui/RichTextMessageEditor'
 
 export function AdminOrdersPage() {
@@ -92,6 +93,7 @@ export function AdminOrdersPage() {
   )
 
   const detail = orderDetailQuery.data?.item
+  const canSendMessage = msg.replace(/<[^>]*>/g, ' ').trim().length > 0
 
   const nextStatuses = useMemo(() => {
     if (!detail) return []
@@ -238,11 +240,24 @@ export function AdminOrdersPage() {
                 </Typography>
                 <Stack spacing={1} sx={{ mb: 1 }}>
                   {detail.messages.map((m) => (
-                    <Box key={m.id} sx={{ p: 1, border: 1, borderColor: 'divider', borderRadius: 2 }}>
+                    <Box
+                      key={m.id}
+                      sx={{
+                        p: 1.25,
+                        border: 1,
+                        borderColor: 'divider',
+                        borderRadius: 2,
+                        bgcolor: m.authorType === 'admin' ? 'primary.50' : 'grey.100',
+                        alignSelf: m.authorType === 'admin' ? 'flex-end' : 'flex-start',
+                        width: 'fit-content',
+                        maxWidth: '85%',
+                      }}
+                    >
                       <Typography variant="caption" color="text.secondary">
-                        {m.authorType} · {new Date(m.createdAt).toLocaleString()}
+                        {m.authorType === 'admin' ? 'Админ (вы)' : 'Пользователь'} ·{' '}
+                        {new Date(m.createdAt).toLocaleString()}
                       </Typography>
-                      <Typography sx={{ whiteSpace: 'pre-wrap' }}>{m.text}</Typography>
+                      <RichTextMessageContent value={m.text} />
                     </Box>
                   ))}
                   {detail.messages.length === 0 && <Typography color="text.secondary">Нет сообщений.</Typography>}
@@ -255,7 +270,7 @@ export function AdminOrdersPage() {
                   <Button
                     variant="contained"
                     onClick={() => msgMut.mutate()}
-                    disabled={msgMut.isPending || !msg.trim()}
+                    disabled={msgMut.isPending || !canSendMessage}
                     sx={{ minWidth: 160 }}
                   >
                     Отправить