diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 1b88e5346..636c72896 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -644,7 +644,15 @@ export class ChatPage implements OnInit { cssClass: 'modal modal-desktop', }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then((Data) => { + // console.log(Data,'daatatatat'); + + // let data = Data.data + // let roomId = data.roomId + // this.openMessagesPage(roomId); + + }); + } async newGroup() { diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index 0983ecbbe..1c4bc1b2b 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -88,28 +88,29 @@ export class ContactsPage implements OnInit { doRefresh(event){ } - close(){ - this.modalController.dismiss(); + close() { + this.modalController.dismiss({ + roomId: this.room._id + }); } - clicked(){ - - } + clicked() {} createRoom(username:string){ let body = { username: username, } - this.chatService.createRoom(body).subscribe(res => { + this.chatService.createRoom(body).subscribe(async(res) => { this.room = res['room']; + await this.WsChatMethodsService.getAllRooms(); this.getDirectMessage(this.room._id); - this.WsChatMethodsService.getAllRooms() }); } - getDirectMessage(roomId:any){ + + getDirectMessage(roomId:any) { this.chatService.getAllDirectMessages().subscribe(res=>{ @@ -121,6 +122,7 @@ export class ContactsPage implements OnInit { this.openModal(this.dm._id); }); } + async openModal(roomId:any){ this.close();