From de16765d97f2d2e226821e1f93feeaff42317ed9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 12 Oct 2022 13:07:55 +0100
Subject: [PATCH] fix theme bug

---
 src/app/services/theme.service.ts             | 21 +++++++++++--------
 .../group-messages/group-messages.page.ts     | 15 -------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts
index f9ebbe608..960033b3f 100644
--- a/src/app/services/theme.service.ts
+++ b/src/app/services/theme.service.ts
@@ -31,16 +31,19 @@ export class ThemeService {
 
   setTheme(theme: 'gov' | 'default' | 'tribunal') {
 
-    document.body.classList.remove("gov");
-    document.body.classList.remove("default");
-    document.body.classList.remove("tribunal");
-    
-    document.body.classList.add(theme);
-    this.currentTheme = theme;
+    if(this.themes.includes(theme)) {
+      document.body.classList.remove("gov");
+      document.body.classList.remove("default");
+      document.body.classList.remove("tribunal");
+      
+      document.body.classList.add(theme);
+      this.currentTheme = theme;
+  
+      localstoreService.set(this.keyName, {
+        theme: theme
+      })
+    }
 
-    localstoreService.set(this.keyName, {
-      theme: theme
-    })
 
   }
 
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 9747b6908..11f8b9ee5 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -548,21 +548,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         return enterAnimation(baseEl).direction('reverse');
       }
   
-  
-      /* const popover = await this.popoverController.create({
-        component: MessagesOptionsPage,
-        componentProps: {
-          roomId: this.dm._id,
-        },
-        cssClass: 'messages-options',
-        event: ev,
-        translucent: true,
-      });
-      return await popover.present(); */
-  
-      
-  
-  
       const modal = await this.modalController.create({
         enterAnimation,
         leaveAnimation,