diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index cc6274e5c..18a568ae9 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -123,8 +123,11 @@
+ +
@@ -139,11 +142,11 @@

{{group.name.split('-').join(' ')}}

-
{{group.duration}}
-
{{group.countDownTime}}
+
{{group.duration }}
+
{{group.countDownTime }}
-
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
+
{{group.lastMessage.u.name}} : {{group.lastMessage.msg}}
{{group.userThatIsTyping}} está escrever ...
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 5dd2879c2..86a3a4b28 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -31,14 +31,14 @@
- {{member.name}}, + *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe; let last = last"> + {{member.name}},
- {{roomCountDownDate}} + {{ChatSystemService.getGroupRoom(roomId).countDownTime}}
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 8278a55c3..8b9f60be1 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -245,6 +245,12 @@ export class RoomService { this.ChatSystemService.deleteRoom(this.id); this.ChatSystemService.getAllRooms(); this.chatServiceDeleteRoom(this.id); + }, (error)=> { + if(error.status != 0) { + this.ChatSystemService.deleteRoom(this.id); + this.ChatSystemService.getAllRooms(); + this.chatServiceDeleteRoom(this.id); + } }); } else { @@ -252,6 +258,12 @@ export class RoomService { this.ChatSystemService.deleteRoom(this.id); this.ChatSystemService.getAllRooms(); this.chatServiceDeleteRoom(this.id); + }, (error)=> { + if(error.status != 0) { + this.ChatSystemService.deleteRoom(this.id); + this.ChatSystemService.getAllRooms(); + this.chatServiceDeleteRoom(this.id); + } }); } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 5d2516d3f..88a865d57 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -19,8 +19,8 @@
- - {{member.name}}, + + {{member.name}},