Merge pull request #6447 from jfsiebel/problem-with-unread-messages

Set default value for idChatOpen

bigbluebutton-html5/imports/ui/components/authenticated-handler/component.jsx

@@ -5,6 +5,8 @@ import Auth from '/imports/ui/services/auth';
 import LoadingScreen from '/imports/ui/components/loading-screen/component';
 
 const STATUS_CONNECTING = 'connecting';
+const CHAT_CONFIG = Meteor.settings.public.chat;
+const PUBLIC_CHAT_ID = CHAT_CONFIG.public_id;
 
 class AuthenticatedHandler extends Component {
   static setError(codeError) {
@@ -82,7 +84,7 @@ class AuthenticatedHandler extends Component {
     } = this.state;
 
     Session.set('isChatOpen', false);
-    Session.set('idChatOpen', '');
+    Session.set('idChatOpen', PUBLIC_CHAT_ID);
     Session.set('isMeetingEnded', false);
     Session.set('isPollOpen', false);
     Session.set('breakoutRoomIsOpen', false);

bigbluebutton-html5/imports/ui/components/chat/service.js

@@ -196,7 +196,7 @@ const updateScrollPosition =
   );
 
 const updateUnreadMessage = (timestamp) => {
-  const chatID = Session.get('idChatOpen');
+  const chatID = Session.get('idChatOpen') || PUBLIC_CHAT_ID;
   const isPublic = chatID === PUBLIC_CHAT_ID;
   const chatType = isPublic ? PUBLIC_GROUP_CHAT_ID : chatID;
   return UnreadMessages.update(chatType, timestamp);