From d946547cc3aeb793435c58ea9bd04369e84bc20d Mon Sep 17 00:00:00 2001
From: zubiden <19638254+zubiden@users.noreply.github.com>
Date: Sat, 1 Mar 2025 17:59:00 +0100
Subject: [PATCH] Replies: Fix opening comments (#5626)

---
 .../middle/message/hooks/useInnerHandlers.ts  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/middle/message/hooks/useInnerHandlers.ts b/src/components/middle/message/hooks/useInnerHandlers.ts
index dbb083bbf..8570d6700 100644
--- a/src/components/middle/message/hooks/useInnerHandlers.ts
+++ b/src/components/middle/message/hooks/useInnerHandlers.ts
@@ -196,11 +196,20 @@ export default function useInnerHandlers({
     }
 
     if (replyToPeerId && replyToTopId) {
-      focusMessage({
-        chatId: replyToPeerId,
-        threadId: replyToTopId,
-        messageId: forwardInfo!.fromMessageId!,
-      });
+      if (isRepliesChat) {
+        openThread({
+          isComments: true,
+          originChannelId: replyToPeerId,
+          originMessageId: replyToTopId,
+          focusMessageId: forwardInfo!.fromMessageId!,
+        });
+      } else {
+        focusMessage({
+          chatId: replyToPeerId,
+          threadId: replyToTopId,
+          messageId: forwardInfo!.fromMessageId!,
+        });
+      }
     } else {
       focusMessage({
         chatId: originalChatId, messageId: forwardInfo!.fromMessageId!,