diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts
index 2a0a66c75..eda5c0545 100644
--- a/src/app/modals/add-note/add-note.page.ts
+++ b/src/app/modals/add-note/add-note.page.ts
@@ -61,7 +61,7 @@ export class AddNotePage implements OnInit {
     this.documents = this.documents.filter( (e, i) =>  index != i);
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -100,12 +100,15 @@ export class AddNotePage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -143,8 +146,11 @@ export class AddNotePage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 9b67e9240..ca879bbf0 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -131,16 +131,16 @@ export class CreateProcessPage implements OnInit {
   }
   async saveTask(){
 
-    if(this.postData.Priority=='99999861'){
+    if(this.postData.Priority=='99999861') {
       this.dispatchFolder.DeadlineType = 'Normal';
     }
-    else if(this.postData.Priority=='99999862'){
+    else if(this.postData.Priority=='99999862') {
       this.dispatchFolder.DeadlineType = 'Urgente';
     }
-    else if(this.postData.Priority=='99999863'){
+    else if(this.postData.Priority=='99999863') {
       this.dispatchFolder.DeadlineType = 'Muito Urgente';
     }
-    else if(this.postData.Priority=='99999864'){
+    else if(this.postData.Priority=='99999864') {
       this.dispatchFolder.DeadlineType = 'Urgentíssimo';
     }
     
@@ -177,7 +177,7 @@ export class CreateProcessPage implements OnInit {
       
                 try {
                   await this.processes.postDespatcho(this.postData).toPromise()
-                  this.successMessage('')
+                  //this.successMessage('')
                 } catch (error) {
                   this.badRequest()
                 }
@@ -197,7 +197,7 @@ export class CreateProcessPage implements OnInit {
       
                 try {
                   await this.processes.postParecer(this.postData).toPromise()
-                  this.successMessage()
+                  // this.successMessage()
                 } catch (error) {
                   this.badRequest()
                 }
@@ -216,7 +216,7 @@ export class CreateProcessPage implements OnInit {
               
                 try {
                   await this.processes.postDeferimento(this.postData).toPromise()
-                  this.successMessage()
+                  // this.successMessage()
                 } catch (error) {
                   this.badRequest()
                 }
@@ -247,7 +247,7 @@ export class CreateProcessPage implements OnInit {
       
                 try {
                   await this.processes.postDespatcho(this.postData).toPromise()
-                  this.successMessage()
+                  // this.successMessage()
                 } catch (error) {
                   this.badRequest()
                 }
@@ -267,7 +267,7 @@ export class CreateProcessPage implements OnInit {
       
                 try {
                   await this.processes.postParecer(this.postData).toPromise()
-                  this.successMessage()
+                  // this.successMessage()
                 } catch (error) {
                   this.badRequest()
                 }
@@ -286,7 +286,7 @@ export class CreateProcessPage implements OnInit {
               
                 try {
                   await this.processes.postDeferimento(this.postData).toPromise()
-                  this.successMessage()
+                  // this.successMessage()
                 } catch (error) {
                   this.badRequest()
                 }
@@ -301,7 +301,7 @@ export class CreateProcessPage implements OnInit {
    
     
   }
-  async executado(){
+  async executado() {
     let body = { 
       "serialNumber": this.task.serialNumber, 
       "action": "Conhecimento",
@@ -504,7 +504,7 @@ export class CreateProcessPage implements OnInit {
 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -543,12 +543,15 @@ export class CreateProcessPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -586,8 +589,11 @@ export class CreateProcessPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts
index 2ac655fd2..945ede90e 100644
--- a/src/app/modals/dar-parecer/dar-parecer.page.ts
+++ b/src/app/modals/dar-parecer/dar-parecer.page.ts
@@ -97,7 +97,7 @@ export class DarParecerPage implements OnInit {
   }
 
   
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -136,12 +136,15 @@ export class DarParecerPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts
index 5b97e5a0a..122b9c6ff 100644
--- a/src/app/modals/delegar/delegar.page.ts
+++ b/src/app/modals/delegar/delegar.page.ts
@@ -72,22 +72,20 @@ export class DelegarPage implements OnInit {
     
   }
 
-  close(){
+  close() {
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
-  goBack() {
-    window.history.back()
-  }
-  cancelTask(){
+
+  cancelTask() {
     this.modalController.dismiss(null);
   }
 
-  async saveTask(){
+  async saveTask() {
     if(this.taskParticipants.length > 1){
       this.alertService.presentErrorMessage("Selecione apenas um destinatário");
     }
-    else{
+    else {
       let body = {
         "SerialNumber": this.task.SerialNumber,
         "DispatchDocId": this.task.DocId,
@@ -104,7 +102,6 @@ export class DelegarPage implements OnInit {
       (error)=>{
         this.badRequest("Processo não delegado")
       });
-      this.goBack();
     }
   }
 
@@ -174,7 +171,7 @@ export class DelegarPage implements OnInit {
     this.taskParticipants = taskParticipants;
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -213,12 +210,15 @@ export class DelegarPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -256,8 +256,11 @@ export class DelegarPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 65f574f11..4c32025ef 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -226,7 +226,7 @@
                   <div *ngFor="let event of events.value" >
                     
 
-                    <div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" *ngIf="eventListVisible(event.start)">
+                    <div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" >
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index b955f38ca..f35252c8c 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -234,7 +234,7 @@ export class EditEventPage implements OnInit {
     });
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -273,12 +273,15 @@ export class EditEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -316,8 +319,11 @@ export class EditEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
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 53e11a19c..9549c9482 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
@@ -92,7 +92,7 @@ export class EventActionsPopoverPage implements OnInit {
   } 
   
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -131,12 +131,15 @@ export class EventActionsPopoverPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -174,8 +177,11 @@ export class EventActionsPopoverPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
   
 
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index 854f9a005..b54e8af7c 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -169,7 +169,7 @@ export class NewEventPage implements OnInit {
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -208,12 +208,15 @@ export class NewEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -251,8 +254,11 @@ export class NewEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
   async openAttendees() {
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 845b4642b..ef7b51433 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -328,7 +328,8 @@ export class EventsPage implements OnInit {
   goToExpediente(serialNumber:any){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
+        "from": "inicio"
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
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 cf7368de1..e0a66ff92 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
@@ -83,14 +83,14 @@ export class DespachoPrPage implements OnInit {
   }
 
   goBack(){
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "despachospr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
 
-    window.history.back()
   }
 
 
@@ -174,7 +174,7 @@ export class DespachoPrPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  async executado(note:string, documents:any){
+  async executado(note:string, documents:any) {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Conhecimento",
@@ -464,7 +464,7 @@ export class DespachoPrPage implements OnInit {
     return await popover.present();
   }
     
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -503,11 +503,14 @@ export class DespachoPrPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -545,7 +548,10 @@ export class DespachoPrPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 }
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 28b95e615..57dbf26c0 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -85,7 +85,17 @@ export class DespachoPage implements OnInit {
   }
 
   goBack() {
-    window.history.back()
+    // window.history.back()
+
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        // "serialNumber": serialNumber,
+        'despachos': true
+      }
+    }
+
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
   }
 
 
@@ -209,7 +219,7 @@ export class DespachoPage implements OnInit {
 
   }
 
-  async reexecute(note:string, documents:any){
+  async reexecute(note:string, documents:any) {
     let body = { 
       "serialNumber": this.serialnumber, 
       "action": "Reencaminhar",
@@ -231,7 +241,7 @@ export class DespachoPage implements OnInit {
 
   }
 
-  sendExpedienteToPending(){
+  async sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
       this.close();
@@ -414,7 +424,7 @@ export class DespachoPage implements OnInit {
   }
   
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -453,12 +463,15 @@ export class DespachoPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -496,7 +509,10 @@ export class DespachoPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 }
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
index 791955cde..bfdd64f4a 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
@@ -53,8 +53,14 @@ export class DiplomaAssinarPage implements OnInit {
     this.LoadTaskDetail(this.serialnumber);
   }
 
-  goBack(){
-    window.history.back()
+  goBack() {
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "diplomas": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
   }
 
   async openOptions(taskAction?: any) {
@@ -144,18 +150,20 @@ export class DiplomaAssinarPage implements OnInit {
     }
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.goBack();
-      this.successMessage()
+      
+      this.successMessage(false, ()=>{
+        this.goBack();
+      })
     } catch (error) {
       this.badRequest()
     }
   }
 
-  close(){
+  close() {
     this.modalController.dismiss();
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -194,12 +202,15 @@ export class DiplomaAssinarPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -237,8 +248,11 @@ export class DiplomaAssinarPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
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 f5aa91be5..13bbb623e 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -55,14 +55,15 @@ export class DiplomaPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "diplomas": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back()
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "diplomas": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
   }
 
   async openOptions(taskAction?: any) {
@@ -152,8 +153,11 @@ export class DiplomaPage implements OnInit {
     }
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.close();
-      this.successMessage()
+      
+      this.successMessage(false, ()=>{
+        this.close();
+      })
+      
     } catch (error) {
       this.badRequest()
     }
@@ -271,7 +275,7 @@ export class DiplomaPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -310,12 +314,15 @@ export class DiplomaPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -353,8 +360,11 @@ export class DiplomaPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
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 9fd4654cc..805251e85 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
@@ -71,7 +71,8 @@ export class ApproveEventModalPage implements OnInit {
     this.modalController.dismiss(null);
   }
 
-  getTask(){
+  getTask() {
+
     this.processes.GetTask(this.serialNumber).subscribe(res => {
       console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
       this.loadedEvent = res;
@@ -83,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
       this.getAttachments()
 
     })
+    
   }
 
   viewDocument(docId:string, applicationId:string){
@@ -94,20 +96,22 @@ export class ApproveEventModalPage implements OnInit {
     });
   }
   
-  async approveTask(serialNumber:string){
+  async approveTask(serialNumber:string) {
     console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
-    try {  
+    try {
       await this.processes.PostTaskAction(body).toPromise()
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-      this.modalController.dismiss(null);
-      this.successMessage('Evento aprovado')
+
+      this.successMessage('Evento aprovado', ()=>{
+        this.router.navigate(['/home/gabinete-digital/event-list']);
+        this.modalController.dismiss(null);
+      })
+
     } catch (error) {
       this.badRequest('Evento não aprovado')
     }
 
-
   }
 
   emendTask(serialNumber:string){
@@ -119,15 +123,17 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   async rejectTask(serialNumber:string) {
-    // console.log('rejectTask: ',serialNumber)
+
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
-    // console.log(body);
     
     try { 
       await  this.processes.PostTaskAction(body).toPromise()
-      this.router.navigate(['/home/gabinete-digital/event-list']);
 
-      this.successMessage('Evento rejeitado')
+      this.successMessage('Evento rejeitado', () =>{
+        this.router.navigate(['/home/gabinete-digital/event-list']);
+      })
+
+      
     } catch (error) {
       this.badRequest('Evento não rejeitado')
     }
@@ -214,7 +220,7 @@ export class ApproveEventModalPage implements OnInit {
 
   } 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -253,12 +259,15 @@ export class ApproveEventModalPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -296,8 +305,11 @@ export class ApproveEventModalPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
   
 }
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 5aac3efba..2d45475df 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
@@ -63,10 +63,18 @@ export class ApproveEventPage implements OnInit {
   }
 
   goBack() {
-    window.history.back();
+
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "eventos": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
+
   }
 
-  async getTask(){
+  async getTask() {
     this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
     console.log(this.loadedEvent);
 
@@ -78,17 +86,17 @@ export class ApproveEventPage implements OnInit {
     this.getAttachments(instanceId);
   }
 
-  async approveTask(serialNumber:string){
+  async approveTask(serialNumber:string) {
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     
     try {  
       //await this.processes.PostTaskAction(body).toPromise()
-      this.toastService.successMessage('Evento aprovado');
-      setTimeout(()=>{
+      //this.successMessage()
+      this.toastService.successMessage('Evento aprovado', ()=>{
         this.goBack();
-      },7000)
-      //this.goBack();
+      });
+      
     } catch (error) {
       this.badRequest()
     }
@@ -115,10 +123,12 @@ export class ApproveEventPage implements OnInit {
     console.log(body);
     this.successMessage('Process');
     try {    
-      //this.processes.PostTaskAction(body).toPromise();
-     
-      await this.toastService.successMessage('Processo rejeitado');
-      this.goBack();
+      this.processes.PostTaskAction(body).toPromise();
+      await this.successMessage('Processo rejeitado');
+      await this.toastService.successMessage('Processo rejeitado', ()=>{
+        this.goBack();
+      });
+      
     } catch (error) {
       this.badRequest()
     }
@@ -193,14 +203,14 @@ export class ApproveEventPage implements OnInit {
     });
   }
 
-  /* goToEventsToApprove(){
+  goToEventsToApprove(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "eventos": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-  } */
+  }
 
 
   async editar(serialNumber: string) {
@@ -226,7 +236,7 @@ export class ApproveEventPage implements OnInit {
 
 
   
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -265,12 +275,15 @@ export class ApproveEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -308,8 +321,11 @@ export class ApproveEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
   
 }
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 c6d9f57fa..29dc86172 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
@@ -305,7 +305,7 @@ export class BookMeetingModalPage implements OnInit {
 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -350,7 +350,7 @@ export class BookMeetingModalPage implements OnInit {
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -388,8 +388,11 @@ export class BookMeetingModalPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
   goToGabinete() {
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 0733c95ac..10021e2db 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -528,7 +528,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -567,12 +567,15 @@ export class ExpedientTaskModalPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -610,8 +613,11 @@ export class ExpedientTaskModalPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index ff8c63d82..3bf8869fb 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -109,7 +109,7 @@
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" *ngIf="hideSendToPendentes" >Enviar para Pendentes</button>
         <div hidden class="solid"></div>
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
         <button hidden (click)="showToast()" class="btn-cancel" shape="round" >ShowToast</button>
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 9b62ad710..0552f0700 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
@@ -39,6 +39,9 @@ export class ExpedienteDetailPage implements OnInit {
   intervenientes: any;
   cc: any = [];
 
+  hideSendToPendentes = true
+
+
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,
@@ -53,12 +56,19 @@ export class ExpedienteDetailPage implements OnInit {
     private toastService: ToastService,
     private animationController: AnimationController
     ) {
+      
       this.activatedRoute.queryParams.subscribe(params => {
+
         if(params["serialNumber"]) {
           this.serialnumber = params["serialNumber"];
-          console.log(params["serialNumber"]);
         }
+        
+        if(params["type"] == "pendentes") {
+          this.hideSendToPendentes = false
+        }
+
       });
+
     }
 
   ngOnInit() {
@@ -76,29 +86,45 @@ export class ExpedienteDetailPage implements OnInit {
     this.LoadRelatedEvents(this.serialnumber);
   }
 
-  close(){
+  close() {
     this.modalController.dismiss();
   }
 
-  showToast(){
+  showToast() {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
-  /* goBack() {
-    window.history.back()
-  } */
 
-  goBack(){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "expedientes": true,
+  goBack() {
+
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["from"] == "inicio") {
+
+        
+        this.router.navigate(['/home/events']);
+
+      } else {
+
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+            "expedientes": true,
+          }
+        }
+
+        if( window.innerWidth < 801) {
+          this.router.navigate(['/home/gabinete-digital/expediente']);
+        } else {
+          this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        }
+      
       }
-    };
-    if( window.innerWidth < 801){
-      this.router.navigate(['/home/gabinete-digital/expediente']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+
+
+
+
+    });
+    
   }
 
   sendExpedienteToPending(){
@@ -334,7 +360,7 @@ export class ExpedienteDetailPage implements OnInit {
 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -373,12 +399,15 @@ export class ExpedienteDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -416,8 +445,11 @@ export class ExpedienteDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 9f892750d..5cededd0a 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -87,17 +87,24 @@ export class ExpedientePage implements OnInit {
     }, 2000);
   }
 
-  goBack(){
+  goBack() {
+    
     this.router.navigate(['/home/gabinete-digital']);
+  
   }
 
-  goToExpediente(serialNumber:any){
+  goToExpediente(serialNumber:any) {
+    
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
+        "from": "gabinete",
+        "type": "pendentes"
       }
-    };
+    }
+
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+  
   }
 
 }
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
index 31e57a034..94327f159 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
@@ -88,14 +88,14 @@ export class ExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "expedientes-pr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes-pr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+  
 
   }
 
@@ -440,7 +440,7 @@ export class ExpedientePrPage implements OnInit {
     return await popover.present();
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -479,12 +479,15 @@ export class ExpedientePrPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index de2056806..1605ddb95 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -150,14 +150,14 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "expedientes-pr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes-pr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+    // window.history.back();
 
   }
 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 113e45855..d3b28cdd0 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -407,14 +407,18 @@ export class PedidoPage implements OnInit {
   }
   
   goBack() {
-
-    window.history.back();
+    
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "pedidos": true,
+      }
+    }
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
   }
-
-
   
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -453,12 +457,15 @@ export class PedidoPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index f9dcf01cb..4c7d0d072 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -54,8 +54,16 @@ export class PendentesPage implements OnInit {
   }
 
   goBack() {
+    
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "pedidos": true,
+      }
+    }
 
-    window.history.back();
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
+    // window.history.back();
   }
  
   notImplemented(){
@@ -168,7 +176,8 @@ export class PendentesPage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
-        "from": "pendentes"
+        "from": "pendentes",
+        "type": "pendentes"
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index da0a5d487..7d127100f 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,6 +1,6 @@
 <ion-content class="text-white">
   <div class="main-wrapper">
-  <div class="wrapper"  *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint">
+  <div class="wrapper"  *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint ">
 
     <div class="bg-1 d-flex justify-center align-center">
       <div class="bg-2 d-flex justify-center align-center">
@@ -71,11 +71,11 @@
         
       </div>
   
-      <div *ngIf="!setPint" class="voltar d-flex align-center justify-center pt-35 clear" (click)="pin=!pin">
+      <div *ngIf="!setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="setPint=false; userLoginPreference='none'">
         Entrar com senha
       </div>
 
-      <div  *ngIf="setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
+      <div  *ngIf="setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin;">
         Limpar
       </div>
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 2964e31de..a807cb999 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -33,9 +33,9 @@ export class LoginPage implements OnInit {
   password: string = environment.defaultuserpwd;
   userattempt: UserForm;
   code = []
-  setPint = false
 
-  pin = localStorage.getItem('PIN') != null
+  setPint = false
+  pin = false
 
   userLoginPreference: any
 
@@ -57,9 +57,16 @@ export class LoginPage implements OnInit {
 
     if (userData.hasOwnProperty('loginPreference')) {
       this.userLoginPreference = userData.loginPreference
+      this.pin = true
+
     } else {
+
       this.userLoginPreference = ''
+      this.setPint = false
+      this.pin = false
+
     }
+
   }
 
   ngOnInit() {}
@@ -198,7 +205,7 @@ export class LoginPage implements OnInit {
 
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -237,12 +244,15 @@ export class LoginPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
 
 
     const enterAnimation = (baseEl: any) => {
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index 8108d746a..0def7afd9 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -56,7 +56,7 @@ export class NewActionPage implements OnInit {
     this.modalController.dismiss();
   }
   
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -95,12 +95,15 @@ export class NewActionPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -138,8 +141,11 @@ export class NewActionPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
   
 }
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts
index f4adc3908..0d4a520af 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts
@@ -122,7 +122,7 @@ export class PublicationDetailPage implements OnInit {
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -161,12 +161,15 @@ export class PublicationDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -204,7 +207,10 @@ export class PublicationDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 }
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 b448c62aa..cced89669 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
@@ -124,7 +124,7 @@ export class PublicationDetailPage implements OnInit {
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -163,12 +163,15 @@ export class PublicationDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -206,8 +209,11 @@ export class PublicationDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts
index 766a2a20b..04b4726e4 100644
--- a/src/app/services/toast.service.ts
+++ b/src/app/services/toast.service.ts
@@ -22,7 +22,7 @@ export class ToastService {
     toast.present();
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -61,12 +61,15 @@ export class ToastService {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
     },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -104,6 +107,9 @@ export class ToastService {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
     },7000)
   }
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index d75031bb3..432fd955d 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -235,7 +235,7 @@ export class ApproveEventPage implements OnInit {
   } 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -274,12 +274,15 @@ export class ApproveEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -317,8 +320,11 @@ export class ApproveEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index bae43e372..df0c2ec93 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -315,7 +315,7 @@ export class NewEventPage implements OnInit {
     window['temp.path:/home/agenda/new-event.component.ts'] = {}
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -354,12 +354,15 @@ export class NewEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -397,8 +400,11 @@ export class NewEventPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 
diff --git a/src/app/shared/fingerprint/fingerprint.page.ts b/src/app/shared/fingerprint/fingerprint.page.ts
index 7bb9187ef..d1997b19e 100644
--- a/src/app/shared/fingerprint/fingerprint.page.ts
+++ b/src/app/shared/fingerprint/fingerprint.page.ts
@@ -69,7 +69,7 @@ export class FingerprintPage implements OnInit {
 
 }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -115,7 +115,7 @@ export class FingerprintPage implements OnInit {
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -153,8 +153,11 @@ export class FingerprintPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
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 4bcd513d4..c55082221 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
@@ -407,7 +407,7 @@ export class EditEventToApproveComponent implements OnInit {
     });
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -446,12 +446,15 @@ export class EditEventToApproveComponent implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -489,8 +492,11 @@ export class EditEventToApproveComponent implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index ba409c126..8b6549a55 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -32,8 +32,10 @@ export class ExpedientsPage implements OnInit {
     private modalController: ModalController,
     private alertService: AlertService,
     private router: Router, 
+    private activatedRoute: ActivatedRoute,
     ) { 
       this.profile = 'mdgpr';
+
     }
 
   ngOnInit() {
@@ -101,6 +103,8 @@ export class ExpedientsPage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
+        "from": "gabinete",
+        "type": "pendentes"
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 12fff9c1f..416b07535 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -155,29 +155,34 @@ export class PendentesPage implements OnInit {
 
   goToDespacho(serialNumber:any){
     let navigationExtras: NavigationExtras = {
-     queryParams: {
+      queryParams: {
         "serialNumber": serialNumber,
+        }
       }
-     };
-     this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
+      this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
    }
 
-   goToPedido(serialNumber:any){
-    let navigationExtras: NavigationExtras = {
-     queryParams: {
-        "serialNumber": serialNumber,
-      }
-     };
-     this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
-   }
+    goToPedido(serialNumber:any) {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          "serialNumber": serialNumber,
+          }
+        }
+      this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
+    }
 
    goToExpediente(serialNumber:any){
+    
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
+        "from": "gabinete",
+        "type": "pendentes"
       }
-    };
-    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+    }
+
+    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras)
+
   }
 
   async openDespacho(serialNumber:string){
diff --git a/src/app/shared/pin/pin.page.ts b/src/app/shared/pin/pin.page.ts
index bb321155d..0646d4796 100644
--- a/src/app/shared/pin/pin.page.ts
+++ b/src/app/shared/pin/pin.page.ts
@@ -54,7 +54,7 @@ export class PinPage implements OnInit {
 
   }
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -96,7 +96,7 @@ export class PinPage implements OnInit {
    
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts
index d140f491f..827cdc242 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.ts
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts
@@ -145,7 +145,7 @@ export class DeplomaOptionsPage implements OnInit {
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -183,12 +183,15 @@ export class DeplomaOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const modal = await this.modalController.create({
       component: BadRequestPage,
        componentProps: {
@@ -200,8 +203,11 @@ export class DeplomaOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
   goBack() {
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index c0f4ab31e..fac026cb2 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -281,7 +281,7 @@ export class DespachosOptionsPage implements OnInit {
 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -320,12 +320,15 @@ export class DespachosOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const modal = await this.modalController.create({
       component: BadRequestPage,
        componentProps: {
@@ -337,8 +340,11 @@ export class DespachosOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 
@@ -365,14 +371,14 @@ export class DespachosOptionsPage implements OnInit {
 
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "despachospr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back()
+    // window.history.back()
   }
 
 }
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index f942fdd37..fd4e0b524 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -282,7 +282,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -321,12 +321,15 @@ export class DespachosPrOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const modal = await this.modalController.create({
       component: BadRequestPage,
        componentProps: {
@@ -338,8 +341,11 @@ export class DespachosPrOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 
@@ -366,14 +372,15 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "despachospr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back()
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "despachospr": true,
+      }
+    };
+    
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
   }
 
 
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
index f5d683176..4608d15dd 100644
--- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { User } from 'src/app/models/user.model';
@@ -42,7 +42,9 @@ export class OptsExpedientePrPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private userAuth: AuthService,
     private navParams: NavParams,
-    private animationController: AnimationController
+    private animationController: AnimationController,
+    private router: Router
+    
   ) {
 
     this.task = this.navParams.get('task');
@@ -275,19 +277,19 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   goBack() {
-    // let navigationExtras: NavigationExtras = {
-    //   queryParams: {
-    //     "expedientes-pr": true,
-    //   }
-    // };
-    // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "expedientes-pr": true,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
-    window.history.back();
+    // window.history.back();
 
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -326,12 +328,15 @@ export class OptsExpedientePrPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const modal = await this.modalController.create({
       component: BadRequestPage,
        componentProps: {
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index add10b2ba..65f5c9507 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -285,7 +285,7 @@ export class RequestOptionsPage implements OnInit {
 
 
   
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -324,12 +324,15 @@ export class RequestOptionsPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts
index c43558ea0..3c982c133 100644
--- a/src/app/shared/publication/new-action/new-action.page.ts
+++ b/src/app/shared/publication/new-action/new-action.page.ts
@@ -59,7 +59,7 @@ export class NewActionPage implements OnInit {
   }
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -98,12 +98,15 @@ export class NewActionPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -141,8 +144,11 @@ export class NewActionPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 6dced0ef8..b09b55bee 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -275,7 +275,7 @@ export class NewPublicationPage implements OnInit {
   } */
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -314,12 +314,15 @@ export class NewPublicationPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -357,8 +360,11 @@ export class NewPublicationPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
   
 }
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 2703b1f85..e6dbee632 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -141,7 +141,7 @@ export class PublicationDetailPage implements OnInit {
 
 
     
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -180,12 +180,15 @@ export class PublicationDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -223,8 +226,11 @@ export class PublicationDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }