diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 7374544bd..3e80cee0c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -247,9 +247,9 @@
[taskParticipantsCc]="taskParticipantsCc"
[selectedDate]="eventSelectedDate"
[eventAttendees]="contacts"
- (onAddEvent)="closeNewEventComponent()"
+ (onAddEvent)="closeNewEventComponentAndOpenChat($event)"
(openAttendeesComponent)="openAttendeesComponent($event)"
- (cloneAllmobileComponent)="closeNewEventComponent()"
+ (cloneAllmobileComponent)="closeNewEventComponentAndOpenChat($event)"
[style.display]="showNewEvent ? 'flex' : 'none'"
class=" height-100 flex-column">
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 3503e87ef..269d12b40 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -229,6 +229,9 @@ export class ChatPage implements OnInit {
}
}
openMessagesPage(rid) {
+
+ this.roomId = rid;
+
if (window.innerWidth < 701) {
this.openMessagesModal(rid);
}
@@ -236,7 +239,6 @@ export class ChatPage implements OnInit {
this.idSelected = rid;
this.closeAllDesktopComponents();
this.showEmptyComponent = false;
- this.roomId = rid;
this.showMessages = true;
}
}
@@ -275,6 +277,8 @@ export class ChatPage implements OnInit {
}
openGroupMessagesPage(rid) {
+
+ this.roomId = rid;
if (window.innerWidth < 701) {
this.openGroupMessagesModal(rid);
}
@@ -282,7 +286,7 @@ export class ChatPage implements OnInit {
this.idSelected = rid;
this.closeAllDesktopComponents();
this.showEmptyComponent = false;
- this.roomId = rid;
+
this.showGroupMessages = true;
}
@@ -339,6 +343,27 @@ export class ChatPage implements OnInit {
this.idSelected = "";
}
+ async closeNewEventComponentAndOpenChat() {
+ this.closeAllDesktopComponents();
+ this.showMessages = true
+ this.showEmptyComponent = false;
+ this.idSelected = this.roomId
+
+ this.wsChatMethodsService._group.forEach((room)=>{
+ if(room.id == this.idSelected) {
+
+ this.showGroupMessages = true
+ }
+ })
+
+ this.wsChatMethodsService._dm.forEach((room)=>{
+ if(room.id == this.idSelected) {
+ this.showMessages = true
+ }
+ })
+
+ }
+
onSegmentChange() {
this.wsChatMethodsService.getAllRooms();
}