From f4ad966d09b9f5228a72ec42c993389158c04cb2 Mon Sep 17 00:00:00 2001
From: Filipe Marins <filipe.marins@rocket.chat>
Date: Thu, 15 Dec 2022 09:12:32 -0300
Subject: [PATCH] [FIX] Message Actions menu does not close upon choosing an
 action (#27328)

Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Co-authored-by: Hugo Costa <20212776+hugocostadev@users.noreply.github.com>
---
 .../components/Toolbox/MessageActionMenu.tsx           |  5 ++++-
 .../room/MessageList/components/Toolbox/Toolbox.tsx    | 10 ++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
index 12f7fca0664e..b7cca1c7e0e7 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx
@@ -35,7 +35,10 @@ export const MessageActionMenu: FC<{
 		<MessageToolboxItem
 			ref={ref}
 			icon='kebab'
-			onClick={(): void => setVisible(!visible)}
+			onClick={(e): void => {
+				e.stopPropagation();
+				setVisible(!visible);
+			}}
 			data-qa-id='menu'
 			data-qa-type='message-action-menu'
 			title={t('More')}
diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
index bb38db0c0a51..f539a468e4dc 100644
--- a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx
@@ -48,10 +48,7 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => {
 		<MessageToolbox>
 			{messageActions.map((action) => (
 				<MessageToolboxItem
-					onClick={(e): void => {
-						e.stopPropagation();
-						action.action(e, { message, tabbar: toolbox, room });
-					}}
+					onClick={(e): void => action.action(e, { message, tabbar: toolbox, room })}
 					key={action.id}
 					icon={action.icon}
 					title={t(action.label)}
@@ -63,10 +60,7 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => {
 				<MessageActionMenu
 					options={menuActions.map((action) => ({
 						...action,
-						action: (e): void => {
-							e.stopPropagation();
-							action.action(e, { message, tabbar: toolbox, room });
-						},
+						action: (e): void => action.action(e, { message, tabbar: toolbox, room }),
 					}))}
 					data-qa-type='message-action-menu-options'
 				/>