diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 14e45d8eb..83ada0142 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -47,8 +47,8 @@ export class EventActionsPopoverPage implements OnInit {
     this.RouteService.goBack()
   }
 
-  closePopover() {
-    this.popoverController.dismiss();
+  closePopover(message?) {
+    this.popoverController.dismiss(message);
   }
 
   async approveTask() {
@@ -171,8 +171,7 @@ export class EventActionsPopoverPage implements OnInit {
 
     await modal.present();
 
-    modal.onDidDismiss().then(res => {
-    });
+    modal.onDidDismiss().then(res => {});
 
   }
   
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index abae0a480..79fd8c148 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -104,6 +104,7 @@ export class ApproveEventModalPage implements OnInit {
 
     try {
       await this.processes.PostTaskAction(body).toPromise()
+      this.TaskService.loadEventosParaAprovacao();
 
       this.httpErrorHandle.httpsSucessMessagge('Aprovar', ()=>{
         this.router.navigate(['/home/gabinete-digital/event-list']);
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index f8a2b4862..4a56825d6 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -16,7 +16,6 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
 import { RouteService } from 'src/app/services/route.service';
 import { Storage } from '@ionic/storage';
-import config from 'capacitor.config';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service'
 
@@ -76,6 +75,9 @@ export class ApproveEventPage implements OnInit {
       }
     });
 
+    window['approve-event-getTask'] = () => {
+      this.getTask1()
+    }
   }
 
   toDateString(e) {
@@ -115,7 +117,32 @@ export class ApproveEventPage implements OnInit {
     
   }
 
-  async getTask() {
+  getTask1 = () => {
+    this.processes.GetTask(this.serialNumber).subscribe(async res => {
+
+      this.loadedEvent = res
+      console.log('1111=1=1=1=')
+      this.addProcessToDB(this.loadedEvent)
+      
+      try {
+        this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
+        this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+  
+      } catch(error) {
+        console.log(this.loadedEvent)
+        throw(error)
+      }
+
+    }, (error) => {
+      if(error.status == 0) {
+        this.getProcessFromDB();
+      } else {
+        this.httpErrorHandle.httpStatusHandle(error)
+      }
+    })
+  }
+
+  async getTask () {
     this.processes.GetTask(this.serialNumber).subscribe(async res => {
 
       this.loadedEvent = res
@@ -346,8 +373,8 @@ export class ApproveEventPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then(res => {
-      this.TaskService.loadEventosParaAprovacao();
       this.getTask();
+      this.TaskService.loadEventosParaAprovacao();
     });
 
   }
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index b590ab1c0..4e3c579d5 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -8,7 +8,7 @@
       </button>
     </div>
     <div class="header-title">
-      <label>Eventos para Aprovação</label>
+      <label>Eventos para Aprovação ÇÇ</label>
     </div>
     <div style="float:right" *ngIf="showFilter" class="d-flex align-center">
 
@@ -60,11 +60,12 @@
       <!-- <ion-segment-button value="MDGPR">
         Minha agenda
       </ion-segment-button> -->
-      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId">
+
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId || calendars.OwnerUserId">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}}</div>
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index b85dc79d3..e70d2370f 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -137,18 +137,20 @@ export class EventListPage implements OnInit {
       try {
         this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
       } catch (error) {
+        this.skeletonLoader = false
         this.eventsList = [];
       }
 
       this.eventoaprovacaostore.save(segment, this.eventsList)
       
-    } else {
+    } else if(segment) {
 
       this.color = 'pr'
-      let allEvents = await this.processes.eventsToApprove(segment.OwnerUserId,'mobile agenda').toPromise()
+      let allEvents = await this.processes.eventsToApprove(segment,'mobile agenda').toPromise()
       try {
         this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
       } catch(error) {
+        this.skeletonLoader = false
         this.eventsList = []
       }
       
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index d8190643e..ebe99cb23 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -100,11 +100,13 @@ export class EventListPage implements OnInit {
         this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
       } catch (error) {
         this.eventsList = [];
+        this.showLoader = false;
       }
 
       this.eventoaprovacaostore.save(segment, this.eventsList)
       
-    } else {
+    } else if(segment) {
+      console.log('segment', segment)
 
       this.color = 'pr'
       let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
@@ -112,6 +114,7 @@ export class EventListPage implements OnInit {
         this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
       } catch(error) {
         this.eventsList = []
+        this.showLoader = false;
       }
       
       this.eventsList = this.eventsList
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index ace34c488..9c5612958 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -241,27 +241,10 @@ export class EditEventToApproveComponent implements OnInit {
     }
   }
 
-  goBack() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventos": true,
-      }
-    };
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
-
-  }
-
 
 
   close() {
     this.modalController.dismiss();
-    
-    
-
   }
 
   save() {
@@ -313,6 +296,7 @@ export class EditEventToApproveComponent implements OnInit {
 
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
       this.httpErroHalde.httpsSucessMessagge('Editar evento')
+      window['approve-event-getTask']()
     }, error =>{
       this.httpErroHalde.httpStatusHandle(error)
     })
@@ -347,9 +331,7 @@ export class EditEventToApproveComponent implements OnInit {
 
     })
 
-    this.modalController.dismiss();
-    this.goBack();
-
+    this.close();
   }
 
   async openAttendees() {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index ee55c1414..16a865ce9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
 import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = doneITDev
\ No newline at end of file
+export const environment: Environment = DevDev
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index ec63dcd58..b67dcbfd3 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "588745c05",
-  "SHA": "588745c055073c227b8a6830f077133b57f5b09a",
+  "shortSHA": "8ed3ca58e",
+  "SHA": "8ed3ca58ea66975331082df27ef867452df92d2f",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jun 5 15:44:51 2023 +0100'",
+  "lastCommitTime": "'Wed Jun 7 14:43:14 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "4952",
+  "lastCommitNumber": "4953",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   .gitignore\n\tmodified:   package.json\n\tmodified:   src/environments/suport/dev.ts\n\tmodified:   src/environments/suport/doneIt.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified:   src/environments/environment.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file