diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 7d81992a7..7fd4f2720 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -287,7 +287,10 @@ export class ChatPage implements OnInit { }, }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then((res)=>{ + console.log(res.data); + this.modalController.dismiss(res.data); + }); } async openMessagesModal(roomId:any){ diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts index 328b6df18..b6b98717c 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.ts +++ b/src/app/shared/chat/edit-group/edit-group.page.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ModalController, NavParams, PickerController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; @@ -15,6 +15,7 @@ export class EditGroupPage implements OnInit { groupName:string; room:any; @Input() roomId:string; + @Output() openGroupContacts:EventEmitter = new EventEmitter(); constructor( private modalController: ModalController, diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 0efa50774..f25f8e3dd 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -75,6 +75,8 @@ export class ChatPopoverPage implements OnInit { this.popoverController.dismiss(true); } async openChangeGroupName(){ + + const modal = await this.modalController.create({ component: EditGroupPage, componentProps: {