fix missing check for Notification

cinnyapp · Feb 10, 2025 · c4a132d · c4a132d
1 parent 95e28ca
commit c4a132d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx
@@ -38,9 +38,9 @@ function SystemNotification() {
           description={
             notifPermission === 'denied' ? (
               <Text as="span" style={{ color: color.Critical.Main }} size="T200">
-                {!Notification
-                  ? 'Notifications are not supported by the system.'
-                  : 'Notification permission is blocked. Please allow notification permission from browser address bar.'}
+                {'Notification' in window
+                  ? 'Notification permission is blocked. Please allow notification permission from browser address bar.'
+                  : 'Notifications are not supported by the system.'}
               </Text>
             ) : (
               <span>Show desktop notifications when message arrive.</span>

diff --git a/src/app/hooks/usePermission.ts b/src/app/hooks/usePermission.ts
@@ -1,15 +1,15 @@
 import { useEffect, useState } from 'react';
 
 export const getNotificationState = (): PermissionState => {
-  try {
+  if ('Notification' in window) {
     if (window.Notification.permission === 'default') {
       return 'prompt';
     }
 
     return window.Notification.permission;
-  } catch {
-    return 'denied';
   }
+
+  return 'denied';
 };
 
 export function usePermissionState(name: PermissionName, initialValue: PermissionState = 'prompt') {

diff --git a/src/app/utils/dom.ts b/src/app/utils/dom.ts
@@ -219,9 +219,8 @@ export const syntaxErrorPosition = (error: SyntaxError): number | undefined => {
 };
 
 export const notificationPermission = (permission: NotificationPermission) => {
-  try {
+  if ('Notification' in window) {
     return window.Notification.permission === permission;
-  } catch {
-    return false;
   }
+  return false;
 };