diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 5b196e612..6765bcc7f 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -45,7 +45,7 @@
                   <ion-icon  *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
                   <ion-icon *ngIf="profile == 'pr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
                   <ion-icon (click)="viewEventsToApprove()" class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
-                  <ion-icon (click)="openAddEvent()" class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
+                  <ion-icon (click)="clearContact();openAddEvent()" class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
                 </ion-row> 
               </ion-row> 
               
@@ -283,7 +283,7 @@
                 *ngSwitchCase="'day'"
                 [viewDate]="viewDate"
                 [events]="events"
-                (eventClicked)="eventClicked($event)"
+                (eventClicked)="clearContact();eventClicked($event)"
               >
               </mwl-calendar-day-view>
             </div>
@@ -293,7 +293,7 @@
                 *ngSwitchCase="'day'"
                 [viewDate]="viewDate"
                 [events]="TimelineMD"
-                (eventClicked)="eventClicked($event)"
+                (eventClicked)="clearContact();eventClicked($event)"
               >
               </mwl-calendar-day-view>
             </div>
@@ -303,7 +303,7 @@
                 *ngSwitchCase="'day'"
                 [viewDate]="viewDate"
                 [events]="TimelinePR"
-                (eventClicked)="eventClicked($event)"
+                (eventClicked)="clearContact();eventClicked($event)"
               >
               </mwl-calendar-day-view>
             </div>
@@ -319,13 +319,14 @@
       <div *ngIf="(
         mobileComponent.showAddNewEvent == false &&
         mobileComponent.showEditEvent == false &&
-        mobileComponent.showEventDitails == false &&
+        mobileComponent.showEventDetails == false &&
         mobileComponent.showEventList == false &&
         mobileComponent.showEventToApprove == false &&
-        mobileComponent.showAttendees == false
+        mobileComponent.showAttendees == false &&
+        mobileComponent.showAttendeeModal == false
         )
         "
-      class="text-black nothing-to-show">
+        class="text-black nothing-to-show">
           Nenhum evento selecionado
       </div>
       
@@ -338,6 +339,7 @@
         (openAttendeesComponent)="openAttendeesComponent($event)"
         [eventAttendees]="contacts"
         (clearContact)="clearContact()"
+        (setContact)="setContact()"
         
       ></app-new-event>
       <!-- Edit -->
@@ -347,6 +349,8 @@
         [postEvent]="postEvent"
         (cloneAllmobileComponent)="cloneAllmobileComponent()"
         (clearContact)="clearContact()"
+        (openAttendeesComponent)="openAttendeesComponent($event)"
+        (setContact)="setContact()"
       ></app-edit-event>
 
       <!-- View -->
@@ -354,6 +358,7 @@
         [profile]="profile"
         [eventId]="selectedEventId"
         (viewEventDetailDismiss)="viewEventDetailDismiss($event)"
+        [eventAttendees]="contacts"
       ></app-view-event>
 
       
@@ -370,6 +375,7 @@
         (cloneAllmobileComponent)="viewEventDetailDismiss($event)"
         (closeEventToApprove)="closeEventToApprove()"
         (AproveEventEditEvent)="AproveEventEditEvent($event)"
+        [eventAttendees]="contacts"
       >
 
       </app-approve-event>
@@ -380,8 +386,10 @@
         (openAttendeeModal)="openAttendeeModal()"
         [eventAttendees]="contacts"
         (openAddEvent)="openAddEvent($event)"
+        (GoBackEditOrAdd)="GoBackEditOrAdd()"
       >
       </app-attendees>
