fix merge

src/app/shared/agenda/edit-event/edit-event.page.ts

@@ -452,7 +452,8 @@ export class EditEventPage implements OnInit {
     window['temp.path:/home/agenda/edit-event.component.ts'] = {
       postEvent: this._postEvent,
       eventBody: this.eventBody,
-      segment: this.segment
+      segment: this.segment,
+      loadedEventAttachments: this.loadedEventAttachments
     }
   }
 
@@ -464,6 +465,7 @@ export class EditEventPage implements OnInit {
       this._postEvent = restoredData.postEvent
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
+      this.loadedEventAttachments = restoredData.loadedEventAttachments
 
       return true;
     } else {

src/app/shared/agenda/new-event/new-event.page.ts

@@ -727,7 +727,8 @@ export class NewEventPage implements OnInit {
       postEvent: this.postEvent,
       eventBody: this.eventBody,
       segment: this.segment,
-      CalendarName: this.CalendarName
+      CalendarName: this.CalendarName,
+      documents: this.documents
     }
   }
 
@@ -745,6 +746,7 @@ export class NewEventPage implements OnInit {
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
       this.CalendarName = restoredData.CalendarName
+      this.documents = restoredData.documents
 
       // restore dater for date and hours picker
 

src/app/shared/chat/messages/messages.page.ts

@@ -442,7 +442,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
         }
       })