@chat21/chat21-ionic 3.0.63 → 3.0.65-rc1

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

@@ -143,7 +143,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   arrowkeyLocation = -1
   public_Key: any;
   areVisibleCAR: boolean;
-  support_mode: boolean;
+  supportMode: boolean;
   //SOUND
   setTimeoutSound: any;
   audio: any;
@@ -313,7 +313,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       const conversations = this.conversationsHandlerService.conversations
       // console.log('[CONVS-DETAIL] conversations', conversations);
       this.conversation_count = conversations.length
-      this.logger.log('[CONVS-DETAIL] conversation_count', this.conversation_count)
     })
 
     this.conversationsHandlerService.conversationChanged.subscribe((conv) => {
@@ -321,7 +320,6 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       const conversations = this.conversationsHandlerService.conversations
       // console.log('[CONVS-DETAIL] conversations', conversations);
       this.conversation_count = conversations.length
-      this.logger.log('[CONVS-DETAIL] conversation_count', this.conversation_count)
       if (conv && conv.sender !== this.loggedUser.uid) {
         this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange data sender ', conv.sender)
         this.logger.log('[CONVS-DETAIL] subscribe to BSConversationsChange this.loggedUser.uid ', this.loggedUser.uid)
@@ -333,8 +331,8 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
           // ARE AT THE END
           this.updateConversationBadge()
         }
-        if (conv.uid === this.conversationWith) {
-          this.conversationAvatar = setConversationAvatar(conv.conversation_with, conv.conversation_with_fullname, conv.channel_type)
+        if(conv.uid && conv.uid === this.conversationWith){
+          this.conversationAvatar = setConversationAvatar(conv.conversation_with,conv.conversation_with_fullname,conv.channel_type)
         }
 
       }
@@ -354,15 +352,15 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
   }
 
   getOSCODE() {
-    this.support_mode = null
+    this.supportMode = null
     if (this.appConfigProvider.getConfig().supportMode === true || this.appConfigProvider.getConfig().supportMode === 'true') {
-      this.support_mode = true
+      this.supportMode = true
     } else if (this.appConfigProvider.getConfig().supportMode === false || this.appConfigProvider.getConfig().supportMode === 'false') {
-      this.support_mode = false
+      this.supportMode = false
     } else if (!this.appConfigProvider.getConfig().supportMode) {
-      this.support_mode = false
+      this.supportMode = false
     }
-    this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig support_mode', this.support_mode)
+    this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig supportMode', this.supportMode)
     this.public_Key = this.appConfigProvider.getConfig().t2y12PruGU9wUtEGzBJfolMIgK
     this.logger.log('[CONVS-DETAIL] AppConfigService getAppConfig public_Key', this.public_Key)
 
@@ -375,26 +373,17 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
           let car = key.split(':')
           if (car[1] === 'F') {
             this.areVisibleCAR = false
-            this.logger.log(
-              '[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',
-              this.areVisibleCAR,
-            )
+            this.logger.log('[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',this.areVisibleCAR)
           } else {
             this.areVisibleCAR = true
-            this.logger.log(
-              '[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',
-              this.areVisibleCAR,
-            )
+            this.logger.log('[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',this.areVisibleCAR)
           }
         }
       })
 
       if (!this.public_Key.includes('CAR')) {
         this.areVisibleCAR = false
-        this.logger.log(
-          '[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',
-          this.areVisibleCAR,
-        )
+        this.logger.log('[CONVS-DETAIL] PUBLIC-KEY - areVisibleCAR',this.areVisibleCAR)
       }
     } else {
       this.areVisibleCAR = false
@@ -1127,7 +1116,7 @@ export class ConversationDetailPage implements OnInit, OnDestroy, AfterViewInit
       // ----------------------------------------------------------
       // DISPLAY CANNED RESPONSES if message.lastIndexOf("/")
       // ----------------------------------------------------------
-      if (this.areVisibleCAR && this.support_mode === true) {
+      if (this.areVisibleCAR && this.supportMode === true) {
         setTimeout(() => {
           if (this.conversationWith.startsWith('support-group')) {
             const pos = message.lastIndexOf('/')

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

@@ -43,16 +43,17 @@
           <ion-label part="message-text" class="waiting-for-network-msg"> Waiting for network</ion-label>
         </ion-item>
         <!-- supportMode && -->
-        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived'" class="ion-no-padding open-iframe-item">
+        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived' && supportMode" class="ion-no-padding open-iframe-item">
           <div tabindex="0"></div>
           <!-- <ion-note class="pinned-project">
             {{ 'PINNED_PROJECT' | translate }}
           </ion-note> -->
      
-          <app-project-item style="width: 100%;" 
-          (openUnsevedConvsEvent)="openUnsevedConversationIframe($event)"  
-          (projectIdEvent)="getLastProjectId($event)">
-        </app-project-item>
+          <app-project-item
+            style="width: 100%;" 
+            (openUnsevedConvsEvent)="openUnsevedConversationIframe($event)"
+            (projectIdEvent)="getLastProjectId($event)">
+          </app-project-item>
         </ion-item>
 
       <span
@@ -66,10 +67,15 @@
         <!-- ---------------------------------- -->
         <!-- ACTIVE CONVERSATION LIST -->
         <!-- ---------------------------------- -->
-        <ion-list-conversations *ngIf="conversationType ==='active'" [uidConvSelected]="uidConvSelected"
-          [listConversations]="conversations" [stylesMap]="stylesMap" [translationMap]="translationMapConversation"
-          (onConversationSelected)=onConversationSelected($event) (onImageLoaded)="onImageLoaded($event)"
-          (onConversationLoaded)="onConversationLoaded($event)" (onCloseConversation)="onCloseConversation($event)" 
+        <ion-list-conversations *ngIf="conversationType ==='active'" 
+          [uidConvSelected]="uidConvSelected"
+          [listConversations]="conversations" 
+          [stylesMap]="stylesMap" 
+          [translationMap]="translationMapConversation"
+          (onConversationSelected)=onConversationSelected($event) 
+          (onImageLoaded)="onImageLoaded($event)"
+          (onConversationLoaded)="onConversationLoaded($event)" 
+          (onCloseConversation)="onCloseConversation($event)" 
           [archiveActionNotAllowed]="archiveActionNotAllowed"
           (onCloseAlert)="onCloseAlert($event)">
         </ion-list-conversations>
@@ -77,9 +83,12 @@
         <!-- ---------------------------------- -->
         <!-- ARCHIVED CONVERSATION LIST -->
         <!-- ---------------------------------- -->
-        <ion-list-conversations *ngIf="conversationType ==='archived'" [listConversations]="archivedConversations"
-          [stylesMap]="stylesMap" [translationMap]="translationMapConversation"
-          (onConversationSelected)=onConversationSelected($event) (onImageLoaded)="onImageLoaded($event)"
+        <ion-list-conversations *ngIf="conversationType ==='archived'" 
+          [listConversations]="archivedConversations"
+          [stylesMap]="stylesMap" 
+          [translationMap]="translationMapConversation"
+          (onConversationSelected)=onConversationSelected($event) 
+          (onImageLoaded)="onImageLoaded($event)"
           (onConversationLoaded)="onConversationLoaded($event)">
         </ion-list-conversations>
       </ng-template>