@chat21/chat21-ionic 3.0.75 → 3.0.76-rc.2

package/src/app/pages/conversations-list/conversations-list.page.ts

@@ -770,6 +770,11 @@ export class ConversationListPage implements OnInit {
         }
       }
     }
+
+    if(conversation.conversation_with_fullname === 'Guest '){
+      conversation.conversation_with_fullname = 'guest' + '#' + this.getUUidConversation(conversation.uid)
+    }
+
   }
 
   // isMarkdownLink(last_message_text) {
@@ -783,6 +788,27 @@ export class ConversationListPage implements OnInit {
   //   }
   // }
 
+  private getUUidConversation(uid): string{
+    const conversationWith_segments = uid.split('-')
+    // Removes the last element of the array if is = to the separator
+    if (conversationWith_segments[conversationWith_segments.length - 1] === '') {
+      conversationWith_segments.pop()
+    }
+
+    this.logger.log('[CONVS-LIST] - getUUidConversation conversationWith_segments ', conversationWith_segments, conversationWith_segments.length)
+    let mini_uid = ''
+
+    if (conversationWith_segments.length === 4) {
+      mini_uid = conversationWith_segments[conversationWith_segments.length -1].substr(0,5)
+      this.logger.log('[CONVS-LIST] - getUUidConversation mini_uid segment===4', mini_uid)
+    } else {
+      this.logger.log('[CONVS-LIST] - else  getUUidConversation segment<4 ', mini_uid)
+      mini_uid = conversationWith_segments[conversationWith_segments.length -1].substr(-5)
+    }
+
+    return mini_uid
+  }
+
   navigateByUrl(converationType: string, uidConvSelected: string) {
 
     this.logger.log('[CONVS-LIST-PAGE] navigateByUrl uidConvSelected: ', uidConvSelected)
@@ -797,7 +823,7 @@ export class ConversationListPage implements OnInit {
       let pageUrl = 'conversation-detail/' + this.uidConvSelected + '/' + this.conversationSelected.conversation_with_fullname + '/' + converationType
       this.logger.log('[CONVS-LIST-PAGE] pageURL', pageUrl)
         // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'))
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ))
     } else {
       this.logger.log('[CONVS-LIST-PAGE] navigateByUrl this.conversationSelected conversation_with_fullname ', this.conversationSelected.conversation_with_fullname)
       this.logger.log('[CONVS-LIST-PAGE] checkPlatformIsMobile(): ', checkPlatformIsMobile())
@@ -808,7 +834,7 @@ export class ConversationListPage implements OnInit {
       }
       this.logger.log('[CONVS-LIST-PAGE] setUidConvSelected navigateByUrl--->: ', pageUrl)
       // replace(/\(/g, '%28').replace(/\)/g, '%29') -> used for the encoder of any round brackets
-      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29'))
+      this.router.navigateByUrl(pageUrl.replace(/\(/g, '%28').replace(/\)/g, '%29').replace( /#/g, "%23" ))
     }
   }
 

package/src/app/pages/loader-preview/loader-preview.page.ts

@@ -73,10 +73,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
   }
 
   ionViewDidEnter() {
-    this.logger.log(
-      '[LOADER-PREVIEW-PAGE] ionViewDidEnter thumbnailsPreview.nativeElement.offsetHeight',
-      this.thumbnailsPreview.nativeElement.offsetHeight,
-    )
+    this.logger.log('[LOADER-PREVIEW-PAGE] ionViewDidEnter thumbnailsPreview.nativeElement.offsetHeight',this.thumbnailsPreview.nativeElement.offsetHeight)
     this.calculateHeightPreviewArea()
   }
 
