@chat21/chat21-ionic 3.0.97-rc.2 → 3.0.97-rc.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # chat21-ionic ver 3.0
 
+### 3.0.97-rc.4
+- bug-fixed: error getting chat group members
+- bug-fixed: missing info-conversation accordion label 
+
+### 3.0.97-rc.3
+- added: channel property to message/conversation and changed attributes.channel to attributes.offline_channel for offline message email
+- added: channel info in conversation-header-detail component
+- updated: tiledesk logo
+- bug-fixed: sort last-messages for mqtt before publish to component
+
 ### 3.0.97-rc.2
 - added: do not send automatic offline email if conversation is of type 'email' or 'form'
 - added: new tooltip directive

package/Dockerfile

@@ -1,7 +1,7 @@
 ### STAGE 1: Build ###
 
 # We label our stage as ‘builder’
-FROM node:10-alpine as builder
+FROM node:14.21.2-alpine as builder
 
 RUN npm install -g ionic cordova@8.0.0
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@chat21/chat21-ionic",
     "author": "Tiledesk SRL",
-    "version": "3.0.97-rc.2",
+    "version": "3.0.97-rc.4",
     "license": "MIT License",
     "homepage": "https://tiledesk.com/",
     "repository": {

package/src/app/app.component.ts

@@ -769,18 +769,17 @@ export class AppComponent implements OnInit {
         this.hadBeenCalledOpenModal = true;
       }
 
-      // if(this.IS_ON_MOBILE_DEVICE){
-      //   clearTimeout(this.timeModalLogin);
-      //   this.timeModalLogin = setTimeout(() => {
-      //     if (!this.hadBeenCalledOpenModal) {
-      //       this.authModal = this.presentModal('initAuthentication');
-      //       this.hadBeenCalledOpenModal = true;
-      //     }
-      //   }, 1000)
-      // }else{
-      //   this.goToDashboardLogin()
-      // }
-      ;
+      if(this.IS_ON_MOBILE_DEVICE){
+        clearTimeout(this.timeModalLogin);
+        this.timeModalLogin = setTimeout(() => {
+          if (!this.hadBeenCalledOpenModal) {
+            this.authModal = this.presentModal('initAuthentication');
+            this.hadBeenCalledOpenModal = true;
+          }
+        }, 1000)
+      }else{
+        this.goToDashboardLogin()
+      }
     }
   }
 
