@chat21/chat21-web-widget 5.0.67 → 5.0.68

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # chat21-web-widget ver 5.0
 
+### 5.0.68 in PROD
+- bug-fixed: metadata.includes is not a function at isAudio function
+
 ### 5.0.67 in PROD
 - bug-fixed: when refresh the page and an already open conversation is selected, footer is blocked 
 - bug-fix: pdf preview image is not contained into its container

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chat21/chat21-web-widget",
   "author": "Tiledesk SRL",
-  "version": "5.0.67",
+  "version": "5.0.68",
   "license": "MIT",
   "homepage": "https://www.tiledesk.com",
   "repository": {

package/src/app/app.module.ts

@@ -131,6 +131,7 @@ import { StarRatingWidgetService } from './providers/star-rating-widget.service'
 import { LikeUnlikeComponent } from './component/message/like-unlike/like-unlike.component';
 import { Rules } from './utils/rules';
 import { ScriptService } from 'src/chat21-core/providers/scripts/script.service';
+import { CarouselComponent } from './component/message/carousel/carousel.component';
 
 
 
@@ -290,7 +291,8 @@ export function uploadFactory(http: HttpClient, appConfig: AppConfigService, app
     SafeHtmlPipe,
     LikeUnlikeComponent,
     TooltipDirective,
-    AudioComponent
+    AudioComponent,
+    CarouselComponent
   ],
   imports: [
     BrowserModule,

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

@@ -107,6 +107,16 @@
                                   (onAttachmentButtonClicked)="onAttachmentButtonClickedFN($event)">
                               </chat-message-attachment>
                           </div>
+
+                          <!-- carousel -->
+                          <!-- <div *ngIf="message?.attributes && message?.attributes?.attachment && message?.attributes?.attachment?.gallery" [ngClass]="{'slide-in-left': false}" class="carousel_container">
+                            <chat-carousel class="carousel_container"
+                              [message]="message"
+                              [stylesMap]="stylesMap"
+                              (onElementRendered)="onElementRenderedFN($event)"
+                              (onAttachmentButtonClicked)="onAttachmentButtonClickedFN($event)">
+                            </chat-carousel>
+                          </div> -->
     
                       </div>
 

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

@@ -135,6 +135,10 @@
                     align-content: center;
                     justify-content: flex-end;
                 }
+                .carousel_container{
+                    margin: 0px 20px; 
+                }
+            
                 .msg_info_container{
                     text-align: center;
                     padding: 0px 0px 6px 0px

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

@@ -31,11 +31,11 @@
         <!-- ICON EMOJII -->
         <label 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 xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 28 28" >
-                    <path d="M0 0h24v24H0V0z" fill="none"/>
-                    <circle cx="15.5" cy="9.5" r="1.5"/>
-                    <circle cx="8.5" cy="9.5" r="1.5"/>
-                    <path d="M12 16c-1.48 0-2.75-.81-3.45-2H6.88c.8 2.05 2.79 3.5 5.12 3.5s4.32-1.45 5.12-3.5h-1.67c-.7 1.19-1.97 2-3.45 2zm-.01-14C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/>
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+                    <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>

package/src/app/component/message/audio/audio.component.scss

@@ -1,3 +1,7 @@
+#audio_container{
+    display: flex;
+}
+
 #play-icon,
 #pause-icon {
     margin: 20px 2.5% 10px 2.5%;

package/src/app/component/message/carousel/carousel.component.html

@@ -0,0 +1,29 @@
+<div class="wrapper">
+    <div id="left" class="arrow" (click)="goTo('previous')" >
+        <!-- *ngIf="activeElement > 1" -->
+        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
+            <path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12l4.58-4.59z"/>
+        </svg>
+    </div>
+    <div class="carousel">
+        <div class="card" *ngFor="let card of gallery">
+            <div class="card-image">
+                <img [src]="card?.preview?.src" alt="img" draggable="false">
+            </div>
+            <div class="card-content">
+                <div class="card-title">{{card?.title}}</div>
+                <div class="card-description">{{card?.description}}</div>
+            </div>
+            <div class="buttons" *ngIf="card?.buttons && card?.buttons.length > 0">
+                <div class="single-button action" *ngFor="let button of card?.buttons">
+                    <div>{{button.value}}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="right" class="arrow" (click)="goTo('next')" *ngIf="activeElement !== gallery.length">
+        <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
+            <path d="M0 0h24v24H0V0z" fill="none"/><path d="M10.02 6L8.61 7.41 13.19 12l-4.58 4.59L10.02 18l6-6-6-6z"/>
+        </svg>
+    </div>
+</div>

package/src/app/component/message/carousel/carousel.component.scss

@@ -0,0 +1,257 @@
+@import 'src/app/sass/variables';
+
+:host {
+    --backgroundColor: #{var(--blue)};
+    --textColor: #{var(--bck-msg-sent)};
+    --hoverBackgroundColor: #{var(--bck-msg-sent)};
+    --hoverTextColor: #{var(--blue)};
+    --buttonFontSize: #{var(--button-in-msg-font-size)};
+    --max-width: #{var(--button-in-msg-max-width)};
+
+    --cardWidth: 240px;
+}
+
+
+.wrapper {
+    // max-width: 1100px;
+    width: 100%;
+    position: relative;
+    display: flex;
+
+    overflow: scroll;
+    gap: 10px;
+    margin: 0;
+    width: 100%;
+    font-size: 14px;
+    margin: 0 25px;
+  }
+    .wrapper .cards-scroll-spacer{
+        -ms-flex-negative: 0;
+        content: "";
+        flex-shrink: 0;
+        width: 17px;
+    }
+    .wrapper div.arrow {
+        top: 50%;
+        height: 40px;
+        width: 40px;
+        cursor: pointer;
+        font-size: 1.25rem;
+        position: absolute;
+        text-align: center;
+        line-height: 50px;
+        background: #fff;
+        border-radius: 50%;
+        box-shadow: 0 3px 6px rgba(0,0,0,0.23);
+        transform: translateY(-50%);
+        transition: transform 0.1s linear;
+
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+    .wrapper div.arrow:active{
+        transform: translateY(-50%) scale(0.85);
+    }
+    .wrapper div.arrow:first-child{
+        left: 5px;
+    }
+    .wrapper div.arrow:last-child{
+        // right: -22px;
+        // right: 22px;
+        left: calc(var(--cardWidth) - -15px);
+    }
+    .wrapper .carousel{
+        display: grid;
+        grid-auto-flow: column;
+        grid-auto-columns: calc((100% / 3) - 12px);
+        align-items: start;
+        overflow: hidden;
+        // scroll-snap-type: x mandatory;
+        gap: 16px;
+        border-radius: 8px;
+        scroll-behavior: smooth;
+        scrollbar-width: none;
+
+        // display: flex;
+        // align-items: flex-start;
+    }
+    .carousel::-webkit-scrollbar {
+        display: none;
+    }
+    .carousel.no-transition {
+        scroll-behavior: auto;
+    }
+    .carousel.dragging {
+        scroll-snap-type: none;
+        scroll-behavior: auto;
+    }
+    .carousel.dragging .card {
+        cursor: grab;
+        user-select: none;
+    }
+    .carousel :where(.card, .card-imgage) {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+    .carousel .card {
+        scroll-snap-align: start;
+        width: var(--cardWidth);
+        background: rgb(255, 255, 255);
+        box-shadow: 0 3px 6px rgba(0,0,0,0.23);
+        cursor: pointer;
+        // padding-bottom: 15px;
+        flex-direction: column;
+        border-radius: 8px;
+        border: 1px solid;
+        border-color: rgb(219, 225, 232);
+    }
+
+    .carousel .card-image {
+        height: 170px;
+        width: var(--cardWidth);
+    }
+
+    img {
+        height: 100%;
+        -o-object-fit: cover;
+        object-fit: cover;
+    
+        background: transparent!important;
+        display: block;
+        max-width: 100% !important;
+        border-radius: 8px 8px 0px 0px;
+    }
+
+    .carousel .card-content{
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-direction: column;
+        flex-direction: column;
+        padding: 0 20px 30px;
+
+        .card-title{
+            word-wrap: break-word;
+            font-size: 16px;
+            font-weight: 600;
+            line-height: 20px;
+            margin-top: 12px;
+            white-space: pre-wrap;
+            width: 100%;
+        }
+
+        .card-description{
+            word-wrap: break-word;
+            font-size: 16px;
+            line-height: 20px;
+            margin-top: 12px;
+            white-space: pre-wrap;
+        }
+    }
+
+    .carousel .buttons{
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-direction: column;
+        flex-direction: column;
+        width: 100%;
+
+
+        .single-button{
+            // border-top-color: rgb(219, 225, 232);
+
+            -webkit-box-align: center;
+            -ms-flex-align: center;
+            align-items: center;
+            justify-content: center;
+            border-top: 1px solid var(--textColor);
+            cursor: pointer;
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            font-weight: 600;
+            height: 45px;
+            padding: 0 10px;
+            -webkit-transition: all .3s;
+            transition: all .3s;
+
+            color: var(--textColor);
+            background: var(--backgroundColor);
+            font-family: 'Muli', sans-serif;
+            font-size: var(--buttonFontSize);
+
+
+            div{
+                overflow: hidden!important;
+                text-align: center;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                width: 100%; 
+            }
+
+            &:focus,
+            &:hover {
+                color: var(--hoverTextColor);
+                background:  var(--hoverBackgroundColor);
+                transform: scale(1.05);
+                .icon-button-action {
+                    svg {
+                        fill: var(--hoverTextColor);
+                    }
+                }
+            }
+            &:after {
+                content: "";
+                position: absolute;
+                width: 0;
+                height: 0;
+                top: 50%;
+                left: 50%;
+                transform-style: flat;
+                transform: translate3d(-50%,-50%,0);
+                background: rgba(white,.2);
+                border-radius: 100%;
+                transition: width .5s ease, height .5s ease;
+            }
+
+
+        }
+
+        .single-button:last-child{
+            border-radius: 0px 0px 8px 8px;
+        }
+    }
+//   .card .card-image img {
+//     width: 140px;
+//     height: 140px;
+//     border-radius: 50%;
+//     object-fit: cover;
+//     border: 4px solid #fff;
+//   }
+  .carousel .card h2 {
+    font-weight: 500;
+    font-size: 1.56rem;
+    margin: 30px 0 5px;
+  }
+  .carousel .card span {
+    color: #6A6D78;
+    font-size: 1.31rem;
+  }
+  @media screen and (max-width: 900px) {
+    .wrapper .carousel {
+      grid-auto-columns: calc((100% / 2) - 9px);
+    }
+  }
+  @media screen and (max-width: 600px) {
+    .wrapper .carousel {
+    //   grid-auto-columns: 100%;
+      grid-auto-columns: 75%;
+    }
+  }

package/src/app/component/message/carousel/carousel.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CarouselComponent } from './carousel.component';
+
+describe('CarouselComponent', () => {
+  let component: CarouselComponent;
+  let fixture: ComponentFixture<CarouselComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ CarouselComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(CarouselComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/src/app/component/message/carousel/carousel.component.ts

@@ -0,0 +1,111 @@
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, SimpleChange, SimpleChanges, ViewChildren } from '@angular/core';
+import { MessageModel } from 'src/chat21-core/models/message';
+
+@Component({
+  selector: 'chat-carousel',
+  templateUrl: './carousel.component.html',
+  styleUrls: ['./carousel.component.scss']
+})
+export class CarouselComponent implements OnInit{
+
+  // ========= begin:: Input/Output values ============//
+  @Input() message: MessageModel;
+  @Input() stylesMap: Map<string, string>;
+  @Output() onAttachmentButtonClicked = new EventEmitter<any>();
+  @Output() onElementRendered = new EventEmitter<{element: string, status: boolean}>()
+  // ========= end:: Input/Output values ============//
+  gallery: any[]
+
+  wrapper: HTMLElement;
+  carousel: HTMLElement;
+  firstCardWidth: number;
+  activeElement: number = 1;
+
+  fontSize: string;
+  backgroundColor: string;
+  textColor: string;
+  hoverBackgroundColor: string;
+  hoverTextColor: string;
+
+  constructor(private elementRef: ElementRef) { }
+
+  ngOnInit() {
+    console.log('[CAROUSEL-MESSAGE] hello', this.message)
+
+    
+    this.wrapper = this.elementRef.nativeElement.querySelector('.wrapper')
+    this.carousel = this.elementRef.nativeElement.querySelector('.carousel') 
+
+    
+    // this.firstCardWidth = (this.elementRef.nativeElement.querySelector(".card") as HTMLElement).offsetWidth
+    console.log('carrrrrrrrr', this.wrapper, this.elementRef.nativeElement.querySelector(".card"))
+    // Get the number of cards that can fit in the carousel at once
+    let cardPerView = Math.round(this.carousel.offsetWidth / this.firstCardWidth);
+
+    // Insert copies of the last few cards to beginning of carousel for infinite scrolling
+    // const carouselChildrens = [...this.carousel.children];
+    // carouselChildrens.slice(-cardPerView).reverse().forEach(card => {
+    //   this.carousel.insertAdjacentHTML("afterbegin", card.outerHTML);
+    // });
+    // // Insert copies of the first few cards to end of carousel for infinite scrolling
+    // carouselChildrens.slice(0, cardPerView).forEach(card => {
+    //   this.carousel.insertAdjacentHTML("beforeend", card.outerHTML);
+    // });
+
+    // Scroll the carousel at appropriate postition to hide first few duplicate cards on Firefox
+    this.carousel.classList.add("no-transition");
+    this.carousel.scrollLeft = this.carousel.offsetWidth;
+    this.carousel.classList.remove("no-transition");
+
+    
+    console.log('[CAROUSEL-MESSAGE] cardPerView -->', cardPerView, this.carousel.querySelectorAll('.card') )
+
+    let currentItem = 0
+    // Store items as an array of objects
+    const items = this.carousel.querySelectorAll('.card')
+
+    this.carousel.addEventListener("scroll", function(el){
+      // console.log('elementttt', el)
+      // Find item closest to the goal
+      // currentItem = items.reduce((prev, curr) => {
+      //   return (Math.abs(curr.offsetY - scrollY - goal) < Math.abs(prev.offsetY - scrollY - goal) ? curr : prev); // return the closest to the goal
+      // });
+    });
+
+  }
+
+  ngOnChanges(changes: SimpleChanges){
+    if(this.message && this.message.attributes && this.message.attributes?.attachment && this.message.attributes?.attachment?.gallery){
+      this.gallery = this.message.attributes.attachment.gallery
+      console.log('carrrrrrrrr', this.wrapper, this.elementRef.nativeElement.querySelector(".card"))
+    
+    }
+
+    if(this.stylesMap){
+      if(this.stylesMap.has('buttonFontSize')) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--buttonFontSize', this.stylesMap.has('buttonFontSize'));
+      if(this.stylesMap.has('buttonBackgroundColor')) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--backgroundColor', this.stylesMap.has('buttonBackgroundColor'));
+      if(this.stylesMap.has('buttonTextColor')) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--textColor', this.stylesMap.has('buttonTextColor'));
+      if(this.stylesMap.has('buttonHoverBackgroundColor')) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--hoverBackgroundColor', this.stylesMap.has('buttonHoverBackgroundColor'));
+      if(this.stylesMap.has('buttonHoverTextColor')) this.elementRef.nativeElement.querySelector('.action').style.setProperty('--hoverTextColor', this.stylesMap.has('buttonHoverTextColor'));
+    }
+
+    
+  }
+
+  goTo(direction: 'next' | 'previous' ){
+    let width = (this.carousel.querySelector(".card") as HTMLElement).offsetWidth
+    let gap = Math.round( 16 / 2)
+    let cardPerView = Math.round(this.carousel.offsetWidth / width);
+
+    console.log('go to -->', direction, width, cardPerView, this.carousel.offsetWidth)
+
+    this.carousel.scrollLeft += direction == "previous" ? -(width+gap) : width+gap;
+    // this.activeElement += direction == "previous" ? -1 : 1;
+
+    // this.carousel.classList.add("no-transition");
+    // this.carousel.scrollLeft += width;
+    // this.carousel.classList.remove("no-transition");
+
+
+  }
+}

package/src/app/providers/global-settings.service.ts

@@ -997,7 +997,7 @@ export class GlobalSettingsService {
         TEMP = tiledeskSettings['participants'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > participants:: ', TEMP]);
         if (TEMP !== undefined) {
-            globals.participants = TEMP.split(',').map(key => { return key.trim()});;
+            globals.participants = TEMP.split(',').map(key => { return key.trim()});
         }
         TEMP = tiledeskSettings['whatsappNumber'];
         // this.logger.debug('[GLOBAL-SET] setVariablesFromSettings > whatsappNumber:: ', TEMP]);

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

@@ -105,14 +105,14 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
         this.logger.debug('[FIREBASEConversationHandlerSERVICE] urlNodeFirebase *****', this.urlNodeFirebase);
         const firebaseMessages = this.firebase.database().ref(this.urlNodeFirebase);
         this.ref = firebaseMessages.orderByChild('timestamp').limitToLast(100);
-        this.ref.on('child_added', (childSnapshot) => {
+        this.ref.on('child_added', async (childSnapshot) => {
             that.logger.debug('[FIREBASEConversationHandlerSERVICE] >>>>>>>>>>>>>> child_added: ', childSnapshot.val())
             const msg: MessageModel = childSnapshot.val();        
             msg.uid = childSnapshot.key;
 
             if (msg.attributes && msg.attributes.commands) {
                 this.logger.debug('[FIREBASEConversationHandlerSERVICE] splitted message::::', msg)
-                that.addCommandMessage(msg)
+                await that.addCommandMessage(msg)
             } else {
                 this.logger.debug('[FIREBASEConversationHandlerSERVICE] NOT splitted message::::', msg)
                 that.addedNew(msg)
@@ -255,6 +255,7 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
 
     
 
+            
             this.addRepalceMessageInArray(msg.uid, msg);
             this.messageAdded.next(msg);
         } else {
@@ -468,59 +469,63 @@ export class FirebaseConversationHandler extends ConversationHandlerService {
     }
 
 
-    private addCommandMessage(msg: MessageModel){
+    private async addCommandMessage(msg: MessageModel): Promise<boolean> {
         const that = this;
         const commands = msg.attributes.commands;
         let i=0;
-        function execute(command){
-            if(command.type === "message"){
-                that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> type="message"', command, i)
-                if (i >= 2) {
-                    
-                    //check if previus wait message type has time value, otherwize set to 1000ms
-                    !commands[i-1].time? commands[i-1].time= 1000 : commands[i-1].time
-                    command.message.timestamp = commands[i-2].message.timestamp + commands[i-1].time;
-                    
-                    /** CHECK IF MESSAGE IS JUST RECEIVED: IF false, set next message time (if object exist) to 0 -> this allow to show it immediately */
-                    if(!isJustRecived(that.startTime.getTime(), msg.timestamp)){
-                        let previewsTimeMsg = msg.timestamp;
-                        commands[i-2]? previewsTimeMsg = commands[i-2].message.timestamp : null;
-                        command.message.timestamp = previewsTimeMsg + 100
-                        commands[i+1]? commands[i+1].time = 0 : null
-                    }
-                } else { /**MANAGE FIRST MESSAGE */
-                    command.message.timestamp = msg.timestamp;
-                    if(!isJustRecived(that.startTime.getTime(), msg.timestamp)){
-                        commands[i+1]? commands[i+1].time = 0 : null
-                    }
-                }
-                that.generateMessageObject(msg, command.message, function () {
-                    i += 1
-                    if (i < commands.length) {
-                        execute(commands[i])
+        return new Promise((resolve, reject)=>{
+            function execute(command){
+                if(command.type === "message"){
+                    that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> type="message"', command, i)
+                    if (i >= 2) {
+                        
+                        //check if previus wait message type has time value, otherwize set to 1000ms
+                        !commands[i-1].time? commands[i-1].time= 1000 : commands[i-1].time
+                        command.message.timestamp = commands[i-2].message.timestamp + commands[i-1].time;
+                        
+                        /** CHECK IF MESSAGE IS JUST RECEIVED: IF false, set next message time (if object exist) to 0 -> this allow to show it immediately */
+                        if(!isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                            let previewsTimeMsg = msg.timestamp;
+                            commands[i-2]? previewsTimeMsg = commands[i-2].message.timestamp : null;
+                            command.message.timestamp = previewsTimeMsg + 100
+                            commands[i+1]? commands[i+1].time = 0 : null
+                        }
+                    } else { /**MANAGE FIRST MESSAGE */
+                        command.message.timestamp = msg.timestamp;
+                        if(!isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                            commands[i+1]? commands[i+1].time = 0 : null
+                        }
                     }
-                    else {
-                        that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit') 
+                    that.generateMessageObject(msg, command.message, function () {
+                        i += 1
+                        if (i < commands.length) {
+                            execute(commands[i])
+                        }
+                        else {
+                            that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (wait), exit')
+                            resolve(true)
+                        }
+                    })
+                }else if(command.type === "wait"){
+                    that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> type="wait"', command, i, commands.length)
+                    //publish waiting event to simulate user typing
+                    if(isJustRecived(that.startTime.getTime(), msg.timestamp)){
+                        that.messageWait.next({uid: that.conversationWith, uidUserTypingNow: msg.sender, nameUserTypingNow: msg.sender_fullname, waitTime: command.time, command: command})
                     }
-                })
-            }else if(command.type === "wait"){
-                that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> type="wait"', command, i, commands.length)
-                //publish waiting event to simulate user typing
-                if(isJustRecived(that.startTime.getTime(), msg.timestamp)){
-                    that.messageWait.next({uid: that.conversationWith, uidUserTypingNow: msg.sender, nameUserTypingNow: msg.sender_fullname, waitTime: command.time, command: command})
+                    setTimeout(function() {
+                        i += 1
+                        if (i < commands.length) {
+                            execute(commands[i])
+                        }
+                        else {
+                            that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (send message), exit')
+                            resolve(true)
+                        }
+                    },command.time)
                 }
-                setTimeout(function() {
-                    i += 1
-                    if (i < commands.length) {
-                        execute(commands[i])
-                    }
-                    else {
-                        that.logger.debug('[FIREBASEConversationHandlerSERVICE] addCommandMessage --> last command executed (send message), exit') 
-                    }
-                },command.time)
             }
-        }
-        execute(commands[0]) //START render first message
+            execute(commands[0]) //START render first message
+        })
     }
 
     private generateMessageObject(message, command_message, callback) {

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

@@ -8,7 +8,7 @@ import {
     MAX_WIDTH_IMAGES,
     CHANNEL_TYPE_GROUP,
     TYPE_SUPPORT_GROUP
-} from '../../chat21-core/utils/constants';
+} from './constants';
 
 /** */
 export function isImage(message: any) {
@@ -27,14 +27,14 @@ export function isFrame(message: any) {
 
 /** */
 export function isFile(message: any) {
-  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && !message.metadata.includes('audio')) {
+  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && !message.metadata.type.includes('audio')) {
     return true;
   }
   return false;
 }
 
 export function isAudio(message: any) {
-  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && message.metadata.includes('audio') ) {
+  if (message && message.type && message.type === 'file' && message.metadata && message.metadata.src && message.metadata.type.includes('audio') ) {
     return true;
   }
   return false;