@@ -86,17 +83,11 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
     // USE CASE IMAGE
     // ---------------------------------------------------------------------
     if (file.type.startsWith('image') && !file.type.includes('svg')) {
-      this.logger.log(
-        '[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE IMAGE file TYPE',
-        file.type,
-      )
+      this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL - USE CASE IMAGE file TYPE',file.type)
       const reader = new FileReader()
       reader.onloadend = (evt) => {
         const img = reader.result.toString()
-        this.logger.log(
-          '[LOADER-PREVIEW-PAGE] - readAsDataURL - FileReader success ',
-          img,
-        )
+        this.logger.log('[LOADER-PREVIEW-PAGE] - readAsDataURL - FileReader success ',img)
         this.arrayFiles.push(img)
         if (!this.fileSelected) {
           this.fileSelected = img
@@ -232,9 +223,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
       this.logger.log('typeFile: ', typeFile)
 
       const reader = new FileReader()
-      reader.addEventListener(
-        'load',
-        function () {
+      reader.addEventListener('load',function () {
           const img = reader.result.toString()
           that.logger.log('FileReader success')
           that.arrayFiles.push(img)
@@ -292,13 +281,9 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
   }
 
   calculateHeightPreviewArea() {
-    const heightThumbnailsPreview = this.thumbnailsPreview.nativeElement
-      .offsetHeight
-    const heightMessageTextArea = this.messageTextArea.nativeElement
-      .offsetHeight
-    this.heightPreviewArea = (
-      heightMessageTextArea + heightThumbnailsPreview
-    ).toString()
+    const heightThumbnailsPreview = this.thumbnailsPreview.nativeElement.offsetHeight
+    const heightMessageTextArea = this.messageTextArea.nativeElement.offsetHeight
+    this.heightPreviewArea = (heightMessageTextArea + heightThumbnailsPreview).toString()
     // this.logger.log('heightThumbnailsPreview', heightThumbnailsPreview);
     // this.logger.log('heightMessageTextArea', this.messageTextArea);
     // this.logger.log('heightPreviewArea', this.heightPreviewArea);
@@ -349,10 +334,7 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
 
   /** */
   onSendMessage() {
-    this.logger.log(
-      '[LOADER-PREVIEW-PAGE] onSendMessage messageString:',
-      this.messageString,
-    )
+    this.logger.log('[LOADER-PREVIEW-PAGE] onSendMessage messageString:',this.messageString)
     let file = this.selectedFiles.item(0)
     const file4Load = new Image()
     const nameImg = file.name
@@ -373,7 +355,6 @@ export class LoaderPreviewPage implements OnInit, AfterViewInit {
       fileSelected: file,
       messageString: this.messageString,
       metadata: metadata,
-      type: TYPE_MSG_IMAGE,
     })
   }
 

package/src/app/services/canned-responses/canned-responses.service.ts

@@ -26,8 +26,7 @@ export class CannedResponsesService {
   }
 
 
-  public getCannedResponses(token: string, projectid: string) {
-
+  public getAll(token: string, projectid: string) {
     const cannedResponsesURL = this.apiUrl + projectid + "/canned/";
     this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - URL ', cannedResponsesURL);
 
@@ -37,13 +36,50 @@ export class CannedResponsesService {
         Authorization: token
       })
     };
-
-    return this.http
-      .get(cannedResponsesURL, httpOptions)
-      .pipe(map((res: any) => {
+    
+    return this.http.get(cannedResponsesURL, httpOptions).pipe(map((res: any) => {
         this.logger.log('[CANNED-RESPONSES-SERVICE] getCannedResponses - RES ', res);
         return res
-      }))
+    }))
+  }
+
+  public edit(token: string, projectid: string, canned: any){
+    const cannedResponsesURL = this.apiUrl + projectid + "/canned/"+ canned._id;
+    this.logger.log('[CANNED-RESPONSES-SERVICE] editCannedResponses - URL ', cannedResponsesURL);
+    
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+
+    const body = {
+      title: canned.title,
+      text: canned.text
+    }
+
+    return this.http.put(cannedResponsesURL, body, httpOptions).pipe(map((res: any) => {
+        this.logger.log('[CANNED-RESPONSES-SERVICE] editCannedResponses - RES ', res);
+        return res
+    }))
+  }
+
+  public delete(token: string, projectid: string, cannedID: string){
+    const cannedResponsesURL = this.apiUrl + projectid + "/canned/"+cannedID;
+    this.logger.log('[CANNED-RESPONSES-SERVICE] deleteCannedResponses - URL ', cannedResponsesURL);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+        Authorization: token
+      })
+    };
+
+    return this.http.delete(cannedResponsesURL, httpOptions).pipe(map((res: any) => {
+        this.logger.log('[CANNED-RESPONSES-SERVICE] deleteCannedResponses - RES ', res);
+        return res
+    }))
   }
 
 }

package/src/app/utils/scrollbar-theme.directive.ts

@@ -24,9 +24,10 @@ export class ScrollbarThemeDirective {
       ::-webkit-scrollbar {
           width: 6px;
          height: 8px;
+         display: none;
       }
       ::-webkit-scrollbar-track {
-      background: #f9f9f9;
+        background: #f9f9f9;
       }
       ::-webkit-scrollbar-thumb {
          background-color: #b9b9b9;

package/src/assets/i18n/ar.json

@@ -65,6 +65,8 @@
         "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
         "INFO_SUPPORT_CHAT_REOPENED": "تمت إعادة فتح الدردشة",
         "INFO_SUPPORT_CHAT_CLOSED": "الدردشة مغلقة",
+        "INFO_SUPPORT_LEAD_UPDATED":"تحديث الرصاص",
+        "INFO_SUPPORT_MEMBER_LEFT_GROUP":"تمت إزالته من المجموعة",
         "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "تم تعيين طلب دعم جديد لك",
         "LABEL_PROFILE": "الملف الشخصي",
         "LABEL_CLOSE": "مغلق",

package/src/assets/i18n/az.json

@@ -65,6 +65,8 @@
     "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
     "INFO_SUPPORT_CHAT_REOPENED": "Çat yenidən açıldı",
     "INFO_SUPPORT_CHAT_CLOSED": "Çat bağlandı",
+    "INFO_SUPPORT_LEAD_UPDATED":"Rəqəm yeniləndi",
+    "INFO_SUPPORT_MEMBER_LEFT_GROUP":"qrupdan çıxarıldı",
     "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Sizə yeni dəstək sorğusu təyin edilib",
     "LABEL_PROFILE": "Profil",
     "LABEL_CLOSE": "Bağlı",

package/src/assets/i18n/de.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Chat wieder geöffnet",
   "INFO_SUPPORT_CHAT_CLOSED": "Chat geschlossen",
+  "INFO_SUPPORT_LEAD_UPDATED":"Leitung aktualisiert",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"aus der Gruppe entfernt",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Ihnen wurde eine neue Support-Anfrage zugewiesen",
   "LABEL_PROFILE": "Profil",
   "LABEL_CLOSE": "Abgeschlossen",

package/src/assets/i18n/en.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Chat reopened",
   "INFO_SUPPORT_CHAT_CLOSED": "Chat closed",
+  "INFO_SUPPORT_LEAD_UPDATED":"Lead updated",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"removed from group",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "A new support request has been assigned to you",
   "LABEL_PROFILE": "Profile",
   "LABEL_CLOSE": "Closed",

package/src/assets/i18n/es.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Chat reabierto",
   "INFO_SUPPORT_CHAT_CLOSED": "Chat cerrado",
+  "INFO_SUPPORT_LEAD_UPDATED":"Cliente potencial actualizado",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"eliminado del grupo",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU":"Se le ha asignado una nueva solicitud de soporte",
   "LABEL_PROFILE": "Perfil",
   "LABEL_CLOSE": "Cerrado",

package/src/assets/i18n/fr.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Chat rouvert",
   "INFO_SUPPORT_CHAT_CLOSED": "Chat fermé",
+  "INFO_SUPPORT_LEAD_UPDATED":"Prospect mis à jour",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"supprimé du groupe",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Une nouvelle demande de support vous a été attribuée",
   "LABEL_PROFILE": "Profil",
   "LABEL_CLOSE": "Fermé",

package/src/assets/i18n/it.json

@@ -65,6 +65,8 @@
     "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
     "INFO_SUPPORT_CHAT_REOPENED": "Chat riaperta",
     "INFO_SUPPORT_CHAT_CLOSED": "Chat chiusa",
+    "INFO_SUPPORT_LEAD_UPDATED":"Contatto aggiornato",
+    "INFO_SUPPORT_MEMBER_LEFT_GROUP":"rimosso dal gruppo",
     "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU":"Una nuova richiesta di supporto è stata assegnata a te",
     "LABEL_PROFILE": "Profilo",
     "LABEL_CLOSE": "Chiusa",

package/src/assets/i18n/kk.json

@@ -65,6 +65,8 @@
     "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
     "INFO_SUPPORT_CHAT_REOPENED": "Чат қайта ашылды",
     "INFO_SUPPORT_CHAT_CLOSED": "Чат жабылды",
+    "INFO_SUPPORT_LEAD_UPDATED":"Жетекші жаңартылды",
+    "INFO_SUPPORT_MEMBER_LEFT_GROUP":"топтан шығарылды",
     "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Сізге жаңа қолдау сұрауы тағайындалды",
     "LABEL_PROFILE": "Профиль",
     "LABEL_CLOSE": "Жабық",

package/src/assets/i18n/pt.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Bate-papo reaberto",
   "INFO_SUPPORT_CHAT_CLOSED": "Bate-papo fechado",
+  "INFO_SUPPORT_LEAD_UPDATED":"Lead atualizado",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"removido do grupo",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Uma nova solicitação de suporte foi atribuída a você",
   "LABEL_PROFILE": "Perfil",
   "LABEL_CLOSE": "Fechadas",

package/src/assets/i18n/ru.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Чат снова открыт",
   "INFO_SUPPORT_CHAT_CLOSED": "Чат закрыт",
+  "INFO_SUPPORT_LEAD_UPDATED":"Интерес обновлен",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"удален из группы",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Вам назначен новый запрос в службу поддержки",
   "LABEL_PROFILE": "Профиль",
   "LABEL_CLOSE": "Закрыто",

package/src/assets/i18n/sr.json

@@ -65,6 +65,8 @@
         "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
         "INFO_SUPPORT_CHAT_REOPENED": "Ћаскање је поново отворено",
         "INFO_SUPPORT_CHAT_CLOSED": "Ћаскање је затворено",
+        "INFO_SUPPORT_LEAD_UPDATED":"Лид је ажуриран",
+        "INFO_SUPPORT_MEMBER_LEFT_GROUP":"уклоњен из групе",
         "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Додељен вам је нови захтев за подршку",
         "LABEL_PROFILE": "Профил",
         "LABEL_CLOSE": "Затворено",

package/src/assets/i18n/sv.json

@@ -65,6 +65,8 @@
     "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
     "INFO_SUPPORT_CHAT_REOPENED": "Chatten öppnades igen",
     "INFO_SUPPORT_CHAT_CLOSED": "Chatten stängd",
+    "INFO_SUPPORT_LEAD_UPDATED":"Lead uppdaterad",
+    "INFO_SUPPORT_MEMBER_LEFT_GROUP":"borttagen från gruppen",
     "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "En ny supportförfrågan har tilldelats dig",
     "LABEL_PROFILE": "Profil",
     "LABEL_CLOSE": "Stängd",

package/src/assets/i18n/tr.json

@@ -65,6 +65,8 @@
   "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
   "INFO_SUPPORT_CHAT_REOPENED": "Sohbet yeniden açıldı",
   "INFO_SUPPORT_CHAT_CLOSED": "sohbet kapatıldı",
+  "INFO_SUPPORT_LEAD_UPDATED":"Potansiyel müşteri güncellendi",
+  "INFO_SUPPORT_MEMBER_LEFT_GROUP":"gruptan kaldırıldı",
   "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Size yeni bir destek talebi atandı",
   "LABEL_PROFILE": "Profil",
   "LABEL_CLOSE": "Kapalı",

package/src/assets/i18n/uk.json

@@ -65,6 +65,8 @@
     "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ предмет }} {{ дієслово} {{ доповнення}}",
     "INFO_SUPPORT_CHAT_REOPENED": "Чат знову відкрився",
     "INFO_SUPPORT_CHAT_CLOSED": "Чат закритий",
+    "INFO_SUPPORT_LEAD_UPDATED":"Лід оновлено",
+    "INFO_SUPPORT_MEMBER_LEFT_GROUP":"видалено з групи",
     "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Вам призначено новий запит на підтримку",
     "LABEL_PROFILE": "Профіль",
     "LABEL_CLOSE": "зачинено",

package/src/assets/i18n/uz.json

@@ -66,6 +66,8 @@
     "INFO_SUPPORT_USER_ADDED_MESSAGE": "{{ subject }} {{ verb }} {{ complement }}",
     "INFO_SUPPORT_CHAT_REOPENED": "Chat qayta ochildi",
     "INFO_SUPPORT_CHAT_CLOSED": "Chat yopildi",
+    "INFO_SUPPORT_LEAD_UPDATED":"Etakchi yangilandi",
+    "INFO_SUPPORT_MEMBER_LEFT_GROUP":"guruhdan olib tashlandi",
     "INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU": "Sizga yangi qoʻllab-quvvatlash soʻrovi tayinlandi",
     "LABEL_PROFILE": "Profil",
     "LABEL_CLOSE": "Yopiq",

package/src/chat-config-pre.json

@@ -23,7 +23,7 @@
     },
     "apiUrl": "https://tiledesk-server-pre.herokuapp.com/",
     "baseImageUrl": "https://firebasestorage.googleapis.com/v0/b/",
-    "dashboardUrl": "https://support-pre.tiledesk.com/dashboard/",
+    "dashboardUrl": "/dashboard/",
     "logLevel": "DEBUG",
     "authPersistence": "LOCAL",
     "supportMode": true,

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

@@ -18,7 +18,7 @@ import { ConversationHandlerService } from '../abstract/conversation-handler.ser
 import { LoggerService } from '../abstract/logger.service';
 import { LoggerInstance } from '../logger/loggerInstance';
 // utils
-import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO, TOUCHING_OPERATOR } from '../../utils/constants';
+import { MSG_STATUS_RECEIVED, CHAT_REOPENED, CHAT_CLOSED, MEMBER_JOINED_GROUP, TYPE_DIRECT, MESSAGE_TYPE_INFO, TOUCHING_OPERATOR, LEAD_UPDATED, MEMBER_LEFT_GROUP } from '../../utils/constants';
 import { compareValues, searchIndexInArrayForUid, conversationMessagesRef } from '../../utils/utils';
 
 
@@ -333,6 +333,8 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         const INFO_SUPPORT_USER_ADDED_VERB = this.translationMap.get('INFO_SUPPORT_USER_ADDED_VERB');
         const INFO_SUPPORT_CHAT_REOPENED = this.translationMap.get('INFO_SUPPORT_CHAT_REOPENED');
         const INFO_SUPPORT_CHAT_CLOSED = this.translationMap.get('INFO_SUPPORT_CHAT_CLOSED');
+        const INFO_SUPPORT_LEAD_UPDATED = this.translationMap.get('INFO_SUPPORT_LEAD_UPDATED');
+        const INFO_SUPPORT_MEMBER_LEFT_GROUP = this.translationMap.get('INFO_SUPPORT_MEMBER_LEFT_GROUP');
         const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
 
         if (message.attributes.messagelabel
@@ -365,15 +367,23 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
             message.text = INFO_SUPPORT_CHAT_REOPENED;
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
-        }
-        // ['last_message_text']
-        else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+        } else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
             // console.log('FIREBASEConversationHandlerSERVICE message text', message.text)
             const textAfterColon = message.text.split(":")[1]
             // console.log('FIREBASEConversationHandlerSERVICE message text - textAfterColon', textAfterColon)
             if (textAfterColon !== undefined) {
                 message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
             }
