diff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts
index 843b919f9..35ea3028c 100644
--- a/src/app/guards/inactivity.guard.ts
+++ b/src/app/guards/inactivity.guard.ts
@@ -23,7 +23,7 @@ export class InactivityGuard implements CanActivate {
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
 
-      console.log('hire inactinity!', state.url)
+      // console.log('hire inactinity!', state.url)
 
       if ( (this.platform.is('desktop') || this.platform.is('mobileweb')) ) {
         
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index ba6f75d80..8d934ed36 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -133,7 +133,7 @@ export class ChatPage implements OnInit {
       if(event.notification == "recive") {
         this.onSegmentChange()
       }
-      console.log(event)
+      // console.log(event)
     });
 
   }
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index f6e2a1b0e..f649a05aa 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -123,7 +123,7 @@ export class DespachoPrPage implements OnInit {
       this.fulltask = res;
       
       // this.updateProcessOnDB(res);
-      console.log('this.fulltask', this.fulltask)
+      // console.log('this.fulltask', this.fulltask)
       let thedate = new Date(this.task.CreateDate);
       this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
 
@@ -395,7 +395,7 @@ export class DespachoPrPage implements OnInit {
           await this.generateDiploma(res.data.note, docs);
         }
         else if (actionName == 'Concluido') {
-          console.log('actionName', actionName)
+          // console.log('actionName', actionName)
           await this.concluir(res.data.note, docs);
         }
         else if (actionName == 'Reexecução') {
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 870906a05..ffc5ce1b1 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -492,7 +492,7 @@ export class DespachoPage implements OnInit {
     await popover.present();
     
     popover.onDidDismiss().then((res)=> {
-      console.log('res', res.data)
+      // console.log('res', res.data)
       if(res.data == 'back') {
         this.goBack();
       }
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 76d9e4000..ce629ed79 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -59,18 +59,16 @@
   </div>
 </ion-header>
 <ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
 
   <div class="main-content width-100 overflow-y-auto height-100">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-          pullingIcon="chevron-down-circle-outline"
-          pullingText="deslize para actualizar"
-          refreshingSpinner="circles"
-          refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
-
-
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <div class="height-100">
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index b5c06d54d..068076bff 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -19,16 +19,17 @@
 </ion-header>
 <ion-content>
 
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+      pullingIcon="chevron-down-circle-outline"
+      pullingText="deslize para actualizar"
+      refreshingSpinner="circles"
+      refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
+  
   <div class="main-content width-100 overflow-y-auto height-100">
 
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
 
     <div class="d-flex ion-justify-content-between ion-align-items-center" style="
@@ -136,14 +137,6 @@
 
 
   <div class="main-content width-100 overflow-y-auto height-100">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-          pullingIcon="chevron-down-circle-outline"
-          pullingText="deslize para actualizar"
-          refreshingSpinner="circles"
-          refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
 
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 71c8b1aa8..5d730d106 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -384,7 +384,7 @@ export class DiplomaPage implements OnInit {
   }
 
   tempMethod(actionname) {
-    console.log(actionname)
+    // console.log(actionname)
   }
 
   
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 204e463ed..30b71d26f 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
@@ -112,7 +112,7 @@ export class ApproveEventPage implements OnInit {
         this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
   
       } catch(error) {
-        console.log(this.loadedEvent)
+        // console.log(this.loadedEvent)
         throw(error)
       }
 
@@ -136,7 +136,7 @@ export class ApproveEventPage implements OnInit {
         this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
   
       } catch(error) {
-        console.log(this.loadedEvent)
+        // console.log(this.loadedEvent)
         throw(error)
       }
 
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 5c1132cc6..2fdac7f9c 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -147,7 +147,7 @@ export class BookMeetingModalPage implements OnInit {
      if(!this.CalendarName) {
       if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
         this.CalendarName = 'Meu calendario';
-        console.log(this.eventService.calendarNamesAry)
+        // console.log(this.eventService.calendarNamesAry)
       } else {
         this.CalendarName = this.eventService.calendarNamesAry[0]
       }
@@ -164,7 +164,7 @@ export class BookMeetingModalPage implements OnInit {
   }
 
   ngOnInit() {
-    console.log('TEsTEROLE',this.eventService.calendarNamesAry)
+    // console.log('TEsTEROLE',this.eventService.calendarNamesAry)
     this.adding = "intervenient";
     this.getAttachments();
     this.setDefaultTime()
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 5e94d1e29..21ab56df1 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -95,7 +95,7 @@ export class ExpedienteDetailPage implements OnInit {
     public TaskService: TaskService
   ) {
     this.loggeduser = SessionStore.user
-    console.log('SessionStore', SessionStore)
+    // console.log('SessionStore', SessionStore)
     
     this.activatedRoute.paramMap.subscribe(params => {
       if (params["params"].SerialNumber) {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index d6e4b4cae..ee65ae5f4 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -59,7 +59,7 @@ export class ExpedientePage implements OnInit {
       if(event.notification == "recive") {
         this.refreshing();
       }
-      console.log(event)
+      // console.log(event)
     })
   }
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index a75504b7f..a555bcbe6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -460,11 +460,11 @@ export class GabineteDigitalPage implements OnInit {
 
 
   doRefreshAside() {
+    
     try {
       window['gabinete-aside-refresh']()
-    } catch (error) {
-      
-    }
+    } catch(error) {}
+    
     setTimeout(() => {
       this.loadAllProcesses();
     }, 1000) 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index c9b6d129f..d4d6a7b39 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -76,16 +76,17 @@
 </ion-header>
 
 <ion-content>
-
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+      pullingIcon="chevron-down-circle-outline"
+      pullingText="deslize para actualizar"
+      refreshingSpinner="circles"
+      refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
+  
   <div class="main-content width-100 overflow-y-auto height-100">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
+
 
     <div class="width-100" [ngSwitch]="segment">
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html
index ae53fe01f..4739432c6 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.html
@@ -1,6 +1,12 @@
 
 
 <ion-content>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+  
   <div class="content-container">
     <div *ngIf="publication.Title != ''">
     <div class="title-content">
@@ -14,11 +20,7 @@
         <p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
       </div>
     </div>
-    <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-      <ion-refresher-content>
-      </ion-refresher-content>
-    </ion-refresher>
+
     <div class="post-item">
       <div *ngIf="publication.FileBase64.length > 30" class="post-img">
         <img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 246b34e26..14d116885 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -35,7 +35,7 @@ export class PublicationDetailPage implements OnInit {
     ) {
 
       this.activatedRoute.paramMap.subscribe(params => {
-        console.log(params["params"])
+        // console.log(params["params"])
         if(params["params"]) {
           this.folderId = params["params"].folderId;
           this.publicationId = params["params"].publicationId;
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 18fd87fb3..dc1891e69 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -236,7 +236,7 @@ export class SearchPage implements OnInit {
             gridSize: 15
           },
         );
-        console.log('set visualy')
+        // console.log('set visualy')
       }, 300)
 
     });
@@ -364,7 +364,7 @@ export class SearchPage implements OnInit {
         this.showLoader = false;
         // this.searchResult = "Registo não encontrado"
         this.httpErrorhandle.httpStatusHandle(error)
-        console.log(error)
+        // console.log(error)
       });
     }
     else if ( this.type == "AccoesPresidenciais & ArquivoDespachoElect") {
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index a78b1d467..cf36d3a7b 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -109,6 +109,9 @@ export class TaskService {
   }
 
   overdueTask(isoDateString:string) {
+    if(!isoDateString) {
+      return false
+    }
     return (new Date()).getTime()  > (new Date(isoDateString)).getTime()
   }
 
@@ -132,7 +135,9 @@ export class TaskService {
     } else if (attribute == 'Não lidos') {
       return !(item.TaskStatus == 'Open' || item.taskStatus == 'Open')
     } else if (attribute == 'OverdueTasks') {
+
       return this.overdueTask(item.Deadline || item.deadline)
+      
     }
     return true
   }
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 ebe99cb23..177990254 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -106,7 +106,7 @@ export class EventListPage implements OnInit {
       this.eventoaprovacaostore.save(segment, this.eventsList)
       
     } else if(segment) {
-      console.log('segment', segment)
+      // console.log('segment', segment)
 
       this.color = 'pr'
       let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts
index 81444ee22..6c205b2fe 100644
--- a/src/environments/suport/oapr.ts
+++ b/src/environments/suport/oapr.ts
@@ -32,7 +32,7 @@ export const oaprDev: Environment = {
   apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
   logoLabel: 'Presidente da República',
   despachoLabel: 'Presidencial',
-  despachoLabel2: 'Despachos Presidenciais',
+  despachoLabel2: 'Despachos Presidênciais',
   production: false,
   domain: 'oapr.gov.ao',
   defaultuser: 'gmanuel@oapr.gov.ao',
@@ -44,6 +44,6 @@ export const oaprDev: Environment = {
   agendaVP: 'Agenda do MD',
   PR: 'PR',
   VP: '',
-  dispatchPR: 'Despachos Presidenciais',
+  dispatchPR: 'Despachos Presidênciais',
   sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712',
 };
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index 8ef416f85..92b9ee5ff 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "4f90a6649",
-  "SHA": "4f90a66493b84e3b8d78ff48c1c305531a9a9db2",
+  "shortSHA": "d011b2749",
+  "SHA": "d011b274930a49e44e2694619e5f5383be61ad7b",
   "branch": "feature/gabinete-search",
-  "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sun Jun 11 20:25:07 2023 +0100'",
-  "lastCommitMessage": "remove text",
-  "lastCommitNumber": "5001",
+  "lastCommitAuthor": "'Eudes Inácio'",
+  "lastCommitTime": "'Mon Jun 12 08:20:48 2023 +0100'",
+  "lastCommitMessage": "Bug on refresh button solved",
+  "lastCommitNumber": "5002",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nYour branch is behind 'origin/feature/gabinete-search' by 4 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/environments/suport/oapr.ts",
+  "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 1 and 4 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/guards/inactivity.guard.ts\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/environments/suport/oapr.ts",
   "changeAuthor": "eudes.inacio"
 }
\ No newline at end of file