Fix reaction tooltip message

Signed-off-by: ajbura <[email protected]>
cinnyapp · Feb 4, 2022 · b008c5f · b008c5f
1 parent a59aa2c
commit b008c5f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git 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>