@@ -1151,7 +1150,17 @@ export class AppComponent implements OnInit {
     this.chatManager.goOffLine();
 
     this.router.navigateByUrl('conversation-detail/'); //redirect to basePage
-    this.goToDashboardLogin()
+    if(this.IS_ON_MOBILE_DEVICE){
+        clearTimeout(this.timeModalLogin);
+        this.timeModalLogin = setTimeout(() => {
+          if (!this.hadBeenCalledOpenModal) {
+            this.authModal = this.presentModal('initAuthentication');
+            this.hadBeenCalledOpenModal = true;
+          }
+        }, 1000)
+      }else{
+        this.goToDashboardLogin()
+      }
     
 
     // if (!this.hadBeenCalledOpenModal) {

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.html

@@ -110,10 +110,10 @@
       
       <div class="bubble-container">
 
-        <div class="email-logo" *ngIf="message?.attributes?.channel && message?.attributes?.channel.includes(TYPE_MSG_EMAIL)">
+        <div class="email-logo" *ngIf="message?.attributes?.offline_channel && message?.attributes?.offline_channel.includes(TYPE_MSG_EMAIL)">
           <ion-icon name="mail"></ion-icon>
           <ion-icon name="flash" 
-            *ngIf="message?.attributes?.channel.includes('offline_')"
+            *ngIf="message?.attributes?.offline_channel.includes('offline_')"
             [ngStyle]="{'color': stylesMap.get('bubbleSentBackground')}">
           </ion-icon>
         </div>
@@ -186,7 +186,7 @@
 
       <ng-container *ngIf="message?.attributes && message?.attributes?.sourcePage && !isSameSender(message?.sender, i)">
         <ion-button shape="round" size="small" class="btn-info-msg " ion-button fill="clear"
-          (click)="onClickInfoMessage(message, i)" tooltip="{{addAsCannedResponseTooltipText}}" placement="bottom">
+          (click)="onClickInfoMessage(message, i)" tooltip="{{viewedPageTooltipText}}" placement="bottom">
           <ion-icon slot="icon-only" name="information-circle-outline"></ion-icon>
         </ion-button>
       </ng-container>

package/src/app/chatlib/conversation-detail/ion-conversation-detail/ion-conversation-detail.component.ts

@@ -41,6 +41,7 @@ export class IonConversationDetailComponent extends ConversationContentComponent
   public fileType: any
   public browserLang: string;
   public addAsCannedResponseTooltipText: string;
+  public viewedPageTooltipText: string;
   public showSourceInfo: boolean = false;
   public showSourceInfoIndex: number = 0;
   // public openInfoConversation: boolean = true;
@@ -115,9 +116,10 @@ export class IonConversationDetailComponent extends ConversationContentComponent
     // this.translate.getTranslation(chat_lang).subscribe((labels: string) => {
     //   console.log('[CONVS-DETAIL] translations: ', labels);
     // });
-    this.translate.get('AddAsCannedResponse').subscribe((text: string) => {
-        // console.log('[CONVS-DETAIL] AddAsCannedResponse translated: ', text);
-        this.addAsCannedResponseTooltipText = text
+    this.translate.get(['AddAsCannedResponse', 'ViewedPage']).subscribe((text: string) => {
+        console.log('[CONVS-DETAIL] AddAsCannedResponse translated: ', text);
+        this.addAsCannedResponseTooltipText = text['AddAsCannedResponse']
+        this.viewedPageTooltipText = text['ViewedPage']
       })
   }
 

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.html

@@ -96,17 +96,22 @@
       <div class="conversation_project truncate">
         <!-- DIRECT CONV -->
         <div *ngIf="conversation.channel_type === TYPE_DIRECT">
-          <svg xmlns="http://www.w3.org/2000/svg" height="15"  width="15" viewBox="0 0 24 24" fill="#000000"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/></svg>
+          <img class="channel-icon" src="assets/images/channel_icons/direct.svg">
           <span  class="truncate">{{translationsMap.get('DIRECT_CHAT')}}</span>
         </div>
         <!-- GROUP CONV -->
         <div *ngIf="conversation.uid.startsWith(TYPE_GROUP)">
-          <svg xmlns="http://www.w3.org/2000/svg" height="15"  width="15" viewBox="0 0 24 24" fill="#000000"><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/></svg>
-          <span  class="truncate">{{translationsMap.get('GROUP_CHAT')}}</span>
+          <img class="channel-icon" src="assets/images/channel_icons/group.svg">
+          <span class="truncate">{{translationsMap.get('GROUP_CHAT')}}</span>
         </div>
         <!-- SUPPORT-GROUP CONV -->
         <div  *ngIf="conversation.uid.startsWith(TYPE_SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
-          <svg xmlns="http://www.w3.org/2000/svg" data-v-78d18411="" width="15" height="15" fill="none" viewBox="0 0 24 24" class="inbox-icon"><path d="M22.002 12C22.002 6.477 17.524 2 12 2 6.476 1.999 2 6.477 2 12.001c0 5.186 3.947 9.45 9.001 9.952V20.11c-.778-.612-1.478-1.905-1.939-3.61h1.94V15H8.737a18.969 18.969 0 0 1-.135-5h6.794c.068.64.105 1.31.105 2h1.5c0-.684-.033-1.353-.095-2h3.358c.154.64.237 1.31.237 2h1.5ZM4.786 16.5h2.722l.102.396c.317 1.17.748 2.195 1.27 3.015a8.532 8.532 0 0 1-4.094-3.41ZM3.736 10h3.358a20.847 20.847 0 0 0-.095 2c0 1.043.075 2.051.217 3H4.043a8.483 8.483 0 0 1-.544-3c0-.682.08-1.347.232-1.983L3.736 10Zm5.122-5.902.023-.008C8.16 5.222 7.611 6.748 7.298 8.5H4.25c.905-2 2.56-3.587 4.608-4.402Zm3.026-.594L12 3.5l.126.006c1.262.126 2.48 2.125 3.045 4.995H8.83c.568-2.878 1.79-4.88 3.055-4.996Zm3.343.76-.107-.174.291.121a8.533 8.533 0 0 1 4.339 4.29h-3.048c-.298-1.665-.806-3.125-1.475-4.237Z M12 19a1 1 0 0 0 1 1h3v2h-.5a.5.5 0 1 0 0 1h4a.5.5 0 0 0 0-1H19v-2h3a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1h-9a1 1 0 0 0-1 1v5Z" fill="currentColor"/></svg>
+          <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="conversation?.attributes && ( (conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_CHAT21) ||  !conversation?.attributes?.channel) " >
+          <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_EMAIL" >
+          <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_FORM" >
+          <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_MESSANGER" >
+          <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_WHATSAPP" >
+          <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversation?.attributes && conversation?.attributes?.channel && conversation?.attributes?.channel === CHANNEL_TYPE_TELEGRAM" >
           <span *ngIf="conversation?.attributes?.project_name" class="truncate">{{conversation?.attributes?.project_name}}</span>
           <span *ngIf="!conversation?.attributes?.project_name" class="truncate">{{conversation?.attributes?.projectId}}</span>
         </div>

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.scss

@@ -99,6 +99,10 @@ ion-item {
             span{
                 padding-left: 5px
             }
+            .channel-icon{
+                vertical-align: sub;
+                filter: brightness(0) saturate(100%) invert(83%) sepia(45%) saturate(1879%) hue-rotate(178deg) brightness(79%) contrast(81%);
+            }
         }
         .conversation_with {
             color: rgba(0, 0, 0, 1);

package/src/app/chatlib/list-conversations-component/ion-list-conversations/ion-list-conversations.component.ts

@@ -1,4 +1,4 @@
-import { TYPE_GROUP, TYPE_SUPPORT_GROUP } from './../../../../chat21-core/utils/constants';
+import { CHANNEL_TYPE_CHAT21, CHANNEL_TYPE_EMAIL, CHANNEL_TYPE_FORM, CHANNEL_TYPE_MESSANGER, CHANNEL_TYPE_TELEGRAM, CHANNEL_TYPE_WHATSAPP, TYPE_GROUP, TYPE_SUPPORT_GROUP } from './../../../../chat21-core/utils/constants';
 import { TYPE_DIRECT } from 'src/chat21-core/utils/constants';
 import { Component, EventEmitter, Input, IterableDiffers, KeyValueDiffers, OnInit, Output, SimpleChange } from '@angular/core';
 import { ConversationModel } from 'src/chat21-core/models/conversation';
@@ -53,6 +53,14 @@ export class IonListConversationsComponent extends ListConversationsComponent im
   TYPE_GROUP = TYPE_GROUP;
   TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP;
 
+  //ATTRIBUTES CHANNEL
+  CHANNEL_TYPE_CHAT21 = CHANNEL_TYPE_CHAT21;
+  CHANNEL_TYPE_EMAIL = CHANNEL_TYPE_EMAIL;
+  CHANNEL_TYPE_FORM = CHANNEL_TYPE_FORM;
+  CHANNEL_TYPE_MESSANGER = CHANNEL_TYPE_MESSANGER;
+  CHANNEL_TYPE_WHATSAPP = CHANNEL_TYPE_WHATSAPP;
+  CHANNEL_TYPE_TELEGRAM = CHANNEL_TYPE_TELEGRAM;
+  
   IS_ON_MOBILE_DEVICE: boolean
   /**
    * 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.html

@@ -44,7 +44,12 @@
               </div>
               <!-- SUPPORT-GROUP CONV -->
               <div  *ngIf="conversationUid?.startsWith(TYPE_SUPPORT_GROUP) && !IS_ON_MOBILE_DEVICE">
-                <svg xmlns="http://www.w3.org/2000/svg" data-v-78d18411="" width="15" height="15" fill="none" viewBox="0 0 24 24" class="inbox-icon"><path d="M22.002 12C22.002 6.477 17.524 2 12 2 6.476 1.999 2 6.477 2 12.001c0 5.186 3.947 9.45 9.001 9.952V20.11c-.778-.612-1.478-1.905-1.939-3.61h1.94V15H8.737a18.969 18.969 0 0 1-.135-5h6.794c.068.64.105 1.31.105 2h1.5c0-.684-.033-1.353-.095-2h3.358c.154.64.237 1.31.237 2h1.5ZM4.786 16.5h2.722l.102.396c.317 1.17.748 2.195 1.27 3.015a8.532 8.532 0 0 1-4.094-3.41ZM3.736 10h3.358a20.847 20.847 0 0 0-.095 2c0 1.043.075 2.051.217 3H4.043a8.483 8.483 0 0 1-.544-3c0-.682.08-1.347.232-1.983L3.736 10Zm5.122-5.902.023-.008C8.16 5.222 7.611 6.748 7.298 8.5H4.25c.905-2 2.56-3.587 4.608-4.402Zm3.026-.594L12 3.5l.126.006c1.262.126 2.48 2.125 3.045 4.995H8.83c.568-2.878 1.79-4.88 3.055-4.996Zm3.343.76-.107-.174.291.121a8.533 8.533 0 0 1 4.339 4.29h-3.048c-.298-1.665-.806-3.125-1.475-4.237Z M12 19a1 1 0 0 0 1 1h3v2h-.5a.5.5 0 1 0 0 1h4a.5.5 0 0 0 0-1H19v-2h3a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1h-9a1 1 0 0 0-1 1v5Z" fill="currentColor"/></svg>
+                <img class="channel-icon" src="assets/images/channel_icons/chat21.svg" *ngIf="( (conversationAvatar?.channel && conversationAvatar?.channel === CHANNEL_TYPE_CHAT21) ||  !conversationAvatar?.channel) " >
+                <img class="channel-icon" src="assets/images/channel_icons/email-logo.svg" *ngIf="conversationAvatar?.channel && conversationAvatar?.channel === CHANNEL_TYPE_EMAIL" >
+                <img class="channel-icon" src="assets/images/channel_icons/form-logo_v2.svg" *ngIf="conversationAvatar?.channel && conversationAvatar?.channel === CHANNEL_TYPE_FORM" >
+                <img class="channel-icon" src="assets/images/channel_icons/messenger-logo.svg" *ngIf="conversationAvatar?.channel && conversationAvatar?.channel === CHANNEL_TYPE_MESSANGER" >
+                <img class="channel-icon" src="assets/images/channel_icons/whatsapp-logo.svg" *ngIf="conversationAvatar?.channel && conversationAvatar?.channel === CHANNEL_TYPE_WHATSAPP" >
+                <img class="channel-icon" src="assets/images/channel_icons/telegram-logo.svg" *ngIf="conversationAvatar?.channel && conversationAvatar?.channel === CHANNEL_TYPE_TELEGRAM" >
                 <span *ngIf="conversationAvatar?.project_name" class="truncate">{{conversationAvatar?.project_name}}</span>
                 <span *ngIf="!conversationAvatar?.project_name" class="truncate">{{conversationAvatar?.projectId}}</span>
               </div>

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.scss

@@ -208,6 +208,10 @@ ion-header {
         span{
             padding-left: 5px
         }
+        .channel-icon{
+            vertical-align: sub;
+            filter: brightness(0) saturate(100%) invert(83%) sepia(45%) saturate(1879%) hue-rotate(178deg) brightness(79%) contrast(81%);
+        }
     }
 }
 

package/src/app/components/conversation-detail/header-conversation-detail/header-conversation-detail.component.ts

@@ -1,4 +1,4 @@
-import { TYPE_GROUP } from './../../../../chat21-core/utils/constants';
+import { CHANNEL_TYPE_CHAT21, CHANNEL_TYPE_EMAIL, CHANNEL_TYPE_FORM, CHANNEL_TYPE_MESSANGER, CHANNEL_TYPE_TELEGRAM, CHANNEL_TYPE_WHATSAPP, TYPE_GROUP } from './../../../../chat21-core/utils/constants';
 import {
   Component,
   OnInit,
@@ -51,6 +51,14 @@ export class HeaderConversationDetailComponent implements OnInit, OnChanges {
   TYPE_SUPPORT_GROUP = TYPE_SUPPORT_GROUP
   TYPE_GROUP = TYPE_GROUP
 
+  //ATTRIBUTES CHANNEL
+  CHANNEL_TYPE_CHAT21 = CHANNEL_TYPE_CHAT21;
+  CHANNEL_TYPE_EMAIL = CHANNEL_TYPE_EMAIL;
+  CHANNEL_TYPE_FORM = CHANNEL_TYPE_FORM;
+  CHANNEL_TYPE_MESSANGER = CHANNEL_TYPE_MESSANGER;
+  CHANNEL_TYPE_WHATSAPP = CHANNEL_TYPE_WHATSAPP;
+  CHANNEL_TYPE_TELEGRAM = CHANNEL_TYPE_TELEGRAM;
+  
   constructor(
     public imageRepoService: ImageRepoService,
     private route: ActivatedRoute,

package/src/app/components/conversation-detail/message-text-area/message-text-area.component.ts

@@ -402,7 +402,7 @@ export class MessageTextAreaComponent implements OnInit, AfterViewInit, OnChange
         if (form && form.text && form.text.trim() !== '') {
           const text = '**' + form.subject + '**\r\n' + form.text
           const attributes = {
-            channel: TYPE_MSG_EMAIL
+            offline_channel: TYPE_MSG_EMAIL
           }
           this.eventSendMessage.emit({ msg: text, type: TYPE_MSG_TEXT, metadata: null, attributes: attributes });
         }

package/src/app/pages/authentication/login/login.page.ts

@@ -60,7 +60,7 @@ export class LoginPage implements OnInit {
 
   /** */
   initialize() {
-    this.companyLogoBlackUrl = 'assets/chat21-logo.svg';
+    this.companyLogoBlackUrl = 'assets/chat21-logo.png';
     this.companyName = 'Tiledesk'; // this.chatManager.getTenant();
     this.translations();
     this.events.subscribe('sign-in', this.signIn);

package/src/app/pages/conversation-detail/conversation-detail.page.html

@@ -256,7 +256,7 @@
             [tenant]="tenant" 
             [groupDetail]="groupDetail"
             [isMobile]="isMobile"
-            [translationMap]="translationsMap">
+            [translationMap]="translationsInfoConversationMap">
           </app-info-content>
         </ion-col>
 

package/src/app/pages/conversation-detail/conversation-detail.page.ts

@@ -337,7 +337,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.channel_type,
             null,
             conv.attributes['projectId'],
-            conv.attributes['project_name'])
+            conv.attributes['project_name']),
+            conv.attributes['channel']
         }
 
       }
