@chat21/chat21-ionic 3.0.61-rc2 → 3.0.61-rc21

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

@@ -18,7 +18,7 @@ import { ContactsDirectoryPageModule } from '../contacts-directory/contacts-dire
 import { ProfileInfoPageModule } from '../profile-info/profile-info.module';
 // import { ConversationDetailPageModule } from '../conversation-detail/conversation-detail.module';
 import { SharedModule } from 'src/app/shared/shared.module';
-
+import { ScrollbarThemeModule } from '../../utils/scrollbar-theme.directive';
 @NgModule({
   imports: [
     CommonModule,
@@ -28,6 +28,7 @@ import { SharedModule } from 'src/app/shared/shared.module';
     // ConversationDetailPageModule,
     ContactsDirectoryPageModule,
     ProfileInfoPageModule,
+    ScrollbarThemeModule,
     TranslateModule.forChild({
       loader: {
         provide: TranslateLoader,

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

@@ -3,7 +3,7 @@
     [numberOpenConv]="numberOpenConv" 
     [supportMode]="supportMode"
     [archived_btn]="archived_btn"
-    [teammates_btn]="teammates_btn"
+    [writeto_btn]="writeto_btn"
     (openContactsDirectory)=openContactsDirectory($event) 
     (openProfileInfo)=openProfileInfo($event)>
   </app-ddp-header>
@@ -14,8 +14,8 @@
   </app-option-header>
 </ion-header>
 
-<ion-content #ioncontentconvlist class="list-avatar-page" appScrollbarTheme>
-
+<ion-content id="convs-list" #ioncontentconvlist class="list-avatar-page" appScrollbarTheme>
+  <!-- class="ps" style="position: relative; max-width: 600px; max-height: 100%;" [perfectScrollbar]="config" -->
   <div id="scrollbar2">
     <ion-list>
 
@@ -43,7 +43,7 @@
           <ion-label part="message-text" class="waiting-for-network-msg"> Waiting for network</ion-label>
         </ion-item>
         <!-- supportMode && -->
-        <ion-item  *ngIf="displayNewConvsItem" class="ion-no-padding open-iframe-item">
+        <ion-item  *ngIf="displayNewConvsItem && conversationType !=='archived'" class="ion-no-padding open-iframe-item">
           <div tabindex="0"></div>
           <!-- <ion-note class="pinned-project">
             {{ 'PINNED_PROJECT' | translate }}
@@ -51,7 +51,8 @@
      
           <app-project-item style="width: 100%;" 
           (openUnsevedConvsEvent)="openUnsevedConversationIframe($event)"  
-          (projectIdEvent)="getLastProjectId($event)"></app-project-item>
+          (projectIdEvent)="getLastProjectId($event)">
+        </app-project-item>
         </ion-item>
 
       <span
@@ -68,7 +69,9 @@
         <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)">
+          (onConversationLoaded)="onConversationLoaded($event)" (onCloseConversation)="onCloseConversation($event)" 
+          [archiveActionNotAllowed]="archiveActionNotAllowed"
+          (onCloseAlert)="onCloseAlert($event)">
         </ion-list-conversations>
 
         <!-- ---------------------------------- -->

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

@@ -1,3 +1,5 @@
+@import '~perfect-scrollbar/css/perfect-scrollbar.css';
+
 ion-header {
   border-bottom-style: solid;
   border-color: var(--light-gray);
@@ -304,10 +306,16 @@ ion-list {
 }
 
 .pinned-project {
-
   color: #3880ff;
   position: absolute;
   right: 8px;
   top: 2px;
   // font-size: 12px !important;
 }
+
+// #convs-list {
+//   overflow: hidden;
+// }
+// #convs-list:hover {
+//   overflow-y: scroll;
+// }