From 1508e80850056de7b8e0f07c7d2874e51a6bea01 Mon Sep 17 00:00:00 2001
From: Filipe Marins <filipe.marins@rocket.chat>
Date: Tue, 26 Apr 2022 00:40:04 -0300
Subject: [PATCH 1/2] fix: add stop propagation on open thread

---
 apps/meteor/client/views/room/contexts/MessageContext.ts    | 2 +-
 apps/meteor/client/views/room/providers/MessageProvider.tsx | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/client/views/room/contexts/MessageContext.ts b/apps/meteor/client/views/room/contexts/MessageContext.ts
index d20ec99575da..28b5aa9644e3 100644
--- a/apps/meteor/client/views/room/contexts/MessageContext.ts
+++ b/apps/meteor/client/views/room/contexts/MessageContext.ts
@@ -23,7 +23,7 @@ export type MessageContextValue = {
 	actions: {
 		openUserCard: (username: string) => (e: MouseEvent<HTMLDivElement>) => void;
 		openRoom: (id: string) => () => void;
-		openThread: (tmid: string, jump?: string) => () => void;
+		openThread: (tmid: string, jump?: string) => (e: MouseEvent) => void;
 		runActionLink: (message: IMessage) => (action: string) => () => void;
 		replyBroadcast: (message: IMessage) => void;
 	};
diff --git a/apps/meteor/client/views/room/providers/MessageProvider.tsx b/apps/meteor/client/views/room/providers/MessageProvider.tsx
index 899ffc297edf..0de19c113a2c 100644
--- a/apps/meteor/client/views/room/providers/MessageProvider.tsx
+++ b/apps/meteor/client/views/room/providers/MessageProvider.tsx
@@ -35,8 +35,10 @@ export const MessageProvider = memo(function MessageProvider({
 	const dateAndTime = useFormatDateAndTime();
 	const context = useMemo(() => {
 		const openThread =
-			(tmid: string, jump?: string): (() => void) =>
-			(): void => {
+			(tmid: string, jump?: string): ((e: MouseEvent) => void) =>
+			(e: MouseEvent): void => {
+				e.stopPropagation();
+
 				router.replace(
 					{
 						...params,

From 2f41414bc438b5557f960681367c066e647e7b25 Mon Sep 17 00:00:00 2001
From: gabriellsh <gabriel.henriques@rocket.chat>
Date: Tue, 26 Apr 2022 11:00:42 -0300
Subject: [PATCH 2/2] Fix type

---
 apps/meteor/client/components/Message/Metrics/Thread.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/components/Message/Metrics/Thread.tsx b/apps/meteor/client/components/Message/Metrics/Thread.tsx
index 728364e18662..d271ebf49482 100644
--- a/apps/meteor/client/components/Message/Metrics/Thread.tsx
+++ b/apps/meteor/client/components/Message/Metrics/Thread.tsx
@@ -1,5 +1,5 @@
 import { Message, MessageMetricsItem, MessageBlock } from '@rocket.chat/fuselage';
-import React, { useCallback, FC } from 'react';
+import React, { useCallback, FC, MouseEvent as ReactMouseEvent } from 'react';
 
 import { useEndpoint } from '../../../contexts/ServerContext';
 import { useTranslation } from '../../../contexts/TranslationContext';
@@ -17,7 +17,7 @@ type ThreadReplyOptions = {
 	counter: number;
 	participants: number;
 	following: boolean;
-	openThread: () => any;
+	openThread: (e: ReactMouseEvent<Element, MouseEvent>) => void;
 };
 
 const ThreadMetric: FC<ThreadReplyOptions> = ({ unread, mention, all, rid, mid, counter, participants, following, lm, openThread }) => {