From 1572f06ef43687cdb23e534104d188c62c7d127a Mon Sep 17 00:00:00 2001
From: RoyceDa <admin@rosetta-im.com>
Date: Sat, 21 Feb 2026 20:49:55 +0200
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=82=D1=87=D0=B8=D1=81=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BD=D0=B0=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B8=D1=8F=20ESC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/DialogInput/DialogInput.tsx               | 1 +
 app/components/MessageAttachments/MessageAttachments.tsx | 1 -
 app/components/ReplyHeader/ReplyHeader.tsx               | 6 +-----
 app/providers/DialogProvider/useReplyMessages.ts         | 2 ++
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/components/DialogInput/DialogInput.tsx b/app/components/DialogInput/DialogInput.tsx
index e529a4e..4cb6354 100644
--- a/app/components/DialogInput/DialogInput.tsx
+++ b/app/components/DialogInput/DialogInput.tsx
@@ -60,6 +60,7 @@ export function DialogInput() {
     useHotkeys([
         ['Esc', () => {
             setAttachments([]);
+            deselectAllMessages();
         }]
     ], [], true);
 
diff --git a/app/components/MessageAttachments/MessageAttachments.tsx b/app/components/MessageAttachments/MessageAttachments.tsx
index 6446d1e..44c7714 100644
--- a/app/components/MessageAttachments/MessageAttachments.tsx
+++ b/app/components/MessageAttachments/MessageAttachments.tsx
@@ -42,7 +42,6 @@ export function MessageAttachments(props: MessageAttachmentsProps) {
                         text: props.text,
                         parent: props.parent,
                     }
-                    console.info("Rendering attachment", attachProps);
                     switch (att.type) {
                         case AttachmentType.MESSAGES:
                             return <MessageReplyMessages {...attachProps} key={index}></MessageReplyMessages>
diff --git a/app/components/ReplyHeader/ReplyHeader.tsx b/app/components/ReplyHeader/ReplyHeader.tsx
index 23b6c4c..760895c 100644
--- a/app/components/ReplyHeader/ReplyHeader.tsx
+++ b/app/components/ReplyHeader/ReplyHeader.tsx
@@ -1,7 +1,7 @@
 import { useRosettaColors } from "@/app/hooks/useRosettaColors";
 import { useReplyMessages } from "@/app/providers/DialogProvider/useReplyMessages";
 import { Button, Flex, Modal, Text } from "@mantine/core";
-import { useDisclosure, useHotkeys } from "@mantine/hooks";
+import { useDisclosure } from "@mantine/hooks";
 import { IconCornerUpLeft, IconCornerUpRightDouble, IconTrash, IconX } from "@tabler/icons-react";
 import classes from "./ReplyHeader.module.css";
 import { DialogsList } from "../DialogsList/DialogsList";
@@ -19,10 +19,6 @@ export function ReplyHeader() {
     const [opened, { open, close }] = useDisclosure(false);
     const navigate = useNavigate();
     const {deleteSelectedMessages} = useDialog();
-    
-    useHotkeys([
-        ['Esc', deselectAllMessages]
-    ], [], true);
 
     const onClickForward = () => {
         open();
diff --git a/app/providers/DialogProvider/useReplyMessages.ts b/app/providers/DialogProvider/useReplyMessages.ts
index 4475286..487e8bb 100644
--- a/app/providers/DialogProvider/useReplyMessages.ts
+++ b/app/providers/DialogProvider/useReplyMessages.ts
@@ -35,6 +35,7 @@ export function useReplyMessages() {
     const {dialog} = context;
 
     const selectMessage = (message : MessageReply) => {
+        console.info("-> ", replyMessages);
         console.info(message);
         if(replyMessages.publicKey != dialog){
             /**
@@ -70,6 +71,7 @@ export function useReplyMessages() {
     }
 
     const deselectAllMessages = () => {
+        console.info("Deselecting all messages");
         setReplyMessages({
             publicKey: "",
             messages: []