From f3872e7ce11ab83cbfe72ad87d8c9e2bd457231b Mon Sep 17 00:00:00 2001 From: "dev.daminik00" Date: Fri, 19 Sep 2025 00:49:01 +0200 Subject: [PATCH] fix --- .../domains/chat/ChatMessage/ChatMessage.module.scss | 1 - src/components/domains/chat/ChatMessage/ChatMessage.tsx | 5 +++-- .../chat/ChatMessage/MessageText/MessageText.module.scss | 4 +++- .../domains/chat/ChatMessage/MessageText/MessageText.tsx | 2 +- .../domains/chat/ChatModalsWrapper/ChatModalsWrapper.tsx | 4 +++- .../GlobalNewMessagesBanner/GlobalNewMessagesBanner.tsx | 6 +++++- .../LastMessagePreview/LastMessagePreview.module.scss | 4 +++- .../chat/LastMessagePreview/LastMessagePreview.tsx | 5 ++--- src/components/domains/chat/MessageInput/MessageInput.tsx | 5 ++++- .../chat/NewMessagesWrapper/NewMessagesWrapper.tsx | 6 +++++- .../sections/NewMessagesSection/NewMessagesSection.tsx | 6 +++++- src/components/ui/ModalSheet/ModalSheet.tsx | 8 +++++++- src/hooks/balance/useBalance.ts | 2 +- 13 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/components/domains/chat/ChatMessage/ChatMessage.module.scss b/src/components/domains/chat/ChatMessage/ChatMessage.module.scss index 04f7b78..303170d 100644 --- a/src/components/domains/chat/ChatMessage/ChatMessage.module.scss +++ b/src/components/domains/chat/ChatMessage/ChatMessage.module.scss @@ -10,5 +10,4 @@ align-self: flex-end; margin-left: auto; } - } diff --git a/src/components/domains/chat/ChatMessage/ChatMessage.tsx b/src/components/domains/chat/ChatMessage/ChatMessage.tsx index 566e4f5..c6f1376 100644 --- a/src/components/domains/chat/ChatMessage/ChatMessage.tsx +++ b/src/components/domains/chat/ChatMessage/ChatMessage.tsx @@ -1,20 +1,21 @@ "use client"; -import clsx from "clsx"; import { useEffect } from "react"; +import clsx from "clsx"; import type { IChatMessage } from "@/entities/chats/types"; import { useShowRefillModal } from "@/hooks/refill/useShowRefillModal"; import { useChat } from "@/providers/chat-provider"; import { formatTime } from "@/shared/utils/date"; -import styles from "./ChatMessage.module.scss"; import MessageBubble from "./MessageBubble/MessageBubble"; import MessageMeta from "./MessageMeta/MessageMeta"; import MessageStatus from "./MessageStatus/MessageStatus"; import MessageText from "./MessageText/MessageText"; import MessageTyping from "./MessageTyping/MessageTyping"; +import styles from "./ChatMessage.module.scss"; + export interface ChatMessageProps { // message: { // id: string; diff --git a/src/components/domains/chat/ChatMessage/MessageText/MessageText.module.scss b/src/components/domains/chat/ChatMessage/MessageText/MessageText.module.scss index d22965d..0eb7a6b 100644 --- a/src/components/domains/chat/ChatMessage/MessageText/MessageText.module.scss +++ b/src/components/domains/chat/ChatMessage/MessageText/MessageText.module.scss @@ -10,7 +10,9 @@ &.blurred { filter: blur(4px); opacity: 0.6; - transition: filter 0.3s ease, opacity 0.3s ease; + transition: + filter 0.3s ease, + opacity 0.3s ease; pointer-events: none; user-select: none; // Запрещаем выделение текста -webkit-user-select: none; // Safari diff --git a/src/components/domains/chat/ChatMessage/MessageText/MessageText.tsx b/src/components/domains/chat/ChatMessage/MessageText/MessageText.tsx index ac0dcac..e6c7bd6 100644 --- a/src/components/domains/chat/ChatMessage/MessageText/MessageText.tsx +++ b/src/components/domains/chat/ChatMessage/MessageText/MessageText.tsx @@ -28,7 +28,7 @@ export default function MessageText({ return (
diff --git a/src/components/domains/chat/GlobalNewMessagesBanner/GlobalNewMessagesBanner.tsx b/src/components/domains/chat/GlobalNewMessagesBanner/GlobalNewMessagesBanner.tsx index 49d46f2..15b7e56 100644 --- a/src/components/domains/chat/GlobalNewMessagesBanner/GlobalNewMessagesBanner.tsx +++ b/src/components/domains/chat/GlobalNewMessagesBanner/GlobalNewMessagesBanner.tsx @@ -41,7 +41,11 @@ export default function GlobalNewMessagesBanner() { onClick={() => setHomeNewMessages({ isVisibleAll: !isVisibleAll })} /> )} - +
); } diff --git a/src/components/domains/chat/LastMessagePreview/LastMessagePreview.module.scss b/src/components/domains/chat/LastMessagePreview/LastMessagePreview.module.scss index 7726e13..0edcc00 100644 --- a/src/components/domains/chat/LastMessagePreview/LastMessagePreview.module.scss +++ b/src/components/domains/chat/LastMessagePreview/LastMessagePreview.module.scss @@ -21,7 +21,9 @@ &.blurred { filter: blur(4px); opacity: 0.6; - transition: filter 0.3s ease, opacity 0.3s ease; + transition: + filter 0.3s ease, + opacity 0.3s ease; user-select: none; -webkit-user-select: none; -moz-user-select: none; diff --git a/src/components/domains/chat/LastMessagePreview/LastMessagePreview.tsx b/src/components/domains/chat/LastMessagePreview/LastMessagePreview.tsx index 5cab797..bea56b8 100644 --- a/src/components/domains/chat/LastMessagePreview/LastMessagePreview.tsx +++ b/src/components/domains/chat/LastMessagePreview/LastMessagePreview.tsx @@ -25,8 +25,7 @@ export default function LastMessagePreview({ // Определяем нужно ли блюрить сообщение const shouldBlur = - message.sentWithZeroBalance === true && - currentBalance <= 0; + message.sentWithZeroBalance === true && currentBalance <= 0; const getMessageIcon = () => { switch (message.type) { @@ -80,7 +79,7 @@ export default function LastMessagePreview({ size="sm" color="secondary" align="left" - className={`${styles.text} ${shouldBlur ? styles.blurred : ''}`} + className={`${styles.text} ${shouldBlur ? styles.blurred : ""}`} > {getMessageText()} diff --git a/src/components/domains/chat/MessageInput/MessageInput.tsx b/src/components/domains/chat/MessageInput/MessageInput.tsx index a69d1b4..c41fb68 100644 --- a/src/components/domains/chat/MessageInput/MessageInput.tsx +++ b/src/components/domains/chat/MessageInput/MessageInput.tsx @@ -12,7 +12,10 @@ interface MessageInputProps { disabled?: boolean; } -export default function MessageInput({ onSend, disabled = false }: MessageInputProps) { +export default function MessageInput({ + onSend, + disabled = false, +}: MessageInputProps) { const t = useTranslations("Chat"); const [message, setMessage] = useState(""); diff --git a/src/components/domains/chat/NewMessagesWrapper/NewMessagesWrapper.tsx b/src/components/domains/chat/NewMessagesWrapper/NewMessagesWrapper.tsx index 08d7546..fbe2899 100644 --- a/src/components/domains/chat/NewMessagesWrapper/NewMessagesWrapper.tsx +++ b/src/components/domains/chat/NewMessagesWrapper/NewMessagesWrapper.tsx @@ -34,7 +34,11 @@ export default function NewMessagesWrapper() { }} isVisibleViewAll={unreadChats.length > 1} > - + )} diff --git a/src/components/domains/dashboard/sections/NewMessagesSection/NewMessagesSection.tsx b/src/components/domains/dashboard/sections/NewMessagesSection/NewMessagesSection.tsx index f1e18e1..2728fa6 100644 --- a/src/components/domains/dashboard/sections/NewMessagesSection/NewMessagesSection.tsx +++ b/src/components/domains/dashboard/sections/NewMessagesSection/NewMessagesSection.tsx @@ -31,7 +31,11 @@ export default function NewMessagesSection() { }} /> )} - + )} diff --git a/src/components/ui/ModalSheet/ModalSheet.tsx b/src/components/ui/ModalSheet/ModalSheet.tsx index 73b8899..f1484d1 100644 --- a/src/components/ui/ModalSheet/ModalSheet.tsx +++ b/src/components/ui/ModalSheet/ModalSheet.tsx @@ -39,7 +39,13 @@ export default function ModalSheet({ return ( { /* Backdrop close disabled */ } : onClose} + onClose={ + disableBackdropClose + ? () => { + /* Backdrop close disabled */ + } + : onClose + } className={clsx(className, styles.overlay, { [styles.closed]: !open && isOpen, })} diff --git a/src/hooks/balance/useBalance.ts b/src/hooks/balance/useBalance.ts index addae77..59f6d1a 100644 --- a/src/hooks/balance/useBalance.ts +++ b/src/hooks/balance/useBalance.ts @@ -13,7 +13,7 @@ export const useBalance = () => { const { balance: apiBalance, isLoading } = useUserBalance(); // Слушаем обновления баланса через WebSocket - useSocketEvent("balance_updated", (b) => { + useSocketEvent("balance_updated", b => { setSocketBalance(b.data.balance); });