@chat21/chat21-web-widget 5.1.26 → 5.1.27-rc1

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

@@ -113,6 +113,15 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   // availableAgentsStatus = false; // indica quando è impostato lo stato degli agenti nel subscribe
   messages: Array<MessageModel> = [];
 
+  // Temporary "thinking" state after a client message is sent.
+  public showThinkingMessage: boolean = false;
+  private waitingServerReply: boolean = false;
+
+  // Badge "ultimo messaggio ricevuto dal server" (bot/umano)
+  public showLastServerSenderBadge: boolean = false;
+  public lastServerSenderKind: 'bot' | 'human' | null = null;
+  public lastServerSenderBadgeText: string = '';
+
 
   CLIENT_BROWSER: string = navigator.userAgent;
 
@@ -235,7 +244,8 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       'CONTINUE',
       'EMOJI_NOT_ELLOWED',
       'ATTACHMENT',
-      'EMOJI'
+      'EMOJI',
+      'CLOSE_CHAT'
     ];
 
     const keysContent = [
@@ -252,6 +262,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       'LABEL_TODAY',
       'LABEL_TOMORROW',
       'LABEL_LOADING',
+      'LABEL_THINKING',
       'LABEL_TO',
       'ARRAY_DAYS',
     ];
@@ -356,6 +367,130 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
 
   }
 
+  private classifyMessageSenderKind(msg: MessageModel | null | undefined): 'bot' | 'human' | 'system' | 'unknown' {
+    if (!msg) return 'unknown';
+
+    const sender = msg.sender;
+    const senderFullname = msg.sender_fullname;
+    const senderFullnameLower = (senderFullname || '').toString().toLowerCase();
+
+    // System messages are always from "system".
+    if (sender === 'system' || senderFullnameLower === 'system') {
+      return 'system';
+    }
+
+    const chatbotId = msg?.attributes?.flowAttributes?.chatbot_id;
+    if (chatbotId && sender && String(chatbotId) === String(sender)) {
+      return 'bot';
+    }
+
+    // Fallback heuristics (used when chatbot_id is missing)
+    if (sender && String(sender).includes('bot_')) {
+      return 'bot';
+    }
+    if (senderFullnameLower.includes('bot')) {
+      return 'bot';
+    }
+
+    return 'human';
+  }
+
+  /**
+   * Detects explicit handoff-to-human system messages.
+   * Example:
+   * attributes.subtype = "info"
+   * attributes.updateconversation = true
+   * attributes.messagelabel.key = "MEMBER_JOINED_GROUP"
+   * attributes.messagelabel.parameters.member_id = "<human-agent-id>"
+   */
+  private isHumanHandoffSystemMessage(msg: MessageModel | null | undefined): boolean {
+    if (!msg) return false;
+    if (msg.sender !== 'system') return false;
+
+    const attrs: any = msg.attributes || {};
+    const key = attrs?.messagelabel?.key;
+    const memberId = attrs?.messagelabel?.parameters?.member_id;
+
+    if (attrs?.subtype !== 'info') return false;
+    if (attrs?.updateconversation !== true) return false;
+    if (key !== 'MEMBER_JOINED_GROUP') return false;
+    if (!memberId || typeof memberId !== 'string') return false;
+
+    // Exclude system/bot/self joins.
+    if (memberId === 'system') return false;
+    if (memberId.startsWith('bot_')) return false;
+    if (this.senderId && memberId === this.senderId) return false;
+
+    return true;
+  }
+
+  /**
+   * Finds the last server message (sender != client) and classifies it as bot/human.
+   * If the last server message is "system", it scans backward to find the last non-system server message.
+   */
+  private refreshLastServerSenderBadge() {
+    const senderId = this.senderId;
+    const msgs = this.messages || [];
+
+    let found: 'bot' | 'human' | null = null;
+    let latestServerMsg: MessageModel | null = null;
+
+    // messages are kept sorted by the handler, but we still scan from the end for "latest".
+    for (let i = msgs.length - 1; i >= 0; i--) {
+      const m = msgs[i];
+      if (!m) continue;
+
+      // Skip messages sent by the current client/user.
+      if (senderId && m.sender === senderId) continue;
+
+      if (!latestServerMsg) {
+        latestServerMsg = m;
+      }
+
+      const kind = this.classifyMessageSenderKind(m);
+      if (kind === 'system') continue;
+      if (kind === 'bot' || kind === 'human') {
+        found = kind;
+        break;
+      }
+    }
+
+    // Priority rule requested: if the latest server message is a system handoff message,
+    // consider the conversation as "human".
+    if (this.isHumanHandoffSystemMessage(latestServerMsg)) {
+      found = 'human';
+    }
+
+    this.lastServerSenderKind = found;
+    this.showLastServerSenderBadge = found !== null;
+    this.lastServerSenderBadgeText = found === 'bot' ? 'Bot' : (found === 'human' ? 'Umano' : '');
+  }
+
+  private startThinkingMessage() {
+    this.waitingServerReply = true;
+    this.showThinkingMessage = true;
+  }
+
+  private stopThinkingMessageImmediately() {
+    if (!this.waitingServerReply) {
+      return;
+    }
+    this.waitingServerReply = false;
+    this.showThinkingMessage = false;
+  }
+
+  private shouldShowThinkingForBot(): boolean {
+    // Primary source: latest server-side classification already computed.
+    if (this.lastServerSenderKind === 'bot') {
+      return true;
+    }
+    // Safe fallback for bot-targeted direct conversations.
+    if (this.conversationWith && this.conversationWith.includes('bot_')) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * do per scontato che this.userId esiste!!!
    */
@@ -368,6 +503,11 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     // this.connectConversation();
     await this.initConversationHandler();
 
+    // After loading/connecting, compute "ultimo messaggio ricevuto dal server"
+    // (excluding messages sent by the client).
+    this.refreshLastServerSenderBadge();
+    setTimeout(() => this.refreshLastServerSenderBadge(), 300);
+
     this.logger.debug('[CONV-COMP] ------ 4: initializeChatManager ------ ');
     //this.initializeChatManager();
 
@@ -470,7 +610,7 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       return this.isConversationArchived;
     }
 
