Merge branch 'develop' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js

public_new/js/views/chats/chat-room-message.js

@@ -320,7 +320,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
 };
 
 ChatRoom.getMeetingID = function (meetingID) {
-  return typeof meetingID != "undefined" ? 0 : meetingID;
+  return typeof meetingID == "undefined" ? 0 : meetingID;
 };
 
 ChatRoom.getDisplayUserList = function (userList) {

public_new/js/views/collaboration/fermi-web-socket-bridge.js

@@ -61,10 +61,7 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
 
 // GET_COLLABORATION_TYPE_RESPONSE
 FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) {
-  
-  if (typeof meetingID == undefined) {
-    var meetingID = 0;
-  }
+  let meetingID = globalUserInfo.meetingID ?? 0;
 
   console.log(
     "peacekim:: FermiWebSocketBridge.getCollaborationTypeResponse hostID: " +

public_new/js/views/collaboration/share-event-listener.js

@@ -138,7 +138,7 @@ CoviewBridge.bindMessageEvent = function () {
     }
     switch (json.api) {
       case "LoginResponse":
-        CollaborationFeature.didReceiveLoginResponseMessage();
+        await CollaborationFeature.didReceiveLoginResponseMessage();
         break;
       case "CreateRoomResponse":
         if (json.resultCode == 200) {