save

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

@@ -83,7 +83,7 @@
 <ion-footer>
   <div class="container width-100 d-flex">
     <div>
-      <button class="btn-no-color" (click)="openOptions()">
+      <button class="btn-no-color" (click)="openChatOptions()">
         <ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
       </button>
     </div>

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

@@ -135,7 +135,7 @@ export class GroupMessagesPage implements OnInit {
 
   async openOptions() {
     console.log('OK');
-    const modal = await this.modalController.create({
+    const modal = await this.popoverController.create({
       component: ChatPopoverPage,
       cssClass: 'chat-popover',
       componentProps: {
@@ -147,19 +147,14 @@ export class GroupMessagesPage implements OnInit {
       if(res.data == 'leave'){
         this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo';
       }
+      else if(res.data == 'cancel'){
+        console.log('cancel');
+      }
       console.log('OK2');
       
-      console.log(res.data);
-      /* if(res.data ==){
-        this.roomName = res.data.name.split('-').join(' ');
-        console.log(this.roomName);
-        
-        this.getRoomInfo();
-        //this.modalController.dismiss();
-      }; */
-      
     });
   }
+
   async openChatOptions(ev: any) {
     const popover = await this.popoverController.create({
       component: ChatOptionsPopoverPage,

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

@@ -20,10 +20,10 @@
   justify-content: space-around;
 }
 .solid {
-  display: none;
+  display: block;
   width: 90%;
   border-top: 1px solid #bbb;
-  margin: 0 auto !important;
+  margin: 10px auto !important;
 }
 @media only screen and (min-width: 1024px) {
   .arrow-right{
@@ -37,12 +37,10 @@
   }
   .btn-ok{
     width: 100% !important;
-    margin-bottom: 10px !important;
-}
+  }
   .btn-delete{
       width: 100% !important;
       margin-bottom: 10px !important;
-      margin-top: 10px !important;
   }
   .solid{
       display: block;

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

@@ -23,14 +23,15 @@ export class ChatPopoverPage implements OnInit {
 
   ngOnInit() {
     console.log(this.roomId);
-    
   }
+
   close(){
     if( window.innerWidth <= 1024){
-      //this.popoverController.dismiss();
+      this.popoverController.dismiss('cancel');
       this.modalController.dismiss('cancel');
     }
     else{
+      this.popoverController.dismiss('cancel');
       this.modalController.dismiss('cancel');
     }
   }
@@ -56,8 +57,10 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
+    this.popoverController.dismiss('leave');
     this.modalController.dismiss('leave');
   }
+
   //Delete
   deleteGroup(){
     let body = { "roomId":this.roomId, }
@@ -75,6 +78,7 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
+    this.popoverController.dismiss('delete');
     this.modalController.dismiss('delete');
   }