base commit

client/src/pages/me/ui/sections/MessagesPage.tsx

@@ -14,6 +14,7 @@ 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 { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
+import { RichTextMessageContent } from '@/shared/ui/RichTextMessageContent'
 import { RichTextMessageEditor } from '@/shared/ui/RichTextMessageEditor'
 
 export function MessagesPage() {
@@ -57,6 +58,7 @@ export function MessagesPage() {
   })
 
   const order = orderQuery.data?.item
+  const canSendMessage = text.replace(/<[^>]*>/g, ' ').trim().length > 0
 
   return (
     <Box>
@@ -166,12 +168,15 @@ export function MessagesPage() {
                         bgcolor: m.authorType === 'admin' ? 'grey.100' : 'primary.50',
                         border: 1,
                         borderColor: 'divider',
+                        alignSelf: m.authorType === 'admin' ? 'flex-start' : 'flex-end',
+                        width: 'fit-content',
+                        maxWidth: '85%',
                       }}
                     >
                       <Typography variant="caption" color="text.secondary">
                         {m.authorType === 'admin' ? 'Админ' : 'Вы'} · {new Date(m.createdAt).toLocaleString()}
                       </Typography>
-                      <Typography sx={{ whiteSpace: 'pre-wrap' }}>{m.text}</Typography>
+                      <RichTextMessageContent value={m.text} />
                     </Box>
                   ))}
                   {order.messages.length === 0 && <Typography color="text.secondary">Нет сообщений.</Typography>}
@@ -184,7 +189,7 @@ export function MessagesPage() {
                     variant="contained"
                     sx={{ minWidth: 140 }}
                     onClick={() => msgMut.mutate()}
-                    disabled={msgMut.isPending || !text.trim()}
+                    disabled={msgMut.isPending || !canSendMessage}
                   >
                     Отправить
                   </Button>