diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index d80344e0e..3219a3666 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -68,14 +68,12 @@ export class GroupContactsPage implements OnInit { this.chatService.removeGroupMember(body).subscribe(res=>{ console.log(res); this.getMembers(); - this.loadUsers(); }); } else if(this.room.t == "c"){ this.chatService.removeChannelMember(body).subscribe(res=>{ console.log(res); this.getMembers(); - this.loadUsers(); }); } } @@ -84,11 +82,13 @@ export class GroupContactsPage implements OnInit { if(this.room.t == "p"){ this.chatService.getGroupMembers(this.room._id).subscribe(res=>{ this.members = res['members']; + this.loadUsers(); }); } else if(this.room.t == "c"){ this.chatService.getChannelMembers(this.room._id).subscribe(res=>{ this.members = res['members']; + this.loadUsers(); }); } } @@ -134,9 +134,10 @@ export class GroupContactsPage implements OnInit { return null; } - doRefresh(event){ + doRefresh(ev){ this.loadUsers(); this.getMembers(); + ev.target.complete(); } async close(){ diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index b186a88a0..f2b21fe3f 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -221,8 +221,8 @@ export class GroupContactsPage implements OnInit { return null; } - doRefresh(event){ - + doRefresh(ev){ + ev.target.complete(); } async close(){ diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 66fa65889..1300d7c22 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -265,7 +265,7 @@ background: rgba(51, 51, 51, 0.3); } .modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{ - padding-top: 75px; + padding-top: 65px; --border-radius: 25px 25px 0 0; --border-width:0px; }