Merge branch 'feature/websocket' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/websocket

src/app/services/chat/room.service.ts

@@ -39,30 +39,18 @@ export class RoomService {
   }
 
   receiveMessage() {
-    /* this.WsChatService.receiveMyMessageConfirmation(
-      this.id,
-      (ChatMessage:ChatMessage) => {
-
-        ChatMessage = this.fix_updatedAt(ChatMessage)
-        const message = new MessageService()
-        message.setData(ChatMessage.result)
-        this.massages.push(message)
-        this.lastMessage.msg = message.msg;
-        this.calDateDuration(ChatMessage.result._updatedAt)
-        this.ToastService.presentToast('nova mensagem')
-      }
-    ) */
 
     this.WsChatService.receiveLiveMessageFromRoom(
       this.id,
       (ChatMessage) => {
         ChatMessage = ChatMessage.fields.args[0]
         ChatMessage = this.fix_updatedAt(ChatMessage)
-        const message = new MessageService()
+
         this.ToastService.presentToast('nova mensagem')
-        this.lastMessage.msg = message.msg;
+        const message = new MessageService()
         message.setData(ChatMessage)
-        this.calDateDuration(ChatMessage.result._updatedAt)
+        this.lastMessage.msg = message.msg
+        this.calDateDuration(ChatMessage._updatedAt)
         this.massages.push(message)
       }
     )