diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index 00b99e9d3..a823304b6 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -118,8 +118,8 @@
               </div>
               <div class="approve-event-detail">
                 <h3 id="profile-title">{{item.title}}</h3>
-                <p *ngIf = "item.service == 'agenda'">{{item.location}}</p>
-                <p id="profile-title" *ngIf = "item.service != 'agenda'">{{item.body}}</p>
+                <p *ngIf = "item.service == 'agenda'">{{item.notificationBody}}</p>
+                <p id="profile-title" *ngIf = "item.service != 'agenda'">{{item.notificationBody}}</p>
               </div>
             </div>
 
diff --git a/src/app/module/notification/data/infra/db/notification.db.ts b/src/app/module/notification/data/infra/db/notification.db.ts
index bcda6fe24..965bea4cc 100644
--- a/src/app/module/notification/data/infra/db/notification.db.ts
+++ b/src/app/module/notification/data/infra/db/notification.db.ts
@@ -12,6 +12,7 @@ export const NotificationTableSchema = z.object({
   dateEnd: z.string().optional().nullable(),
   location: z.string().optional().nullable(),
   status: z.boolean().optional(),
+  notificationBody: z.any().optional()
 })
 export type NotificationTable = z.infer<typeof NotificationTableSchema>
 
diff --git a/src/app/module/notification/domain/mapper/notificationListMapper.ts b/src/app/module/notification/domain/mapper/notificationListMapper.ts
index 0a736e853..e453aecec 100644
--- a/src/app/module/notification/domain/mapper/notificationListMapper.ts
+++ b/src/app/module/notification/domain/mapper/notificationListMapper.ts
@@ -15,7 +15,8 @@ export function NotificationListMapper(NotificationOutputDTO: NotificationOutput
       dateEnd: e.endDate,
       createdAt: e.createdAt,
       status: e.status,
-      location: e.location
+      location: e.location,
+      notificationBody: e.body
     }
   ))
 }
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 f0ee509d0..b000c5f22 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -64,7 +64,6 @@ export class EditEventPage implements OnInit {
   selectedRecurringType: any;
 
   CalendarNameOwnerName = ''
-  CalendarNamesOptions = []
 
   public date: any;
   public disabled = false;
@@ -101,6 +100,9 @@ export class EditEventPage implements OnInit {
   selectedUserCalendar:any;
   SessionStore = SessionStore
   serverCurrentList = []
+
+  CalendarNamesOptions = ['Oficial', 'Pessoal']
+
   constructor(
     private modalController: ModalController,
     private navParams: NavParams,
@@ -145,7 +147,7 @@ export class EditEventPage implements OnInit {
 
     if (this.postEvent) {
       if (this.postEvent.Body) {
-        if (typeof (this.postEvent.Body.Text) == 'string') {
+        if (typeof (this.postEvent?.Body?.Text) == 'string') {
           this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
         }
       }
@@ -388,7 +390,7 @@ export class EditEventPage implements OnInit {
   }
 
   validationEditAllEvent() {
-    if (this.postEvent.IsRecurring) {
+    if (this.postEvent.IsRecurring && this.postEvent.EventRecurrence.frequency != 'never') {
       this.alertController.create({
         header: 'Editar evento?',
         message: 'Este evento tem recorrência, deseja editar a Sequência de eventos?',
diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
index 89920a258..3d89c26a2 100644
--- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
+++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
@@ -43,7 +43,7 @@ export class AgendaDataRepositoryService {
       wxeMail: SessionStore.user.Email,
       role: SessionStore.user.RoleDescription,
       roleId: SessionStore.user.RoleID,
-      shareType: 0,
+      shareType: 3,
       date: '',
     }
 
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 63cf0681f..1ac72650a 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -516,6 +516,8 @@ export class EditEventToApprovePage implements OnInit {
 
     if (this.eventProcess['activityInstanceName'] == 'Editar Evento') {
       this.reenviar();
+    } else {
+      this.toastService._badRequest('Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico. #this.eventProcess["activityInstanceName"] == "Editar Evento"')
     }
 
   }
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 47b518ce0..b735f0d94 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -294,29 +294,6 @@
       </div>
     </div>
 
-    <!-- <div class="container-div d-flex">
-      <div class="ion-item-class-2 width-100 d-flex">
-        <div class="ion-icon-class">
-          <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
-        </div>
-        <div class="ion-input-class flex-grow-1">
-
-          <mat-form-field   appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
-            <mat-select
-            placeholder="Selecione repetição*"
-            [(ngModel)]="_postEvent.EventRecurrence.Type"
-            (ngModelChange)="onSelectedRecurringChanged($event)">
-              <mat-option
-                *ngFor="let recurring of recurringTypes"
-                value="{{recurring.Code}}">
-                {{recurring.Description}}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-        </div>
-      </div>
-    </div> -->
 
     <div *ngIf="_postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
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 353e744c0..46d5e8a10 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -39,7 +39,6 @@ export class EditEventPage implements OnInit {
   eventAttendees: EventPerson[];
   // minDate: string;
   loadedEventAttachments: any[] = [];
-  recurringTypes = [];
   selectedRecurringType: any;
   deletedAttachmentsList = [];
 
@@ -105,6 +104,8 @@ export class EditEventPage implements OnInit {
   selectedUserCalendar:any;
   CalendarNamesOptions = ['Oficial', 'Pessoal']
 
+  dateDifference = 0
+
   constructor(
     private modalController: ModalController,
     private eventsService: EventsService,
@@ -186,7 +187,6 @@ export class EditEventPage implements OnInit {
 
     this.initCalendarName = this._postEvent.CalendarName;
 
-    this.getRecurrenceTypes();
 
     setTimeout(() => {
       this._postEvent.EventRecurrence.Type = this._postEvent.EventRecurrence.Type.toString();
@@ -197,8 +197,6 @@ export class EditEventPage implements OnInit {
     this.CalendarNameOwnerName = this.eventsService.detectCalendarNameByCalendarId(this._postEvent.CalendarId)
     this.changeAgenda()
 
-
-
   }
 
 
@@ -227,12 +225,6 @@ export class EditEventPage implements OnInit {
     this.deleteTemporaryData();
   }
 
-  getRecurrenceTypes() {
-    this.eventsService.getRecurrenceTypes().subscribe(res => {
-
-      this.recurringTypes = res;
-    });
-  }
 
 
   runValidation() {
@@ -375,7 +367,8 @@ export class EditEventPage implements OnInit {
   }
 
   validationEditAllEvent() {
-    if (this.postEvent.IsRecurring) {
+
+    if (this.postEvent.IsRecurring && this._postEvent.EventRecurrence.frequency != 'never') {
       this.alertController.create({
         header: 'Editar evento?',
         message: 'Este evento tem recorrência, deseja editar a Sequência de eventos?',
diff --git a/version/git-version.ts b/version/git-version.ts
index 014098c6b..1b429eeba 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,11 +1,11 @@
 export let versionData = {
-  "shortSHA": "de34cbdba",
-  "SHA": "de34cbdbaa6516a1fa746a6e86837228030b1955",
+  "shortSHA": "2cc90867d",
+  "SHA": "2cc90867d8b621ff1848fb334211ab4bf2a791b1",
   "branch": "feature/agenda-api-peter",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Jun 28 08:39:08 2024 +0100'",
-  "lastCommitMessage": "fix color",
-  "lastCommitNumber": "5853",
-  "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/profile.page.html",
+  "lastCommitTime": "'Fri Jun 28 10:27:13 2024 +0100'",
+  "lastCommitMessage": "click area",
+  "lastCommitNumber": "5854",
+  "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 1 commit.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/profile.page.html\n\tmodified:   src/app/module/notification/data/infra/db/notification.db.ts\n\tmodified:   src/app/module/notification/domain/mapper/notificationListMapper.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.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:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file