Skip to content

Commit

Permalink
fixed display filter
Browse files Browse the repository at this point in the history
  • Loading branch information
larryrider committed Dec 11, 2024
1 parent 74c6bf6 commit 17d4700
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const RaiseHandContainerButton = (props: AbstractButtonProps) => {
return showReactionsAsPartOfRaiseHand
? <ReactionsMenuButton
{ ...props }
showRaiseHand = { true } />
showRaiseHand = { false } />
: <RaiseHandButton { ...props } />;
};

Expand Down
5 changes: 3 additions & 2 deletions react/features/toolbox/components/web/Toolbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,11 @@ const Toolbox = ({

const filtered = [
...order.map(key => buttons[key as keyof typeof buttons]),
...Object.values(buttons).filter((button, index) => !order.includes(keys[index]) && button.display)
].filter(({ key, alias = NOT_APPLICABLE }) =>
...Object.values(buttons).filter((button, index) => !order.includes(keys[index]))
].filter(({ display, key, alias = NOT_APPLICABLE }) =>
!_jwtDisabledButtons.includes(key)
&& (isButtonEnabled(key, _toolbarButtons) || isButtonEnabled(alias, _toolbarButtons))
&& display
);

let sliceIndex = _overflowDrawer || _reactionsButtonEnabled ? order.length + 2 : order.length + 1;
Expand Down

0 comments on commit 17d4700

Please sign in to comment.