Merge branch 'developer' into feature/chat

src/app/pages/chat/chat.page.html

@@ -100,7 +100,11 @@
         <app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
         <app-edit-group [roomId]="roomId" *ngIf="showEditGroup" class="d-flex height-100 flex-column"></app-edit-group>
         <app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
-        <app-group-messages (openGroupContacts)="openGroupContactsPage($event)" *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
+        <app-group-messages
+          (closeAllDesktopComponents)="closeAllDesktopComponents()"
+          (showEmptyContainer)="showEmptyContainer()"
+          (openGroupContacts)="openGroupContactsPage($event)" 
+          *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
 </ion-content>

src/app/pages/chat/chat.page.ts

@@ -113,6 +113,9 @@ export class ChatPage implements OnInit {
     this.showGroupContacts=false;
     console.log('All components closed!');
   }
+  showEmptyContainer(){
+    this.showEmptyComponent=true;
+  }
   openGroupContactsPage(data){
     console.log(data);
     this.groupRoomId = data;

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -134,26 +134,27 @@ export class GroupMessagesPage implements OnInit {
     this.message = "";
   }
 
-  async openOptions(ev: any) {
-    const popover = await this.popoverController.create({
+  async openOptions() {
+    console.log('OK');
+    const modal = await this.modalController.create({
       component: ChatPopoverPage,
       cssClass: 'chat-popover',
-      event: ev,
       componentProps: {
-        room: this.room,
+        roomId: this.roomId,
       },
-      translucent: true
     });
-    await popover.present();
-    popover.onDidDismiss().then(res=>{
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log('OK2');
+      
       console.log(res);
-      if(res.data){
+      /* if(res.data ==){
         this.roomName = res.data.name.split('-').join(' ');
         console.log(this.roomName);
         
         this.getRoomInfo();
-        /* this.modalController.dismiss(); */
-      };
+        //this.modalController.dismiss();
+      }; */
       
     });
   }