From 35b8eed2404e32afccb7bfc7148376951294d486 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 9 Feb 2022 15:34:25 +0100
Subject: [PATCH] merge

---
 src/app/pages/chat/group-messages/group-messages.page.ts  | 4 ----
 src/app/shared/chat/group-messages/group-messages.page.ts | 2 --
 src/app/shared/chat/messages/messages.page.ts             | 2 --
 3 files changed, 8 deletions(-)

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 dfe16ba9b..873f9f534 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -490,7 +490,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       const data = res.data;
 
       if(data.selected) {
-        const loader = this.toastService.loading();
 
         this.wsChatMethodsService.getGroupRoom(this.roomId).send({
           file:{
@@ -514,9 +513,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
           }]
         })
 
-
-        loader.remove();
-
       }
     });
   }
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 402175eaa..d59adfc8e 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -596,7 +596,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       const data = res.data;
 
       if(data.selected) {
-        const loader = this.toastService.loading();
 
         this.wsChatMethodsService.getGroupRoom(roomId).send({
           file:{
@@ -621,7 +620,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
           temporaryData: res
         })
 
-        loader.remove();
 
       }
     });
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 29aca9233..bbe6e0297 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -532,7 +532,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       const roomId = this.roomId
 
       if(data.selected) {
-        const loader = this.toastService.loading();
 
         this.wsChatMethodsService.getDmRoom(roomId).send({
           file:{
@@ -552,7 +551,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           }],
         })
 
-        loader.remove();
 
       }
     });