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 ff64cf50f..48cab411f 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -179,6 +179,11 @@
{{msg.file.venue}}
+
+
+ {{ msg.msg}}
+
+
Apagou a mensagem
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index f3198487e..1acd1d60e 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -434,4 +434,8 @@ ion-footer {
margin: 0px auto !important;
width: 110px;
text-align: center;
+ margin-top: 10px !important;
+ padding: 15px 20px;
+ border-radius: 10px;
}
+
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index a08408149..bba7ae46c 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -504,13 +504,25 @@ export class RoomService {
//Get previous last message from room
const previousLastMessage = this.messages.slice(-1)[0];
- if(previousLastMessage) {
- this.lastMessage = previousLastMessage;
- this.calDateDuration(previousLastMessage._updatedAt)
- this.sortRoomList()
+ if(previousLastMessage.dateLabel == false) {
+ if(previousLastMessage) {
+ this.lastMessage = previousLastMessage;
+ this.calDateDuration(previousLastMessage._updatedAt)
+ this.sortRoomList()
+ }
+ } else {
+ const previousLastMessage = this.messages.slice(-2)[0];
+
+ if(previousLastMessage) {
+ this.lastMessage = previousLastMessage;
+ this.calDateDuration(previousLastMessage._updatedAt)
+ this.sortRoomList()
+ }
+
}
+
return true
} else {
@@ -592,7 +604,7 @@ export class RoomService {
this.message= ''
- this.hojeLabel(offlineChatMessage)
+ this.hojeLabel({...offlineChatMessage})
const message: MessageService = await this.prepareCreate({message:offlineChatMessage, save: environment.chatOffline})
this.registerSendMessage(message)
@@ -759,8 +771,6 @@ export class RoomService {
let currentDateMessage = new Date().toLocaleDateString()
if(!this.labelDates.find( e => e == currentDateMessage)) {
-
- offlineChatMessage.msg = currentDateMessage
const cloneMessage = new MessageServiceDateLabel()
cloneMessage.ChatSystemService = this.ChatSystemService
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 ebe4e8d07..f91180b6a 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -186,9 +186,9 @@
-
+
Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index e3cfc5dea..41cb9de0e 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -337,4 +337,7 @@
margin: 0px auto !important;
width: 110px;
text-align: center;
+ margin-top: 10px !important;
+ padding: 15px 20px;
+ border-radius: 10px;
}