Fix frontend exception when announcement not set

Flagsmith · Jul 12, 2024 · 3861704 · 3861704
1 parent b32a6ca
commit 3861704
Showing 1 changed file with 31 additions and 26 deletions.
diff --git a/frontend/web/components/Announcement.tsx b/frontend/web/components/Announcement.tsx
@@ -20,32 +20,37 @@ const Announcement: FC<AnnouncementType> = () => {
   }
 
   const announcementValue = Utils.getFlagsmithJSONValue('announcement', null)
-  const { buttonText, description, id, isClosable, title, url } =
-    announcementValue as AnnouncementValueType
-  const dismissed = flagsmith.getTrait('dismissed_announcement')
-
-  const showBanner =
-    announcementValue &&
-    (!dismissed || dismissed !== announcementValue.id) &&
-    Utils.getFlagsmithHasFeature('announcement')
-
-  return (
-    <>
-      {showBanner && (
-        <InfoMessage
-          title={title}
-          isClosable={isClosable}
-          close={() => closeAnnouncement(id)}
-          buttonText={buttonText}
-          url={url}
-        >
-          <div>
-            <div>{description}</div>
-          </div>
-        </InfoMessage>
-      )}
-    </>
-  )
+
+  if (announcementValue) {
+    const { buttonText, description, id, isClosable, title, url } =
+      announcementValue as AnnouncementValueType
+
+    const dismissed = flagsmith.getTrait('dismissed_announcement')
+    const showBanner =
+      announcementValue &&
+      (!dismissed || dismissed !== announcementValue.id) &&
+      Utils.getFlagsmithHasFeature('announcement')
+
+    return (
+      <>
+        {showBanner && (
+          <InfoMessage
+            title={title}
+            isClosable={isClosable}
+            close={() => closeAnnouncement(id)}
+            buttonText={buttonText}
+            url={url}
+          >
+            <div>
+              <div>{description}</div>
+            </div>
+          </InfoMessage>
+        )}
+      </>
+    )
+  }
+
+  return <></>
 }
 
 export default Announcement