diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index a472ba4f7..952f4793a 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -8,13 +8,12 @@
         <ion-header>
           <div class="title-content">
             <div class="middle">
-              <ion-label class="title">Editar Evento</ion-label>
+              <ion-label id="vsdfajnl" class="title">Editar Evento</ion-label>
             </div>
           </div>
         </ion-header>
       </div>
       <ion-item-sliding class="overflow-y-auto">
-
         <div class="px-20">
           <div class="ion-item-container width-100" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
             <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
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 5f43995ef..81d1983c5 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -487,13 +487,18 @@ export class EditEventPage implements OnInit {
   }
 
 
-  getAttachments(eventId: string){
-    this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
-      this.loadedEventAttachments = res;
-      
-    },((erro) => {
-      console.error('editgetAttchament', erro)
-    }));
+  getAttachments(eventId: string) {
+
+    if(this.postEvent.HasAttachments) {
+      this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
+        this.loadedEventAttachments = res;
+        
+      },((erro) => {
+        console.error('editgetAttchament', erro)
+      }));  
+    }
+
+    
   }
 
   deleteAttachment(attachmentID: string, index) {
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index bb51935d1..bb48c9bfe 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -20,7 +20,7 @@ import { Storage } from '@ionic/storage';
 import { SessionStore } from 'src/app/store/session.service';
 import { CalendarService } from 'src/app/store/calendar.service';
 import { HttpErrorHandle} from 'src/app/services/http-error-handle.service'
-
+import { AttachmentsService } from 'src/app/services/attachments.service';
 
 @Component({
   selector: 'app-view-event',
@@ -73,7 +73,8 @@ export class ViewEventPage implements OnInit {
     private RouteService: RouteService,
     private ionicStorage: Storage,
     private CalendarService: CalendarService,
-    private httpErrorHandle: HttpErrorHandle
+    private httpErrorHandle: HttpErrorHandle,
+    private attachmentsService: AttachmentsService,
   ) {
 
     
@@ -394,6 +395,7 @@ export class ViewEventPage implements OnInit {
         setTimeout(() => {
           /* this.loadEvent(); */
           this.loadEvent()
+          this.getAttachments()
         }, 250);
         this.isEventEdited = true;
       }
@@ -404,6 +406,18 @@ export class ViewEventPage implements OnInit {
     this.dicIndex = index
   }
 
+
+  getAttachments() {
+    if(this.loadedEvent.HasAttachments) {
+      this.attachmentsService.getAttachmentsById(this.loadedEvent.EventId).subscribe(res=>{
+        this.loadedEvent.Attachments = res;
+        
+      },((erro) => {
+        console.error('editgetAttchament', erro)
+      }));  
+    }
+  }
+
   async LoadDocumentDetails() {
 
     const docId = this.loadedEvent.Attachments[this.dicIndex].SourceId
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index d55c30178..1c6a7a9f8 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -90,7 +90,7 @@
     </ion-buttons>
     <ion-buttons class="flex-grow-1" slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Enviar</ion-label>
+        <ion-label>Selecionar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 17cbfd6f8..43f5a0866 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -98,7 +98,7 @@
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
-        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído 123</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
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 4e64bc8dd..3dd5c493c 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
@@ -308,7 +308,7 @@ export class DespachoPrPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.httpErroHandle.httpsSucessMessagge('Concluir')
+      this.httpErroHandle.httpsSucessMessagge('Concluir Despacho')
       this.TaskService.loadDiplomas()
     } catch (error) {
       this.httpErroHandle.httpStatusHandle(error)
@@ -408,6 +408,7 @@ export class DespachoPrPage implements OnInit {
           await this.generateDiploma(res.data.note, docs);
         }
         else if (actionName == 'Concluido') {
+          console.log('actionName', actionName)
           await this.concluir(res.data.note, docs);
         }
         else if (actionName == 'Reexecução') {
@@ -415,7 +416,7 @@ export class DespachoPrPage implements OnInit {
         }
 
         this.TaskService.loadDiplomas()
-        this.goBack();
+        // this.goBack();
       }
     });
   }
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index b907d1a19..0d329d7cb 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -152,7 +152,7 @@ export class SearchPage implements OnInit {
           applicationId: ApplicationType,
           docId: item.Id,
         },
-        cssClass: 'modal modal-desktop'
+        cssClass: 'modal-width-100-width-background modal'
       });
       await modal.present();
 
@@ -170,7 +170,7 @@ export class SearchPage implements OnInit {
           applicationId: ApplicationType,
           docId: item.Id,
         },
-        cssClass: 'modal modal-desktop'
+        cssClass: 'modal-width-100-width-background modal'
       });
       await modal.present();
     } 
diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts
index 2aacaa696..6be31e892 100644
--- a/src/app/services/http-error-handle.service.ts
+++ b/src/app/services/http-error-handle.service.ts
@@ -92,8 +92,12 @@ export class HttpErrorHandle {
       case 'Arquivar':
         this.toastService._successMessage('Tarefa Arquivada!')
         break
+      case 'Concluir Despacho':
+        this.toastService._successMessage('Despacho concluido')
+        break;
       case 'Concluir':
         this.toastService._successMessage('Diploma concluido')
+        break;
       case 'Reexecução':
         this.toastService._successMessage('Enviado para reexecução!')
         break;
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 901c19b53..a7b5321e1 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">Editar Evento</ion-label> <br>
+          <ion-label id="edit-event-desktop" class="title">Editar Evento</ion-label> <br>
           <i style="margin-top: -3px; font-size: 15px;" > Campos marcados com * são obrigatórios</i>
         </div>
       </div>
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 03de73d21..2972b70ea 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -450,13 +450,15 @@ export class EditEventPage implements OnInit {
   }
 
   async getAttachments(eventId: string){
-    let rest: any;
-    try {
-      rest = this.attachmentsService.getAttachmentsById(eventId).toPromise()
-    } catch (error) {
-      console.error('getAttchment', error)
+    if(this.postEvent.HasAttachments) {
+      let rest: any;
+      try {
+        rest = this.attachmentsService.getAttachmentsById(eventId).toPromise()
+      } catch (error) {
+        console.error('getAttchment', error)
+      }
+      this.loadedEventAttachments = rest;
     }
-    this.loadedEventAttachments = rest;
   }
 
   deleteAttachment(attachmentID: string, index) {
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html
index f9e36e2ab..4a8db993c 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.html
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html
@@ -87,7 +87,7 @@
     </ion-buttons>
     <ion-buttons slot="end">
       <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Enviar</ion-label>
+        <ion-label>Selecionar</ion-label>
       </button>
     </ion-buttons>
   </ion-toolbar>
diff --git a/version/git-version.ts b/version/git-version.ts
index 11743db60..476a81574 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "91588ebb2",
-  "SHA": "91588ebb24dc5cd0e6ff09806faca06fd01aa5d1",
+  "shortSHA": "7f3cfdc55",
+  "SHA": "7f3cfdc55eaf73f209eda70ac66421d005e406e2",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Jun 9 09:22:46 2023 +0100'",
-  "lastCommitMessage": "fix event to approve",
-  "lastCommitNumber": "4956",
+  "lastCommitTime": "'Fri Jun 9 12:02:11 2023 +0100'",
+  "lastCommitMessage": "fix loader",
+  "lastCommitNumber": "4957",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified:   src/app/pages/events/attendees/attendees.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/services/http-error-handle.service.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file