@@ -783,7 +784,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   private setAttributes(): any {
     const attributes: any = {
       client: navigator.userAgent,
-      sourcePage: location.href,
+      sourcePage: location.href
     }
 
     //TODO: servono ???
@@ -846,7 +847,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.channel_type,
             null,
             conv.attributes['projectId'],
-            conv.attributes['project_name']
+            conv.attributes['project_name'],
+            conv.attributes['channel']
           )
           
         }
@@ -863,7 +865,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 conv.channel_type,
                 null,
                 conv.attributes['projectId'],
-                conv.attributes['project_name']
+                conv.attributes['project_name'],
+                conv.attributes['channel']
               )
               let duration = getDateDifference(conv.timestamp, Date.now())
               duration.days > 10 && conv.channel_type !== TYPE_DIRECT? this.disableTextarea = true: this.disableTextarea = false
@@ -884,7 +887,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
             conv.channel_type,
             null,
             conv.attributes['projectId'],
-            conv.attributes['project_name']
+            conv.attributes['project_name'],
+            conv.attributes['channel']
           )
           let duration = getDateDifference(conv.timestamp, Date.now())
           duration.days > 10 && conv.channel_type !== TYPE_DIRECT? this.disableTextarea = true: this.disableTextarea = false
@@ -899,7 +903,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
                 conv.channel_type,
                 null,
                 conv.attributes['projectId'],
