From fe5dd1e67debaedadd05d9cfd8e59e615511a347 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:25:41 -0500
Subject: [PATCH] single condition check for fetching and disabling button

---
 .../settings/NotificationsSettingsView.tsx    | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/web/src/views/settings/NotificationsSettingsView.tsx b/web/src/views/settings/NotificationsSettingsView.tsx
index 52a02af5a..82d09107a 100644
--- a/web/src/views/settings/NotificationsSettingsView.tsx
+++ b/web/src/views/settings/NotificationsSettingsView.tsx
@@ -165,13 +165,27 @@ export default function NotificationView({
   const watchAllEnabled = form.watch("allEnabled");
   const watchCameras = useMemo(() => form.watch("cameras") || [], [form]);
 
-  const { data: publicKey } = useSWR(
+  const anyCameraNotificationsEnabled = useMemo(
+    () =>
+      config &&
+      Object.values(config.cameras).some(
+        (c) =>
+          c.enabled_in_config &&
+          c.notifications &&
+          c.notifications.enabled_in_config,
+      ),
+    [config],
+  );
+
+  const shouldFetchPubKey = Boolean(
     config &&
-      (config.notifications?.enabled ||
-        watchAllEnabled ||
-        (Array.isArray(watchCameras) && watchCameras.length > 0))
-      ? "notifications/pubkey"
-      : null,
+      (config.notifications?.enabled || anyCameraNotificationsEnabled) &&
+      (watchAllEnabled ||
+        (Array.isArray(watchCameras) && watchCameras.length > 0)),
+  );
+
+  const { data: publicKey } = useSWR(
+    shouldFetchPubKey ? "notifications/pubkey" : null,
     { revalidateOnFocus: false },
   );
 
@@ -525,13 +539,7 @@ export default function NotificationView({
                   </Heading>
                   <Button
                     aria-label={t("notification.registerDevice")}
-                    disabled={
-                      (!config?.notifications.enabled &&
-                        notificationCameras.length === 0 &&
-                        !form.watch("allEnabled") &&
-                        form.watch("cameras").length === 0) ||
-                      publicKey == undefined
-                    }
+                    disabled={!shouldFetchPubKey || publicKey == undefined}
                     onClick={() => {
                       if (registration == null) {
                         Notification.requestPermission().then((permission) => {