Merge with websocket branch

src/app/shared/chat/messages/messages.page.html

@@ -2,11 +2,9 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="header-top">
-        <div class="middle" *ngFor="let users of dmUsers">
-          <ion-label class="title">{{users.name}}</ion-label>
-          <span>
-            <ion-icon class="{{users.status}}" name="ellipse"></ion-icon>
-          </span>
+        <div class="middle">
+          <ion-label class="title">{{ wsChatMethodsService.getDmRoom(roomId).name }}</ion-label>
+          <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
         </div>
         <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">
@@ -41,7 +39,7 @@
   </ion-refresher>
   <div class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last">
-      <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45'>
+      <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.msg !=''">
         <div class="message-item-options d-flex justify-content-end">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer">
           </fa-icon>