From 88f01ee141162127bb0836544941f2a1d5457045 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 3 Aug 2022 16:31:03 +0100
Subject: [PATCH 1/5] open event

---
 src/app/modals/view-event/view-event.page.ts  | 63 ++++++++++++++-----
 .../group-messages/group-messages.page.html   |  4 +-
 .../group-messages/group-messages.page.ts     |  5 +-
 .../pages/chat/messages/messages.page.html    |  4 +-
 src/app/pages/chat/messages/messages.page.ts  |  6 +-
 .../shared/agenda/new-event/new-event.page.ts |  3 +
 .../group-messages/group-messages.page.html   |  4 +-
 .../group-messages/group-messages.page.ts     |  5 +-
 .../shared/chat/messages/messages.page.html   |  2 +-
 src/app/shared/chat/messages/messages.page.ts |  5 +-
 10 files changed, 70 insertions(+), 31 deletions(-)

diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts
index cf65032c3..f37748364 100644
--- a/src/app/modals/view-event/view-event.page.ts
+++ b/src/app/modals/view-event/view-event.page.ts
@@ -21,6 +21,7 @@ import { Event } from '../../models/event.model';
 import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { RouteService } from 'src/app/services/route.service';
+import { SessionStore } from 'src/app/store/session.service';
 
 
 @Component({
@@ -54,6 +55,8 @@ export class ViewEventPage implements OnInit {
   header = true
   task: ExpedientTaskModalPageNavParamsTask;
   LoadedDocument: any = null;
+  CalendarId
+  sesseionStora = SessionStore
 
   constructor(
     private modalController: ModalController,
@@ -74,6 +77,7 @@ export class ViewEventPage implements OnInit {
     public ThemeService: ThemeService
   ) {
     this.eventId = this.navParams.get('eventId');
+    this.CalendarId = this.navParams.get('CalendarId');
     this.isEventEdited = false;
     this.loadedEvent = new Event();
     this.eventBody = { BodyType: "1", Text: "" };
@@ -127,24 +131,51 @@ export class ViewEventPage implements OnInit {
 
   loadEvent() {
     const loader = this.toastService.loading();
-    this.eventsService.getEvent(this.eventId).subscribe(res => {
-      this.loadedEvent = res;
-      this.addEventToDb(res);
-      /* this.today = new Date(res.StartDate);
-      this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]); */
-      loader.remove()
-    }, (error) => {
-
-      if (error.status === 0) {
-        this.getFromDb();
-      } else {
-        this.toastService.badRequest('Este evento já não existe na sua agenda')
+    
+    if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
+      this.eventsService.getEvent(this.eventId).subscribe(res => {
+        this.loadedEvent = res;
+        this.addEventToDb(res);
+        
         loader.remove()
-        this.modalController.dismiss('Eevent not Foud');
-        this.RouteService.goBack();
+      }, (error) => {
+  
+        
+        if (error.status === 0) {
+          this.getFromDb();
+        } else {
+          this.toastService.badRequest('Este evento já não existe na sua agenda')
+          loader.remove()
+          this.modalController.dismiss('Eevent not Foud');
+          this.RouteService.goBack();
+        }
+        loader.remove()
+      });
+    } else {
+
+      
+      if(this.CalendarId) {
+        this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
+          this.loadedEvent = res;
+          this.addEventToDb(res);
+          
+          loader.remove()
+        }, (error) => {
+    
+          if (error.status === 0) {
+            this.getFromDb();
+          } else {
+            this.toastService.badRequest('Este evento já não existe na sua agenda')
+            loader.remove()
+            this.modalController.dismiss('Eevent not Foud');
+            this.RouteService.goBack();
+          }
+          loader.remove()
+        });
       }
-      loader.remove()
-    });
+
+    }
+
   }
 
   deleteEvent() {
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 468922cf8..cc652c9c0 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -160,7 +160,7 @@
       </div>
       <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
         <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
-        <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+        <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
         <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
         <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
       </div>
@@ -200,7 +200,7 @@
       <!-- <div *ngIf="msg.file">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
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 980185f06..1f0b3301e 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -325,7 +325,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.loadFiles();
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -336,7 +336,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 3f06827b5..16e5f7872 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -168,7 +168,7 @@
         </div>
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
           </button><br />
           <ion-label class="info-meeting-medium">
@@ -186,7 +186,7 @@
       <div *ngIf="msg.file && msg.delate == false">
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
           </button><br />
           <ion-label class="info-meeting-medium">
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 0a55bfca5..268e41527 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -338,7 +338,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     } catch (err) { }
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
+
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -348,7 +349,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
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 0a52d766e..92494a5e2 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -459,6 +459,7 @@ export class NewEventPage implements OnInit {
             "end": this.postEvent.EndDate,
             "venue": this.postEvent.Location,
             "id": id,
+            "calendarId": CalendarId
           }
           this.chatMethodService.sendMessage(this.roomId,data);
         },
@@ -512,6 +513,7 @@ export class NewEventPage implements OnInit {
             "end": this.postEvent.EndDate,
             "venue": this.postEvent.Location,
             "id": id,
+            "calendarId": CalendarId
           }
           this.chatMethodService.sendMessage(this.roomId,data);
 
@@ -567,6 +569,7 @@ export class NewEventPage implements OnInit {
             "end": this.postEvent.EndDate,
             "venue": this.postEvent.Location,
             "id": id,
+            "calendarId": CalendarId
           }
           this.chatMethodService.sendMessage(this.roomId,data);
           this.toastService._successMessage('Evento criado')
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index f64d7faed..cc1b4c7ec 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -165,7 +165,7 @@
         </div>
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
@@ -203,7 +203,7 @@
       <!-- <div *ngIf="msg.file" >
         <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
+          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
           <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon> {{msg.file.venue}}</ion-label><br />
         </div>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index f5e2b4b96..6b66a249d 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -213,7 +213,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     } catch (err) { }
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -224,7 +224,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index e127dbfe8..6dd7d2e21 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -176,7 +176,7 @@
 
 
           <ion-label *ngIf="msg.delate == false" class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
-          <button *ngIf="msg.delate == false" (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal">
+          <button *ngIf="msg.delate == false" (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal">
             <ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label>
           </button><br />
           <ion-label *ngIf="msg.delate == false" class="info-meeting-medium">
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 7562a9514..0a3c0a29c 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -372,7 +372,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     return this.timeService.showDateDuration(start);
   }
 
-  async goToEvent(eventId: any) {
+  async goToEvent(event: any) {
     let classs;
     if (window.innerWidth < 701) {
       classs = 'modal modal-desktop'
@@ -382,7 +382,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     const modal = await this.modalController.create({
       component: ViewEventPage,
       componentProps: {
-        eventId: eventId,
+        eventId: event.id,
+        CalendarId: event.calendarId
       },
       cssClass: classs,
     });

From fd2e6856a9af4b14ef5a651c09baa0ba1f71d2f8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 3 Aug 2022 16:45:52 +0100
Subject: [PATCH 2/5] save

---
 src/app/pages/chat/messages/messages.page.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 16e5f7872..e0ff11ec4 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -54,7 +54,6 @@
           <span class="time">{{msg.duration}}</span>
         </div>
         <div>
-          <!-- <div class="message-attachments"> -->
             <div class="file">
               <ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
               <ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
@@ -67,7 +66,6 @@
                 <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
               </ion-label>
             </div>
-          <!-- </div>     -->
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>

From 9299d391cdc7cb2c9dce90b1058f7b638f3b8621 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 4 Aug 2022 16:13:11 +0100
Subject: [PATCH 3/5] add loader

---
 src/app/pages/chat/messages/messages.page.html    | 14 ++++++++++----
 src/app/services/chat/message.service.ts          |  2 +-
 .../chat/group-messages/group-messages.page.html  | 14 ++++++++++----
 src/app/shared/chat/messages/messages.page.html   | 15 +++++++++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index e0ff11ec4..74142cdbb 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -85,8 +85,11 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                   </ion-item>
                 </div>
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
@@ -134,8 +137,11 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                     </ion-item>
                   </div>
                   <div class="file audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index c0ee74133..d7cc38f89 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -56,7 +56,7 @@ export class MessageService {
   messageSend = false
   delate = false
   delateRequest = false
-  downloadLoader: boolean;
+  downloadLoader: boolean = false
 
   constructor(private storage: Storage,
     private NfService: NfService,
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index cc1b4c7ec..d9fcd5d2d 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -89,8 +89,11 @@
                       <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                         <ion-icon name="image" class="file-icon"></ion-icon>
                         <ion-label>{{"Imagem"}}</ion-label>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+    
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                       </ion-item>
                     </div>
                   </div>
@@ -135,8 +138,11 @@
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                           <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                           <ion-label>{{"Mensagem de voz"}}</ion-label>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+      
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                         </ion-item>
                       </div>
                       <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 6dd7d2e21..a66504622 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -90,8 +90,12 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                    
                   </ion-item>
                 </div>
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
@@ -142,8 +146,11 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{'Mensagem de voz'}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
                     </ion-item>
                   </div>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">

From f3c77a427925789bf4e3f6b91abbc52acbf59844 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 5 Aug 2022 14:42:19 +0100
Subject: [PATCH 4/5] save

---
 src/app/services/chat/message.service.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index d7cc38f89..4b2ef8839 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -57,6 +57,8 @@ export class MessageService {
   delate = false
   delateRequest = false
   downloadLoader: boolean = false
+  downloadAttachments = false;
+  downloadAttachmentsTemp = 0;
 
   constructor(private storage: Storage,
     private NfService: NfService,
@@ -254,7 +256,14 @@ export class MessageService {
         // save the changes to the storage
         this.save()
         this.downloadLoader = false;
+        this.downloadAttachments = true
+        this.downloadAttachmentsTemp++;
       }
+    }, ()=>{
+      // error
+      this.downloadLoader = false;
+      this.downloadAttachments = true
+      this.downloadAttachmentsTemp++;
     });
 
   }

From 66103d0cd96e4cc69e74620e2f955e1291d164f9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 5 Aug 2022 15:36:09 +0100
Subject: [PATCH 5/5] improve icons loaders

---
 .../group-messages/group-messages.page.html   | 16 ++++++++++++----
 .../pages/chat/messages/messages.page.html    | 10 ++++++----
 src/app/services/chat/message.service.ts      |  2 +-
 .../group-messages/group-messages.page.html   | 10 ++++++----
 .../shared/chat/messages/messages.page.html   | 19 +++++++++++--------
 src/assets/images/retry-svgrepo-com.svg       |  3 +++
 6 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 src/assets/images/retry-svgrepo-com.svg

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index cc652c9c0..f47750df2 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -90,8 +90,12 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                   </ion-item>
                 </div>
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image" >
@@ -131,8 +135,12 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                     </ion-item>
                   </div>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 74142cdbb..b9d0b620f 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -85,11 +85,12 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
 
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                     <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                    <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                   </ion-item>
                 </div>
                 <img *ngIf="msg.attachments[0].image_url" src="{{msg.attachments[0].image_url}}" alt="image">
@@ -137,11 +138,12 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
   
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                     </ion-item>
                   </div>
                   <div class="file audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 4b2ef8839..9ac1017ca 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -262,7 +262,7 @@ export class MessageService {
     }, ()=>{
       // error
       this.downloadLoader = false;
-      this.downloadAttachments = true
+      this.downloadAttachments = false
       this.downloadAttachmentsTemp++;
     });
 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index d9fcd5d2d..bccd01e04 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -89,11 +89,12 @@
                       <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                         <ion-icon name="image" class="file-icon"></ion-icon>
                         <ion-label>{{"Imagem"}}</ion-label>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
     
                         <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                        <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                       </ion-item>
                     </div>
                   </div>
@@ -138,11 +139,12 @@
                         <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                           <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                           <ion-label>{{"Mensagem de voz"}}</ion-label>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
       
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
                           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                          <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
                         </ion-item>
                       </div>
                       <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index a66504622..269d2e38f 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -90,12 +90,13 @@
                   <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                     <ion-icon name="image" class="file-icon"></ion-icon>
                     <ion-label>{{"Imagem"}}</ion-label>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+  
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
 
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
-                    <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
-                    
                   </ion-item>
                 </div>
                   <img *ngIf="msg.attachments[0].image_url" src={{msg.attachments[0].image_url}} alt="image">
@@ -146,11 +147,13 @@
                     <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
                       <ion-icon name="mic-outline" class="file-icon"></ion-icon>
                       <ion-label>{{'Mensagem de voz'}}</ion-label>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0 " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.downloadAttachmentsTemp == 0" class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
   
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' && msg.downloadLoader == true " class="icon-download" src="assets/gif/theme/default/Blocks-loader.svg" slot="end"></ion-icon>
-                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>
+                      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == true" class="icon-download" src="assets/gif/theme/gov/Blocks-loader.svg" slot="end"></ion-icon>s
+                      <ion-icon *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false" src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12">  </ion-icon>
+
                     </ion-item>
                   </div>
                   <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
diff --git a/src/assets/images/retry-svgrepo-com.svg b/src/assets/images/retry-svgrepo-com.svg
new file mode 100644
index 000000000..1617591e8
--- /dev/null
+++ b/src/assets/images/retry-svgrepo-com.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#000000" d="M14.9547098,7.98576084 L15.0711,7.99552 C15.6179,8.07328 15.9981,8.57957 15.9204,9.12636 C15.6826,10.7983 14.9218,12.3522 13.747,13.5654 C12.5721,14.7785 11.0435,15.5888 9.37999,15.8801 C7.7165,16.1714 6.00349,15.9288 4.48631,15.187 C3.77335,14.8385 3.12082,14.3881 2.5472,13.8537 L1.70711,14.6938 C1.07714,15.3238 3.55271368e-15,14.8776 3.55271368e-15,13.9867 L3.55271368e-15,9.99998 L3.98673,9.99998 C4.87763,9.99998 5.3238,11.0771 4.69383,11.7071 L3.9626,12.4383 C4.38006,12.8181 4.85153,13.1394 5.36475,13.3903 C6.50264,13.9466 7.78739,14.1285 9.03501,13.9101 C10.2826,13.6916 11.4291,13.0839 12.3102,12.174 C13.1914,11.2641 13.762,10.0988 13.9403,8.84476 C14.0181,8.29798 14.5244,7.91776 15.0711,7.99552 L14.9547098,7.98576084 Z M11.5137,0.812976 C12.2279,1.16215 12.8814,1.61349 13.4558,2.14905 L14.2929,1.31193 C14.9229,0.681961 16,1.12813 16,2.01904 L16,6.00001 L12.019,6.00001 C11.1281,6.00001 10.6819,4.92287 11.3119,4.29291 L12.0404,3.56441 C11.6222,3.18346 11.1497,2.86125 10.6353,2.60973 C9.49736,2.05342 8.21261,1.87146 6.96499,2.08994 C5.71737,2.30841 4.57089,2.91611 3.68976,3.82599 C2.80862,4.73586 2.23802,5.90125 2.05969,7.15524 C1.98193,7.70202 1.47564,8.08224 0.928858,8.00448 C0.382075,7.92672 0.00185585,7.42043 0.0796146,6.87364 C0.31739,5.20166 1.07818,3.64782 2.25303,2.43465 C3.42788,1.22148 4.95652,0.411217 6.62001,0.119916 C8.2835,-0.171384 9.99651,0.0712178 11.5137,0.812976 Z"/>
+</svg>