Merge pull request #43 from Resgrid/develop

CU-86862jmua minor bug fix for web
Resgrid · Dec 10, 2023 · 851f74e · 851f74e
2 parents 43b5727 + af57b7c
commit 851f74e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -87,7 +87,7 @@ export class AppComponent {
 
       if (this.platform.is('ios')) {
       }
-      
+
       const prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
       this.toggleDarkTheme(prefersDark.matches);
       prefersDark.addListener((mediaQuery) =>
@@ -122,37 +122,42 @@ export class AppComponent {
       }
 
       if (!this.$themePreferenceSub || this.$themePreferenceSub.closed) {
-        this.$themePreferenceSub = this.themePreference$.subscribe((themePref) => {
-            const prefersDark = window.matchMedia('(prefers-color-scheme: dark)');
-            this.toggleDarkTheme(prefersDark)
-        });
+        this.$themePreferenceSub = this.themePreference$.subscribe(
+          (themePref) => {
+            const prefersDark = window.matchMedia(
+              '(prefers-color-scheme: dark)'
+            );
+            this.toggleDarkTheme(prefersDark);
+          }
+        );
       }
 
       setTimeout(function () {
         that.store.dispatch(new SettingsActions.PrimeSettings());
       }, 1000);
 
-      try
-      {
-        await PushNotifications.removeAllDeliveredNotifications();
-      } catch (e) {
-        console.log(e);
+      if (this.platform.is('ios') || this.platform.is('android')) {
+        try {
+          await PushNotifications.removeAllDeliveredNotifications();
+        } catch (e) {
+          console.log(e);
+        }
       }
     });
   }
 
   // Add or remove the "dark" class based on if the media query matches
   private toggleDarkTheme(shouldAdd) {
-		this.themePreference$.pipe(take(1)).subscribe((enableDarkMode) => {
-			if (enableDarkMode === -1) {
-				document.body.classList.toggle('dark', shouldAdd);
-			} else if (enableDarkMode === 0) {
-				document.body.classList.toggle('dark', false);
-			} else if (enableDarkMode === 1) {
-				document.body.classList.toggle('dark', true);
-			}
-		});
-	}
+    this.themePreference$.pipe(take(1)).subscribe((enableDarkMode) => {
+      if (enableDarkMode === -1) {
+        document.body.classList.toggle('dark', shouldAdd);
+      } else if (enableDarkMode === 0) {
+        document.body.classList.toggle('dark', false);
+      } else if (enableDarkMode === 1) {
+        document.body.classList.toggle('dark', true);
+      }
+    });
+  }
 
   public triggerSelectCallModal() {
     this.store.dispatch(new SettingsActions.ShowSetActiveCallModal());

diff --git a/src/app/features/home/pages/map/map.page.ts b/src/app/features/home/pages/map/map.page.ts
@@ -65,12 +65,7 @@ export class MapPage {
       if (
         location &&
         location.Latitude &&
-        location.Longitude //&&
-        //(!this.lastMapUpdateTimestamp ||
-        //  this.utilsProvider.getMinutesBetweenDates(
-        //    this.lastMapUpdateTimestamp,
-        //    currentDate
-        //  ) > 1)
+        location.Longitude
       ) {
         if (this.map) {
           if (!this.userMovedMap) {