diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 9814a6372..bf7ad1f2d 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -520,10 +520,9 @@ export class AgendaPage implements OnInit {
             // loop
             this.CalendarStore.pushEvent(response, 'md');
 
-            this.listToPresent = this.CalendarStore.eventSource
             this.trasnformData(response, 'md');
 
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
             this.myCal.update();
             this.myCal.loadEvents();
@@ -548,10 +547,8 @@ export class AgendaPage implements OnInit {
           // calendar
           this.CalendarStore.pushEvent(response, 'pr');
 
-          this.listToPresent = this.CalendarStore.eventSource
 
-
-          this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           // 
           this.myCal.update();
@@ -579,10 +576,8 @@ export class AgendaPage implements OnInit {
             this.CalendarStore.removeRange(startTime, endTime, 'pr')
             this.CalendarStore.pushEvent(response, 'pr');
 
-            this.listToPresent = this.CalendarStore.eventSource
 
-
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
             // 
 
@@ -615,10 +610,9 @@ export class AgendaPage implements OnInit {
               this.CalendarStore.pushEvent(response, 'md');
   
               
-              this.listToPresent = this.CalendarStore.eventSource
               this.trasnformData(response, 'md');
   
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
   
               // 
               this.myCal.update();
@@ -642,10 +636,7 @@ export class AgendaPage implements OnInit {
             // calendar
             this.CalendarStore.pushEvent(response, 'pr');
   
-            this.listToPresent = this.CalendarStore.eventSource
-  
-  
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
   
             // 
             this.myCal.update();
@@ -680,9 +671,7 @@ export class AgendaPage implements OnInit {
           // loop
           this.CalendarStore.pushEvent(eventsList, 'md');
 
-          this.listToPresent = this.CalendarStore.eventSource
-
-          this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           // 
           this.myCal.update();
@@ -715,10 +704,8 @@ export class AgendaPage implements OnInit {
 
 
           this.CalendarStore.pushEvent(eventsList, 'pr');
-          this.listToPresent = this.CalendarStore.eventSource
 
-
-          this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           // 
 
@@ -757,9 +744,7 @@ export class AgendaPage implements OnInit {
             // loop
             this.CalendarStore.pushEvent(eventsList, 'pr');
   
-            this.listToPresent = this.CalendarStore.eventSource
-  
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             
             // console.log('this.TimelineMDList', this.TimelineMDList);
 
@@ -793,13 +778,9 @@ export class AgendaPage implements OnInit {
   
             // loop
             this.CalendarStore.pushEvent(eventsList, 'md');
+          
   
-            this.listToPresent = this.CalendarStore.eventSource           
-  
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            // console.log(this.CalendarStore.eventSource)
-            // console.log('this.TimelineMDList', this.TimelineMDList)
-
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
             this.myCal.update();
             this.myCal.loadEvents();
@@ -843,10 +824,7 @@ export class AgendaPage implements OnInit {
             this.CalendarStore.pushEvent(eventsList, 'pr');
             this.listToPresent = this.CalendarStore.eventSource
 
-            
-  
-  
-            this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             // console.log('this.TimelinePRList', this.TimelinePRList)
             // 
   
@@ -1030,22 +1008,22 @@ export class AgendaPage implements OnInit {
         case "Combinado":
 
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
           else if (this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') {
 
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
           else if (this.loggeduser.Profile == 'PR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
           } else {
             
             if(this.profile == "pr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             } else if (this.profile == "mdgpr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             }
 
           }
@@ -1054,17 +1032,17 @@ export class AgendaPage implements OnInit {
         case "Pessoal":
           //Inicializa o array eventSource
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
           else if(this.loggeduser.Profile == 'PR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
           } else {
             if(this.profile == "pr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             } else if (this.profile == "mdgpr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             }
           }
           break;
@@ -1072,17 +1050,17 @@ export class AgendaPage implements OnInit {
         case "Oficial":
 
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
 
           } else if(this.loggeduser.Profile == 'PR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           } else {
             if(this.profile == "pr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             } else if (this.profile == "mdgpr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             }
           }
           break;
@@ -1172,13 +1150,13 @@ export class AgendaPage implements OnInit {
     if (this.profile == "mdgpr") {
       this.profile = "pr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+      this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
     }
     else {
       this.profile = "mdgpr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+      this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
     }
 
   }
@@ -1260,9 +1238,16 @@ export class AgendaPage implements OnInit {
       this.postEvent = data.event;
 
       this.mobileComponent.showEditEvent = true;
+    } else if(data.type == 'delete') {
+
     }
 
     this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+
+    setTimeout(()=>{
+      this.onCurrentChanged(this.eventSelectedDate)
+    }, 500)
+    
   }
 
 
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 6e13d2471..e157b893e 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -151,7 +151,7 @@
                 <p class="text-center exp-card-title ">Todas as tarefas</p>
                 <p class="text-center exp-card-content"> {{ getAllProcessCount }} <span class="title1">Documentos</span></p>
               </div>
-
+  
               <div *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])" (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'"  class="box-hover exp-card d-flex flex-column">
                 <div class="d-flex justify-center">
                   <ion-icon  src="assets/images/icons-agenda.svg"></ion-icon>
@@ -159,7 +159,7 @@
                 <p class="text-center exp-card-title ">Eventos para Aprovação</p>
                 <p class="text-center exp-card-content">{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} <span class="title1">Documentos</span></p>
               </div>
-
+  
               <div (click)="openExpedientListPage(); selectedElement='Correspondence'" [class.active]="selectedElement == 'Correspondence'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-correspondencia.svg"></ion-icon>
@@ -222,6 +222,32 @@
                 <p class="text-center exp-card-title ">Pedidos de Deferimento</p>
                 <p class="text-center exp-card-content">{{pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
               </div>
+
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
+                <div class="center-div">
+                  <div class="exp-card-icon">
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-despachos-presidente.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'showDespachosPr'"  src="assets/images/theme/gov/icons-despachos-presidente.svg"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'showDespachosPr'"  src="assets/images/theme/gov/icons-despachos-presidente-hover.svg"></ion-icon>
+                  </div>
+                  <div class="exp-card-text">
+                    <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p>
+                    <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Despachos criados por mim</p>
+                    <p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
+                  </div>
+                </div>
+              </div>
+  
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" class="box-hover exp-card d-flex flex-column justify-center">
+                <div class="d-flex justify-center">
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasPorValidar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                </div>
+                <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Validar</p>
+                <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar</p>
+                <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
+              </div>
   
               <div *ngIf="SessionStore.user.Profile == 'Consultant'"  (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
@@ -237,6 +263,17 @@
 
               </div>
 
+              <div (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
+                <div class="d-flex justify-center">
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente.svg"></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasAssinados'"  src="assets/images/theme/gov/icons-diplomas-assinados-presidente-hover.svg"></ion-icon>
+                </div>
+                <p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas assinados PR</p>
+                <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas</p>
+                <p class="text-center exp-card-content">{{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
+              </div>
+  
               <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
                 <div class="d-flex justify-center">
                   <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
@@ -313,6 +350,7 @@
                     <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
                     <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
                   </div>
+            
                 </ion-item>
                 <ion-item lines="none"
                 class="item-skeleton width-100 d-flex ion-no-border ion-no-margin ion-no-padding">
@@ -332,10 +370,15 @@
                     <div class="my-2"><div style="width: 50%; background-color: #eeeeee; height: 10px;"></div></div>
                     <div class="my-2"><div style="width: 100%; background-color: #eeeeee; height: 10px;"></div></div>
                   </div>
+            
                 </ion-item>
               </ion-item-sliding>
             </div>
+
+
+
           </div>
+
         </div>
       </div>
 
diff --git a/src/app/pages/inactivity/inactivity.page.ts b/src/app/pages/inactivity/inactivity.page.ts
index 954cc101e..63dc58b8a 100644
--- a/src/app/pages/inactivity/inactivity.page.ts
+++ b/src/app/pages/inactivity/inactivity.page.ts
@@ -37,9 +37,7 @@ export class InactivityPage implements OnInit {
 
   loop = false
 
-  ngOnInit() {
-    alert('pin')
-  }
+  ngOnInit() {}
 
   runloop() {
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 7c8f64857..787d027a4 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -131,7 +131,8 @@ export class LoginPage implements OnInit {
               this.ChatSystemService.loadChat();
           
             }
-
+            
+            this.changeProfileService.runLogin();
             this.getToken();
             SessionStore.setInativity(true);
 
diff --git a/src/app/services/attachments.service.ts b/src/app/services/attachments.service.ts
index 85b91a87c..fd67ce1ee 100644
--- a/src/app/services/attachments.service.ts
+++ b/src/app/services/attachments.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Attachment, EventAttachment } from '../models/attachment.model';
+import { Attachment } from '../models/attachment.model';
 import { Observable } from 'rxjs';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
@@ -7,6 +7,7 @@ import { LoginUserRespose } from '../models/user.model';
 import { SessionStore } from '../store/session.service';
 import { File } from '@ionic-native/file/ngx';
 import { Platform } from '@ionic/angular';
+import { ChangeProfileService } from './change-profile.service';
 
 @Injectable({
   providedIn: 'root'
@@ -16,11 +17,29 @@ export class AttachmentsService {
   loggeduser: LoginUserRespose;
   headers: HttpHeaders;
 
-  constructor(private http: HttpClient, private platform: Platform, private file: File) {
+  constructor(
+    private http: HttpClient, 
+    private platform: Platform, 
+    private file: File, 
+    private changeProfileService: ChangeProfileService) {
+
+    this.changeProfileService.registerCallback(() => {
+      this.loggeduser = SessionStore.user
+      this.headers = new HttpHeaders();
+      
+      this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
+    })
+    this.changeProfileService.registerLoginCallback(() => {
+      this.loggeduser = SessionStore.user
+      this.headers = new HttpHeaders();
+      
+      this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
+    })
+
     this.loggeduser = SessionStore.user
     this.headers = new HttpHeaders();
-    
     this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
+
   }
 
   uploadFile(formData:any) {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 4b5cf4e4d..5fa183863 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -223,6 +223,7 @@ export class AuthService {
       SessionStore.setInativity(false)
       SessionStore.setUrlBeforeInactivity(this.router.url);
       setTimeout(() => {
+        // alert('logout')
         this.router.navigateByUrl('/', { replaceUrl: true });
       }, 100)
 
diff --git a/src/app/services/change-profile.service.ts b/src/app/services/change-profile.service.ts
index 9d1cdf3e7..8563e21ce 100644
--- a/src/app/services/change-profile.service.ts
+++ b/src/app/services/change-profile.service.ts
@@ -12,6 +12,12 @@ export class ChangeProfileService {
     id: string
   }[] = []
 
+
+  callbacksLogin: {
+    funx: Function
+    id: string
+  }[] = []
+
   constructor() { }
 
 
@@ -23,6 +29,15 @@ export class ChangeProfileService {
     return id;
   }
 
+
+  registerLoginCallback(funx: Function, object: any = {} ) {
+
+    const id = uuidv4()
+    this.callbacksLogin.push({funx, id})
+
+    return id;
+  }
+
   deleteCallback(id) {
     this.callbacks.forEach((e, index)=> {
       if(e.id == id) {
@@ -38,5 +53,11 @@ export class ChangeProfileService {
       e.funx()
     })
   }
+
+  runLogin() {
+    this.callbacksLogin.forEach((e, index)=> {
+      e.funx()
+    })
+  }
   
 }
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index d01f444dd..ae151e20b 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -193,8 +193,6 @@ export class ViewEventPage implements OnInit {
         });
       } else {
 
-        
-
         if(this.CalendarId) {
           this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => {
             this.toastService.successMessage('Evento apagado');