From 7def88a7e2434ed494c7160bf685403236415cf4 Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com>
Date: Tue, 29 Nov 2022 12:12:35 -0300
Subject: [PATCH] Regression: Avatar and Username for Allowed Reactions and for
 Message Removed (#4714)

---
 app/containers/message/index.tsx | 7 ++++---
 app/containers/message/utils.ts  | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/containers/message/index.tsx b/app/containers/message/index.tsx
index ed2b06b76..246284536 100644
--- a/app/containers/message/index.tsx
+++ b/app/containers/message/index.tsx
@@ -233,7 +233,9 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 				!(previousItem.groupable === false || item.groupable === false || broadcast === true) &&
 				// @ts-ignore TODO: IMessage vs IMessageFromServer non-sense
 				item.ts - previousItem.ts < Message_GroupingPeriod * 1000 &&
-				previousItem.tmid === item.tmid
+				previousItem.tmid === item.tmid &&
+				item.t !== 'rm' &&
+				previousItem.t !== 'rm'
 			) {
 				return false;
 			}
@@ -405,8 +407,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 					threadBadgeColor,
 					toggleFollowThread,
 					replies
-				}}
-			>
+				}}>
 				{/* @ts-ignore*/}
 				<Message
 					id={id}
diff --git a/app/containers/message/utils.ts b/app/containers/message/utils.ts
index ae3717eae..fb734f96a 100644
--- a/app/containers/message/utils.ts
+++ b/app/containers/message/utils.ts
@@ -65,6 +65,7 @@ const messagesWithAuthorName: MessageTypesValues[] = [
 	'room_changed_avatar',
 	'room_e2e_disabled',
 	'room_e2e_enabled',
+	'room-allowed-reacting',
 	'room-disallowed-reacting',
 	'room-set-read-only',
 	'room-removed-read-only',