Merge pull request #18706 from ramonlsouza/issue-18696

fix: Raised hand button incorrect state
bigbluebutton · Sep 7, 2023 · e4807fd · e4807fd
2 parents ff1bf8a + ae159e8
commit e4807fd
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/reactions-button/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/reactions-button/component.jsx
@@ -123,9 +123,18 @@ const ReactionsButton = (props) => {
     customStyles: {...actionCustomStyles, width: 'auto'},
   });
 
-  const icon = currentUserReaction === 'none' ? 'hand' : null;
+  const icon = !raiseHand && currentUserReaction === 'none' ? 'hand' : null;
   const currentUserReactionEmoji = reactions.find(({ native }) => native === currentUserReaction);
-  const customIcon = !icon ? <Emoji key={currentUserReactionEmoji?.id} emoji={{ id: currentUserReactionEmoji?.id }} {...emojiProps} /> : null;
+
+  let customIcon = null;
+
+  if (raiseHand) {
+    customIcon = <Emoji key="hand" emoji={{ id: 'hand' }} {...emojiProps} />;
+  } else {
+    if (!icon) {
+      customIcon = <Emoji key={currentUserReactionEmoji?.id} emoji={{ id: currentUserReactionEmoji?.id }} {...emojiProps} />;
+    }
+  }
 
   return (
     <BBBMenu