-                conv.attributes['project_name']
+                conv.attributes['project_name'],
+                conv.attributes['channel']
               )
             }
             this.logger.log('[CONVS-DETAIL] - setHeaderContent > conversationAvatar: ', this.conversationAvatar)
@@ -1054,12 +1059,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         msg = `[${metadata.name}](${metadata.src})`
       }
     }
-
+    this.conversation.attributes && this.conversation.attributes['channel']? attributes.channel = this.conversation.attributes['channel']: null;
     metadata ? (metadata = metadata) : (metadata = '')
-    const emailSectionMsg = (attributes && attributes['channel']===TYPE_MSG_EMAIL)
-    const channelIsNotEmailOrForm = (attributes && attributes['channel'] && (attributes['channel'].name===TYPE_MSG_EMAIL || attributes['channel'].name===TYPE_MSG_FORM))
+    this.logger.log('[CONVS-DETAIL] attributes--->>>> 1111',this.conversation.attributes, attributes)
     this.logger.log('[CONVS-DETAIL] - SEND MESSAGE msg: ', msg, ' - messages: ', this.messages, ' - loggedUser: ', this.loggedUser)
-
+    
+    
+    const emailSectionMsg = (attributes && attributes['offline_channel']===TYPE_MSG_EMAIL)
+    const channelIsNotEmailOrForm = (attributes && attributes['channel'] && (attributes['channel'] === TYPE_MSG_EMAIL || attributes['channel']===TYPE_MSG_FORM))
+    
     if ((msg && msg.trim() !== '') || type !== TYPE_MSG_TEXT) {
 
       
@@ -1071,7 +1079,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.sendEmail(msgText).subscribe(status => {
           if(status){
             //SEND MESSAGE ALSO AS EMAIL
-            attributes['channel']= 'offline_'+TYPE_MSG_EMAIL
+            attributes['offline_channel']= 'offline_'+TYPE_MSG_EMAIL
           }
 
           this.conversationHandlerService.sendMessage(
@@ -1105,6 +1113,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
 
+
   // ----------------------------------------------------------
   // InitSubscriptions BS subscriptions
   // ----------------------------------------------------------
@@ -1248,7 +1257,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.channelType,
         null,
         this.conversation.attributes['projectId'],
-        this.conversation.attributes['project_name']
+        this.conversation.attributes['project_name'],
+        this.conversation.attributes['channel']
       )
     }
     if (msg.attributes && msg.attributes.hasOwnProperty("updateUserEmail")) {
@@ -1260,7 +1270,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
         this.channelType,
         userEmail,
         this.conversation.attributes['projectId'],
-        this.conversation.attributes['project_name']
+        this.conversation.attributes['project_name'],
+        this.conversation.attributes['channel']
       )
       this.getLeadDetail()
     }

package/src/assets/i18n/ar.json

@@ -251,6 +251,7 @@
   "Continue":"استمر",
   "ViewArchivedConversations":"المحادثات المؤرشفة",
   "ViewContactsList":"قائمة جهات الاتصال",
+  "ViewedPage":"الصفحة المعروضة",
   "AddAsCannedResponse":"إضافة كإجابة جاهزة",
   "AddNewCannedResponse":"إضافة رد جاهز جديد",
   "TitleIsRequired":"العنوان مطلوب",

package/src/assets/i18n/az.json

@@ -251,6 +251,7 @@
     "Continue": "Davam et",
     "ViewArchivedConversations": "Arxivləşdirilmiş söhbətlər",
     "ViewContactsList": "Əlaqə siyahısı",
+    "ViewedPage":"Baxılmış Səhifə",
     "AddAsCannedResponse": "Konservləşdirilmiş cavab kimi əlavə edin",
     "AddNewCannedResponse": "Yeni hazırlanmış cavab əlavə edin",
     "TitleIsRequired": "Başlıq tələb olunur",

package/src/assets/i18n/de.json

@@ -251,6 +251,7 @@
   "Continue":"Fortsetzen",
   "ViewArchivedConversations":"Archivierte Gespräche",
   "ViewContactsList":"Kontaktliste",
+  "ViewedPage":"Angesehene Seite",
   "AddAsCannedResponse":"Als Standardantwort hinzufügen",
   "AddNewCannedResponse":"Fügen Sie eine neue Standardantwort hinzu",
   "TitleIsRequired":"Titel ist erforderlich",

package/src/assets/i18n/en.json

@@ -251,6 +251,7 @@
   "Continue":"Continue",
   "ViewArchivedConversations":"Archived conversations",
   "ViewContactsList":"Contacts list",
+  "ViewedPage":"Viewed Page",
   "AddAsCannedResponse":"Add as canned response",
   "AddNewCannedResponse":"Add a new canned response",
   "TitleIsRequired":"Title is required",

package/src/assets/i18n/es.json

@@ -251,6 +251,7 @@
   "Continue":"Continuar",
   "ViewArchivedConversations":"Conversaciones archivadas",
   "ViewContactsList":"Lista de contactos",
+  "ViewedPage":"Página vista",
   "AddAsCannedResponse":"Agregar como respuesta predeterminada",
   "AddNewCannedResponse":"Agregar una nueva respuesta predeterminada",
   "TitleIsRequired":"El título es obligatorio",

package/src/assets/i18n/fr.json

@@ -251,6 +251,7 @@
   "Continue":"Continuez",
   "ViewArchivedConversations":"Conversations archivées",
   "ViewContactsList":"Liste de contacts",
+  "ViewedPage":"Page consultée",
   "AddAsCannedResponse":"Ajouter comme réponse par défaut",
   "AddNewCannedResponse":"Ajouter une nouvelle réponse par défaut",
   "TitleIsRequired":"Le titre est requis",

package/src/assets/i18n/it.json

@@ -251,6 +251,7 @@
     "Continue":"Continua",
     "ViewArchivedConversations":"Conversazioni archiviate",
     "ViewContactsList":"Elenco contatti",
+    "ViewedPage":"Pagina visualizzata",
     "AddAsCannedResponse":"Aggiungi come risposta predefinita",
     "AddNewCannedResponse":"Aggiungi una nuova risposta predefinita",
     "TitleIsRequired":"Il titolo è obbligatorio",

package/src/assets/i18n/kk.json

@@ -251,6 +251,7 @@
     "Continue": "Жалғастыру",
     "ViewArchivedConversations": "Мұрағатталған сұхбаттар",
     "ViewContactsList": "Контактілер тізімі",
+    "ViewedPage":"Қаралған бет",
     "AddAsCannedResponse": "Консервіленген жауап ретінде қосыңыз",
     "AddNewCannedResponse": "Жаңа консервіленген жауапты қосыңыз",
     "TitleIsRequired": "Тақырып қажет",

package/src/assets/i18n/pt.json

@@ -251,6 +251,7 @@
   "Continue":"Continuar",
   "ViewArchivedConversations":"Conversas arquivadas",
   "ViewContactsList":"Lista de contatos",
+  "ViewedPage":"Página visualizada",
   "AddAsCannedResponse":"Adicione como resposta padrão",
   "AddNewCannedResponse":"Adicionar uma nova resposta padrão",
   "TitleIsRequired":"O título é obrigatório",

package/src/assets/i18n/ru.json

@@ -251,6 +251,7 @@
   "Continue":"Продолжать",
   "ViewArchivedConversations":"Заархивированные беседы",
   "ViewContactsList":"Список контактов",
+  "ViewedPage":"Просмотренная страница",
   "AddAsCannedResponse":"Добавить как ответ по умолчанию",
   "AddNewCannedResponse":"Добавить новый ответ по умолчанию",
   "TitleIsRequired":"Требуется заголовок",

package/src/assets/i18n/sr.json

@@ -251,6 +251,7 @@
   "Continue":"Наставити",
   "ViewArchivedConversations":"Архивирани разговори",
   "ViewContactsList":"Листа контаката",
+  "ViewedPage":"Погледана страница",
   "AddAsCannedResponse":"Додај као задани одговор",
   "AddNewCannedResponse":"Додајте нови подразумевани одговор",
   "TitleIsRequired":"Наслов је обавезан",

package/src/assets/i18n/sv.json

@@ -251,6 +251,7 @@
     "Continue": "Fortsätta",
     "ViewArchivedConversations": "Arkiverade konversationer",
     "ViewContactsList": "Kontaktlista",
+    "ViewedPage":"Visad sida",
     "AddAsCannedResponse": "Lägg till som standardsvar",
     "AddNewCannedResponse": "Lägg till ett nytt standardsvar",
     "TitleIsRequired": "Titel krävs",

package/src/assets/i18n/tr.json

@@ -251,6 +251,7 @@
   "Continue":"Devam",
   "ViewArchivedConversations":"Arşivlenmiş konuşmalar",
   "ViewContactsList":"Kişiler listesi",
+  "ViewedPage":"Görüntülenen Sayfa",
   "AddAsCannedResponse":"Varsayılan yanıt olarak ekle",
   "AddNewCannedResponse":"Yeni bir hazır yanıt ekle",
   "TitleIsRequired":"Başlık zorunludur",

package/src/assets/i18n/uk.json

@@ -251,6 +251,7 @@
     "Continue": "Продовжуйте",
     "ViewArchivedConversations": "Архівні бесіди",
     "ViewContactsList": "Список контактів",
+    "ViewedPage":"Переглянута сторінка",
     "AddAsCannedResponse": "Додати як стандартну відповідь",
     "AddNewCannedResponse": "Додайте нову готову відповідь",
     "TitleIsRequired": "Заголовок обов’язковий",

package/src/assets/i18n/uz.json

@@ -252,6 +252,7 @@
     "Continue": "Davom eting",
     "ViewArchivedConversations": "Arxivlangan suhbatlar",
     "ViewContactsList": "Kontaktlar ro'yxati",
+    "ViewedPage":"Koʻrilgan sahifa",
     "AddAsCannedResponse": "Konservalangan javob sifatida qo'shing",
     "AddNewCannedResponse": "Yangi tayyor javob qo'shing",
     "TitleIsRequired": "Sarlavha kerak",

package/src/assets/images/channel_icons/chat21.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-v-78d18411="" width="15" height="15" fill="none" viewBox="0 0 24 24" class="inbox-icon">
+    <path d="M22.002 12C22.002 6.477 17.524 2 12 2 6.476 1.999 2 6.477 2 12.001c0 5.186 3.947 9.45 9.001 9.952V20.11c-.778-.612-1.478-1.905-1.939-3.61h1.94V15H8.737a18.969 18.969 0 0 1-.135-5h6.794c.068.64.105 1.31.105 2h1.5c0-.684-.033-1.353-.095-2h3.358c.154.64.237 1.31.237 2h1.5ZM4.786 16.5h2.722l.102.396c.317 1.17.748 2.195 1.27 3.015a8.532 8.532 0 0 1-4.094-3.41ZM3.736 10h3.358a20.847 20.847 0 0 0-.095 2c0 1.043.075 2.051.217 3H4.043a8.483 8.483 0 0 1-.544-3c0-.682.08-1.347.232-1.983L3.736 10Zm5.122-5.902.023-.008C8.16 5.222 7.611 6.748 7.298 8.5H4.25c.905-2 2.56-3.587 4.608-4.402Zm3.026-.594L12 3.5l.126.006c1.262.126 2.48 2.125 3.045 4.995H8.83c.568-2.878 1.79-4.88 3.055-4.996Zm3.343.76-.107-.174.291.121a8.533 8.533 0 0 1 4.339 4.29h-3.048c-.298-1.665-.806-3.125-1.475-4.237Z M12 19a1 1 0 0 0 1 1h3v2h-.5a.5.5 0 1 0 0 1h4a.5.5 0 0 0 0-1H19v-2h3a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1h-9a1 1 0 0 0-1 1v5Z" fill="currentColor"/>
+</svg>

package/src/assets/images/channel_icons/direct.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="15"  width="15" viewBox="0 0 24 24" fill="#000000">
+    <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
+</svg>

package/src/assets/images/channel_icons/email-logo.svg

@@ -0,0 +1,9 @@
+<svg focusable="false"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" height="15"  width="15" viewBox="0 0 512 512"
+	 style="enable-background:new 0 0 512 512;" xml:space="preserve">
+	<path fill="#2C3E48" d="M502.3,190.8c3.9-3.1,9.7-0.2,9.7,4.7V400c0,26.5-21.5,48-48,48H48c-26.5,0-48-21.5-48-48V195.6
+		c0-5,5.7-7.8,9.7-4.7c22.4,17.4,52.1,39.5,154.1,113.6c21.1,15.4,56.7,47.8,92.2,47.6c35.7,0.3,72-32.8,92.3-47.6
+		C450.3,230.4,479.9,208.2,502.3,190.8z M256,320c23.2,0.4,56.6-29.2,73.4-41.4c132.7-96.3,142.8-104.7,173.4-128.7
+		c5.8-4.5,9.2-11.5,9.2-18.9v-19c0-26.5-21.5-48-48-48H48C21.5,64,0,85.5,0,112v19c0,7.4,3.4,14.3,9.2,18.9
+		c30.6,23.9,40.7,32.4,173.4,128.7C199.4,290.8,232.8,320.4,256,320L256,320z"/>
+</svg>

package/src/assets/images/channel_icons/form-logo_v2.svg

@@ -0,0 +1,13 @@
+<svg focusable="false"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 448 512" height="15"  width="15"
+	 style="enable-background:new 0 0 448 512;" xml:space="preserve">
+<path fill="#779bbb" d="M450,432V80c0-26.5-21.5-48-48-48H50C23.5,32,2,53.5,2,80v352c0,26.5,21.5,48,48,48h352
+	C428.5,480,450,458.5,450,432z M114,192c-8.8,0-16-7.2-16-16v-32c0-8.8,7.2-16,16-16h226c8.8,0,16,7.2,16,16l1,32
+	c0,8.8-8.2,16-17,16H114z M114,288c-8.8,0-16-7.2-16-16v-32c0-8.8,7.2-16,16-16h155c8.8,0,16,7.2,16,16v32c0,8.8-7.2,16-16,16H114z
+	 M114,384c-8.8,0-16-7.2-16-16v-32c0-8.8,7.2-16,16-16h111c8.8,0,16,7.2,16,16v32c0,8.8-7.2,16-16,16H114z"/>
+<g>
+	<polygon fill="#779bbb" points="405.1,237.6 365,204.1 262.4,336.1 262.3,378.6 302.4,369.6 	"/>
+	<path fill="#779bbb" d="M427.8,197L398,172.1c-2.8-2.4-7-1.9-9.2,1L371.8,195l40.1,33.5l17.1-21.9C431.1,203.7,430.7,199.4,427.8,197z
+		"/>
+</g>
+</svg>

package/src/assets/images/channel_icons/group.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="15"  width="15" viewBox="0 0 24 24" fill="#000000">
+    <path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/>
+</svg>

package/src/assets/images/channel_icons/messenger-logo.svg

@@ -0,0 +1,8 @@
+<svg focusable="false" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" height="15"  width="15" viewBox="0 0 512 512"
+	 style="enable-background:new 0 0 512 512;" xml:space="preserve">
+	<path fill="#2C3E48" d="M256.5,8C116.5,8,8,110.3,8,248.6c0,72.3,29.7,134.8,78.1,177.9c8.3,7.5,6.6,11.9,8.1,58.2
+		c0.4,11,9.6,19.6,20.6,19.2c2.5-0.1,5-0.6,7.3-1.7c52.9-23.3,53.6-25.1,62.6-22.7c153.3,42.2,319.4-55.9,319.4-231
+		C504,110.3,396.6,8,256.5,8z M405.8,193.1l-73,115.6c-11.1,17.4-34.1,22.6-51.6,11.5c-0.8-0.5-1.6-1-2.3-1.6l-58.1-43.5
+		c-5.3-4-12.7-4-18,0l-78.4,59.4c-10.5,7.9-24.2-4.6-17.1-15.7l73-115.6c11-17.4,34.1-22.6,51.6-11.6c0.8,0.5,1.6,1.1,2.4,1.6
+		l58.1,43.5c5.3,4,12.7,4,18,0l78.4-59.4C399.1,169.5,412.8,182,405.8,193.1L405.8,193.1z"/>
+</svg>

package/src/assets/images/channel_icons/telegram-logo.svg

@@ -0,0 +1,7 @@
+<svg focusable="false"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 448 512" height="15"  width="15"
+	 style="enable-background:new 0 0 448 512;" xml:space="preserve">
+	<path fill="#2C3E48" d="M446.7,98.6l-67.6,318.8c-5.1,22.5-18.4,28.1-37.3,17.5l-103-75.9l-49.7,47.8c-5.5,5.5-10.1,10.1-20.7,10.1
+		l7.4-104.9l190.9-172.5c8.3-7.4-1.8-11.5-12.9-4.1L117.8,284L16.2,252.2c-22.1-6.9-22.5-22.1,4.6-32.7L418.2,66.4
+		C436.6,59.5,452.7,70.5,446.7,98.6z"/>
+</svg>

package/src/assets/images/channel_icons/whatsapp-logo.svg

@@ -0,0 +1,12 @@
+<svg focusable="false"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 448 512" height="15"  width="15"
+	 style="enable-background:new 0 0 448 512;" xml:space="preserve">
+	<path fill="2C3E48" d="M380.9,97.1C339,55.1,283.2,32,223.9,32c-122.4,0-222,99.6-222,222c0,39.1,10.2,77.3,29.6,111L0,480l117.7-30.9
+		c32.4,17.7,68.9,27,106.1,27h0.1c122.3,0,224.1-99.6,224.1-222C448,194.8,422.8,139.1,380.9,97.1z M223.9,438.7
+		c-33.2,0-65.7-8.9-94-25.7l-6.7-4l-69.8,18.3L72,359.2l-4.4-7c-18.5-29.4-28.2-63.3-28.2-98.2c0-101.7,82.8-184.5,184.6-184.5
+		c49.3,0,95.6,19.2,130.4,54.1s56.2,81.2,56.1,130.5C410.5,355.9,325.6,438.7,223.9,438.7z M325.1,300.5c-5.5-2.8-32.8-16.2-37.9-18
+		c-5.1-1.9-8.8-2.8-12.5,2.8c-3.7,5.6-14.3,18-17.6,21.8c-3.2,3.7-6.5,4.2-12,1.4c-32.6-16.3-54-29.1-75.5-66
+		c-5.7-9.8,5.7-9.1,16.3-30.3c1.8-3.7,0.9-6.9-0.5-9.7s-12.5-30.1-17.1-41.2c-4.5-10.8-9.1-9.3-12.5-9.5c-3.2-0.2-6.9-0.2-10.6-0.2
+		c-3.7,0-9.7,1.4-14.8,6.9c-5.1,5.6-19.4,19-19.4,46.3s19.9,53.7,22.6,57.4c2.8,3.7,39.1,59.7,94.8,83.8c35.2,15.2,49,16.5,66.6,13.9
+		c10.7-1.6,32.8-13.4,37.4-26.4s4.6-24.1,3.2-26.4C334.3,304.6,330.6,303.2,325.1,300.5z"/>
+</svg>

package/src/chat21-core/providers/mqtt/mqtt-conversation-handler.ts

@@ -98,6 +98,7 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         }
         this.chat21Service.chatClient.lastMessages(this.conversationWith, (err, messages) => {
             if (!err) {
+                messages.sort(compareValues('timestamp', 'asc'));
                 messages.forEach(message => {
                     const msg: MessageModel = message;        
                     msg.uid = message.message_id;

package/src/chat21-core/providers/mqtt/mqtt-groups-handler.ts

@@ -85,8 +85,8 @@ import { avatarPlaceholder, getColorBck } from 'src/chat21-core/utils/utils-user
     }
 
     private groupValue(childSnapshot: any){
-        this.logger.debug('[MQTT-GROUPS-SERV] group detail::', childSnapshot.val(), childSnapshot)
-        const group: GroupModel = childSnapshot.val();
+        this.logger.debug('[MQTT-GROUPS-SERV] group detail::', childSnapshot)
+        const group: GroupModel = childSnapshot;
         this.logger.debug('[MQTT-GROUPS-SERV] groupValue ', group)
         if (group) {
             let groupCompleted = this.completeGroup(group)

package/src/chat21-core/providers/mqtt/mqtt-notifications.ts

@@ -36,10 +36,10 @@ export class MQTTNotifications extends NotificationsService {
   }
     
   getNotificationPermissionAndSaveToken(currentUserUid) {
-    console.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid );
+    this.logger.log("[MQTTNotificationService] getNotificationPermissionAndSaveToken()",currentUserUid );
     this.userId = currentUserUid;
     if (firebase.messaging.isSupported()) {
-      console.log("[MQTTNotificationService] firebase.messaging.isSupported -> YES");
+      this.logger.log("[MQTTNotificationService] firebase.messaging.isSupported -> YES");
       const messaging = firebase.messaging();
       // messaging.requestPermission()
       Notification.requestPermission().then((permission) => {

package/src/chat21-core/utils/constants.ts

@@ -39,6 +39,12 @@ export const BCK_COLOR_CONVERSATION_UNSELECTED = '#FFFFFF ';
 
 export const TYPE_SUPPORT_GROUP = 'support-group';
 export const CHANNEL_TYPE_GROUP = 'group';
+export const CHANNEL_TYPE_CHAT21 = 'chat21';
+export const CHANNEL_TYPE_EMAIL = 'email';
+export const CHANNEL_TYPE_FORM = 'form';
+export const CHANNEL_TYPE_MESSANGER = 'messanger';
+export const CHANNEL_TYPE_WHATSAPP = 'whatsapp';
+export const CHANNEL_TYPE_TELEGRAM = 'telegram';
 
 // TYPES MESSAGES
 export const TYPE_MSG_TEXT = 'text';

package/src/chat21-core/utils/utils.ts

@@ -573,11 +573,14 @@ export function setConversationAvatar(
   conversationWithEmail?: string,
   projectId?: string,
   project_name?: string,
+  channel?: string,
   width?: string,
   height?: string,
 ): any {
   const conversationWidth = (width) ? width : '40px';
   const conversationHeight = (height) ? height : '40px';
+  const conversationChannel = (channel) ? channel : 'chat21';
+
   const conversationAvatar = {
     uid: conversationWith,
     conversation_with: conversationWith,
@@ -588,6 +591,7 @@ export function setConversationAvatar(
     color: getColorBck(conversationWithFullname),
     projectId: projectId,
     project_name: project_name,
+    channel: conversationChannel,
     width: conversationWidth,
     height: conversationHeight
   };

package/src/assets/chat21-logo.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg30"
-   version="1.1"
-   viewBox="0 0 412 132">
-  <metadata
-     id="metadata34">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <style
-       id="style2">.cls-1{fill:#3c3c3b;}.cls-2{fill:#ef806e;}.cls-3{fill:none;}</style>
-  </defs>
-  <title
-     id="title6">tiledesk-logo</title>
-  <g
-     data-name="Livello 2"
-     id="Livello_2">
-    <g
-       data-name="Livello 1"
-       id="Livello_1-2">
-      <path
-         id="path8"
-         d="M88.09,58.83h11V41.69h7V58.83h10.93v6.52H106.14v37.59h-7V65.35h-11Z"
-         class="cls-1" />
-      <path
-         id="path10"
-         d="M135,46.75a4.45,4.45,0,1,1-1.3-3.16A4.3,4.3,0,0,1,135,46.75Zm-7.92,56.19V58.83h7v44.11Z"
-         class="cls-1" />
-      <path
-         id="path12"
-         d="M149.54,102.94V27.75h7v75.19Z"
-         class="cls-1" />
-      <path
-         id="path14"
-         d="M214.71,83.59h-38.8a15,15,0,0,0,5.51,9.32,15.94,15.94,0,0,0,17.49,2A16.22,16.22,0,0,0,204.68,90h8a22.46,22.46,0,0,1-8.47,10,21,21,0,0,1-11.53,3.66,25.12,25.12,0,0,1-10-1.8,23.88,23.88,0,0,1-7.32-4.91,21.92,21.92,0,0,1-6.77-16.24,23.1,23.1,0,0,1,23.06-23.06,22.57,22.57,0,0,1,16.09,6.52,21,21,0,0,1,7,15.74ZM201.62,68.26a15.18,15.18,0,0,0-10-3.61q-8.57,0-13.53,7.77A15.58,15.58,0,0,0,176,77.58h31.28A16.21,16.21,0,0,0,201.62,68.26Z"
-         class="cls-1" />
-      <path
-         id="path16"
-         d="M261.32,102.94V95.41q-.59.77-1.25,1.52a20.38,20.38,0,0,1-30.78,0,24.24,24.24,0,0,1,0-32.08,20.38,20.38,0,0,1,30.78,0q.66.74,1.25,1.52V27.75h7v75.19Zm-4.46-33.28a15.16,15.16,0,0,0-22.16,0,16.36,16.36,0,0,0,0,22.46,15.16,15.16,0,0,0,22.16,0,16.36,16.36,0,0,0,0-22.46Z"
-         class="cls-1" />
-      <path
-         id="path18"
-         d="M326.49,83.59h-38.8a15,15,0,0,0,5.51,9.32,15.94,15.94,0,0,0,17.49,2A16.22,16.22,0,0,0,316.46,90h8A22.46,22.46,0,0,1,316,100a21,21,0,0,1-11.53,3.66,25.12,25.12,0,0,1-10-1.8,23.88,23.88,0,0,1-7.32-4.91,21.92,21.92,0,0,1-6.77-16.24,23.1,23.1,0,0,1,23.06-23.06,22.57,22.57,0,0,1,16.09,6.52,21,21,0,0,1,7,15.74ZM313.4,68.26a15.18,15.18,0,0,0-10-3.61q-8.58,0-13.53,7.77a15.58,15.58,0,0,0-2.11,5.16h31.28A16.21,16.21,0,0,0,313.4,68.26Z"
-         class="cls-1" />
-      <path
-         id="path20"
-         d="M351.22,98.43q9.63,0,9.63-7.2,0-4.2-6.9-6.44-2.91-1-6.26-1.77a34,34,0,0,1-6.3-2.16,12.35,12.35,0,0,1-5.11-4,9.67,9.67,0,0,1-1.7-5.7q0-6.57,4.62-10a18.18,18.18,0,0,1,11-3.39,20,20,0,0,1,10.66,2.64q4.23,2.6,5.64,9.29H359q-1.12-3.69-3.42-4.9A11.72,11.72,0,0,0,350,63.64a10.66,10.66,0,0,0-5.63,1.42,4.8,4.8,0,0,0-2.4,4.42,5,5,0,0,0,2,4.36,17.61,17.61,0,0,0,4.87,2.28q2.91.91,6.26,1.66A29.59,29.59,0,0,1,361.46,80q6.81,3.25,6.81,10.37t-5.1,10.52a19.46,19.46,0,0,1-5.67,2.55,25.09,25.09,0,0,1-6.67.85q-15.34,0-17.62-13.63h7.42q1.12,4.29,3.78,6A12,12,0,0,0,351.22,98.43Z"
-         class="cls-1" />
-      <path
-         id="path22"
-         d="M378.32,102.94V27.75h7V78.58l16.14-19.85h9.32L392.65,80.19,412,102.94h-9.32L385.33,81.78v21.17Z"
-         class="cls-1" />
-      <polygon
-         id="polygon24"
-         points="38.24 27.75 0 27.75 0 104.25 76.49 104.25 76.49 66 38.24 66 38.24 27.75"
-         class="cls-2" />
-      <rect
-         id="rect26"
-         height="132"
-         width="412"
-         class="cls-3" />
-    </g>
-  </g>
-</svg>