git pull made and peter chnages recived

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

@@ -6,7 +6,7 @@
     </button>
   </div>
   <div class="buttons">
-    <button (click)="addContacts()" class="btn-cancel" shape="round" >Adicionar</button>
+    <button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round" >Adicionar</button>
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
     <button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" >Alterar nome do grupo</button>
     <div class="solid"></div>

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

@@ -5,9 +5,12 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
 import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
+<<<<<<< HEAD
 import { HttpErrorResponse } from '@angular/common/http';
 import { SessionStore } from 'src/app/store/session.service';
 import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
+=======
+>>>>>>> b8a1734abbbe321eedb202ddde21592f161acf12
 
 
 @Component({
@@ -43,11 +46,11 @@ export class ChatPopoverPage implements OnInit {
   close(action:any){
     if( window.innerWidth < 701){
       this.popoverController.dismiss(action);
-      this.modalController.dismiss(action);
+      this.modalController.dismiss(action)
     }
     else{
       this.popoverController.dismiss(action);
-      this.modalController.dismiss(action);
+      this.modalController.dismiss(action)
     }
   }
 
@@ -128,38 +131,24 @@ export class ChatPopoverPage implements OnInit {
       }
     });
     this.popoverController.dismiss('delete');
-    this.modalController.dismiss('delete');
+    this.modalController.dismiss('delete')
   }
 
   async openChangeGroupName(){
     if( window.innerWidth < 701){
       this.popoverController.dismiss('edit');
+      this.modalController.dismiss('edit')
     }
     else{
-      this.modalController.dismiss('edit');
+      this.popoverController.dismiss('edit');
+      this.modalController.dismiss('edit')
     }
   }
 
-  async addContacts() {
-    
 
-    const modal = await this.modalController.create({
-      component: GroupContactsPage,
-      componentProps: {
-        isCreated: this.isGroupCreated,
-        room: this.room,
-        members: this.members,
-        name: this.room.name,
-      },
-      cssClass: 'contacts',
-      backdropDismiss: false
-    });
-
-    await modal.present();
-
-    modal.onDidDismiss().then(() => {
-      /* this.getRoomInfo(); */
-    });
+  async addUser() {
+    this.popoverController.dismiss('addUser');
+    this.modalController.dismiss('addUser')
   }
 
 }