From b008c5f07f70f6f81d059f9617dd4c8bf40aeb8e Mon Sep 17 00:00:00 2001
From: ajbura <ajbura@gmail.com>
Date: Fri, 4 Feb 2022 11:39:18 +0530
Subject: [PATCH] Fix reaction tooltip message

Signed-off-by: ajbura <ajbura@gmail.com>
---
 src/app/molecules/message/Message.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
index 8d3b61f6..319e9c86 100644
--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -304,9 +304,11 @@ function genReactionMsg(userIds, reaction) {
       {userIds.map((userId, index) => (
         <React.Fragment key={userId}>
           {twemojify(getUsername(userId))}
-          <span style={{ opacity: '.6' }}>
-            {index === userIds.length - 1 ? ' and ' : ', '}
-          </span>
+          {index < userIds.length - 1 && (
+            <span style={{ opacity: '.6' }}>
+              {index === userIds.length - 2 ? ' and ' : ', '}
+            </span>
+          )}
         </React.Fragment>
       ))}
       <span style={{ opacity: '.6' }}>{' reacted with '}</span>