diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx index e21103a3..e9b41bb3 100644 --- a/src/app/molecules/message/Message.jsx +++ b/src/app/molecules/message/Message.jsx @@ -360,24 +360,21 @@ function pickEmoji(e, roomId, eventId, roomTimeline) { } function genReactionMsg(userIds, reaction, shortcode) { - let i18nKey = 'Molecules.Message.user_reacted'; - - if (userIds.length <= 3) { - i18nKey += `_${userIds.length}`; - } - return ( - , - user_one: , - user_two: , - user_three: , - emoji: , - }} - /> + <> + {userIds.map((userId, index) => ( + + {twemojify(getUsername(userId))} + {index < userIds.length - 1 && ( + + {index === userIds.length - 2 ? ' and ' : ', '} + + )} + + ))} + {' reacted with '} + {twemojify(shortcode ? `:${shortcode}:` : reaction, { className: 'react-emoji' })} + ); }