Simplify highlightBorderColor in product type (#657)

formbricks · Aug 7, 2023 · 89dae8f · 89dae8f · vercel · Aug 7, 2023
1 parent 370041b
commit 89dae8f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/apps/web/components/preview/MultipleChoiceMultiQuestion.tsx b/apps/web/components/preview/MultipleChoiceMultiQuestion.tsx
@@ -39,19 +39,21 @@ export default function MultipleChoiceMultiQuestion({
     .map((choice) => choice.label);
 
   useEffect(() => {
-    if(Array.isArray(storedResponseValue)){
+    if (Array.isArray(storedResponseValue)) {
       const nonOtherSavedChoices = storedResponseValue?.filter((answer) =>
-      nonOtherChoiceLabels.includes(answer)
-    );
-    const savedOtherSpecified = storedResponseValue?.find((answer) => !nonOtherChoiceLabels.includes(answer));
-
-    setSelectedChoices(nonOtherSavedChoices ?? []);
-
-    if (savedOtherSpecified) {
-      setOtherSpecified(savedOtherSpecified);
-      setShowOther(true);
+        nonOtherChoiceLabels.includes(answer)
+      );
+      const savedOtherSpecified = storedResponseValue?.find(
+        (answer) => !nonOtherChoiceLabels.includes(answer)
+      );
+
+      setSelectedChoices(nonOtherSavedChoices ?? []);
+
+      if (savedOtherSpecified) {
+        setOtherSpecified(savedOtherSpecified);
+        setShowOther(true);
+      }
     }
-  }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [storedResponseValue, question.id]);
 

diff --git a/packages/types/v1/product.ts b/packages/types/v1/product.ts
@@ -7,8 +7,10 @@ export const ZProduct = z.object({
   name: z.string(),
   teamId: z.string(),
   brandColor: z.string().regex(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/),
-  highlightBorderColor: z.union([z.string().regex(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/), z.null()]),
-
+  highlightBorderColor: z
+    .string()
+    .regex(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/)
+    .nullable(),
   recontactDays: z.number().int(),
   formbricksSignature: z.boolean(),
   placement: z.enum(["bottomLeft", "bottomRight", "topLeft", "topRight", "center"]),