From b479b7c6d7a34ddfa2e60b601e358c39b4fffb16 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 17 Feb 2023 08:43:28 -0800
Subject: [PATCH] chore: Enable push permissions if available (#6474)

---
 .../dashboard/settings/profile/NotificationSettings.vue  | 9 +++------
 app/views/layouts/vueapp.html.erb                        | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
index 2c3650c29..a13c4d704 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/NotificationSettings.vue
@@ -235,7 +235,7 @@
       </div>
     </div>
     <div
-      v-if="vapidPublicKey && !isBrowserSafari"
+      v-if="vapidPublicKey && hasPushAPISupport"
       class="profile--settings--row row push-row"
     >
       <div class="columns small-3 ">
@@ -393,11 +393,8 @@ export default {
       pushFlags: 'userNotificationSettings/getSelectedPushFlags',
       uiSettings: 'getUISettings',
     }),
-    isBrowserSafari() {
-      if (window.browserConfig) {
-        return window.browserConfig.is_safari === 'true';
-      }
-      return false;
+    hasPushAPISupport() {
+      return !!('Notification' in window);
     },
   },
   watch: {
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 206598032..4c0c62a49 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -49,7 +49,6 @@
       window.globalConfig = <%= raw @global_config.to_json %>
       window.browserConfig = {
         browser_name: '<%= browser.name %>',
-        is_safari: '<%= browser.safari? %>'
       }
       window.errorLoggingConfig = '<%= ENV.fetch('SENTRY_DSN', '')%>'
     </script>