-    //FALLBACK TO TILEDESK
+    //   //FALLBACK TO TILEDESK
     const requests_list = await this.tiledeskRequestService.getMyRequests().catch(err => {
       this.logger.error('[CONV-COMP] getConversationDetail: error getting request from Tiledesk', err);
       this.isConversationArchived=true
@@ -488,9 +628,9 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       return this.isConversationArchived
     }
 
-    this.isConversationArchived = true;
-    return null;
-  }
+      this.isConversationArchived = false;
+      return null;
+    }
 
   /**
     * this.g.recipientId:
@@ -787,8 +927,14 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       subscribtion = this.conversationHandlerService.messageAdded.pipe(takeUntil(this.unsubscribe$)).subscribe((msg: MessageModel) => {
         this.logger.debug('[CONV-COMP] ***** DETAIL messageAdded *****', msg);
         if (msg) {
+          if (msg.sender !== this.senderId) {
+            this.stopThinkingMessageImmediately();
+          }
 
           that.newMessageAdded(msg);
+          // Update badge based on the latest message received from the server.
+          // We rely on `messages` being kept in-sync by the conversation handler.
+          that.refreshLastServerSenderBadge();
           this.checkMessagesLegntForTranscriptDownloadMenuOption();
           this.resetTimeout();
           
@@ -840,6 +986,20 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
       this.subscriptions.push(subscribe);
     }
 
+    subscribtionKey = 'conversationsAdded';
+    subscribtion = this.subscriptions.find(item => item.key === subscribtionKey);
+    if(!subscribtion){
+
+      subscribtion = this.chatManager.conversationsHandlerService.conversationChanged.pipe(takeUntil(this.unsubscribe$)).subscribe((conversation) => {
+        this.logger.debug('[CONV-COMP] ***** DATAIL conversationsChanged *****', conversation, this.conversationWith, this.isConversationArchived);
+        if(conversation && conversation.recipient === this.conversationId){
+          this.isConversationArchived = false
+        }
+      });
+      const subscribe = {key: subscribtionKey, value: subscribtion };
+      this.subscriptions.push(subscribe);
+    }
+
     subscribtionKey = 'messageWait';
     subscribtion = this.subscriptions.find(item => item.key === subscribtionKey);
     if (!subscribtion) {
@@ -1088,6 +1248,13 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   }
   /** CALLED BY: conv-header component */
   onWidgetSizeChange(mode: any){
+    if (this.g?.isMobile) {
+      this.g.fullscreenMode = true;
+      this.g.size = 'max';
+      this.isMenuShow = false;
+      return;
+    }
+
     const normalize = (val: any): 'min' | 'max' | 'top' => {
       const v = (typeof val === 'string') ? val.toLowerCase().trim() : '';
       return (v === 'min' || v === 'max' || v === 'top') ? (v as any) : 'min';
@@ -1294,6 +1461,16 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
   }
   /** CALLED BY: conv-footer component */ 
   onAfterSendMessageFN(message: MessageModel){
+    // Manage thinking state only for messages sent by the current client.
+    // Do not force-hide here for other message types/events.
+    if (message && message.sender === this.senderId) {
+      if (this.shouldShowThinkingForBot()) {
+        this.startThinkingMessage();
+      } else {
+        this.showThinkingMessage = false;
+        this.waitingServerReply = false;
+      }
+    }
     this.onAfterSendMessage.emit(message)
   }
   /** CALLED BY: conv-footer component */ 
@@ -1325,6 +1502,12 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     this.logger.debug('[CONV-COMP] floating onNewConversationButtonClicked')
     this.onNewConversationButtonClicked.emit()
   }