+        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
+            message.text = INFO_SUPPORT_LEAD_UPDATED;
+        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
+           let subject: string;
+           if (message.attributes.messagelabel.parameters.fullname) {
+               subject = message.attributes.messagelabel.parameters.fullname;
+           }else{
+               subject = message.attributes.messagelabel.parameters.member_id;
+           }
+           message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
         }
     }
 

package/src/chat21-core/providers/firebase/firebase-conversations-handler.ts

@@ -617,7 +617,7 @@ export class FirebaseConversationsHandler extends ConversationsHandlerService {
         let old_conv = this.conversations.find(conv => conv.uid === conversation.uid)
         let conversation_with_fullname = conversation.recipient_fullname
         if(old_conv){
-            if(conversation.recipient_fullname !== old_conv.recipient_fullname && conversation.recipient_fullname !== 'Guest '){
+            if(conversation.recipient_fullname !== old_conv.recipient_fullname && (conversation.recipient_fullname !== 'Guest ')){
                 conversation_with_fullname = conversation.recipient_fullname
             } else {
                 // conversation_with_fullname=  old_conv.recipient_fullname

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

@@ -1,3 +1,4 @@
+import { TOUCHING_OPERATOR, LEAD_UPDATED, MEMBER_LEFT_GROUP } from './../../utils/constants';
 import { Inject, Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
@@ -330,6 +331,10 @@ export class MQTTConversationHandler extends ConversationHandlerService {
         const INFO_SUPPORT_USER_ADDED_VERB = this.translationMap.get('INFO_SUPPORT_USER_ADDED_VERB');
         const INFO_SUPPORT_CHAT_REOPENED = this.translationMap.get('INFO_SUPPORT_CHAT_REOPENED');
         const INFO_SUPPORT_CHAT_CLOSED = this.translationMap.get('INFO_SUPPORT_CHAT_CLOSED');
+        const INFO_SUPPORT_LEAD_UPDATED = this.translationMap.get('INFO_SUPPORT_LEAD_UPDATED');
+        const INFO_SUPPORT_MEMBER_LEFT_GROUP = this.translationMap.get('INFO_SUPPORT_MEMBER_LEFT_GROUP');
+        const INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU = this.translationMap.get('INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU');
+
         if (message.attributes.messagelabel
             && message.attributes.messagelabel.parameters
             && message.attributes.messagelabel.key === MEMBER_JOINED_GROUP
@@ -359,6 +364,23 @@ export class MQTTConversationHandler extends ConversationHandlerService {
             message.text = INFO_SUPPORT_CHAT_REOPENED;
         } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === CHAT_CLOSED)) {
             message.text = INFO_SUPPORT_CHAT_CLOSED;
+        } else if ((message.attributes && message.attributes.messagelabel && message.attributes.messagelabel.key === TOUCHING_OPERATOR) && message.sender === "system") {
+            // console.log('FIREBASEConversationHandlerSERVICE message text', message.text)
+            const textAfterColon = message.text.split(":")[1]
+            // console.log('FIREBASEConversationHandlerSERVICE message text - textAfterColon', textAfterColon)
+            if (textAfterColon !== undefined) {
+                message.text = INFO_A_NEW_SUPPORT_REQUEST_HAS_BEEN_ASSIGNED_TO_YOU + ': ' + textAfterColon;
+            }
+        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === LEAD_UPDATED)) {
+            message.text = INFO_SUPPORT_LEAD_UPDATED;
+        } else if ((message.attributes.messagelabel && message.attributes.messagelabel.key === MEMBER_LEFT_GROUP)) {
+           let subject: string;
+           if (message.attributes.messagelabel.parameters.fullname) {
+               subject = message.attributes.messagelabel.parameters.fullname;
+           }else{
+               subject = message.attributes.messagelabel.parameters.member_id;
+           }
+           message.text = subject + ' ' +  INFO_SUPPORT_MEMBER_LEFT_GROUP ;
         }
     }
 

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

@@ -61,7 +61,9 @@ export const MESSAGE_TYPE_DATE = 'DATE';
 export const CHAT_REOPENED = 'CHAT_REOPENED';
 export const CHAT_CLOSED = 'CHAT_CLOSED';
 export const MEMBER_JOINED_GROUP = 'MEMBER_JOINED_GROUP';
-export const TOUCHING_OPERATOR = "TOUCHING_OPERATOR"
+export const MEMBER_LEFT_GROUP = "MEMBER_LEFT_GROUP"
+export const LEAD_UPDATED = "LEAD_UPDATED";
+export const TOUCHING_OPERATOR = "TOUCHING_OPERATOR";
 
 
 // URLS

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

@@ -406,6 +406,20 @@ export function getFromNow(timestamp): string {
   return date_as_string;
 }
 
+export function getDateDifference(startTimestampDate, endTimestampDate){
+  // var startTime = moment.unix(startTimestampDate);
+  // var endTime = moment.unix(endTimestampDate);
+
+  const startTime = moment(startTimestampDate);
+  const endTime = moment(endTimestampDate);
+  const duration = moment.duration(endTime.diff(startTime));
+  const days = duration.asDays()
+  const hours = duration.asHours();
+  const minutes = duration.asMinutes();
+
+  return {days, hours, minutes}
+}
+
 
 
 export function popupUrl(html, title) {

package/src/global.scss

@@ -431,124 +431,14 @@ select:-webkit-autofill:focus {
 /*
  * Canned responses
  * -------------------------------------------- */
-
-#canned {
-    z-index: 99999;
-    width: 100%;
-    // background: rgba(237,240,244,.9);
-    // position: fixed;
-    // top: 0;
-    // bottom: 0;
-    // left: 0;
-    // right: 0;
-    // overflow: hidden;
-}
-
 .canned-list {
-    // position: absolute;
-    // bottom: 0;
-    background-color: white !important;
-    width: 100%;
-    max-height: 310px;
-    overflow-y: auto;
-    // padding: 10px 0;
-    // margin: 0;
-    margin-bottom: 1px;
-    font-size: 14px;
-    line-height: 1.42857143;
-    color: #080f1a;
-    box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
-    // list-style: none;
-    z-index: 999999;
-}
-
-.canned-item {
-    -webkit-tap-highlight-color: transparent;
-    font-family: Lato, sans-serif;
-    font-size: 14px;
-    line-height: 1.42857143;
-    list-style: none;
-    box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
-    // margin: 0 10px;
-    position: relative;
-    outline: none;
-    color: #434a54;
-    // padding: 10px;
-    padding: 5px;
-    width: auto;
-    cursor: pointer;
-    // .item-inner{
-    //     border: none!important;
-    // }
-}
-
-// .canned-item:hover {
-//     background-color: #eaf1fd!important;
-//     border-radius: 4px;
-
-//   }
-
-#canned > ion-list > ion-item {
-    --background-hover: #1877f2 !important;
-}
-
-//   div.item-native > div:hover {
-//     background-color: #eaf1fd!important;
-// }
-
-//   div.item-native > div
-
-// .canned-item {
-//     // background-color: #eaf1fd!important;
-//     border-radius: 4px;
-//     --background-hover: #eaf1fd!important;
-//   }
-
-//   #canned > ion-list > ion-item {
-//     --background-hover: #eaf1fd!important;
-//   }
-
-//   :host {
-//     #canned > ion-list > ion-item {
-//       &:hover {
-//         --background-hover: #eaf1fd
-//       }
-//     }
-//   }
-
-// .cannedContent {
-//     width: 100%;
-// }
-
-#canned > ion-list > ion-item > div > div.cannedTitle {
-    padding-top: 5px;
-}
-
-#canned > ion-list > ion-item > div > div.cannedText {
-    text-align: left;
-    font-size: 12px;
-    display: block;
-    padding-bottom: 5px;
-    // white-space: nowrap;
-    // width: 100%;
-    // overflow: hidden;
-    // text-overflow: ellipsis;
-    // border: 0px solid #000000;
+    .native-input[disabled] {
+        opacity: 10 !important;
+    }
 }
 
-#canned > ion-list > ion-item > div > div.nocannedTitle {
-    color: #f44336;
-}
 
-#canned > ion-list > ion-item > div > div.no-canned-available-text {
-    color: #1877f2 !important;
-}
 
-#canned > ion-list > ion-item > div > div.no-canned-available-text:hover {
-    text-decoration: underline;
-}
 
 .highlight-search-string {
     color: #1877f2 !important;