Regression: Avatar and Username for Allowed Reactions and for Message Removed (#4714)

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}

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',