diff --git a/bigbluebutton-html5/imports/ui/components/raisehand-notifier/container.jsx b/bigbluebutton-html5/imports/ui/components/raisehand-notifier/container.jsx
index 2b0743454d..d77ba34fde 100644
--- a/bigbluebutton-html5/imports/ui/components/raisehand-notifier/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/raisehand-notifier/container.jsx
@@ -6,6 +6,7 @@ import RaiseHandNotifier from './component';
import { SET_RAISE_HAND } from '/imports/ui/core/graphql/mutations/userMutations';
import useCurrentUser from '/imports/ui/core/hooks/useCurrentUser';
import { RAISED_HAND_USERS } from './queries';
+import logger from '/imports/startup/client/logger';
const StatusNotifierContainer = (props) => {
const { data: currentUserData } = useCurrentUser((user) => ({
@@ -22,7 +23,10 @@ const StatusNotifierContainer = (props) => {
const raiseHandUsers = usersData?.user || [];
if (usersError) {
- throw new Error(`Error on requesting raise hand data: ${usersError}`);
+ logger.error({
+ logCode: 'raisehand_notifier_container_subscription_error',
+ extraInfo: { usersError },
+ }, 'Error on requesting raise hand data');
}
const [setRaiseHand] = useMutation(SET_RAISE_HAND);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx
index 82a81de295..ad635d6314 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/list-item/component.tsx
@@ -115,7 +115,7 @@ const UserListItem: React.FC = ({ user, lockSettings }) => {
if (user.mobile && LABEL.mobile) {
subs.push(intl.formatMessage(messages.mobile));
}
- if (user.locked && lockSettings.hasActiveLockSetting && !user.isModerator) {
+ if (user.locked && lockSettings?.hasActiveLockSetting && !user.isModerator) {
subs.push(
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/user-actions/component.tsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/user-actions/component.tsx
index 9716551475..c26e9ba263 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/user-actions/component.tsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-participants/user-actions/component.tsx
@@ -284,12 +284,8 @@ const UserActions: React.FC = ({
allowedToSetAway,
} = actionsnPermitions;
- const {
- disablePrivateChat,
- } = lockSettings;
-
const userLocked = user.locked
- && lockSettings.hasActiveLockSetting
+ && lockSettings?.hasActiveLockSetting
&& !user.isModerator;
let userListDropdownItems = [] as PluginSdk.UserListDropdownInterface[];
@@ -373,7 +369,7 @@ const UserActions: React.FC = ({
&& (
currentUser.isModerator ? allowedToChatPrivately
: allowedToChatPrivately && (
- !(currentUser.locked && disablePrivateChat)
+ !(currentUser.locked && lockSettings?.disablePrivateChat)
// TODO: Add check for hasPrivateChat between users
|| user.isModerator
)
@@ -434,7 +430,7 @@ const UserActions: React.FC = ({
},
{
allowed: allowedToUnmuteAudio
- && !lockSettings.disableMic
+ && !lockSettings?.disableMic
&& !isBreakout,
key: 'unmute',
label: intl.formatMessage(messages.UnmuteUserAudioLabel),