From b33b4f1a1b55b903d4c37d768fa511d053f54cb4 Mon Sep 17 00:00:00 2001
From: Equilibrium ITO <eudes.inacio@equilibrium.co.ao>
Date: Tue, 5 Mar 2024 09:29:36 +0100
Subject: [PATCH 1/7] pod install made

---
 ios/App/App.xcodeproj/project.pbxproj | 20 ++++++++++----------
 ios/App/App/Info.plist                |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 5854d2b87..acfc782cf 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -15,7 +15,7 @@
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
 		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
-		A9D8C5112B87AF2B00C95FBB /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A9D8C5102B87AF2B00C95FBB /* GoogleService-Info.plist */; };
+		A99931862B9691C4001D9C4F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A99931852B9691C4001D9C4F /* GoogleService-Info.plist */; };
 		A9D8C5192B87B08300C95FBB /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D8C5182B87B08300C95FBB /* ShareViewController.swift */; };
 		A9D8C51C2B87B08300C95FBB /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9D8C51A2B87B08300C95FBB /* MainInterface.storyboard */; };
 		A9D8C5202B87B08300C95FBB /* Share.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A9D8C5162B87B08300C95FBB /* Share.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -55,7 +55,7 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
-		A9D8C5102B87AF2B00C95FBB /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
+		A99931852B9691C4001D9C4F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		A9D8C5162B87B08300C95FBB /* Share.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Share.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		A9D8C5182B87B08300C95FBB /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		A9D8C51B2B87B08300C95FBB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
@@ -117,8 +117,8 @@
 		504EC3061FED79650016851F /* App */ = {
 			isa = PBXGroup;
 			children = (
+				A99931852B9691C4001D9C4F /* GoogleService-Info.plist */,
 				A9D8C5252B888E8300C95FBB /* App.entitlements */,
-				A9D8C5102B87AF2B00C95FBB /* GoogleService-Info.plist */,
 				50379B222058CBB4000EE86E /* capacitor.config.json */,
 				504EC3071FED79650016851F /* AppDelegate.swift */,
 				504EC30B1FED79650016851F /* Main.storyboard */,
@@ -243,7 +243,7 @@
 				50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
 				504EC30D1FED79650016851F /* Main.storyboard in Resources */,
 				2FAD9763203C412B000D30F8 /* config.xml in Resources */,
-				A9D8C5112B87AF2B00C95FBB /* GoogleService-Info.plist in Resources */,
+				A99931862B9691C4001D9C4F /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -489,16 +489,16 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 86;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.3;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1;
+				MARKETING_VERSION = 3.6;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -516,16 +516,16 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 86;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.3;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1;
+				MARKETING_VERSION = 3.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
index 02e3d1d91..27edf47ff 100644
--- a/ios/App/App/Info.plist
+++ b/ios/App/App/Info.plist
@@ -62,7 +62,6 @@
 	<string>This app requires access to the photo library.</string>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>processing</string>
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

From 6494be6ac8f9904dc3e0c768276e3feaad788955 Mon Sep 17 00:00:00 2001
From: Equilibrium ITO <eudes.inacio@equilibrium.co.ao>
Date: Tue, 5 Mar 2024 10:15:15 +0100
Subject: [PATCH 2/7] some changes

---
 ios/App/App.xcodeproj/project.pbxproj | 8 ++++----
 src/environments/environment.prod.ts  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index acfc782cf..0fed9f9ee 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -489,7 +489,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 86;
+				CURRENT_PROJECT_VERSION = 87;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -498,7 +498,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6;
+				MARKETING_VERSION = 3.7;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -516,7 +516,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 86;
+				CURRENT_PROJECT_VERSION = 87;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -525,7 +525,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6;
+				MARKETING_VERSION = 3.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 2536052bb..1b55290ea 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,4 +4,4 @@ import { environment as doneITProd } from './suport/doneIt'
  import { DevDev } from './suport/dev'
 
 
-export const environment: Environment = DevDev;
+export const environment: Environment = oaprProd;

From e87b4ccdeff6b855169a3d0919141ea2d4559d67 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 11 Mar 2024 10:23:33 +0100
Subject: [PATCH 3/7] remove publication mobile

---
 src/app/pages/login/login.page.ts             | 14 ++++++++--
 .../new-publication/new-publication.page.html |  2 +-
 .../new-publication/new-publication.page.ts   | 28 +++++++++----------
 src/app/services/auth.service.ts              |  1 +
 src/app/services/chat/chat-system.service.ts  |  2 +-
 src/app/services/chat/room.service.ts         |  2 +-
 src/app/shared/header/header.page.ts          | 10 +++++++
 .../new-publication/new-publication.page.html |  2 +-
 .../new-publication/new-publication.page.ts   |  3 +-
 9 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 0be3a9409..ce39c08b8 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -144,8 +144,18 @@ export class LoginPage implements OnInit {
 
             if (attempt.ChatData) {
 
-              await this.authService.loginToChatWs();
-              this.ChatService.setheader()
+              try {
+
+                await MessageModel.deleteAll();
+                await DeleteMessageModel.deleteAll();
+                this.ChatSystemService.clearChat();
+                this.NotificationHolderService.clear()
+                await this.authService.loginToChatWs();
+                this.ChatService.setheader()
+
+              } catch(error) {
+                console.log("faild to clear chat")
+              }
 
             }
 
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index a091392c3..9ea946437 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -40,7 +40,7 @@
 
 
               <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'" [(ngModel)]="capturedImage"
-                name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.FileBase64"
+                name="image" ngDefaultControl [src]="seleted.FileBase64"
                 (click)="imageSize(capturedImage)"  style="height: 69px;"></ion-img>
 
               <video *ngIf="checkFileType.checkFileType(seleted.FileExtension)  == 'video'" width="70" height="70"
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 86b6814c1..dc36e34f8 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -758,7 +758,7 @@ console.log(stringGerada);
             this.shareContentAndroid(resultUrl,FileExtension)
           }
 
-/* 
+/*
           Filesystem.readFile({ path: resultUrl }).then(async (content) => {
             let fileObject;
             try {
@@ -809,7 +809,7 @@ console.log(stringGerada);
     } else {
       window["sharedContent"] = null
     }
-      
+
   }
 
   async recordevideoIos(fullPath) {
@@ -854,7 +854,7 @@ console.log(stringGerada);
       .catch((erro) => console.error('read converted video erro ', erro));
     });
 
-   
+
   } catch (error) {
       console.log('record video ios erro, ', error)
   }
@@ -906,7 +906,7 @@ console.log(stringGerada);
         }
       } else {
         fileObject = {
-          FileBase64: content.data,
+          FileBase64: 'data:image/jpeg;base64,' + content.data,
           FileExtension: this.removeTextBeforeSlash(element.mimeType, '/'),
           OriginalFileName: 'image'
         }
@@ -915,18 +915,18 @@ console.log(stringGerada);
       this.seletedContent.push(fileObject)
     })
     .catch((err) => console.error(err));
-    
+
   }
 
    gerarStringAleatoria() {
     const caracteres = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
     let stringAleatoria = '';
-  
+
     for (let i = 0; i < 4; i++) {
       const indiceAleatorio = Math.floor(Math.random() * caracteres.length);
       stringAleatoria += caracteres.charAt(indiceAleatorio);
     }
-  
+
     return stringAleatoria;
   }
 
@@ -944,23 +944,23 @@ console.log(stringGerada);
                 OriginalFileName: 'shared',
               }
             console.log('shared base', content.data)
-    
+
             this.seletedContent.push(fileObject)
           } catch (error) {
             console.log('error shared filesystem', error)
           }
-    
+
         })
       } else if (this.checkFileType.checkFileType(FileExtension) == 'video') {
         const directory = await Filesystem.getUri({
           directory: Directory.Cache,
           path: '',
         });
-    
+
         let fileObject ={};
         this.videoconvertService.convertVideo(fullPath,directory.uri,filename,'mp4').then(() => {
           Filesystem.readFile({ path: `${directory.uri}output.mp4`})
-    
+
           .then(async (content) => {
             console.log(content.data)
             this.filecontent = true;
@@ -991,8 +991,8 @@ console.log(stringGerada);
         });
 
       }
-  
-     
+
+
     } catch (error) {
         console.log('record video ios erro, ', error)
     }
@@ -1005,7 +1005,7 @@ console.log(stringGerada);
       try {
         if (this.checkFileType.checkFileType(FileExtension) == 'image') {
           fileObject = {
-            FileBase64: this.removeTextBeforeSlash(content.data, ','),
+            FileBase64:  'data:image/jpeg;base64,' +this.removeTextBeforeSlash(content.data, ','),
             FileExtension: FileExtension,
             OriginalFileName: 'shared',
           }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 7e382a2f6..13f89e896 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -183,6 +183,7 @@ export class AuthService {
     setTimeout(() => {
 
       if (SessionStore.user.ChatData?.data) {
+        this.RochetChatConnectorService.logout();
         this.RochetChatConnectorService.connect();
         this.RochetChatConnectorService.login().then((message: any) => {
           console.log('Chat login', message)
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 551d9aba8..8ac80a56c 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -157,7 +157,7 @@ export class ChatSystemService {
 
   runMainChangeDetector() {
     console.log("change")
-    this.mainChangeDetector()
+    // this.mainChangeDetector()
   }
 
   loadChat() {
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 07037a32b..857a802f0 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -391,7 +391,7 @@ export class RoomService {
       this.name = ChatMessage.msg
     }
 
-    this.changeDetector()
+    // this.changeDetector()
     setTimeout(() => {
       done()
     }, 5)
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index a64e8061a..820d5c56c 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -43,6 +43,16 @@ export class HeaderPage implements OnInit {
   notificationCount: number = 0;
   profilePicture = "";
 
+  hideHeader = false
+
+
+  hideHeaderValidation() {
+    const result = this.HeaderSettingsService.hideHeader && this.ActiveTabService.pages.gabineteDetails
+    if(result != this.hideHeader) {
+      this.hideHeader = true
+    }
+  }
+
 
   constructor(
     private router: Router,
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index db13dc81e..5c5d8635d 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -64,7 +64,7 @@
               </div>
 
               <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'"
-                name="image" ngDefaultControl [src]="seleted.url" style="height: 69px;"></ion-img>
+                name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.FileBase64" style="height: 69px;"></ion-img>
 
               <video class="sdf" *ngIf="checkFileType.checkFileType(seleted.FileExtension)  == 'video' && checkDesktop() == true" width="70" height="70"
                 preload="metadata" webkit-playsinline="webkit-playsinline">
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 effa8a82c..5317377cd 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -410,7 +410,6 @@ export class NewPublicationPage implements OnInit {
             if(e.FileType == 'video' && e.blobFile && e.toUpload) {
               e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
               e.FileExtension = "mp4"
-              e.Base64 = ""
             }
             return e
           })
@@ -420,7 +419,7 @@ export class NewPublicationPage implements OnInit {
           const publication: any = Object.assign({}, this.publicationFormMV.form)
 
           publication.Files = publication.Files.map( (e:PublicationAttachmentEntity) => ({
-            FileBase64: e.url,
+            FileBase64: e.Base64,
             FileExtension: e.FileExtension,
             OriginalFileName:  e.OriginalFileName || 'foto'
           }))

From 26546236623777617fb73d1f0784c6c0125d3382 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 11 Mar 2024 10:34:00 +0100
Subject: [PATCH 4/7] fix publications

---
 .../publication/new-publication/new-publication.page.html  | 7 +------
 .../publication/new-publication/new-publication.page.ts    | 6 +++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index 5c5d8635d..b6bc54cf9 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -64,18 +64,13 @@
               </div>
 
               <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'"
-                name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.FileBase64" style="height: 69px;"></ion-img>
+                name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.Base64" style="height: 69px;"></ion-img>
 
               <video class="sdf" *ngIf="checkFileType.checkFileType(seleted.FileExtension)  == 'video' && checkDesktop() == true" width="70" height="70"
                 preload="metadata" webkit-playsinline="webkit-playsinline">
                 <source type="video/mp4" [src]="seleted.url">
               </video>
 
-              <video class="sdfsdf" *ngIf="checkFileType.checkFileType(seleted.FileExtension)  == 'video' && checkTableDivice() == true" width="70" height="70"
-                preload="metadata" webkit-playsinline="webkit-playsinline">
-                <source type="video/mp4" [src]="'data:video/mp4;base64,' + seleted.Base64">
-              </video>
-
             </div>
 
           </div>
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 5317377cd..a5795a5f7 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -402,6 +402,7 @@ export class NewPublicationPage implements OnInit {
       let time = new Date()
       if (this.publicationFormMV.form.Files.length >= 1) {
 
+        const loader = this.toastService.loading()
 
         const upload = await this.publicationFormMV.uploadVideosFiles()
 
@@ -410,7 +411,10 @@ export class NewPublicationPage implements OnInit {
             if(e.FileType == 'video' && e.blobFile && e.toUpload) {
               e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
               e.FileExtension = "mp4"
+              e.Base64 = ''
             }
+
+
             return e
           })
 
@@ -427,7 +431,7 @@ export class NewPublicationPage implements OnInit {
           publication.DocumentId = null;
           publication.ProcessId = this.folderId
 
-          const loader = this.toastService.loading()
+
 
           try {
 

From c22efc99dcd73b8c7b06bf62bc7636fdaff2dd91 Mon Sep 17 00:00:00 2001
From: Equilibrium ITO <eudes.inacio@equilibrium.co.ao>
Date: Mon, 11 Mar 2024 11:18:32 +0100
Subject: [PATCH 5/7] bug adding file to chat on ios solved

---
 ios/App/App.xcodeproj/project.pbxproj         |  8 +--
 package-lock.json                             | 14 ++---
 package.json                                  |  2 +-
 src/app/app.component.ts                      | 11 ++--
 src/app/interceptors/token.interceptors.ts    |  5 +-
 .../group-messages/group-messages.page.ts     | 40 +++++++++++++++
 src/app/pages/chat/messages/messages.page.ts  | 51 ++++++++++++++++++-
 src/app/services/functions/file.service.ts    | 12 +++++
 8 files changed, 126 insertions(+), 17 deletions(-)

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 0fed9f9ee..02a8ed1b5 100644
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -489,7 +489,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 87;
+				CURRENT_PROJECT_VERSION = 88;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -498,7 +498,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7;
+				MARKETING_VERSION = 3.8;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -516,7 +516,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 87;
+				CURRENT_PROJECT_VERSION = 88;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -525,7 +525,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7;
+				MARKETING_VERSION = 3.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
diff --git a/package-lock.json b/package-lock.json
index fd3d134d0..df3443228 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -124,7 +124,7 @@
         "cordova-plugin-filepath": "^1.5.8",
         "cordova-plugin-multiple-documents-picker": "^1.0.0",
         "cordova-plugin-okhttp": "^2.0.0",
-        "cordova-plugin-screen-orientation": "^3.0.2",
+        "cordova-plugin-screen-orientation": "^3.0.4",
         "cordova-res": "^0.15.3",
         "cordova-sqlite-storage": "^6.0.0",
         "cross-env": "^7.0.3",
@@ -12878,9 +12878,9 @@
       ]
     },
     "node_modules/cordova-plugin-screen-orientation": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
-      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.4.tgz",
+      "integrity": "sha512-AswRuUKJ8J3HycUilTJsIB50aa9TLrwndPNBFG+wfAPhHEqIBF0HaD0q3HbAK7ypgmaj0cvbzk84qP51IcTfrQ==",
       "engines": {
         "cordovaDependencies": {
           "4.0.0": {
@@ -53547,9 +53547,9 @@
       "integrity": "sha512-k8Fr3Zcv2kcsTD7TYrPPBZX/kEDSCjnPQOtaQBOFmCS3IcJNgWQY8LYST57zkIijaTKeQR7JZo4DvW1Oda3o2Q=="
     },
     "cordova-plugin-screen-orientation": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
-      "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.4.tgz",
+      "integrity": "sha512-AswRuUKJ8J3HycUilTJsIB50aa9TLrwndPNBFG+wfAPhHEqIBF0HaD0q3HbAK7ypgmaj0cvbzk84qP51IcTfrQ=="
     },
     "cordova-plugin-statusbar": {
       "version": "2.4.3",
diff --git a/package.json b/package.json
index 20a04a850..b942356d9 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "cordova-plugin-filepath": "^1.5.8",
     "cordova-plugin-multiple-documents-picker": "^1.0.0",
     "cordova-plugin-okhttp": "^2.0.0",
-    "cordova-plugin-screen-orientation": "^3.0.2",
+    "cordova-plugin-screen-orientation": "^3.0.4",
     "cordova-res": "^0.15.3",
     "cordova-sqlite-storage": "^6.0.0",
     "cross-env": "^7.0.3",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index a8e9d3c9c..95e5aa059 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -12,6 +12,7 @@ import { Storage } from '@ionic/storage';
 import { ChatController } from './controller/chat';
 import { register } from 'swiper/element/bundle';
 import { DomSanitizer } from '@angular/platform-browser';
+import {ScreenOrientation} from "@ionic-native/screen-orientation/ngx";
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -41,7 +42,8 @@ export class AppComponent {
       public ThemeService: ThemeService,
       private storage: Storage,
       private ChatSystemService: ChatSystemService,
-      private sanitizer: DomSanitizer
+      private sanitizer: DomSanitizer,
+      private screenOrientation: ScreenOrientation
   ) {
 
     window["sanitizer"] = this.sanitizer
@@ -77,9 +79,12 @@ export class AppComponent {
       if (this.platform.is("tablet")) {
         window.screen.orientation.unlock();
       } else if( this.platform.is("mobile")) {
-        // window.screen.orientation.lock('portrait');
+        if(this.platform.is('ios')){
+          this.screenOrientation.lock('portrait')
+        } else {
+          window.screen.orientation.lock('portrait');
+        }
       }
-
     });
   }
 }
diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/interceptors/token.interceptors.ts
index 13e4ebe71..23ca06a7c 100644
--- a/src/app/interceptors/token.interceptors.ts
+++ b/src/app/interceptors/token.interceptors.ts
@@ -121,7 +121,10 @@ export class TokenInterceptor implements HttpInterceptor {
           } else {
             /* const pathBeforeGoOut = window.location.pathname */
             this.router.navigateByUrl('/auth', { replaceUrl: true }).then(() =>{
-              this.httpErrorHandle.httpsSucessMessagge('sessonExpired')
+              if(SessionStore.user.Authorization){
+                this.httpErrorHandle.httpsSucessMessagge('sessonExpired')
+              }
+              
             })
           }
           return of(false);
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index 0f25ba173..262955733 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -34,6 +34,7 @@ import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { RouteService } from 'src/app/services/route.service';
 import { FileValidatorService } from "src/app/services/file/file-validator.service"
 import { sanitize } from "sanitize-filename-ts";
+import { FilePicker } from '@capawesome/capacitor-file-picker';
 
 
 @Component({
@@ -828,8 +829,47 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   async addFileToChat(types: typeof FileType[]) {
 
+    
+
     const roomId = this.roomId
 
+    if(this.platform.is('ios')) {
+      console.log('ios add file ')
+
+      const resultt = await FilePicker.pickFiles({
+        types: ['application/pdf'],
+        multiple: false,
+        readData: true,
+      });
+
+      console.log('RESULT', resultt.files[0])
+
+      const blobb = this.fileService.base64toBlob(resultt.files[0].data, resultt.files[0].mimeType)
+
+      const formDataa = new FormData();
+      formDataa.append('blobFile', blobb);
+      /*  console.log('add file', fileBase64) */
+
+      this.ChatSystemService.getGroupRoom(roomId).send({
+        file: {
+          "type": resultt.files[0].mimeType,
+          "guid": '',
+        },
+        attachments: [{
+          "title": sanitize(resultt.files[0].name),
+          "name": sanitize(resultt.files[0].name),
+          // "text": "description",
+          "title_link_download": false,
+        }],
+        temporaryData: formDataa,
+        attachmentsModelData: {
+          fileBase64: '',
+        }
+      })
+      return
+        
+    }
+
     const file: any = await this.fileService.getFileFromDevice(types);
 
 
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index b28b048a0..8990525c5 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -35,6 +35,7 @@ import { NotificationsService } from 'src/app/services/notifications.service';
 import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'
 import { FileValidatorService } from "src/app/services/file/file-validator.service"
 import { sanitize } from "sanitize-filename-ts";
+import { FilePicker } from '@capawesome/capacitor-file-picker';
 
 
 
@@ -839,9 +840,46 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async addFileToChat(types: typeof FileType[]) {
-    console.log('add file')
+    console.log('add file ')
     const roomId = this.roomId
 
+    if(this.platform.is('ios')) {
+      console.log('ios add file ')
+
+      const resultt = await FilePicker.pickFiles({
+        types: ['application/pdf'],
+        multiple: false,
+        readData: true,
+      });
+
+      console.log('RESULT', resultt.files[0])
+
+      const blobb = this.fileService.base64toBlob(resultt.files[0].data, resultt.files[0].mimeType)
+
+      const formDataa = new FormData();
+      formDataa.append('blobFile', blobb);
+      /*  console.log('add file', fileBase64) */
+
+      this.ChatSystemService.getDmRoom(roomId).send({
+        file: {
+          "type": resultt.files[0].mimeType,
+          "guid": '',
+        },
+        attachments: [{
+          "title": sanitize(resultt.files[0].name),
+          "name": sanitize(resultt.files[0].name),
+          // "text": "description",
+          "title_link_download": false,
+        }],
+        temporaryData: formDataa,
+        attachmentsModelData: {
+          fileBase64: '',
+        }
+      })
+      return
+        
+    }
+
     const file: any = await this.fileService.getFileFromDevice(types);
     console.log(file)
 
@@ -1239,6 +1277,17 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
+  dataURItoBlobIso(dataURI: any) {
+    const byteString = window.atob(dataURI);
+    const arrayBuffer = new ArrayBuffer(byteString.length);
+    const int8Array = new Uint8Array(arrayBuffer);
+    for (let i = 0; i < byteString.length; i++) {
+      int8Array[i] = byteString.charCodeAt(i);
+    }
+    const blob = new Blob([int8Array], { type: 'application/pdf' });    
+    return blob;
+}
+
 }
 
 
diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts
index 6c2c22a11..d7295d49e 100644
--- a/src/app/services/functions/file.service.ts
+++ b/src/app/services/functions/file.service.ts
@@ -263,5 +263,17 @@ export class FileService {
     return new File([u8arr], filename, {type:mime});
   }
 
+  base64toBlobIos(base64Data, contentType) {
+    contentType = contentType || '';
+    const byteCharacters = atob(base64Data);
+    const byteArray = new Uint8Array(byteCharacters.length);
+  
+    for (let i = 0; i < byteCharacters.length; i++) {
+      byteArray[i] = byteCharacters.charCodeAt(i);
+    }
+  
+    return new Blob([byteArray], { type: contentType });
+  }
+
 
 }

From c49cd411e35ca8752af70565bba5adcb0ce5be44 Mon Sep 17 00:00:00 2001
From: Equilibrium ITO <eudes.inacio@equilibrium.co.ao>
Date: Mon, 11 Mar 2024 13:21:44 +0100
Subject: [PATCH 6/7] document preview working

---
 src/app/pages/chat/messages/messages.page.ts | 10 +++++-----
 src/app/services/chat/message.service.ts     |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 756bcb752..2ed64198e 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -29,7 +29,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
-import { Filesystem, Directory } from '@capacitor/filesystem';
+import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
 import { NewEventPage } from '../../agenda/new-event/new-event.page';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'
@@ -1106,11 +1106,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async openFile(pdfString, filename, type) {
-    const blob = this.b64toBlob(pdfString, type)
-    console.log(blob)
     let pathFile = ''
     const fileName = filename
-    const contentFile = blob
     if (this.platform.is('ios')) {
       pathFile = this.file.documentsDirectory
     } else {
@@ -1122,13 +1119,16 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     await Filesystem.writeFile({
       path: fileName,
       data: pdfString,
-      directory: Directory.Data,
+      directory: Directory.Cache,
+      encoding: Encoding.UTF8,
     }).then((dir) => {
       console.log('DIR ', dir)
       this.fileOpener
         .open(dir.uri, type)
         .then(() => console.log())
         .catch(e => console.error(e))
+    }).catch((error) => {
+      console.log('error writing the file', error)
     });
   }
 
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 3a3cf1f4b..4fca908d9 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -448,6 +448,8 @@ export class MessageService {
     let downloadFile = "";
     this.AttachmentsService.downloadFile(this.file.guid).subscribe(async (event) => {
 
+      console.log('download file',event)
+
       if (event.type === HttpEventType.DownloadProgress) {
 
       } else if (event.type === HttpEventType.Response) {
@@ -456,6 +458,7 @@ export class MessageService {
         } else if (this.file.type != "application/img") {
 
           downloadFile = new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '');
+          console.log('downloaded file', downloadFile)
 
         }
 

From 6fc91a997344273ef470a5d7a4fc65dcc35ceb7e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 11 Mar 2024 16:34:50 +0100
Subject: [PATCH 7/7] fix alignment

---
 src/app/pages/chat/chat.page.html             | 28 +++++++------------
 .../gabinete-digital.page.scss                |  8 +++---
 .../task-details/task-details.page.scss       |  4 +--
 .../new-publication/new-publication.page.ts   |  5 +++-
 .../view-publications.page.ts                 |  1 -
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 18a568ae9..d058c8ae2 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -73,33 +73,25 @@
                       </div>
                       <div class="item-date font-13-em" [class.item-date-active]="room.id == idSelected">{{room.duration}}</div>
                     </div>
-                    <div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected">
+                    <div *ngIf="room.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="room.id ==idSelected">
+                      <div class="item-message font-13-em add-ellipsis white-space-nowrap" *ngIf="room.otherUserType == false"> {{room.lastMessage.msg}} </div>
+                      <div class="font-13-em" *ngIf="room.otherUserType == true">está escrever ...</div>
 
-                      <p class="font-13-em mb-0 add-ellipsis white-space-nowrap" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
-                      <p class="font-13-em" *ngIf="room.otherUserType == true">está escrever...</p>
-                      <!-- <ion-label *ngIf="room.lastMessage.file">
-                        <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
-                      </ion-label> -->
-
-                      <div *ngIf="room.lastMessage.file">
-                        <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img' && room.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
+                      <div class="item-files add-ellipsis" *ngIf="room.lastMessage.file">
+                        <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/audio' && room.lastMessage.file.type != 'application/img'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
                         <fa-icon *ngIf="room.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
-                        <span  class="font-13-em" *ngIf="room.lastMessage.file.type == 'application/audio'"> audio </span>
-
+                        <span *ngIf="room.lastMessage.file.type == 'application/audio'" class="item-files-title font-13-em"> audio </span>
                         <fa-icon *ngIf="room.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
-
+                        <span *ngIf="room.lastMessage.file.type != 'application/audio' && room.lastMessage.attachments" class="item-files-title font-13-em add-ellipsis"> {{ room.lastMessage.attachments[0].title }}</span>
                         <fa-icon *ngIf="room.lastMessage.file.type == 'application/img' " icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
 
-                        <span class="font-13-em"> {{room.lastMessage.file.name || room.lastMessage.file.subject || room.lastMessage.attachments[0].title}}</span>
                       </div>
-
-                      <!-- <ion-label *ngIf="room.lastMessage.attachments">
-                        <div *ngIf="room.lastMessage.attachments[0].image_url">
+                      <div  class="item-files" *ngIf="room.attachments">
+                        <div *ngIf="room.value.lastMessage.attachments[0].image_url">
                           <fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
                           <span class="font-13-em"> Fotografia</span>
                         </div>
-                      </ion-label> -->
-
+                      </div>
                     </div>
                   </div>
                 </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 760d40f48..274f01222 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -315,7 +315,7 @@ ion-list {
           float: left;
           display: inline;
           margin: 0 !important;
-          padding: 2.5px 10.5px 2.5px 10.5px;
+          padding: 2.5px 10.5px 2.5px 0px;
         }
       }
 
@@ -356,7 +356,7 @@ ion-list {
         /* border: 1px solid red; */
 
         ion-label {
-          padding: 2.5px 10.5px 2.5px 10.5px;
+          padding: 2.5px 10.5px 2.5px 0px;
           margin: 0 !important;
         }
       }
@@ -371,7 +371,7 @@ ion-list {
         //border: 1px solid blue;
 
         ion-label {
-          padding: 2.5px 10.5px 2.5px 10.5px;
+          padding: 2.5px 10.5px 2.5px 0px;
           margin: 0 !important;
         }
       }
@@ -809,4 +809,4 @@ ion-segment-button {
   height: 11px;
   min-width: 27px;
   min-height: 27px;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
index 9683273b5..025cf95c2 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
@@ -68,7 +68,7 @@ ion-button{
 }
 
 .upper-content-margin {
-  margin-left: 41px;
+  margin-left: 20px;
 }
 
 
@@ -277,7 +277,7 @@ ion-button{
 
 
   .upper-content {
-    margin-left: 41px;
+    margin-left: 20px;
   }
 
   .activity-instanceName {
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 a5795a5f7..7cbda136a 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -411,7 +411,10 @@ export class NewPublicationPage implements OnInit {
             if(e.FileType == 'video' && e.blobFile && e.toUpload) {
               e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
               e.FileExtension = "mp4"
-              e.Base64 = ''
+            }
+
+            if(e.FileType == 'video' ) {
+              e.Base64 = e.url
             }
 
 
diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts
index 1659c2f1b..b944537b0 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -246,7 +246,6 @@ export class ViewPublicationsPage implements OnInit {
 
       if(JSON.stringify(a) !=  JSON.stringify(b)) {
 
-        // console.log({a, b})
         this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
       } else {
         // console.log({publicationDetails})