Merge branch 'developer' into feature/chat

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -27,16 +27,19 @@ export class ChatPopoverPage implements OnInit {
   }
   close(){
     if( window.innerWidth <= 1024){
-      this.popoverController.dismiss();
+      //this.popoverController.dismiss();
+      this.modalController.dismiss('cancel');
     }
     else{
-      this.modalController.dismiss();
+      this.modalController.dismiss('cancel');
     }
   }
 
    //Top menu options
    //Close
    leaveGroup(){
+     console.log('leave');
+     
     let body = { "roomId":this.roomId, }
 
     this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
@@ -53,7 +56,7 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
-    this.popoverController.dismiss(true);
+    this.modalController.dismiss('leave');
   }
   //Delete
   deleteGroup(){
@@ -72,12 +75,12 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
-    this.popoverController.dismiss(true);
+    this.modalController.dismiss('delete');
   }
-  async openChangeGroupName(){
 
-    
-    const modal = await this.modalController.create({
+  async openChangeGroupName(){
+    this.modalController.dismiss('edit');
+    /* const modal = await this.modalController.create({
       component: EditGroupPage,
       componentProps: {
         roomId: this.roomId,
@@ -89,8 +92,8 @@ export class ChatPopoverPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then((res)=>{
       console.log(res.data);
-      this.popoverController.dismiss(res.data);
-    });
+      this.modalController.dismiss(res.data);
+    }); */
   }
 
 }