+
+  /** CALLED BY: conv-footer component */
+  onCloseChatButtonClickedFN(event){
+    this.logger.debug('[CONV-COMP] onCloseChatButtonClicked::::', event)
+    this.onCloseChat()
+  }
   // =========== END: event emitter function ====== //
 
 
@@ -1345,6 +1528,8 @@ export class ConversationComponent implements OnInit, AfterViewInit, OnChanges {
     //this.storageService.removeItem('activeConversation');
     this.isConversationArchived = false;
     this.hideTextAreaContent = false;
+    this.showThinkingMessage = false;
+    this.waitingServerReply = false;
     this.conversationFooter.textInputTextArea='';
     this.hideFooterTextReply = false;
     this.footerMessagePlaceholder = '';

package/src/app/component/conversation-detail/conversation-audio-recorder/conversation-audio-recorder.component.ts

@@ -38,19 +38,32 @@ export class ConversationAudioRecorderComponent {
     this.startTime = Date.now();
     navigator.mediaDevices.getUserMedia({ audio: true })
       .then(stream => {
+
+        this.audioChunks = [];
+
         this.mediaRecorder = new MediaRecorder(stream);
         this.mediaRecorder.start();
         this.isRecording = true;
         this.startRecordingEvent.emit();
         this.mediaRecorder.addEventListener('dataavailable', (event) => {
-          this.audioChunks.push(event.data);
+          if (event.data && event.data.size > 0) {
+            this.audioChunks.push(event.data);
+          }
         });
 
         this.mediaRecorder.addEventListener('stop', () => {
-          this.audioBlob = new Blob(this.audioChunks, { type: 'audio/mpeg' });
+          // ✅ MIME REALE del recorder
+          const mimeType = this.mediaRecorder.mimeType;
+          this.audioBlob = new Blob(this.audioChunks, {
+            type: mimeType
+          });
+
+          // ⭐ chiude microfono
+          stream.getTracks().forEach(track => track.stop());
+
+          this.audioChunks = [];
           this.rawAudioUrl = URL.createObjectURL(this.audioBlob);
           this.audioUrl = this.sanitizer.bypassSecurityTrustUrl(this.rawAudioUrl);
-          this.audioChunks = []; 
           this.endRecordingEvent.emit(this.audioBlob);
         });
       })

package/src/app/component/conversation-detail/conversation-content/conversation-content.component.html

@@ -13,7 +13,6 @@
           [nameUserTypingNow]="nameUserTypingNow">
         </user-typing>
       </span>
-      
     
       <div id="chat21-sheet-content" class="chat21-sheet-content">
           <div class="chat21-conversation-parts-container">
@@ -120,25 +119,21 @@
 
                       <!-- FILE PENDING UPLOAD -->
                       <!--  -->
-                      <div *ngIf="showUploadProgress" class="msg_container base_sent" >
+                      <div *ngIf="showUploadProgress && !showThinkingMessage" class="msg_container base_sent" >
                         <div class="chat21-spinner active" id="chat21-spinner" style="margin: 0px 6px 0px;">
                           <div class="chat21-bounce1" [ngStyle]="{'background-color': stylesMap.get('iconColor')}"></div>
                           <div class="chat21-bounce2" [ngStyle]="{'background-color': stylesMap.get('iconColor'), 'opacity': 0.4}"></div>
                           <div class="chat21-bounce3" [ngStyle]="{'background-color': stylesMap.get('iconColor'), 'opacity': 0.6}"></div>
                         </div>
-
-                        
                       </div>
 
 
-                      <div *ngIf="isTypings && typingLocation==='content' " class="msg_container base_receive">
-                        <!-- !isSameSender(idUserTypingNow, i) -->
+                      <div *ngIf="isTypings && !showThinkingMessage && typingLocation==='content'" class="msg_container base_receive">
                         <chat-avatar-image *ngIf="idUserTypingNow " class="slide-in-left"  
                           [senderID]="idUserTypingNow"
                           [senderFullname]="nameUserTypingNow"
                           [baseLocation]="baseLocation">
                         </chat-avatar-image>
-
                         <user-typing
                           [ngClass]="{'userTypingNowExist': !idUserTypingNow}"
                           [color]="stylesMap?.get('iconColor')"
@@ -147,7 +142,16 @@
                           [nameUserTypingNow]="nameUserTypingNow">
                         </user-typing>
                       </div>
-                      
+
+                      <div *ngIf="showThinkingMessage" class="msg_container base_receive thinking_receive">
+                        <user-typing class="loading thinking-dots"
+                          [color]="stylesMap?.get('iconColor')"
+                          [translationMap]="translationMap"
+                          [idUserTypingNow]="idUserTypingNow"
+                          [nameUserTypingNow]="nameUserTypingNow">
+                        </user-typing>
+                      </div>
+   
                   </div>
               </div>
           </div>
@@ -155,7 +159,6 @@
       </div>
     </div>  
   </div>
-
 </div>
 
 

package/src/app/component/conversation-detail/conversation-content/conversation-content.component.scss

@@ -44,7 +44,7 @@
                 top: 0;
                 right: 0;
                 left: 0;
-                bottom: calc(var(--chat-footer-logo-height) + var(--chat-footer-height));
+                bottom: calc(var(--chat-footer-logo-height) + var(--chat-footer-height) + var(--chat-footer-close-button-height));
                 overflow: hidden;
                 .time{
                     margin-bottom: 20px;
@@ -122,6 +122,11 @@
                     text-align: center;
                     padding: 0px 0px 6px 0px
                 }
+                .thinking_receive {
+                    .thinking-dots ::ng-deep > div.spinner{
+                        margin: 25px 30px;
+                    }
+                }
                 /* ====== SET MESSAGES ====== */
                 .messages {
                     border-radius: var(--border-radius-bubble-message);
@@ -265,6 +270,15 @@
     }// end c21-body-container
 }// end c21-body
 
+@keyframes thinking-dot {
+    0%, 80%, 100% {
+        opacity: 0.2;
+    }
+    40% {
+        opacity: 1;
+    }
+}
+
 /* LOADING */
 /*http://tobiasahlin.com/spinkit/*/
 #chat21-spinner {

package/src/app/component/conversation-detail/conversation-content/conversation-content.component.ts

@@ -23,6 +23,7 @@ export class ConversationContentComponent implements OnInit {
   @Input() idUserTypingNow: string;
   @Input() nameUserTypingNow: string;
   @Input() typingLocation: string;
+  @Input() showThinkingMessage: boolean;
   @Input() fullscreenMode: boolean;
   @Input() translationMap: Map< string, string>;
   @Input() stylesMap: Map<string, string>;
@@ -224,7 +225,6 @@ export class ConversationContentComponent implements OnInit {
     // return false;
   }
 
-
   hideOutsideElements(){
     this.onMenuOptionShow.emit(false)
     this.onEmojiiPickerShow.emit(false)

package/src/app/component/conversation-detail/conversation-footer/conversation-footer.component.html

@@ -14,94 +14,117 @@
 
 </div>
 
-<!-- TEXTAREA + ICONS: conv active-->
-<div class="textarea-container" *ngIf="!hideTextAreaContent && !hideTextReply">
-    
-    <div *ngIf="!isStopRec" class="icons-container">
-        <!-- ICON ATTACHMENT -->
-        <label *ngIf="showAttachmentFooterButton" tabindex="1502" aria-label="allegati" for="chat21-file" class="chat21-textarea-button" [class.active]="!isFilePendingToUpload && !hideTextReply" id="chat21-start-upload-doc">
-            <span class="v-align-center">
-                <svg role="img" aria-labelledby="altIconTitle" xmlns="http://www.w3.org/2000/svg" width="24px" height="24" viewBox="0 0 24 24" fill="currentColor">
-                    <path d="M9.9,22.7c0,0-.1,0-.2,0-1.9.3-3.7-.2-5.2-1.4-3-2.3-3.6-6.4-1.4-9.5L9.5,2.5c.4-.5,1.1-.6,1.6-.3.5.4.6,1.1.3,1.6l-6.5,9.4c-1.4,2-1,4.8.9,6.3,1,.8,2.2,1.1,3.5.9,1.3-.2,2.4-.9,3.1-1.9l6-8.7c.9-1.2.6-3-.6-3.9-.6-.5-1.4-.6-2.1-.5-.8.1-1.4.5-1.9,1.1l-5.8,8.2c-.3.5-.2,1.1.2,1.5.2.2.5.3.8.2.3,0,.6-.2.7-.4l4.7-6.2c.4-.5,1.1-.6,1.6-.2.5.4.6,1.1.2,1.6l-4.7,6.2c-.5.7-1.4,1.2-2.3,1.3-.9.1-1.8-.2-2.5-.7-1.4-1.1-1.6-3.1-.6-4.6l5.8-8.2c.8-1.1,2-1.9,3.4-2.1,1.4-.2,2.7.1,3.8,1,2.2,1.7,2.7,4.8,1.1,7.1l-6,8.7c-1.1,1.5-2.6,2.5-4.4,2.8h0Z"/>
-                    <title id="altIconTitle">{{ 'MAX_ATTACHMENT' | translate: { FILE_SIZE_LIMIT: file_size_limit } }}</title>
-                </svg>
-                
-            </span>
-             <input
-                [attr.disabled] = "(isFilePendingToUpload || isConversationArchived || hideTextReply)? true : null"
-                tabindex="1503" 
-                type="file" 
-                aria-label="seleziona allegato"
-                [accept]="fileUploadAccept"
-                name="chat21-file"
-                id="chat21-file"
-                #chat21_file
-                class="inputfile" 
-                [ngStyle]="{'display': 'block', height:'1px', width:'1px', overflow: 'hidden' }"
-                (change)="detectFiles($event)"/>
-        </label>
-        <!-- ICON EMOJII -->
-        <label *ngIf="showEmojiFooterButton" tabindex="1504" aria-label="emojii" for="chat21-emojii" class="chat21-textarea-button" [class.active]="!isFilePendingToUpload && !hideTextReply" id="chat21-emoticon-picker" (click)="onEmojiiPickerClicked()">
-            <span class="v-align-center">
-                <svg role="img" aria-labelledby="altIconTitle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="currentColor">
-                    <path stroke-width=".4px" stroke="currentColor" d="M12,20.8c-5.1,0-9.3-4.2-9.3-9.3S6.9,2.2,12,2.2s9.3,4.2,9.3,9.3-4.2,9.3-9.3,9.3ZM12,3.6c-4.4,0-7.9,3.6-7.9,7.9s3.6,7.9,7.9,7.9,7.9-3.6,7.9-7.9-3.6-7.9-7.9-7.9Z"/>
-                    <path stroke-width=".4px" stroke="currentColor" d="M12,17.2c-2.7,0-4.3-1.9-4.6-2.3-.2-.3-.2-.7.1-1s.7-.2,1,.1c.1.2,1.4,1.8,3.5,1.8s2.2,0,3.5-1.8c.2-.3.7-.4,1-.1s.4.7.1,1c-1.7,2.2-4.1,2.3-4.6,2.3Z"/>
-                    <path d="M8.7,10.9c-.9,0-1.6-.7-1.6-1.6s.7-1.6,1.6-1.6,1.6.7,1.6,1.6-.7,1.6-1.6,1.6Z"/>
-                    <path d="M15.5,10.9c-.9,0-1.6-.7-1.6-1.6s.7-1.6,1.6-1.6,1.6.7,1.6,1.6-.7,1.6-1.6,1.6Z"/>
-                    <title id="altIconTitle">{{ translationMap?.get('EMOJI') }}</title>
+<div class="textarea-container-wrapper" *ngIf="!hideTextAreaContent && !hideTextReply">
+    <!-- TEXTAREA + ICONS: conv active-->
+    <div class="textarea-container">
+        
+        <div *ngIf="!isStopRec" class="icons-container">
+            <!-- ICON ATTACHMENT -->
+            <label *ngIf="showAttachmentFooterButton" tabindex="1502" aria-label="allegati" for="chat21-file" class="chat21-textarea-button" [class.active]="!isFilePendingToUpload && !hideTextReply" id="chat21-start-upload-doc">
+                <span class="v-align-center">
+                    <svg role="img" aria-labelledby="altIconTitle" xmlns="http://www.w3.org/2000/svg" width="24px" height="24" viewBox="0 0 24 24" fill="currentColor">
+                        <path d="M9.9,22.7c0,0-.1,0-.2,0-1.9.3-3.7-.2-5.2-1.4-3-2.3-3.6-6.4-1.4-9.5L9.5,2.5c.4-.5,1.1-.6,1.6-.3.5.4.6,1.1.3,1.6l-6.5,9.4c-1.4,2-1,4.8.9,6.3,1,.8,2.2,1.1,3.5.9,1.3-.2,2.4-.9,3.1-1.9l6-8.7c.9-1.2.6-3-.6-3.9-.6-.5-1.4-.6-2.1-.5-.8.1-1.4.5-1.9,1.1l-5.8,8.2c-.3.5-.2,1.1.2,1.5.2.2.5.3.8.2.3,0,.6-.2.7-.4l4.7-6.2c.4-.5,1.1-.6,1.6-.2.5.4.6,1.1.2,1.6l-4.7,6.2c-.5.7-1.4,1.2-2.3,1.3-.9.1-1.8-.2-2.5-.7-1.4-1.1-1.6-3.1-.6-4.6l5.8-8.2c.8-1.1,2-1.9,3.4-2.1,1.4-.2,2.7.1,3.8,1,2.2,1.7,2.7,4.8,1.1,7.1l-6,8.7c-1.1,1.5-2.6,2.5-4.4,2.8h0Z"/>
+                        <title id="altIconTitle">{{ 'MAX_ATTACHMENT' | translate: { FILE_SIZE_LIMIT: file_size_limit } }}</title>
+                    </svg>
+                    
+                </span>
+                <input
+                    [attr.disabled] = "(isFilePendingToUpload || isConversationArchived || hideTextReply)? true : null"
+                    tabindex="1503" 
+                    type="file" 
+                    aria-label="seleziona allegato"
+                    [accept]="fileUploadAccept"
+                    name="chat21-file"
+                    id="chat21-file"
+                    #chat21_file
+                    class="inputfile" 
+                    [ngStyle]="{'display': 'block', height:'1px', width:'1px', overflow: 'hidden' }"
+                    (change)="detectFiles($event)"/>
+            </label>
+            <!-- ICON EMOJII -->
+            <label *ngIf="showEmojiFooterButton" tabindex="1504" aria-label="emojii" for="chat21-emojii" class="chat21-textarea-button" [class.active]="!isFilePendingToUpload && !hideTextReply" id="chat21-emoticon-picker" (click)="onEmojiiPickerClicked()">
+                <span class="v-align-center">
+                    <svg role="img" aria-labelledby="altIconTitle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="currentColor">
+                        <path stroke-width=".4px" stroke="currentColor" d="M12,20.8c-5.1,0-9.3-4.2-9.3-9.3S6.9,2.2,12,2.2s9.3,4.2,9.3,9.3-4.2,9.3-9.3,9.3ZM12,3.6c-4.4,0-7.9,3.6-7.9,7.9s3.6,7.9,7.9,7.9,7.9-3.6,7.9-7.9-3.6-7.9-7.9-7.9Z"/>
+                        <path stroke-width=".4px" stroke="currentColor" d="M12,17.2c-2.7,0-4.3-1.9-4.6-2.3-.2-.3-.2-.7.1-1s.7-.2,1,.1c.1.2,1.4,1.8,3.5,1.8s2.2,0,3.5-1.8c.2-.3.7-.4,1-.1s.4.7.1,1c-1.7,2.2-4.1,2.3-4.6,2.3Z"/>
+                        <path d="M8.7,10.9c-.9,0-1.6-.7-1.6-1.6s.7-1.6,1.6-1.6,1.6.7,1.6,1.6-.7,1.6-1.6,1.6Z"/>
+                        <path d="M15.5,10.9c-.9,0-1.6-.7-1.6-1.6s.7-1.6,1.6-1.6,1.6.7,1.6,1.6-.7,1.6-1.6,1.6Z"/>
+                        <title id="altIconTitle">{{ translationMap?.get('EMOJI') }}</title>
 
-                    <!-- <path d="M0,0H20.57V20.57H0V0Z" fill="none"/>
-                    <circle cx="15.02" cy="9.86" r="1.29"/>
-                    <circle cx="9.02" cy="9.86" r="1.29"/>
-                    <path d="M12.02,15.43c-1.27,0-2.36-.69-2.96-1.71h-1.43c.69,1.76,2.39,3,4.39,3s3.7-1.24,4.39-3h-1.43c-.6,1.02-1.69,1.71-2.96,1.71Zm0-12C7.28,3.43,3.45,7.27,3.45,12s3.83,8.57,8.56,8.57,8.58-3.84,8.58-8.57S16.75,3.43,12.01,3.43Zm0,15.43c-3.79,0-6.86-3.07-6.86-6.86s3.07-6.86,6.86-6.86,6.86,3.07,6.86,6.86-3.07,6.86-6.86,6.86Z"/> -->
-                </svg>
-            </span>
-        </label>
-    </div>
+                        <!-- <path d="M0,0H20.57V20.57H0V0Z" fill="none"/>
+                        <circle cx="15.02" cy="9.86" r="1.29"/>
+                        <circle cx="9.02" cy="9.86" r="1.29"/>
+                        <path d="M12.02,15.43c-1.27,0-2.36-.69-2.96-1.71h-1.43c.69,1.76,2.39,3,4.39,3s3.7-1.24,4.39-3h-1.43c-.6,1.02-1.69,1.71-2.96,1.71Zm0-12C7.28,3.43,3.45,7.27,3.45,12s3.83,8.57,8.56,8.57,8.58-3.84,8.58-8.57S16.75,3.43,12.01,3.43Zm0,15.43c-3.79,0-6.86-3.07-6.86-6.86s3.07-6.86,6.86-6.86,6.86,3.07,6.86,6.86-3.07,6.86-6.86,6.86Z"/> -->
+                    </svg>
+                </span>
+            </label>
+        </div>
 
 
 
 
-    <div *ngIf="!isStopRec" class="visible-text-area" [class.hasError]="showAlertEmoji" [class.disabled] = "( isConversationArchived || hideTextReply)? true : null">
-        <!-- isFilePendingToUpload || -->
-      <textarea 
-        [attr.disabled] = "(hideTextReply)? true : null"
-        [attr.placeholder] ="(footerMessagePlaceholder)? footerMessagePlaceholder : translationMap?.get('LABEL_PLACEHOLDER')"
-        start-focus-chat21-conversation-component
-        inputTextArea
-        #textbox
-        tabindex="1501"
-        aria-labelledby="altTextArea"
-        rows="1"
-        id="chat21-main-message-context"
-        class='f21textarea c21-button-clean'
-        [(ngModel)]="textInputTextArea"
-        (ngModelChange)="onTextAreaChange()"
-        (keypress)="onkeypress($event)"
-        (keydown)="onkeydown($event)"
-        (paste)="onPaste($event)">
-      </textarea>
-    
-    </div>
+        <div *ngIf="!isStopRec" class="visible-text-area" [class.hasError]="showAlertEmoji" [class.disabled] = "( isConversationArchived || hideTextReply)? true : null">
+            <!-- isFilePendingToUpload || -->
+        <textarea 
+            [attr.disabled] = "(hideTextReply)? true : null"
+            [attr.placeholder] ="(footerMessagePlaceholder)? footerMessagePlaceholder : translationMap?.get('LABEL_PLACEHOLDER')"
+            start-focus-chat21-conversation-component
+            inputTextArea
+            #textbox
+            tabindex="1501"
+            aria-labelledby="altTextArea"
+            rows="1"
+            id="chat21-main-message-context"
+            class='f21textarea c21-button-clean'
+            [(ngModel)]="textInputTextArea"
+            (ngModelChange)="onTextAreaChange()"
+            (keypress)="onkeypress($event)"
+            (keydown)="onkeydown($event)"
+            (paste)="onPaste($event)">
+        </textarea>
+        
+        </div>
 
-    <!-- ICON SEND -->
-    <div *ngIf="(textInputTextArea !== '' && !isStopRec) || !showAudioRecorderFooterButton" tabindex="-1" class="chat21-textarea-button" [class.disabled]="showAlertEmoji" [class.active]="textInputTextArea && !hideTextReply" id="chat21-button-send" (click)="onSendPressed($event)">
-        <span class="v-align-center">
-            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  height="24" width="24" viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve" fill="currentColor">
-                <path d="M1.8,20.6V3.4l20.2,8.6L1.8,20.6ZM3.9,17.3l12.6-5.4L3.9,6.6v3.7l6.4,1.6-6.4,1.6v3.8ZM3.9,17.3V6.6v10.7Z"/>
-            </svg>
-        </span>
+        <!-- ICON SEND -->
+        <div *ngIf="(textInputTextArea !== '' && !isStopRec) || !showAudioRecorderFooterButton" tabindex="-1" class="chat21-textarea-button" [class.disabled]="showAlertEmoji" [class.active]="textInputTextArea && !hideTextReply" id="chat21-button-send" (click)="onSendPressed($event)">
+            <span class="v-align-center">
+                <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  height="24" width="24" viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve" fill="currentColor">
+                    <path d="M1.8,20.6V3.4l20.2,8.6L1.8,20.6ZM3.9,17.3l12.6-5.4L3.9,6.6v3.7l6.4,1.6-6.4,1.6v3.8ZM3.9,17.3V6.6v10.7Z"/>
+                </svg>
+            </span>
+        </div>
+
+        <!-- ICON REC -->
+        <div *ngIf="showAudioRecorderFooterButton && !textInputTextArea" tabindex="-1" class="chat21-audio-button" [class.active]="isStopRec" id="chat21-button-rec">
+            <chat-audio-recorder
+                (startRecordingEvent)="onStartRecording()"
+                (deleteRecordingEvent)="onDeleteRecording()"
+                (endRecordingEvent)="onEndRecording($event)"
+                (sendRecordingEvent)="onSendRecording($event)"
+                [stylesMap]="stylesMap">
+            </chat-audio-recorder>
+        </div>
     </div>
 
-    <!-- ICON REC -->
-    <div *ngIf="showAudioRecorderFooterButton && !textInputTextArea" tabindex="-1" class="chat21-audio-button" [class.active]="isStopRec" id="chat21-button-rec">
-        <chat-audio-recorder
-            (startRecordingEvent)="onStartRecording()"
-            (deleteRecordingEvent)="onDeleteRecording()"
-            (endRecordingEvent)="onEndRecording($event)"
-            (sendRecordingEvent)="onSendRecording($event)"
-            [stylesMap]="stylesMap">
-        </chat-audio-recorder>
+    <div class="close-chat-container" *ngIf="closeChatInConversation">
+        <button tabindex="1040" aflistconv #aflistconv  class="c21-button-primary c21-close" (click)="onCloseChat($event)" [ngStyle]="{'background-color': stylesMap.get('themeColor'), 'border-color': stylesMap.get('themeColor'), 'color': stylesMap?.get('foregroundColor')}">
+            <span class="v-align-center">
+                <!-- <svg [ngStyle]="{'fill': 'yellow' }" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24">
+                    <path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"  [ngStyle]="{'fill': stylesMap?.get('foregroundColor')}"/>
+                </svg> -->
+                <svg [ngStyle]="{'stroke': stylesMap?.get('foregroundColor'), 'fill': stylesMap?.get('foregroundColor') }" role="img" id="archive" aria-labelledby="altIconTitle" class="icon-menu" xmlns="http://www.w3.org/2000/svg"  
+                    width="15px" height="15px" viewBox="0 0 512 512">
+                    <path d="M80 152v256a40.12 40.12 0 0040 40h272a40.12 40.12 0 0040-40V152" stroke-linecap="round" stroke-linejoin="round" stroke-width="50px" fill="none"></path>
+                    <rect x="48" y="64" width="416" height="80" rx="28" ry="28" stroke-linejoin="round" stroke-width="50px" fill="none" ></rect>
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M320 304l-64 64-64-64M256 345.89V224" stroke-width="50px" fill="none"></path>
+                    <title id="altIconTitle">{{ translationMap?.get('CLOSE_CHAT') }}</title>
+                </svg>
+            </span>
+            <span class="v-align-center c21-label-button">
+                {{translationMap?.get('CLOSE_CHAT')}}
+            </span>  
+            <div class="clear"></div>
+        </button>
     </div>
 </div>