Merge from develop

public_new/js/views/archive/archive.js

@@ -10,10 +10,9 @@ document.addEventListener("DOMContentLoaded", function () {
 
 ArchiveUI.refreshSearchScreen = function (keyword) {
   const archiveList = NativeBridgeDataSource.getArchiveByName(keyword);
-  const typeImage = ArchiveUI.getArchiveTypeIconURL(archive.archiveType);
-
   ArchiveUI.getArchiveTemplate().then(function (archiveTemplate) {
     archiveList.forEach(function (archive) {
+      const typeImage = ArchiveUI.getArchiveTypeIconURL(archive.archiveType);
       let html = ArchiveUI.renderArchiveTemplate(
         archiveTemplate,
         archive.archiveId,

public_new/js/views/collaboration/fermi-web-socket-message-handler.js

@@ -111,6 +111,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
     case "API_WELCOME":
       if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
         FermiWebSocketMessageHandler.apiWelcome();
+      } else {
+        FermiWebSocketBridge.getCollaborationType()
       }
       CollaborationFeature.updateHost();
       break;

public_new/js/views/contact/contact.js

@@ -83,7 +83,7 @@ Contact.appendGroupList = function (groupList) {
   const groupTemplate = getTemplate(TemplateURL.GROUP_LIST);
 
   groupList.forEach(function (group) {
-    const html = renderGroupList(
+    const html = Contact.renderGroupList(
       groupTemplate,
       group.groupName,
       group.groupId,