From 3bf35affb13260df8d663ea4aa47d61f2f4f6a25 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sat, 21 Oct 2023 21:36:11 -0400
Subject: [PATCH] fix: Enable management of notifications without SMTP
 configured

closes #6046
---
 app/scenes/Settings/Notifications.tsx | 76 +++++++++++++--------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/app/scenes/Settings/Notifications.tsx b/app/scenes/Settings/Notifications.tsx
index 76287e63d..1c1d5bb5b 100644
--- a/app/scenes/Settings/Notifications.tsx
+++ b/app/scenes/Settings/Notifications.tsx
@@ -139,45 +139,15 @@ function Notifications() {
       </Text>
 
       {env.EMAIL_ENABLED ? (
-        <>
-          <SettingRow
-            label={t("Email address")}
-            name="email"
-            description={t(
-              "Your email address should be updated in your SSO provider."
-            )}
-          >
-            <Input type="email" value={user.email} readOnly />
-          </SettingRow>
-
-          <h2>{t("Notifications")}</h2>
-
-          {options.map((option) => {
-            const setting = user.subscribedToEventType(option.event);
-
-            return (
-              <SettingRow
-                key={option.event}
-                visible={option.visible}
-                label={
-                  <Flex align="center" gap={4}>
-                    {option.icon} {option.title}
-                  </Flex>
-                }
-                name={option.event}
-                description={option.description}
-              >
-                <Switch
-                  key={option.event}
-                  id={option.event}
-                  name={option.event}
-                  checked={!!setting}
-                  onChange={handleChange}
-                />
-              </SettingRow>
-            );
-          })}
-        </>
+        <SettingRow
+          label={t("Email address")}
+          name="email"
+          description={t(
+            "Your email address should be updated in your SSO provider."
+          )}
+        >
+          <Input type="email" value={user.email} readOnly />
+        </SettingRow>
       ) : (
         <Notice>
           <Trans>
@@ -187,6 +157,34 @@ function Notifications() {
           </Trans>
         </Notice>
       )}
+
+      <h2>{t("Notifications")}</h2>
+
+      {options.map((option) => {
+        const setting = user.subscribedToEventType(option.event);
+
+        return (
+          <SettingRow
+            key={option.event}
+            visible={option.visible}
+            label={
+              <Flex align="center" gap={4}>
+                {option.icon} {option.title}
+              </Flex>
+            }
+            name={option.event}
+            description={option.description}
+          >
+            <Switch
+              key={option.event}
+              id={option.event}
+              name={option.event}
+              checked={!!setting}
+              onChange={handleChange}
+            />
+          </SettingRow>
+        );
+      })}
     </Scene>
   );
 }