add progress bar

src/app/pages/chat/group-messages/group-messages.page.html

@@ -26,6 +26,11 @@
 
 
 <ion-content>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
   <div class="welcome-text">
     <ion-label>Esta conversa passou a grupo</ion-label><br />
     <ion-label>A conversa original mantêm-se como chat individual</ion-label>
@@ -33,7 +38,7 @@
   <div *ngFor="let msg of messages" class="messages">
     <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
       <div class="title">
-        <ion-label>{{msg.u.username}}</ion-label>
+        <ion-label>{{msg.u.name}}</ion-label>
         <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
       </div>
       <div>

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

@@ -14,6 +14,7 @@ import { GroupContactsPage } from './group-contacts/group-contacts.page';
   styleUrls: ['./group-messages.page.scss'],
 })
 export class GroupMessagesPage implements OnInit {
+  showLoader: boolean;
   isGroupCreated:boolean;
   loggedUser: any;
   message:any;
@@ -44,25 +45,30 @@ export class GroupMessagesPage implements OnInit {
       this.loggedUser=res;
       console.log(this.loggedUser); 
     });
-    this.doRefresh();
+    this.load();
+  }
+  load(){
+    this.getGroupContacts();
+    this.loadGroupMessages();
   }
 
   close(){
     this.modalController.dismiss();
   }
 
-  doRefresh(/* event */) {
-    this.getGroupContacts();
-    this.loadGroupMessages()
-    /* event.target.complete(); */
+  doRefresh(ev:any){
+    this.load();
+    ev.target.complete();
   }
 
   getGroupContacts(){
+    this.showLoader = true;
     //If group is private call getGroupMembers
     if(this.room.t === 'p'){
       this.chatService.getGroupMembers(this.room._id).subscribe(res=>{
         console.log(res);
         this.members = res['members'];
+        this.showLoader = false;
       });
     }
     //Otherwise call getChannelMembers for públic groups
@@ -70,17 +76,19 @@ export class GroupMessagesPage implements OnInit {
       this.chatService.getChannelMembers(this.room._id).subscribe(res=>{
         console.log(res);
         this.members = res['members'];
+        this.showLoader = false;
       });
     }
   }
   loadGroupMessages(){
-    
+    this.showLoader = true;
     //If group is private call getGroupMembers
     if(this.room.t === 'p'){
       this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res=>{
         console.log(res);
         let msgOnly = res['messages'].filter(data => data.t != 'au');
         this.messages = msgOnly.reverse();
+        this.showLoader = false;
       });
     }
     //Otherwise call getChannelMembers for públic groups
@@ -118,9 +126,13 @@ export class GroupMessagesPage implements OnInit {
     });
     await popover.present();
     popover.onDidDismiss().then(res=>{
+      console.log(res);
       if(res.data){
-        this.doRefresh();
-        this.modalController.dismiss();
+        this.roomName = res.data.name.split('-').join(' ');
+        console.log(this.roomName);
+        
+        this.load();
+        /* this.modalController.dismiss(); */
       };
       
     });
@@ -155,7 +167,7 @@ export class GroupMessagesPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(()=>{
-      this.doRefresh();
+      this.load();
     });
   }