+      
 
       <app-attendee-modal
         class="d-flex flex-column height-100" 
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 74530b2a9..ef2ed1c5b 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -103,6 +103,9 @@ export class AgendaPage implements OnInit {
   eventsListPessoal: Event[];
   eventsListOficial: Event[];
 
+  // this will make  toggle add event and.
+  showEventEditOrOpen:  "edit" | "add" | "" = ""
+
   prEventList: Event[];
   mdEventList: Event[];
 
@@ -204,12 +207,16 @@ export class AgendaPage implements OnInit {
 
     // this.viewEventDetail(event.id);
 
-    this.cloneAllmobileComponent()
+    this.cloneAllmobileComponent();
+
+    
+    this.showEventEditOrOpen = 'edit';
 
     if( window.innerWidth <= 1024){
       this.router.navigate(["/home/agenda", event.id, 'agenda']);
     } else {
       this.cloneAllmobileComponent();
+
       this.mobileComponent.showEventDetails = true;
     }
 
@@ -749,7 +756,9 @@ export class AgendaPage implements OnInit {
 
   async openAddEvent() {
 
-    await this.cloneAllmobileComponent()
+    await this.cloneAllmobileComponent();
+
+    this.showEventEditOrOpen = 'add';
 
     if( window.innerWidth <= 1024){
       const modal = await this.modalCtrl.create({
@@ -774,6 +783,12 @@ export class AgendaPage implements OnInit {
     }
   }
 
+
+  openEditEvent(){
+    this.showEventEditOrOpen = 'edit';
+
+  }
+
   openAddEventDismiss(data){
 
     let postEvent: Event = data;
@@ -893,6 +908,7 @@ export class AgendaPage implements OnInit {
     this.mobileComponent.showEventList = false;
     this.mobileComponent.showEventToApprove = false;
     this.mobileComponent.showAttendees = false;
+    this.mobileComponent.showAttendeeModal = false;
 
     this.closeEventToApprove();
 
@@ -927,9 +943,31 @@ export class AgendaPage implements OnInit {
     this.contacts = [];
   }
 
+  async setContact(data:EventPerson[]){
+    this.contacts = data;
+  }
+
   async openAttendeeModal(){
     this.cloneAllmobileComponent();
     this.mobileComponent.showAttendeeModal = true;
   }
 
+
+  async GoBackEditOrAdd(){
+    
+
+    if(this.showEventEditOrOpen == "edit"){
+      this.cloneAllmobileComponent();
+
+      this.mobileComponent.showEditEvent = true;
+    } else if(this.showEventEditOrOpen == "add") {
+      this.cloneAllmobileComponent();
+
+      this.mobileComponent.showAddNewEvent = true;
+    } else {
+      // do Nothings
+    }
+
+  }
+
 }
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.component.html
index 45b2046c7..13cacf4c7 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.html
+++ b/src/app/shared/agenda/edit-event/edit-event.component.html
@@ -29,6 +29,7 @@
         Campo obrigatório
       </span> -->
   
+      
     </div>
   
     <div class="container-div">
@@ -134,7 +135,7 @@
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
         </div>
-        <div (click)="openAttendees()" class="ion-input-class d-flex flex-grow-1 width-100 overflow-hidden">
+        <div (click)="openAttendees()" class="ion-input-class d-flex flex-grow-1 width-100 overflow-hidden ">
           <div class="list-people flex-grow-1">
             <ion-item lines="none">
               <ion-list>
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index fd4103f12..bd9541651 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -32,7 +32,8 @@ export class EditEventComponent implements OnInit {
 
 
   @Output() cloneAllmobileComponent = new EventEmitter<any>();
-
+  @Output() openAttendeesComponent = new EventEmitter<any>();
+  @Output() setContact = new EventEmitter<any>();
 
   constructor(
     private modalController: ModalController,
@@ -76,24 +77,10 @@ export class EditEventComponent implements OnInit {
 
   async openAttendees()
   {
-    const modal = await this.modalController.create({
-      component: AttendeesPage,
-       componentProps: {
-        eventAttendees: this.postEvent.Attendees
-      },
-      cssClass: 'attendee',
-      backdropDismiss: false
-    });
 
-    await modal.present();
+    this.openAttendeesComponent.emit();
 
-    modal.onDidDismiss().then((data) => {
-      if (data['data'] != null)
-      { 
-        let newattendees: EventPerson[] = data['data'];
-        this.postEvent.Attendees = newattendees;
-      }
-    });
+    this.clearContact.emit();
 }
 
 }
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index efe420a77..676a0eac6 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -24,6 +24,7 @@ export class NewEventPage implements OnInit {
   @Output() onAddEvent = new EventEmitter<any>();
   @Output() openAttendeesComponent = new EventEmitter<any>();
   @Output() clearContact = new EventEmitter<any>();
+  @Output() GoBackEditOrAdd  = new EventEmitter<any>();
 
   minDate: string;
 
@@ -90,7 +91,7 @@ export class NewEventPage implements OnInit {
     }
   }
   close(){
-    this.onAddEvent.emit(false);
+    this.GoBackEditOrAdd.emit();
     this.clearContact.emit();
   }
   save(){
@@ -104,7 +105,7 @@ export class NewEventPage implements OnInit {
     
     this.onAddEvent.emit(this.postEvent);
 
-    this.clearContact.emit();
+    this.GoBackEditOrAdd.emit();
   }
 
   async openAttendees(data: any)
diff --git a/src/app/shared/event/attendees/attendees.page.ts b/src/app/shared/event/attendees/attendees.page.ts
index 83b802f35..64a8dce6d 100644
--- a/src/app/shared/event/attendees/attendees.page.ts
+++ b/src/app/shared/event/attendees/attendees.page.ts
@@ -20,6 +20,7 @@ export class AttendeesPage implements OnInit {
   @Output() openAttendeeModal = new EventEmitter<any>();
   @Output() openAddEvent  = new EventEmitter<any>();
   @Input() eventAttendees: EventPerson[];
+  @Output() GoBackEditOrAdd = new EventEmitter<any>();
 
   
   constructor(private eventService: EventsService, private modalCtrl: ModalController, 
@@ -31,13 +32,15 @@ export class AttendeesPage implements OnInit {
   }
 
   save(){
-    this.openAddEvent.emit();
+    this.GoBackEditOrAdd.emit();
+    //this.openAddEvent.emit();
     // this.modalCtrl.dismiss(this.eventAttendees);
   }
 
   close(){
+    this.GoBackEditOrAdd.emit();
     // this.modalCtrl.dismiss(null);
-    this.openAddEvent.emit();
+    //this.openAddEvent.emit();
   }
 
   removeAttendee(attendee: EventPerson)