merge developer

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -111,8 +111,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     this.getRoomInfo();
     //this.scrollToBottom();
     this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory();
-    this.wsChatMethodsService.getGroupRoom(this.roomId).getMsgFromDB();
-    console.log('MESSAGES'+ this.wsChatMethodsService.getGroupRoom(this.roomId).messages);
+    // console.log('MESSAGES'+ this.wsChatMethodsService.getGroupRoom(this.roomId).messages);
+    this.wsChatMethodsService.openRoom(this.roomId)
     this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked
 
     setTimeout(()=>{

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

@@ -29,7 +29,7 @@
 
   <div class="main-content">
 
-    <ion-virtual-scroll [items]="users| filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
+    <ion-virtual-scroll [items]="WsChatMethodsService.users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
 
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>

src/app/shared/chat/messages/contacts/contacts.page.ts

@@ -6,6 +6,7 @@ import { ChatService } from 'src/app/services/chat.service';
 import { GroupMessagesPage } from '../../group-messages/group-messages.page';
 import { MessagesPage } from '../messages.page';
 import { ThemeService } from 'src/app/services/theme.service'
+import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service'
 
 @Component({
   selector: 'app-contacts',
@@ -31,7 +32,8 @@ export class ContactsPage implements OnInit {
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public WsChatMethodsService: WsChatMethodsService
   )
   {
     this.loggedUser = authService.ValidatedUserChat['data'];

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

@@ -100,21 +100,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
   ngOnChanges(changes: SimpleChanges): void {
     this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory()
-    //this.wsChatMethodsService.getDmRoom(this.roomId).getMsgFromDB()
+
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
-    /* console.log('DATATATA', this.wsChatMethodsService.getDmRoom(this.roomId).massages)
-    this.wsChatMethodsService.getDmRoom(this.roomId).massages.forEach((element) => {
-      console.log('DATATATA 11', element)
-    }) */
-
-
-    //this.transformData(this.wsChatMethodsService.getDmRoom(this.roomId).massages)
-    //this.getMessageDB()
-
 
+    this.wsChatMethodsService.openRoom(this.roomId)
     setTimeout(() => {
       this.scrollToBottomClicked()
-    }, 50)
+    }, 150)
 
 
   }