@@ -405,6 +405,26 @@ const ChatMessage = ({
405405 [ isMessageEditLoading , handleCheckboxChange , isMessageEditAllowed ] ,
406406 ) ;
407407
408+ const EmojiButton = useCallback ( ( ) => {
409+ return (
410+ < ReactWithEmoji
411+ emojiButtonClassName = { styles . emojiButton }
412+ discussionId = { discussionMessage . discussionId }
413+ discussionMessageId = { discussionMessage . id }
414+ className = {
415+ isNotCurrentUserMessage
416+ ? styles . reactWithEmoji
417+ : styles . reactWithEmojiSelf
418+ }
419+ isNotCurrentUserMessage = { isNotCurrentUserMessage }
420+ />
421+ ) ;
422+ } , [
423+ discussionMessage . discussionId ,
424+ discussionMessage . id ,
425+ isNotCurrentUserMessage ,
426+ ] ) ;
427+
408428 if ( isSystemMessage && discussionMessage . parsedText . length === 0 ) {
409429 return null ;
410430 }
@@ -421,19 +441,7 @@ const ChatMessage = ({
421441 [ styles . systemMessageContainer ] : isSystemMessage ,
422442 } ) }
423443 >
424- { ! isSystemMessage && ! isNotCurrentUserMessage && (
425- < ReactWithEmoji
426- emojiButtonClassName = { styles . emojiButton }
427- discussionId = { discussionMessage . discussionId }
428- discussionMessageId = { discussionMessage . id }
429- className = {
430- isNotCurrentUserMessage
431- ? styles . reactWithEmoji
432- : styles . reactWithEmojiSelf
433- }
434- isNotCurrentUserMessage = { isNotCurrentUserMessage }
435- />
436- ) }
444+ { ! isSystemMessage && ! isNotCurrentUserMessage && < EmojiButton /> }
437445 { isNotCurrentUserMessage &&
438446 ( isUserDiscussionMessage || isBotMessage ) && (
439447 < div className = { styles . iconWrapper } onClick = { handleUserClick } >
@@ -575,19 +583,7 @@ const ChatMessage = ({
575583 </ div >
576584 </ >
577585 ) }
578- { ! isSystemMessage && isNotCurrentUserMessage && (
579- < ReactWithEmoji
580- emojiButtonClassName = { styles . emojiButton }
581- discussionId = { discussionMessage . discussionId }
582- discussionMessageId = { discussionMessage . id }
583- className = {
584- isNotCurrentUserMessage
585- ? styles . reactWithEmoji
586- : styles . reactWithEmojiSelf
587- }
588- isNotCurrentUserMessage = { isNotCurrentUserMessage }
589- />
590- ) }
586+ { ! isSystemMessage && isNotCurrentUserMessage && < EmojiButton /> }
591587 </ div >
592588 </ li >
593589 </ ChatMessageContext . Provider >
0 commit comments