save

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

@@ -367,9 +367,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       console.log(res);
       if (res.data == 'leave') {
         this.getRoomInfo();
-        this.wsChatMethodsService.hidingRoom(this.roomId);
         this.closeAllDesktopComponents.emit();
         this.showEmptyContainer.emit();
+        this.wsChatMethodsService.hidingRoom(this.roomId);
       }
       else if (res.data == 'delete') {
         this.closeAllDesktopComponents.emit();

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

@@ -113,64 +113,6 @@ export class NewGroupPage implements OnInit{
 
     this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
     this.addGroupMessage.emit(res.result.rid);
-
-    /*
-    let body = { "name":name, }
-    this.chatService.addGroup(body).subscribe(res=>{
-      console.log('group created');
-      console.log(res['group']);
-
-      this.addGroupMessage.emit(res['group']._id); */
-
-      /* this.addGroupMessage.emit(res['group']._id);
-
-      if(this.thedate){
-        let countDownBody = {
-          "roomId": res['group']._id,
-          "customFields":{"countDownDate":this.thedate}
-        }
-        this.chatService.setGroupCustomFields(countDownBody).subscribe(res=>{
-          console.log(res);
-        });
-      }
-
-      if(this.documents.length > 0){
-        //If there is documents add
-        this.documents.forEach(async document => {
-
-          let url = await this.processesService.GetDocumentUrl(document.DocId, document.ApplicationId).toPromise();
-          let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
-
-          let body = {
-            "message":
-            {
-              "rid": res['group']._id,
-              "msg": "",
-              "attachments": [{
-                "title": document.Assunto,
-                "description": document.DocTypeDesc,
-                "title_link": url_no_options,
-                "title_link_download": true,
-                //"thumb_url": "assets/images/webtrix-logo.png",
-                "message_link": url_no_options,
-                "type": "webtrix"
-              }],
-              "file":{
-                "name": document.Assunto,
-                "type": "application/webtrix",
-                "ApplicationId": document.ApplicationType,
-                "DocId": document.Id,
-                "Assunto": document.Assunto,
-              }
-            }
-          }
-          this.chatService.sendMessage(body).toPromise();
-        });
-      } */
-
-
-
-    //});
   }
 
   async addContacts(){

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -35,7 +35,7 @@ export class ChatPopoverPage implements OnInit {
   }
 
   close(action:any){
-    if( window.innerWidth <= 701){
+    if( window.innerWidth < 701){
       this.popoverController.dismiss(action);
       this.modalController.dismiss(action);
     }
@@ -50,7 +50,7 @@ export class ChatPopoverPage implements OnInit {
 
    async setRoomOwner(){
     let classs;
-    if (window.innerWidth <= 800) {
+    if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
     } else {
       classs = 'centered-rounded-modal'
@@ -68,6 +68,7 @@ export class ChatPopoverPage implements OnInit {
       modal.onDidDismiss().then((res)=>{
         if(res.data == 'success'){
           this.leaveGroup();
+          //this.wsChatMethodsService.hidingRoom(this.roomId);
         }
     });
    }