From 36e7ee738320ce75ed45fd019410d035f1af5ead Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com>
Date: Mon, 31 Oct 2022 14:02:35 -0300
Subject: [PATCH] [FIX] Messages attributed to wrong user (#4598)

---
 app/containers/message/index.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/containers/message/index.tsx b/app/containers/message/index.tsx
index 39e236f98..21d74de45 100644
--- a/app/containers/message/index.tsx
+++ b/app/containers/message/index.tsx
@@ -93,7 +93,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 
 	shouldComponentUpdate(nextProps: IMessageContainerProps, nextState: IMessageContainerState) {
 		const { isManualUnignored } = this.state;
-		const { threadBadgeColor, isIgnored, highlighted } = this.props;
+		const { threadBadgeColor, isIgnored, highlighted, previousItem } = this.props;
 		if (nextProps.highlighted !== highlighted) {
 			return true;
 		}
@@ -106,6 +106,9 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 		if (nextState.isManualUnignored !== isManualUnignored) {
 			return true;
 		}
+		if (nextProps.previousItem?._id !== previousItem?._id) {
+			return true;
+		}
 		return false;
 	}