Fixe merge conflit

src/app/pages/search/sender/sender.page.html

@@ -5,5 +5,14 @@
 </ion-header>
 
 <ion-content>
-
+  <div class="main-container">
+    <div class="input-text d-flex ion-align-items-center">
+      <ion-input class="search-input" type="search" placeholder="Pesquisar" (change)="filterContact($event)"></ion-input>
+    </div>
+    <ul>
+      <li *ngFor="let contact of showContacts">
+        {{ contact.Name }}
+      </li>
+    </ul>
+  </div>
 </ion-content>

src/app/pages/search/sender/sender.page.scss

@@ -0,0 +1,25 @@
+.main-container{
+  padding: 0px 20px;
+  .input-text {
+    margin-top: 20px;
+    width: 100%;
+    height: 45px;
+    border-radius: 5px;
+    border: 1px solid #ebebeb;
+  }
+  ul{
+    padding: 0px;
+    margin: 0px;
+    padding-top: 10px;
+    li{    
+      padding-top: 5px;
+      padding-bottom: 10px;
+      margin: 0px;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #ebebeb;
+      list-style:  none;
+      font-family: Roboto;
+      font-size: 15px;
+    }
+  }
+}

src/app/pages/search/sender/sender.page.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
-
+import { ContactsService } from 'src/app/services/contacts.service';
+import { EventPerson } from  'src/app/models/eventperson.model';
 @Component({
   selector: 'app-sender',
   templateUrl: './sender.page.html',
@@ -9,9 +10,37 @@ import { ModalController } from '@ionic/angular';
 })
 export class SenderPage implements OnInit {
 
-  constructor(private modalController:ModalController) { }
+  contacts: EventPerson[];
+  showContacts: EventPerson[];
+
+
+  constructor(private modalController:ModalController,
+    private ContactsService: ContactsService) { 
+
+    }
 
   ngOnInit() {
+    this.getSender();
+  }
+
+  getSender(){
+    this.ContactsService.getContacts("").subscribe(res=>{
+      this.contacts = res;
+    });
+  }
+
+  filterContact(findName){
+    console.log(findName)
+    // const persons = this.contacts.filter((person) => {
+
+      // if (person.Name.indexOf(findName) == 0){
+        // return true;
+      // }
+
+    // });
+
+    // this.showContacts = persons;
+
   }
 
   close(){