From c10854523d6311f6c8382af18827d4484ce94e19 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Tue, 29 Aug 2023 19:16:42 +0530
Subject: [PATCH 01/26] fix: it is now not allowed to save/publish a survey
 with 0 responses

---
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index ecdb222632..11ee0d8789 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -94,6 +94,11 @@ export default function SurveyMenuBar({
   };
 
   const validateSurvey = (survey) => {
+    if (localSurvey.questions.length === 0) {
+      toast.error("Please add at least one question");
+      return;
+    }
+
     faultyQuestions = [];
     for (let index = 0; index < survey.questions.length; index++) {
       const question = survey.questions[index];
@@ -125,6 +130,11 @@ export default function SurveyMenuBar({
   };
 
   const saveSurveyAction = (shouldNavigateBack = false) => {
+    if (localSurvey.questions.length === 0) {
+      toast.error("Please add at least one question");
+      return;
+    }
+
     // variable named strippedSurvey that is a copy of localSurvey with isDraft removed from every question
     const strippedSurvey = {
       ...localSurvey,

From 6dfc75a4ce0cb5d98723bff4d337be9176363ec9 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Tue, 29 Aug 2023 19:42:17 +0530
Subject: [PATCH 02/26] fix: consent question's checkbox should now have some
 text or default text mandatory

---
 .../[environmentId]/surveys/[surveyId]/edit/Validation.ts     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
index b11dc523e0..35261f0017 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
@@ -1,6 +1,7 @@
 // extend this object in order to add more validation rules
 
 import {
+  ConsentQuestion,
   MultipleChoiceMultiQuestion,
   MultipleChoiceSingleQuestion,
   Question,
@@ -13,6 +14,9 @@ const validationRules = {
   multipleChoiceSingle: (question: MultipleChoiceSingleQuestion) => {
     return !question.choices.some((element) => element.label.trim() === "");
   },
+  consent: (question: ConsentQuestion) => {
+    return question.label.trim() !== "";
+  },
   defaultValidation: (question: Question) => {
     return question.headline.trim() !== "";
   },

From 00494a709362caf3168822463bc3fba6252c8464 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Tue, 29 Aug 2023 23:08:09 +0530
Subject: [PATCH 03/26] fix: multi option single choose can now not have same
 options

---
 .../[surveyId]/edit/MultipleChoiceSingleForm.tsx       | 10 +++++++++-
 .../surveys/[surveyId]/edit/Validation.ts              |  9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
index bf8b42ac61..e6d5cbc19d 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
@@ -199,7 +199,15 @@ export default function MultipleChoiceSingleForm({
                   className={cn(choice.id === "other" && "border-dashed")}
                   placeholder={choice.id === "other" ? "Other" : `Option ${choiceIdx + 1}`}
                   onChange={(e) => updateChoice(choiceIdx, { label: e.target.value })}
-                  isInvalid={isInValid && choice.label.trim() === ""}
+                  isInvalid={
+                    isInValid &&
+                    (choice.label.trim() === "" ||
+                      question.choices.some((element, index) =>
+                        question.choices
+                          .slice(index + 1)
+                          .some((nextElement) => nextElement.label.trim() === element.label.trim())
+                      ))
+                  }
                 />
                 {question.choices && question.choices.length > 2 && (
                   <TrashIcon
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
index 35261f0017..e5ef3b52ac 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
@@ -12,7 +12,14 @@ const validationRules = {
     return !question.choices.some((element) => element.label.trim() === "");
   },
   multipleChoiceSingle: (question: MultipleChoiceSingleQuestion) => {
-    return !question.choices.some((element) => element.label.trim() === "");
+    return !(
+      question.choices.some((element) => element.label.trim() === "") ||
+      question.choices.some((element, index) =>
+        question.choices
+          .slice(index + 1)
+          .some((nextElement) => nextElement.label.trim() === element.label.trim())
+      )
+    );
   },
   consent: (question: ConsentQuestion) => {
     return question.label.trim() !== "";

From b7d4885e5171f8f87e88b011ba08ecdd713eb0f0 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Wed, 30 Aug 2023 13:11:24 +0530
Subject: [PATCH 04/26] fix: long single word was overflowing the thank you
 card

---
 apps/web/components/preview/Subheader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/components/preview/Subheader.tsx b/apps/web/components/preview/Subheader.tsx
index 030f911090..84bfe4640f 100644
--- a/apps/web/components/preview/Subheader.tsx
+++ b/apps/web/components/preview/Subheader.tsx
@@ -1,6 +1,6 @@
 export default function Subheader({ subheader, questionId }: { subheader?: string; questionId: string }) {
   return (
-    <label htmlFor={questionId} className="block text-sm font-normal leading-6 text-slate-500">
+    <label htmlFor={questionId} className="block break-words text-sm font-normal leading-6 text-slate-500">
       {subheader}
     </label>
   );

From bca1e0e926a95e5b4058fd91825b7e57f55f6a34 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Thu, 31 Aug 2023 20:57:45 +0530
Subject: [PATCH 05/26] fix: not allow new logic jump until previous filled &
 do not allow saving survey until atleast 2 fields are filled

---
 .../surveys/[surveyId]/edit/LogicEditor.tsx         | 12 ++++++++++++
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx       | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
index 05071ab7c1..1004cd8230 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
@@ -20,6 +20,7 @@ import {
 import { QuestionMarkCircleIcon, TrashIcon } from "@heroicons/react/24/solid";
 import { ChevronDown, SplitIcon } from "lucide-react";
 import { useMemo } from "react";
+import { toast } from "react-hot-toast";
 import { BsArrowDown, BsArrowReturnRight } from "react-icons/bs";
 
 interface LogicEditorProps {
@@ -141,6 +142,17 @@ export default function LogicEditor({
   };
 
   const addLogic = () => {
+    if (question.logic && question.logic?.length >= 0) {
+      const hasUndefinedLogic = question.logic.some(
+        (logic) =>
+          logic.condition === undefined && logic.value === undefined && logic.destination === undefined
+      );
+      if (hasUndefinedLogic) {
+        toast.error("Please fill the existing logic jump first!");
+        return;
+      }
+    }
+
     const newLogic: Logic[] = !question.logic ? [] : question.logic;
     newLogic.push({
       condition: undefined,
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index 11ee0d8789..fbab7253cd 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -115,6 +115,19 @@ export default function SurveyMenuBar({
       return false;
     }
 
+    for (const question of survey.questions) {
+      for (const logic of question.logic || []) {
+        const validFields = ["condition", "destination", "value"].filter(
+          (field) => logic[field] !== undefined
+        ).length;
+
+        if (validFields < 2) {
+          toast.error("Please fill all the opened Logic Jumps or delete them!");
+          return false;
+        }
+      }
+    }
+
     /*
      Check whether the count for autocomplete responses is not less 
      than the current count of accepted response and also it is not set to 0

From cc9142e89b529b120233d3a2f0a8b2224cf48145 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Thu, 31 Aug 2023 21:08:56 +0530
Subject: [PATCH 06/26] fix: user can now cannot 2 exactly same logic
 conditions

---
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx            | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index fbab7253cd..4a2186755f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -44,6 +44,8 @@ export default function SurveyMenuBar({
   const [isConfirmDialogOpen, setConfirmDialogOpen] = useState(false);
   const { product } = useProduct(environmentId);
   let faultyQuestions: String[] = [];
+  const existingLogicConditions = new Set();
+
 
   useEffect(() => {
     if (audiencePrompt && activeId === "settings") {
@@ -125,6 +127,13 @@ export default function SurveyMenuBar({
           toast.error("Please fill all the opened Logic Jumps or delete them!");
           return false;
         }
+
+        const thisLogic = `${logic.condition}-${logic.value}`;
+        if (existingLogicConditions.has(thisLogic)) {
+          toast.error("You have 2 exactly same logic conditons!");
+          return false;
+        }
+        existingLogicConditions.add(thisLogic);
       }
     }
 

From 632bab40f397be2eb44ade29c6d46a9c3385cf6d Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Fri, 1 Sep 2023 12:52:03 +0530
Subject: [PATCH 07/26] fix: user cannot select a skipped logic for a required
 question

---
 .../surveys/[surveyId]/edit/LogicEditor.tsx   | 21 ++++++++-----------
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx |  7 ++++++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
index 1004cd8230..d1f394701e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
@@ -239,18 +239,15 @@ export default function LogicEditor({
                   <SelectValue placeholder="Select condition" className="text-xs lg:text-sm" />
                 </SelectTrigger>
                 <SelectContent>
-                  {conditions[question.type].map(
-                    (condition) =>
-                      !(question.required && condition === "skipped") && (
-                        <SelectItem
-                          key={condition}
-                          value={condition}
-                          title={logicConditions[condition].label}
-                          className="text-xs lg:text-sm">
-                          {logicConditions[condition].label}
-                        </SelectItem>
-                      )
-                  )}
+                  {conditions[question.type].map((condition) => (
+                    <SelectItem
+                      key={condition}
+                      value={condition}
+                      title={logicConditions[condition].label}
+                      className="text-xs lg:text-sm">
+                      {logicConditions[condition].label}
+                    </SelectItem>
+                  ))}
                 </SelectContent>
               </Select>
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index 4a2186755f..e0095e6633 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -46,7 +46,7 @@ export default function SurveyMenuBar({
   let faultyQuestions: String[] = [];
   const existingLogicConditions = new Set();
 
-
+  
   useEffect(() => {
     if (audiencePrompt && activeId === "settings") {
       setAudiencePrompt(false);
@@ -119,6 +119,11 @@ export default function SurveyMenuBar({
 
     for (const question of survey.questions) {
       for (const logic of question.logic || []) {
+        if (question.required && logic.condition === "skipped") {
+          toast.error("User cannot skip a required question, please change the logic jump!");
+          return false;
+        }
+
         const validFields = ["condition", "destination", "value"].filter(
           (field) => logic[field] !== undefined
         ).length;

From 59fb26a6fa578bf7e8955b7c3d23bb68d7c4e4c4 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Fri, 1 Sep 2023 16:27:29 +0530
Subject: [PATCH 08/26] fix: setting duplicate question Ids now does not set
 random ID when click saved, the user has to update it

---
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx |  7 ++++++-
 .../[surveyId]/edit/UpdateQuestionId.tsx      | 21 ++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index e0095e6633..3a514f80b0 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -45,8 +45,8 @@ export default function SurveyMenuBar({
   const { product } = useProduct(environmentId);
   let faultyQuestions: String[] = [];
   const existingLogicConditions = new Set();
+  const existingQuestionIds = new Set();
 
-  
   useEffect(() => {
     if (audiencePrompt && activeId === "settings") {
       setAudiencePrompt(false);
@@ -118,6 +118,11 @@ export default function SurveyMenuBar({
     }
 
     for (const question of survey.questions) {
+      if (existingQuestionIds.has(question.id)) {
+        toast.error("You cannot have 2 same question IDs, please change one!");
+        return false;
+      }
+      existingQuestionIds.add(question.id);
       for (const logic of question.logic || []) {
         if (question.required && logic.condition === "skipped") {
           toast.error("User cannot skip a required question, please change the logic jump!");
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx
index 1b18a11d26..32ad333608 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx
@@ -7,6 +7,9 @@ import toast from "react-hot-toast";
 export default function UpdateQuestionId({ localSurvey, question, questionIdx, updateQuestion }) {
   const [currentValue, setCurrentValue] = useState(question.id);
   const [prevValue, setPrevValue] = useState(question.id);
+  const [isInputInvalid, setIsInputInvalid] = useState(
+    currentValue.trim() === "" || currentValue.includes(" ")
+  );
 
   const saveAction = () => {
     // return early if the input value was not changed
@@ -14,28 +17,22 @@ export default function UpdateQuestionId({ localSurvey, question, questionIdx, u
       return;
     }
 
-    // check if id is unique
     const questionIds = localSurvey.questions.map((q) => q.id);
     if (questionIds.includes(currentValue)) {
+      setIsInputInvalid(true);
       toast.error("IDs have to be unique per survey.");
-      setCurrentValue(question.id);
-      return;
-    }
-
-    // check if id contains any spaces
-    if (currentValue.trim() === "" || currentValue.includes(" ")) {
+    } else if (currentValue.trim() === "" || currentValue.includes(" ")) {
+      setIsInputInvalid(true);
       toast.error("ID should not contain space.");
-      setCurrentValue(question.id);
-      return;
+    } else {
+      setIsInputInvalid(false);
+      toast.success("Question ID updated.");
     }
 
     updateQuestion(questionIdx, { id: currentValue });
-    toast.success("Question ID updated.");
     setPrevValue(currentValue); // after successful update, set current value as previous value
   };
 
-  const isInputInvalid = currentValue.trim() === "" || currentValue.includes(" ");
-
   return (
     <div>
       <Label htmlFor="questionId">Question ID</Label>

From 941527151f16cca9b60749372ba258d445e04fe6 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Fri, 1 Sep 2023 16:53:50 +0530
Subject: [PATCH 09/26] fix: multi option multi choose can now not have same
 options

---
 .../[surveyId]/edit/MultipleChoiceMultiForm.tsx        | 10 +++++++++-
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx          |  5 +++--
 .../surveys/[surveyId]/edit/Validation.ts              |  9 ++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
index 2c1f28ed64..c15c1e379e 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
@@ -199,7 +199,15 @@ export default function MultipleChoiceMultiForm({
                   className={cn(choice.id === "other" && "border-dashed")}
                   placeholder={choice.id === "other" ? "Other" : `Option ${choiceIdx + 1}`}
                   onChange={(e) => updateChoice(choiceIdx, { label: e.target.value })}
-                  isInvalid={isInValid && choice.label.trim() === ""}
+                  isInvalid={
+                    isInValid &&
+                    (choice.label.trim() === "" ||
+                      question.choices.some((element, index) =>
+                        question.choices
+                          .slice(index + 1)
+                          .some((nextElement) => nextElement.label.trim() === element.label.trim())
+                      ))
+                  }
                 />
                 {question.choices && question.choices.length > 2 && (
                   <TrashIcon
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index 3a514f80b0..09dd580fee 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -44,8 +44,6 @@ export default function SurveyMenuBar({
   const [isConfirmDialogOpen, setConfirmDialogOpen] = useState(false);
   const { product } = useProduct(environmentId);
   let faultyQuestions: String[] = [];
-  const existingLogicConditions = new Set();
-  const existingQuestionIds = new Set();
 
   useEffect(() => {
     if (audiencePrompt && activeId === "settings") {
@@ -96,6 +94,9 @@ export default function SurveyMenuBar({
   };
 
   const validateSurvey = (survey) => {
+    const existingLogicConditions = new Set();
+    const existingQuestionIds = new Set();
+
     if (localSurvey.questions.length === 0) {
       toast.error("Please add at least one question");
       return;
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
index e5ef3b52ac..1835e1b360 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
@@ -9,7 +9,14 @@ import {
 
 const validationRules = {
   multipleChoiceMulti: (question: MultipleChoiceMultiQuestion) => {
-    return !question.choices.some((element) => element.label.trim() === "");
+    return !(
+      question.choices.some((element) => element.label.trim() === "") ||
+      question.choices.some((element, index) =>
+        question.choices
+          .slice(index + 1)
+          .some((nextElement) => nextElement.label.trim() === element.label.trim())
+      )
+    );
   },
   multipleChoiceSingle: (question: MultipleChoiceSingleQuestion) => {
     return !(

From 877ab1fd39f2fa795229d02a819bc448b8dab3b1 Mon Sep 17 00:00:00 2001
From: Johannes <johannes@formbricks.com>
Date: Mon, 4 Sep 2023 11:15:57 +0200
Subject: [PATCH 10/26] Update wording

---
 .../surveys/[surveyId]/edit/LogicEditor.tsx      |  4 +++-
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx    | 16 ++++++++--------
 package.json                                     |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
index d1f394701e..58780a0877 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
@@ -148,7 +148,9 @@ export default function LogicEditor({
           logic.condition === undefined && logic.value === undefined && logic.destination === undefined
       );
       if (hasUndefinedLogic) {
-        toast.error("Please fill the existing logic jump first!");
+        toast("Please fill current logic jumps first.", {
+          icon: "🤓",
+        });
         return;
       }
     }
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index fe1d9b16ea..bb5685ae89 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -7,6 +7,7 @@ import { useProduct } from "@/lib/products/products";
 import { useSurveyMutation } from "@/lib/surveys/mutateSurveys";
 import { deleteSurvey } from "@/lib/surveys/surveys";
 import type { Survey } from "@formbricks/types/surveys";
+import { TEnvironment } from "@formbricks/types/v1/environment";
 import { Button, Input } from "@formbricks/ui";
 import { ArrowLeftIcon, Cog8ToothIcon, ExclamationTriangleIcon } from "@heroicons/react/24/solid";
 import { isEqual } from "lodash";
@@ -14,7 +15,6 @@ import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import { validateQuestion } from "./Validation";
-import { TEnvironment } from "@formbricks/types/v1/environment";
 
 interface SurveyMenuBarProps {
   localSurvey: Survey;
@@ -114,19 +114,19 @@ export default function SurveyMenuBar({
     // if there are any faulty questions, the user won't be allowed to save the survey
     if (faultyQuestions.length > 0) {
       setInvalidQuestions(faultyQuestions);
-      toast.error("Please fill required fields");
+      toast.error("Please fill all required fields.");
       return false;
     }
 
     for (const question of survey.questions) {
       if (existingQuestionIds.has(question.id)) {
-        toast.error("You cannot have 2 same question IDs, please change one!");
+        toast.error("There are 2 identical question IDs. Please update one.");
         return false;
       }
       existingQuestionIds.add(question.id);
       for (const logic of question.logic || []) {
         if (question.required && logic.condition === "skipped") {
-          toast.error("User cannot skip a required question, please change the logic jump!");
+          toast.error("Your logic jumps a required question. Please update the logic settings.");
           return false;
         }
 
@@ -135,13 +135,13 @@ export default function SurveyMenuBar({
         ).length;
 
         if (validFields < 2) {
-          toast.error("Please fill all the opened Logic Jumps or delete them!");
+          toast.error("Incomplete logic jumps detected: Please fill or delete them.");
           return false;
         }
 
         const thisLogic = `${logic.condition}-${logic.value}`;
         if (existingLogicConditions.has(thisLogic)) {
-          toast.error("You have 2 exactly same logic conditons!");
+          toast.error("You have 2 competing logic conditons. Please update or delete one.");
           return false;
         }
         existingLogicConditions.add(thisLogic);
@@ -164,7 +164,7 @@ export default function SurveyMenuBar({
       !survey.redirectUrl.includes("https://") &&
       !survey.redirectUrl.includes("http://")
     ) {
-      toast.error("Please enter a valid URL for redirecting respondents");
+      toast.error("Please enter a valid URL for redirecting respondents.");
       return false;
     }
 
@@ -173,7 +173,7 @@ export default function SurveyMenuBar({
 
   const saveSurveyAction = (shouldNavigateBack = false) => {
     if (localSurvey.questions.length === 0) {
-      toast.error("Please add at least one question");
+      toast.error("Please add at least one question.");
       return;
     }
 
diff --git a/package.json b/package.json
index 462ea6b663..b79792947e 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "db:migrate:deploy": "turbo run db:migrate:deploy",
     "db:migrate:vercel": "turbo run db:migrate:vercel",
     "db:push": "turbo run db:push",
-    "go": "turbo run go --concurrency 16",
+    "go": "turbo run go --concurrency 17",
     "dev": "turbo run dev --parallel",
     "pre-commit": "lint-staged",
     "start": "turbo run start --parallel",

From 4320e36ed3022a3275e9661eedb4faf79640b087 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Mon, 4 Sep 2023 18:46:18 +0530
Subject: [PATCH 11/26] fix: entire questions get red when a field is invalid,
 now only the field gets red unless trying to save

---
 .../edit/MultipleChoiceMultiForm.tsx          | 29 ++++++++++++++-----
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx |  3 ++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
index c15c1e379e..c19e433bf6 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
@@ -34,6 +34,7 @@ export default function MultipleChoiceMultiForm({
   const [isNew, setIsNew] = useState(true);
   const [showSubheader, setShowSubheader] = useState(!!question.subheader);
   const questionRef = useRef<HTMLInputElement>(null);
+  const [isInvalidValue, setIsInvalidValue] = useState<string>("");
 
   const shuffleOptionsTypes = {
     none: {
@@ -77,6 +78,17 @@ export default function MultipleChoiceMultiForm({
     updateQuestion(questionIdx, { choices: newChoices, logic: newLogic });
   };
 
+  const findDuplicateLabel = () => {
+    for (let i = 0; i < question.choices.length; i++) {
+      for (let j = i + 1; j < question.choices.length; j++) {
+        if (question.choices[i].label.trim() === question.choices[j].label.trim()) {
+          return question.choices[i].label.trim(); // Return the duplicate label
+        }
+      }
+    }
+    return null;
+  };
+
   const addChoice = (choiceIdx?: number) => {
     setIsNew(false); // This question is no longer new.
     let newChoices = !question.choices ? [] : question.choices;
@@ -199,14 +211,17 @@ export default function MultipleChoiceMultiForm({
                   className={cn(choice.id === "other" && "border-dashed")}
                   placeholder={choice.id === "other" ? "Other" : `Option ${choiceIdx + 1}`}
                   onChange={(e) => updateChoice(choiceIdx, { label: e.target.value })}
+                  onBlur={() => {
+                    const duplicateLabel = findDuplicateLabel();
+                    if (duplicateLabel) {
+                      setIsInvalidValue(duplicateLabel);
+                    } else {
+                      setIsInvalidValue("");
+                    }
+                  }}
                   isInvalid={
-                    isInValid &&
-                    (choice.label.trim() === "" ||
-                      question.choices.some((element, index) =>
-                        question.choices
-                          .slice(index + 1)
-                          .some((nextElement) => nextElement.label.trim() === element.label.trim())
-                      ))
+                    (isInValid != null && question.choices[choiceIdx].label.trim() === "") ||
+                    (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim())
                   }
                 />
                 {question.choices && question.choices.length > 2 && (
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index bb5685ae89..d08d2875da 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -126,6 +126,7 @@ export default function SurveyMenuBar({
       existingQuestionIds.add(question.id);
       for (const logic of question.logic || []) {
         if (question.required && logic.condition === "skipped") {
+          setInvalidQuestions([question.id]);
           toast.error("Your logic jumps a required question. Please update the logic settings.");
           return false;
         }
@@ -135,12 +136,14 @@ export default function SurveyMenuBar({
         ).length;
 
         if (validFields < 2) {
+          setInvalidQuestions([question.id]);
           toast.error("Incomplete logic jumps detected: Please fill or delete them.");
           return false;
         }
 
         const thisLogic = `${logic.condition}-${logic.value}`;
         if (existingLogicConditions.has(thisLogic)) {
+          setInvalidQuestions([question.id]);
           toast.error("You have 2 competing logic conditons. Please update or delete one.");
           return false;
         }

From 284361aabaefad171e002e9ad4a3a3ecbb0207d0 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Wed, 6 Sep 2023 23:33:15 +0530
Subject: [PATCH 12/26] fix: corner cases for new option empty and duplicates
 in single and multi select

---
 .../edit/MultipleChoiceMultiForm.tsx          | 21 ++++++++--
 .../edit/MultipleChoiceSingleForm.tsx         | 40 ++++++++++++++++---
 .../[surveyId]/edit/UpdateQuestionId.tsx      |  2 +-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
index c19e433bf6..424cb742cb 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
@@ -34,7 +34,7 @@ export default function MultipleChoiceMultiForm({
   const [isNew, setIsNew] = useState(true);
   const [showSubheader, setShowSubheader] = useState(!!question.subheader);
   const questionRef = useRef<HTMLInputElement>(null);
-  const [isInvalidValue, setIsInvalidValue] = useState<string>("");
+  const [isInvalidValue, setIsInvalidValue] = useState<string | null>(null);
 
   const shuffleOptionsTypes = {
     none: {
@@ -89,6 +89,13 @@ export default function MultipleChoiceMultiForm({
     return null;
   };
 
+  const findEmptyLabel = () => {
+    for (let i = 0; i < question.choices.length; i++) {
+      if (question.choices[i].label.trim() === "") return true;
+    }
+    return false;
+  };
+
   const addChoice = (choiceIdx?: number) => {
     setIsNew(false); // This question is no longer new.
     let newChoices = !question.choices ? [] : question.choices;
@@ -125,6 +132,9 @@ export default function MultipleChoiceMultiForm({
     const newChoices = !question.choices ? [] : question.choices.filter((_, idx) => idx !== choiceIdx);
 
     const choiceValue = question.choices[choiceIdx].label;
+    if (isInvalidValue === choiceValue) {
+      setIsInvalidValue(null);
+    }
     let newLogic: any[] = [];
     question.logic?.forEach((logic) => {
       let newL: string | string[] | undefined = logic.value;
@@ -215,13 +225,16 @@ export default function MultipleChoiceMultiForm({
                     const duplicateLabel = findDuplicateLabel();
                     if (duplicateLabel) {
                       setIsInvalidValue(duplicateLabel);
-                    } else {
+                    } else if (findEmptyLabel()) {
                       setIsInvalidValue("");
+                    } else {
+                      setIsInvalidValue(null);
                     }
                   }}
                   isInvalid={
-                    (isInValid != null && question.choices[choiceIdx].label.trim() === "") ||
-                    (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim())
+                    isInValid &&
+                    ((isInvalidValue === "" && choice.label.trim() === "") ||
+                      (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim()))
                   }
                 />
                 {question.choices && question.choices.length > 2 && (
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
index e6d5cbc19d..b88e92c2b4 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
@@ -33,6 +33,7 @@ export default function MultipleChoiceSingleForm({
   const lastChoiceRef = useRef<HTMLInputElement>(null);
   const [isNew, setIsNew] = useState(true);
   const [showSubheader, setShowSubheader] = useState(!!question.subheader);
+  const [isInvalidValue, setIsInvalidValue] = useState<string | null>(null);
   const questionRef = useRef<HTMLInputElement>(null);
 
   const shuffleOptionsTypes = {
@@ -53,6 +54,24 @@ export default function MultipleChoiceSingleForm({
     },
   };
 
+  const findDuplicateLabel = () => {
+    for (let i = 0; i < question.choices.length; i++) {
+      for (let j = i + 1; j < question.choices.length; j++) {
+        if (question.choices[i].label.trim() === question.choices[j].label.trim()) {
+          return question.choices[i].label.trim(); // Return the duplicate label
+        }
+      }
+    }
+    return null;
+  };
+
+  const findEmptyLabel = () => {
+    for (let i = 0; i < question.choices.length; i++) {
+      if (question.choices[i].label.trim() === "") return true;
+    }
+    return false;
+  };
+
   const updateChoice = (choiceIdx: number, updatedAttributes: { label: string }) => {
     const newLabel = updatedAttributes.label;
     const oldLabel = question.choices[choiceIdx].label;
@@ -113,6 +132,9 @@ export default function MultipleChoiceSingleForm({
     const newChoices = !question.choices ? [] : question.choices.filter((_, idx) => idx !== choiceIdx);
 
     const choiceValue = question.choices[choiceIdx].label;
+    if (isInvalidValue === choiceValue) {
+      setIsInvalidValue(null);
+    }
     let newLogic: any[] = [];
     question.logic?.forEach((logic) => {
       let newL: string | string[] | undefined = logic.value;
@@ -198,15 +220,21 @@ export default function MultipleChoiceSingleForm({
                   value={choice.label}
                   className={cn(choice.id === "other" && "border-dashed")}
                   placeholder={choice.id === "other" ? "Other" : `Option ${choiceIdx + 1}`}
+                  onBlur={() => {
+                    const duplicateLabel = findDuplicateLabel();
+                    if (duplicateLabel) {
+                      setIsInvalidValue(duplicateLabel);
+                    } else if (findEmptyLabel()) {
+                      setIsInvalidValue("");
+                    } else {
+                      setIsInvalidValue(null);
+                    }
+                  }}
                   onChange={(e) => updateChoice(choiceIdx, { label: e.target.value })}
                   isInvalid={
                     isInValid &&
-                    (choice.label.trim() === "" ||
-                      question.choices.some((element, index) =>
-                        question.choices
-                          .slice(index + 1)
-                          .some((nextElement) => nextElement.label.trim() === element.label.trim())
-                      ))
+                    ((isInvalidValue === "" && choice.label.trim() === "") ||
+                      (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim()))
                   }
                 />
                 {question.choices && question.choices.length > 2 && (
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx
index 32ad333608..08650618e8 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/UpdateQuestionId.tsx
@@ -23,7 +23,7 @@ export default function UpdateQuestionId({ localSurvey, question, questionIdx, u
       toast.error("IDs have to be unique per survey.");
     } else if (currentValue.trim() === "" || currentValue.includes(" ")) {
       setIsInputInvalid(true);
-      toast.error("ID should not contain space.");
+      toast.error("ID should not be empty.");
     } else {
       setIsInputInvalid(false);
       toast.success("Question ID updated.");

From e49cfca56aead48f7e6a7543f9e632e72a1856c5 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Thu, 7 Sep 2023 00:13:58 +0530
Subject: [PATCH 13/26] fix: dont allow is skipped on reqd question, and show
 approporiate toast error

---
 .../surveys/[surveyId]/edit/LogicEditor.tsx   | 21 ++++++++-------
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx | 27 ++++++++++++++++---
 .../surveys/[surveyId]/edit/Validation.ts     | 18 ++-----------
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
index 58780a0877..7bea427e73 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/LogicEditor.tsx
@@ -241,15 +241,18 @@ export default function LogicEditor({
                   <SelectValue placeholder="Select condition" className="text-xs lg:text-sm" />
                 </SelectTrigger>
                 <SelectContent>
-                  {conditions[question.type].map((condition) => (
-                    <SelectItem
-                      key={condition}
-                      value={condition}
-                      title={logicConditions[condition].label}
-                      className="text-xs lg:text-sm">
-                      {logicConditions[condition].label}
-                    </SelectItem>
-                  ))}
+                  {conditions[question.type].map(
+                    (condition) =>
+                      !(question.required && condition === "skipped") && (
+                        <SelectItem
+                          key={condition}
+                          value={condition}
+                          title={logicConditions[condition].label}
+                          className="text-xs lg:text-sm">
+                          {logicConditions[condition].label}
+                        </SelectItem>
+                      )
+                  )}
                 </SelectContent>
               </Select>
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index d08d2875da..b1a32c9296 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -15,6 +15,7 @@ import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import { validateQuestion } from "./Validation";
+import { QuestionType } from "@formbricks/types/questions";
 
 interface SurveyMenuBarProps {
   localSurvey: Survey;
@@ -124,13 +125,26 @@ export default function SurveyMenuBar({
         return false;
       }
       existingQuestionIds.add(question.id);
-      for (const logic of question.logic || []) {
-        if (question.required && logic.condition === "skipped") {
-          setInvalidQuestions([question.id]);
-          toast.error("Your logic jumps a required question. Please update the logic settings.");
+
+      if (
+        question.type === QuestionType.MultipleChoiceSingle ||
+        question.type === QuestionType.MultipleChoiceMulti
+      ) {
+        const haveSameChoices =
+          question.choices.some((element) => element.label.trim() === "") ||
+          question.choices.some((element, index) =>
+            question.choices
+              .slice(index + 1)
+              .some((nextElement) => nextElement.label.trim() === element.label.trim())
+          );
+
+        if (haveSameChoices) {
+          toast.error("You have 2 same choices. Please update or delete one.");
           return false;
         }
+      }
 
+      for (const logic of question.logic || []) {
         const validFields = ["condition", "destination", "value"].filter(
           (field) => logic[field] !== undefined
         ).length;
@@ -141,6 +155,11 @@ export default function SurveyMenuBar({
           return false;
         }
 
+        if (question.required && logic.condition === "skipped") {
+          toast.error("You have a missing logic condition. Please update or delete it.");
+          return false;
+        }
+
         const thisLogic = `${logic.condition}-${logic.value}`;
         if (existingLogicConditions.has(thisLogic)) {
           setInvalidQuestions([question.id]);
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
index 1835e1b360..35261f0017 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
@@ -9,24 +9,10 @@ import {
 
 const validationRules = {
   multipleChoiceMulti: (question: MultipleChoiceMultiQuestion) => {
-    return !(
-      question.choices.some((element) => element.label.trim() === "") ||
-      question.choices.some((element, index) =>
-        question.choices
-          .slice(index + 1)
-          .some((nextElement) => nextElement.label.trim() === element.label.trim())
-      )
-    );
+    return !question.choices.some((element) => element.label.trim() === "");
   },
   multipleChoiceSingle: (question: MultipleChoiceSingleQuestion) => {
-    return !(
-      question.choices.some((element) => element.label.trim() === "") ||
-      question.choices.some((element, index) =>
-        question.choices
-          .slice(index + 1)
-          .some((nextElement) => nextElement.label.trim() === element.label.trim())
-      )
-    );
+    return !question.choices.some((element) => element.label.trim() === "");
   },
   consent: (question: ConsentQuestion) => {
     return question.label.trim() !== "";

From 50369afd8566c1186bb5cf616bce2607dcf692b8 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Thu, 7 Sep 2023 00:20:23 +0530
Subject: [PATCH 14/26] fix: only highlight the incorrect choice in multi

---
 .../surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx      | 5 ++---
 .../surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx     | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
index 424cb742cb..3d56eb8c78 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceMultiForm.tsx
@@ -232,9 +232,8 @@ export default function MultipleChoiceMultiForm({
                     }
                   }}
                   isInvalid={
-                    isInValid &&
-                    ((isInvalidValue === "" && choice.label.trim() === "") ||
-                      (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim()))
+                    (isInvalidValue === "" && choice.label.trim() === "") ||
+                    (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim())
                   }
                 />
                 {question.choices && question.choices.length > 2 && (
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
index b88e92c2b4..76584c8918 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/MultipleChoiceSingleForm.tsx
@@ -232,9 +232,8 @@ export default function MultipleChoiceSingleForm({
                   }}
                   onChange={(e) => updateChoice(choiceIdx, { label: e.target.value })}
                   isInvalid={
-                    isInValid &&
-                    ((isInvalidValue === "" && choice.label.trim() === "") ||
-                      (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim()))
+                    (isInvalidValue === "" && choice.label.trim() === "") ||
+                    (isInvalidValue !== null && choice.label.trim() === isInvalidValue.trim())
                   }
                 />
                 {question.choices && question.choices.length > 2 && (

From 9b6ea3f4515d551fd3d0d0045de4c85acfc9786f Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Mon, 25 Sep 2023 10:53:23 +0530
Subject: [PATCH 15/26] wip

---
 .../surveys/[surveyId]/edit/QuestionCard.tsx  | 38 ++++++++++++++++++-
 .../surveys/[surveyId]/edit/SurveyMenuBar.tsx |  1 +
 .../surveys/[surveyId]/edit/Validation.ts     |  7 +++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx
index 143f6ebbff..7b2b177bf1 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx
@@ -42,7 +42,15 @@ interface QuestionCardProps {
   isInValid: boolean;
 }
 
-export function BackButtonInput({ value, onChange }) {
+export function BackButtonInput({
+  value,
+  onChange,
+  className,
+}: {
+  value: string | undefined;
+  onChange: (e: any) => void;
+  className?: string;
+}) {
   return (
     <div className="w-full">
       <Label htmlFor="backButtonLabel">&quot;Back&quot; Button Label</Label>
@@ -53,6 +61,7 @@ export function BackButtonInput({ value, onChange }) {
           value={value}
           placeholder="Back"
           onChange={onChange}
+          className={className}
         />
       </div>
     </div>
@@ -235,9 +244,24 @@ export default function QuestionCard({
                             <Input
                               id="buttonLabel"
                               name="buttonLabel"
+                              className={cn(
+                                isInValid &&
+                                  question.backButtonLabel?.trim() === "" &&
+                                  "border border-red-600 focus:border-red-600"
+                              )}
                               value={question.buttonLabel}
                               placeholder={lastQuestion ? "Finish" : "Next"}
-                              onChange={(e) => updateQuestion(questionIdx, { buttonLabel: e.target.value })}
+                              onChange={(e) => {
+                                const trimmedValue = e.target.value.trim(); // Remove spaces from the start and end
+                                const hasInternalSpaces = /\S\s\S/.test(trimmedValue); // Test if there are spaces between words
+
+                                if (
+                                  !trimmedValue.includes("  ") &&
+                                  (trimmedValue === "" || hasInternalSpaces || !/\s/.test(trimmedValue))
+                                ) {
+                                  updateQuestion(questionIdx, { backButtonLabel: trimmedValue });
+                                }
+                              }}
                             />
                           </div>
                         </div>
@@ -245,6 +269,11 @@ export default function QuestionCard({
                           <BackButtonInput
                             value={question.backButtonLabel}
                             onChange={(e) => updateQuestion(questionIdx, { backButtonLabel: e.target.value })}
+                            className={cn(
+                              isInValid &&
+                                question.backButtonLabel?.trim() === "" &&
+                                "border border-red-600 focus:border-red-600"
+                            )}
                           />
                         )}
                       </div>
@@ -255,6 +284,11 @@ export default function QuestionCard({
                           <BackButtonInput
                             value={question.backButtonLabel}
                             onChange={(e) => updateQuestion(questionIdx, { backButtonLabel: e.target.value })}
+                            className={cn(
+                              isInValid &&
+                                question.backButtonLabel?.trim() === "" &&
+                                "border border-red-600 focus:border-red-600"
+                            )}
                           />
                         </div>
                       )}
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index cc7e9ae0b6..dea245d59b 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -213,6 +213,7 @@ export default function SurveyMenuBar({
     };
 
     if (!validateSurvey(localSurvey)) {
+      setIsMutatingSurvey(false);
       return;
     }
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
index 125098f640..09eb880cf7 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
@@ -18,7 +18,12 @@ const validationRules = {
     return question.label.trim() !== "";
   },
   defaultValidation: (question: TSurveyQuestion) => {
-    return question.headline.trim() !== "";
+    console.log(question);
+    return (
+      question.headline.trim() !== "" &&
+      question.buttonLabel?.trim() !== "" &&
+      question.backButtonLabel?.trim() !== ""
+    );
   },
 };
 

From b13dbc7feab5a5774792cd49be0db8da8f66cff2 Mon Sep 17 00:00:00 2001
From: Johannes <johannes@formbricks.com>
Date: Wed, 4 Oct 2023 14:23:09 +0545
Subject: [PATCH 16/26] reword toast

---
 .../[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index 2e1039b5a3..45963848af 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -142,7 +142,7 @@ export default function SurveyMenuBar({
           );
 
         if (haveSameChoices) {
-          toast.error("You have 2 same choices. Please update or delete one.");
+          toast.error("You have two identical choices.");
           return false;
         }
       }

From 16a94ef61f45852ba428a48bbe5cf6e5502074c8 Mon Sep 17 00:00:00 2001
From: ShubhamPalriwala <spalriwalau@gmail.com>
Date: Wed, 4 Oct 2023 18:04:06 +0530
Subject: [PATCH 17/26] fix: add missing state set on fail

---
 .../[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index 8ca33638b9..3291268377 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -101,7 +101,7 @@ export default function SurveyMenuBar({
     const existingLogicConditions = new Set();
     const existingQuestionIds = new Set();
 
-    if (localSurvey.questions.length === 0) {
+    if (survey.questions.length === 0) {
       toast.error("Please add at least one question");
       return;
     }
@@ -314,6 +314,7 @@ export default function SurveyMenuBar({
               onClick={async () => {
                 setIsMutatingSurvey(true);
                 if (!validateSurvey(localSurvey)) {
+                  setIsMutatingSurvey(false);
                   return;
                 }
                 await updateSurveyAction({ ...localSurvey, status: "inProgress" });

From 07d0f3e7518dc1aed83554444cbaf7110035be0c Mon Sep 17 00:00:00 2001
From: Rotimi Best <rotimiibitoyeemma@gmail.com>
Date: Wed, 4 Oct 2023 13:34:31 +0100
Subject: [PATCH 18/26] fix: move close comment to end in .env.example (#945)

---
 .env.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 1a4c51ccf9..db986396c9 100644
--- a/.env.example
+++ b/.env.example
@@ -104,8 +104,8 @@ NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID=
 
 # Cron Secret
 CRON_SECRET=
-*/
 
 # Encryption key
 # You can use: `openssl rand -base64 16` to generate one
-FORMBRICKS_ENCRYPTION_KEY=
\ No newline at end of file
+FORMBRICKS_ENCRYPTION_KEY=
+*/

From 424cddfa9efca74dd30dc59d679114441d5d2eac Mon Sep 17 00:00:00 2001
From: Rotimi Best <rotimiibitoyeemma@gmail.com>
Date: Wed, 4 Oct 2023 14:25:08 +0100
Subject: [PATCH 19/26] chore: move attributeClass service to new folder
 structure (#944)

* chore: move attributeClass service

* update person service with new attributeClass location
---
 .../(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx  | 2 +-
 .../[environmentId]/(actionsAndAttributes)/attributes/page.tsx  | 2 +-
 .../[environmentId]/surveys/[surveyId]/edit/page.tsx            | 2 +-
 apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts | 2 +-
 .../v1/management/attribute-classes/[attributeClassId]/route.ts | 2 +-
 apps/web/app/api/v1/management/attribute-classes/route.ts       | 2 +-
 .../{services/attributeClass.ts => attributeClass/service.ts}   | 0
 packages/lib/services/person.ts                                 | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/lib/{services/attributeClass.ts => attributeClass/service.ts} (100%)

diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
index 55e1d4d86c..2360b75b2c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
@@ -5,7 +5,7 @@ import type { AttributeClass } from "@prisma/client";
 import { useForm } from "react-hook-form";
 import { ArchiveBoxArrowDownIcon, ArchiveBoxXMarkIcon } from "@heroicons/react/24/solid";
 import { useRouter } from "next/navigation";
-import { updatetAttributeClass } from "@formbricks/lib/services/attributeClass";
+import { updatetAttributeClass } from "@formbricks/lib/attributeClass/service";
 import { useState } from "react";
 
 interface AttributeSettingsTabProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
index 6a37ff53bf..6eda4be838 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
@@ -5,7 +5,7 @@ import AttributeClassDataRow from "@/app/(app)/environments/[environmentId]/(act
 import AttributeTableHeading from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeTableHeading";
 import HowToAddAttributesButton from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/HowToAddAttributesButton";
 import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import { getAttributeClasses } from "@formbricks/lib/services/attributeClass";
+import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { Metadata } from "next";
 
 export const metadata: Metadata = {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx
index fd18a81945..846e0ba128 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx
@@ -6,7 +6,7 @@ import { getSurveyWithAnalytics } from "@formbricks/lib/survey/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/services/product";
 import { getEnvironment } from "@formbricks/lib/services/environment";
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
-import { getAttributeClasses } from "@formbricks/lib/services/attributeClass";
+import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { ErrorComponent } from "@formbricks/ui";
 
 export default async function SurveysEditPage({ params }) {
diff --git a/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts b/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
index 10cafc9191..6d959707cc 100644
--- a/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
+++ b/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
@@ -1,7 +1,7 @@
 import { getUpdatedState } from "@/app/api/v1/js/sync/lib/sync";
 import { responses } from "@/lib/api/response";
 import { transformErrorToDetails } from "@/lib/api/validator";
-import { createAttributeClass, getAttributeClassByNameCached } from "@formbricks/lib/services/attributeClass";
+import { createAttributeClass, getAttributeClassByNameCached } from "@formbricks/lib/attributeClass/service";
 import { getPersonCached, updatePersonAttribute } from "@formbricks/lib/services/person";
 import { ZJsPeopleAttributeInput } from "@formbricks/types/v1/js";
 import { NextResponse } from "next/server";
diff --git a/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts b/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
index f46f0145f9..fe2363263d 100644
--- a/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
+++ b/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
@@ -5,7 +5,7 @@ import {
   deleteAttributeClass,
   getAttributeClass,
   updatetAttributeClass,
-} from "@formbricks/lib/services/attributeClass";
+} from "@formbricks/lib/attributeClass/service";
 import { TAttributeClass, ZAttributeClassUpdateInput } from "@formbricks/types/v1/attributeClasses";
 import { transformErrorToDetails } from "@/lib/api/validator";
 import { authenticateRequest } from "@/app/api/v1/auth";
diff --git a/apps/web/app/api/v1/management/attribute-classes/route.ts b/apps/web/app/api/v1/management/attribute-classes/route.ts
index ca0b33f2c6..48a5aeb8d1 100644
--- a/apps/web/app/api/v1/management/attribute-classes/route.ts
+++ b/apps/web/app/api/v1/management/attribute-classes/route.ts
@@ -4,7 +4,7 @@ import { authenticateRequest } from "@/app/api/v1/auth";
 import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/lib/api/validator";
 import { TAttributeClass, ZAttributeClassInput } from "@formbricks/types/v1/attributeClasses";
-import { createAttributeClass, getAttributeClasses } from "@formbricks/lib/services/attributeClass";
+import { createAttributeClass, getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 
 export async function GET(request: Request) {
   try {
diff --git a/packages/lib/services/attributeClass.ts b/packages/lib/attributeClass/service.ts
similarity index 100%
rename from packages/lib/services/attributeClass.ts
rename to packages/lib/attributeClass/service.ts
diff --git a/packages/lib/services/person.ts b/packages/lib/services/person.ts
index bc2ca3f203..21a89535b9 100644
--- a/packages/lib/services/person.ts
+++ b/packages/lib/services/person.ts
@@ -9,7 +9,7 @@ import { revalidateTag, unstable_cache } from "next/cache";
 import { cache } from "react";
 import { PEOPLE_PER_PAGE } from "../constants";
 import { validateInputs } from "../utils/validate";
-import { getAttributeClassByName } from "./attributeClass";
+import { getAttributeClassByName } from "../attributeClass/service";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
 
 export const selectPerson = {

From 9dfdd4e6ce28c577e33308c6c698224571ebaa8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Oct 2023 16:23:43 +0200
Subject: [PATCH 20/26] chore(deps): bump zod from 3.22.2 to 3.22.3 (#940)

Bumps [zod](https://github.com/colinhacks/zod) from 3.22.2 to 3.22.3.
- [Release notes](https://github.com/colinhacks/zod/releases)
- [Changelog](https://github.com/colinhacks/zod/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colinhacks/zod/compare/v3.22.2...v3.22.3)

---
updated-dependencies:
- dependency-name: zod
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/database/package.json |  2 +-
 packages/types/package.json    |  2 +-
 pnpm-lock.yaml                 | 93 +++++++++++++++++-----------------
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/packages/database/package.json b/packages/database/package.json
index 441f505e79..61f20cc9e4 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -36,7 +36,7 @@
     "prisma": "^5.3.1",
     "prisma-dbml-generator": "^0.10.0",
     "prisma-json-types-generator": "^3.0.1",
-    "zod": "^3.22.2",
+    "zod": "^3.22.3",
     "zod-prisma": "^0.5.4"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index 3a3b260aba..4ca6cd7e68 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -11,6 +11,6 @@
     "@formbricks/tsconfig": "workspace:*"
   },
   "dependencies": {
-    "zod": "^3.22.2"
+    "zod": "^3.22.3"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 68b8a7dc50..f24f9fb7ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 importers:
 
   .:
@@ -28,7 +24,7 @@ importers:
         version: 3.12.7
       turbo:
         specifier: latest
-        version: 1.10.12
+        version: 1.10.14
 
   apps/demo:
     dependencies:
@@ -270,7 +266,7 @@ importers:
         version: 7.72.0(encoding@0.1.13)(next@13.5.3)(react@18.2.0)
       '@t3-oss/env-nextjs':
         specifier: ^0.6.1
-        version: 0.6.1(typescript@5.2.2)(zod@3.22.2)
+        version: 0.6.1(typescript@5.2.2)(zod@3.22.3)
       bcryptjs:
         specifier: ^2.4.3
         version: 2.4.3
@@ -403,11 +399,11 @@ importers:
         specifier: ^3.0.1
         version: 3.0.1(prisma@5.3.1)(typescript@5.2.2)
       zod:
-        specifier: ^3.22.2
-        version: 3.22.2
+        specifier: ^3.22.3
+        version: 3.22.3
       zod-prisma:
         specifier: ^0.5.4
-        version: 0.5.4(prisma@5.3.1)(zod@3.22.2)
+        version: 0.5.4(prisma@5.3.1)(zod@3.22.3)
 
   packages/ee:
     dependencies:
@@ -441,7 +437,7 @@ importers:
         version: 9.0.0(eslint@8.50.0)
       eslint-config-turbo:
         specifier: latest
-        version: 1.10.12(eslint@8.50.0)
+        version: 1.10.14(eslint@8.50.0)
       eslint-plugin-react:
         specifier: 7.33.2
         version: 7.33.2(eslint@8.50.0)
@@ -675,8 +671,8 @@ importers:
   packages/types:
     dependencies:
       zod:
-        specifier: ^3.22.2
-        version: 3.22.2
+        specifier: ^3.22.3
+        version: 3.22.3
     devDependencies:
       '@formbricks/tsconfig':
         specifier: workspace:*
@@ -5819,25 +5815,25 @@ packages:
     dependencies:
       defer-to-connect: 1.1.3
 
-  /@t3-oss/env-core@0.6.1(typescript@5.2.2)(zod@3.22.2):
+  /@t3-oss/env-core@0.6.1(typescript@5.2.2)(zod@3.22.3):
     resolution: {integrity: sha512-KQD7qEDJtkWIWWmTVjNvk0wnHpkvAQ6CRbUxbWMFNG/fiosBQDQvtRpBNu6USxBscJCoC4z6y7P9MN52/mLOzw==}
     peerDependencies:
       typescript: '>=4.7.2'
       zod: ^3.0.0
     dependencies:
       typescript: 5.2.2
-      zod: 3.22.2
+      zod: 3.22.3
     dev: false
 
-  /@t3-oss/env-nextjs@0.6.1(typescript@5.2.2)(zod@3.22.2):
+  /@t3-oss/env-nextjs@0.6.1(typescript@5.2.2)(zod@3.22.3):
     resolution: {integrity: sha512-z1dIC++Vxj9kmzX5nSPfcrCSkszy3dTEPC4Ssx7Ap5AqR3c2Qa7S0xf8axn6coy7D/vCXDAAnHYnCMDhtcY3SQ==}
     peerDependencies:
       typescript: '>=4.7.2'
       zod: ^3.0.0
     dependencies:
-      '@t3-oss/env-core': 0.6.1(typescript@5.2.2)(zod@3.22.2)
+      '@t3-oss/env-core': 0.6.1(typescript@5.2.2)(zod@3.22.3)
       typescript: 5.2.2
-      zod: 3.22.2
+      zod: 3.22.3
     dev: false
 
   /@tailwindcss/forms@0.5.6(tailwindcss@3.3.3):
@@ -10897,13 +10893,13 @@ packages:
     resolution: {integrity: sha512-NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw==}
     dev: true
 
-  /eslint-config-turbo@1.10.12(eslint@8.50.0):
-    resolution: {integrity: sha512-z3jfh+D7UGYlzMWGh+Kqz++hf8LOE96q3o5R8X4HTjmxaBWlLAWG+0Ounr38h+JLR2TJno0hU9zfzoPNkR9BdA==}
+  /eslint-config-turbo@1.10.14(eslint@8.50.0):
+    resolution: {integrity: sha512-ZeB+IcuFXy1OICkLuAplVa0euoYbhK+bMEQd0nH9+Lns18lgZRm33mVz/iSoH9VdUzl/1ZmFmoK+RpZc+8R80A==}
     peerDependencies:
       eslint: '>6.6.0'
     dependencies:
       eslint: 8.50.0
-      eslint-plugin-turbo: 1.10.12(eslint@8.50.0)
+      eslint-plugin-turbo: 1.10.14(eslint@8.50.0)
     dev: true
 
   /eslint-import-resolver-node@0.3.6:
@@ -11117,8 +11113,8 @@ packages:
       semver: 6.3.1
       string.prototype.matchall: 4.0.8
 
-  /eslint-plugin-turbo@1.10.12(eslint@8.50.0):
-    resolution: {integrity: sha512-uNbdj+ohZaYo4tFJ6dStRXu2FZigwulR1b3URPXe0Q8YaE7thuekKNP+54CHtZPH9Zey9dmDx5btAQl9mfzGOw==}
+  /eslint-plugin-turbo@1.10.14(eslint@8.50.0):
+    resolution: {integrity: sha512-sBdBDnYr9AjT1g4lR3PBkZDonTrMnR4TvuGv5W0OiF7z9az1rI68yj2UHJZvjkwwcGu5mazWA1AfB0oaagpmfg==}
     peerDependencies:
       eslint: '>6.6.0'
     dependencies:
@@ -22299,65 +22295,64 @@ packages:
     dependencies:
       safe-buffer: 5.2.1
 
-  /turbo-darwin-64@1.10.12:
-    resolution: {integrity: sha512-vmDfGVPl5/aFenAbOj3eOx3ePNcWVUyZwYr7taRl0ZBbmv2TzjRiFotO4vrKCiTVnbqjQqAFQWY2ugbqCI1kOQ==}
+  /turbo-darwin-64@1.10.14:
+    resolution: {integrity: sha512-I8RtFk1b9UILAExPdG/XRgGQz95nmXPE7OiGb6ytjtNIR5/UZBS/xVX/7HYpCdmfriKdVwBKhalCoV4oDvAGEg==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-darwin-arm64@1.10.12:
-    resolution: {integrity: sha512-3JliEESLNX2s7g54SOBqqkqJ7UhcOGkS0ywMr5SNuvF6kWVTbuUq7uBU/sVbGq8RwvK1ONlhPvJne5MUqBCTCQ==}
+  /turbo-darwin-arm64@1.10.14:
+    resolution: {integrity: sha512-KAdUWryJi/XX7OD0alOuOa0aJ5TLyd4DNIYkHPHYcM6/d7YAovYvxRNwmx9iv6Vx6IkzTnLeTiUB8zy69QkG9Q==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-64@1.10.12:
-    resolution: {integrity: sha512-siYhgeX0DidIfHSgCR95b8xPee9enKSOjCzx7EjTLmPqPaCiVebRYvbOIYdQWRqiaKh9yfhUtFmtMOMScUf1gg==}
+  /turbo-linux-64@1.10.14:
+    resolution: {integrity: sha512-BOBzoREC2u4Vgpap/WDxM6wETVqVMRcM8OZw4hWzqCj2bqbQ6L0wxs1LCLWVrghQf93JBQtIGAdFFLyCSBXjWQ==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-linux-arm64@1.10.12:
-    resolution: {integrity: sha512-K/ZhvD9l4SslclaMkTiIrnfcACgos79YcAo4kwc8bnMQaKuUeRpM15sxLpZp3xDjDg8EY93vsKyjaOhdFG2UbA==}
+  /turbo-linux-arm64@1.10.14:
+    resolution: {integrity: sha512-D8T6XxoTdN5D4V5qE2VZG+/lbZX/89BkAEHzXcsSUTRjrwfMepT3d2z8aT6hxv4yu8EDdooZq/2Bn/vjMI32xw==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-64@1.10.12:
-    resolution: {integrity: sha512-7FSgSwvktWDNOqV65l9AbZwcoueAILeE4L7JvjauNASAjjbuzXGCEq5uN8AQU3U5BOFj4TdXrVmO2dX+lLu8Zg==}
+  /turbo-windows-64@1.10.14:
+    resolution: {integrity: sha512-zKNS3c1w4i6432N0cexZ20r/aIhV62g69opUn82FLVs/zk3Ie0GVkSB6h0rqIvMalCp7enIR87LkPSDGz9K4UA==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo-windows-arm64@1.10.12:
-    resolution: {integrity: sha512-gCNXF52dwom1HLY9ry/cneBPOKTBHhzpqhMylcyvJP0vp9zeMQQkt6yjYv+6QdnmELC92CtKNp2FsNZo+z0pyw==}
+  /turbo-windows-arm64@1.10.14:
+    resolution: {integrity: sha512-rkBwrTPTxNSOUF7of8eVvvM+BkfkhA2OvpHM94if8tVsU+khrjglilp8MTVPHlyS9byfemPAmFN90oRIPB05BA==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /turbo@1.10.12:
-    resolution: {integrity: sha512-WM3+jTfQWnB9W208pmP4oeehZcC6JQNlydb/ZHMRrhmQa+htGhWLCzd6Q9rLe0MwZLPpSPFV2/bN5egCLyoKjQ==}
+  /turbo@1.10.14:
+    resolution: {integrity: sha512-hr9wDNYcsee+vLkCDIm8qTtwhJ6+UAMJc3nIY6+PNgUTtXcQgHxCq8BGoL7gbABvNWv76CNbK5qL4Lp9G3ZYRA==}
     hasBin: true
-    requiresBuild: true
     optionalDependencies:
-      turbo-darwin-64: 1.10.12
-      turbo-darwin-arm64: 1.10.12
-      turbo-linux-64: 1.10.12
-      turbo-linux-arm64: 1.10.12
-      turbo-windows-64: 1.10.12
-      turbo-windows-arm64: 1.10.12
+      turbo-darwin-64: 1.10.14
+      turbo-darwin-arm64: 1.10.14
+      turbo-linux-64: 1.10.14
+      turbo-linux-arm64: 1.10.14
+      turbo-windows-64: 1.10.14
+      turbo-windows-arm64: 1.10.14
     dev: true
 
   /tween-functions@1.2.0:
@@ -24199,7 +24194,7 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /zod-prisma@0.5.4(prisma@5.3.1)(zod@3.22.2):
+  /zod-prisma@0.5.4(prisma@5.3.1)(zod@3.22.3):
     resolution: {integrity: sha512-5Ca4Qd1a1jy1T/NqCEpbr0c+EsbjJfJ/7euEHob3zDvtUK2rTuD1Rc/vfzH8q8PtaR2TZbysD88NHmrLwpv3Xg==}
     engines: {node: '>=14'}
     hasBin: true
@@ -24215,15 +24210,15 @@ packages:
       parenthesis: 3.1.8
       prisma: 5.3.1
       ts-morph: 13.0.3
-      zod: 3.22.2
+      zod: 3.22.3
     dev: true
 
   /zod@3.21.4:
     resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==}
     dev: false
 
-  /zod@3.22.2:
-    resolution: {integrity: sha512-wvWkphh5WQsJbVk1tbx1l1Ly4yg+XecD+Mq280uBGt9wa5BKSWf4Mhp6GmrkPixhMxmabYY7RbzlwVP32pbGCg==}
+  /zod@3.22.3:
+    resolution: {integrity: sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==}
 
   /zustand@4.4.1(@types/react@18.2.23)(react@18.2.0):
     resolution: {integrity: sha512-QCPfstAS4EBiTQzlaGP1gmorkh/UL1Leaj2tdj+zZCZ/9bm0WS7sI2wnfD5lpOszFqWJ1DcPnGoY8RDL61uokw==}
@@ -24248,3 +24243,7 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: false
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

From 16603f1a42bccaf20873d5d7a893188cf431bb37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Oct 2023 16:24:14 +0200
Subject: [PATCH 21/26] chore(deps-dev): bump postcss from 8.4.30 to 8.4.31
 (#939)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/surveys/package.json         |   2 +-
 packages/tailwind-config/package.json |   2 +-
 packages/ui/package.json              |   2 +-
 pnpm-lock.yaml                        | 815 ++++++--------------------
 4 files changed, 172 insertions(+), 649 deletions(-)

diff --git a/packages/surveys/package.json b/packages/surveys/package.json
index 2f3b8cc94c..4f8301ae7a 100644
--- a/packages/surveys/package.json
+++ b/packages/surveys/package.json
@@ -20,7 +20,7 @@
     "@preact/preset-vite": "^2.5.0",
     "autoprefixer": "^10.4.16",
     "eslint-config-formbricks": "workspace:*",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.31",
     "preact": "^10.17.1",
     "tailwindcss": "^3.3.3",
     "terser": "^5.20.0",
diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
index 0d8a04d8df..73ce4d4d67 100644
--- a/packages/tailwind-config/package.json
+++ b/packages/tailwind-config/package.json
@@ -10,7 +10,7 @@
     "@tailwindcss/forms": "^0.5.6",
     "@tailwindcss/typography": "^0.5.10",
     "autoprefixer": "^10.4.16",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.31",
     "tailwindcss": "^3.3.3"
   }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 5efb234cdb..fc19e19002 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -16,7 +16,7 @@
     "@formbricks/tsconfig": "workspace:*",
     "concurrently": "^8.2.1",
     "eslint-config-formbricks": "workspace:*",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.31",
     "react": "18.2.0"
   },
   "dependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f24f9fb7ef..bf3c7df2e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -115,7 +115,7 @@ importers:
         version: 8.10.0
       autoprefixer:
         specifier: ^10.4.15
-        version: 10.4.16(postcss@8.4.30)
+        version: 10.4.16(postcss@8.4.31)
       clsx:
         specifier: ^2.0.0
         version: 2.0.0
@@ -612,13 +612,13 @@ importers:
         version: 2.5.0(@babel/core@7.23.0)(preact@10.17.1)(vite@4.4.9)
       autoprefixer:
         specifier: ^10.4.16
-        version: 10.4.16(postcss@8.4.30)
+        version: 10.4.16(postcss@8.4.31)
       eslint-config-formbricks:
         specifier: workspace:*
         version: link:../eslint-config-formbricks
       postcss:
-        specifier: ^8.4.30
-        version: 8.4.30
+        specifier: ^8.4.31
+        version: 8.4.31
       preact:
         specifier: ^10.17.1
         version: 10.17.1
@@ -645,10 +645,10 @@ importers:
         version: 0.5.10(tailwindcss@3.3.3)
       autoprefixer:
         specifier: ^10.4.16
-        version: 10.4.16(postcss@8.4.30)
+        version: 10.4.16(postcss@8.4.31)
       postcss:
-        specifier: ^8.4.30
-        version: 8.4.30
+        specifier: ^8.4.31
+        version: 8.4.31
       tailwindcss:
         specifier: ^3.3.3
         version: 3.3.3
@@ -784,8 +784,8 @@ importers:
         specifier: workspace:*
         version: link:../eslint-config-formbricks
       postcss:
-        specifier: ^8.4.30
-        version: 8.4.30
+        specifier: ^8.4.31
+        version: 8.4.31
       react:
         specifier: 18.2.0
         version: 18.2.0
@@ -7559,7 +7559,7 @@ packages:
     hasBin: true
     dev: true
 
-  /autoprefixer@10.4.16(postcss@8.4.24):
+  /autoprefixer@10.4.16(postcss@8.4.31):
     resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
@@ -7571,39 +7571,7 @@ packages:
       fraction.js: 4.3.6
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /autoprefixer@10.4.16(postcss@8.4.27):
-    resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      browserslist: 4.21.10
-      caniuse-lite: 1.0.30001541
-      fraction.js: 4.3.6
-      normalize-range: 0.1.2
-      picocolors: 1.0.0
-      postcss: 8.4.27
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /autoprefixer@10.4.16(postcss@8.4.30):
-    resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      browserslist: 4.21.10
-      caniuse-lite: 1.0.30001541
-      fraction.js: 4.3.6
-      normalize-range: 0.1.2
-      picocolors: 1.0.0
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
 
   /available-typed-arrays@1.0.5:
@@ -9365,22 +9333,13 @@ packages:
       timsort: 0.3.0
     dev: true
 
-  /css-declaration-sorter@6.3.1(postcss@8.4.24):
+  /css-declaration-sorter@6.3.1(postcss@8.4.31):
     resolution: {integrity: sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==}
     engines: {node: ^10 || ^12 || >=14}
     peerDependencies:
       postcss: ^8.0.9
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /css-declaration-sorter@6.3.1(postcss@8.4.30):
-    resolution: {integrity: sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==}
-    engines: {node: ^10 || ^12 || >=14}
-    peerDependencies:
-      postcss: ^8.0.9
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /css-in-js-utils@3.1.0:
@@ -9395,13 +9354,13 @@ packages:
     peerDependencies:
       webpack: ^4.27.0 || ^5.0.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.30)
+      icss-utils: 5.1.0(postcss@8.4.31)
       loader-utils: 2.0.4
-      postcss: 8.4.30
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.30)
-      postcss-modules-local-by-default: 4.0.0(postcss@8.4.30)
-      postcss-modules-scope: 3.0.0(postcss@8.4.30)
-      postcss-modules-values: 4.0.0(postcss@8.4.30)
+      postcss: 8.4.31
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.31)
+      postcss-modules-local-by-default: 4.0.0(postcss@8.4.31)
+      postcss-modules-scope: 3.0.0(postcss@8.4.31)
+      postcss-modules-values: 4.0.0(postcss@8.4.31)
       postcss-value-parser: 4.2.0
       schema-utils: 3.1.1
       semver: 7.5.4
@@ -9506,80 +9465,42 @@ packages:
       postcss-unique-selectors: 4.0.1
     dev: true
 
-  /cssnano-preset-default@5.2.13(postcss@8.4.24):
+  /cssnano-preset-default@5.2.13(postcss@8.4.31):
     resolution: {integrity: sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      css-declaration-sorter: 6.3.1(postcss@8.4.24)
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-calc: 8.2.4(postcss@8.4.24)
-      postcss-colormin: 5.3.0(postcss@8.4.24)
-      postcss-convert-values: 5.1.3(postcss@8.4.24)
-      postcss-discard-comments: 5.1.2(postcss@8.4.24)
-      postcss-discard-duplicates: 5.1.0(postcss@8.4.24)
-      postcss-discard-empty: 5.1.1(postcss@8.4.24)
-      postcss-discard-overridden: 5.1.0(postcss@8.4.24)
-      postcss-merge-longhand: 5.1.7(postcss@8.4.24)
-      postcss-merge-rules: 5.1.3(postcss@8.4.24)
-      postcss-minify-font-values: 5.1.0(postcss@8.4.24)
-      postcss-minify-gradients: 5.1.1(postcss@8.4.24)
-      postcss-minify-params: 5.1.4(postcss@8.4.24)
-      postcss-minify-selectors: 5.2.1(postcss@8.4.24)
-      postcss-normalize-charset: 5.1.0(postcss@8.4.24)
-      postcss-normalize-display-values: 5.1.0(postcss@8.4.24)
-      postcss-normalize-positions: 5.1.1(postcss@8.4.24)
-      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.24)
-      postcss-normalize-string: 5.1.0(postcss@8.4.24)
-      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.24)
-      postcss-normalize-unicode: 5.1.1(postcss@8.4.24)
-      postcss-normalize-url: 5.1.0(postcss@8.4.24)
-      postcss-normalize-whitespace: 5.1.1(postcss@8.4.24)
-      postcss-ordered-values: 5.1.3(postcss@8.4.24)
-      postcss-reduce-initial: 5.1.1(postcss@8.4.24)
-      postcss-reduce-transforms: 5.1.0(postcss@8.4.24)
-      postcss-svgo: 5.1.0(postcss@8.4.24)
-      postcss-unique-selectors: 5.1.1(postcss@8.4.24)
-    dev: true
-
-  /cssnano-preset-default@5.2.13(postcss@8.4.30):
-    resolution: {integrity: sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      css-declaration-sorter: 6.3.1(postcss@8.4.30)
-      cssnano-utils: 3.1.0(postcss@8.4.30)
-      postcss: 8.4.30
-      postcss-calc: 8.2.4(postcss@8.4.30)
-      postcss-colormin: 5.3.0(postcss@8.4.30)
-      postcss-convert-values: 5.1.3(postcss@8.4.30)
-      postcss-discard-comments: 5.1.2(postcss@8.4.30)
-      postcss-discard-duplicates: 5.1.0(postcss@8.4.30)
-      postcss-discard-empty: 5.1.1(postcss@8.4.30)
-      postcss-discard-overridden: 5.1.0(postcss@8.4.30)
-      postcss-merge-longhand: 5.1.7(postcss@8.4.30)
-      postcss-merge-rules: 5.1.3(postcss@8.4.30)
-      postcss-minify-font-values: 5.1.0(postcss@8.4.30)
-      postcss-minify-gradients: 5.1.1(postcss@8.4.30)
-      postcss-minify-params: 5.1.4(postcss@8.4.30)
-      postcss-minify-selectors: 5.2.1(postcss@8.4.30)
-      postcss-normalize-charset: 5.1.0(postcss@8.4.30)
-      postcss-normalize-display-values: 5.1.0(postcss@8.4.30)
-      postcss-normalize-positions: 5.1.1(postcss@8.4.30)
-      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.30)
-      postcss-normalize-string: 5.1.0(postcss@8.4.30)
-      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.30)
-      postcss-normalize-unicode: 5.1.1(postcss@8.4.30)
-      postcss-normalize-url: 5.1.0(postcss@8.4.30)
-      postcss-normalize-whitespace: 5.1.1(postcss@8.4.30)
-      postcss-ordered-values: 5.1.3(postcss@8.4.30)
-      postcss-reduce-initial: 5.1.1(postcss@8.4.30)
-      postcss-reduce-transforms: 5.1.0(postcss@8.4.30)
-      postcss-svgo: 5.1.0(postcss@8.4.30)
-      postcss-unique-selectors: 5.1.1(postcss@8.4.30)
+      css-declaration-sorter: 6.3.1(postcss@8.4.31)
+      cssnano-utils: 3.1.0(postcss@8.4.31)
+      postcss: 8.4.31
+      postcss-calc: 8.2.4(postcss@8.4.31)
+      postcss-colormin: 5.3.0(postcss@8.4.31)
+      postcss-convert-values: 5.1.3(postcss@8.4.31)
+      postcss-discard-comments: 5.1.2(postcss@8.4.31)
+      postcss-discard-duplicates: 5.1.0(postcss@8.4.31)
+      postcss-discard-empty: 5.1.1(postcss@8.4.31)
+      postcss-discard-overridden: 5.1.0(postcss@8.4.31)
+      postcss-merge-longhand: 5.1.7(postcss@8.4.31)
+      postcss-merge-rules: 5.1.3(postcss@8.4.31)
+      postcss-minify-font-values: 5.1.0(postcss@8.4.31)
+      postcss-minify-gradients: 5.1.1(postcss@8.4.31)
+      postcss-minify-params: 5.1.4(postcss@8.4.31)
+      postcss-minify-selectors: 5.2.1(postcss@8.4.31)
+      postcss-normalize-charset: 5.1.0(postcss@8.4.31)
+      postcss-normalize-display-values: 5.1.0(postcss@8.4.31)
+      postcss-normalize-positions: 5.1.1(postcss@8.4.31)
+      postcss-normalize-repeat-style: 5.1.1(postcss@8.4.31)
+      postcss-normalize-string: 5.1.0(postcss@8.4.31)
+      postcss-normalize-timing-functions: 5.1.0(postcss@8.4.31)
+      postcss-normalize-unicode: 5.1.1(postcss@8.4.31)
+      postcss-normalize-url: 5.1.0(postcss@8.4.31)
+      postcss-normalize-whitespace: 5.1.1(postcss@8.4.31)
+      postcss-ordered-values: 5.1.3(postcss@8.4.31)
+      postcss-reduce-initial: 5.1.1(postcss@8.4.31)
+      postcss-reduce-transforms: 5.1.0(postcss@8.4.31)
+      postcss-svgo: 5.1.0(postcss@8.4.31)
+      postcss-unique-selectors: 5.1.1(postcss@8.4.31)
     dev: true
 
   /cssnano-util-get-arguments@4.0.0:
@@ -9604,22 +9525,13 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /cssnano-utils@3.1.0(postcss@8.4.24):
+  /cssnano-utils@3.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /cssnano-utils@3.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /cssnano@4.1.11:
@@ -9632,27 +9544,15 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /cssnano@5.1.14(postcss@8.4.24):
+  /cssnano@5.1.14(postcss@8.4.31):
     resolution: {integrity: sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-preset-default: 5.2.13(postcss@8.4.24)
+      cssnano-preset-default: 5.2.13(postcss@8.4.31)
       lilconfig: 2.1.0
-      postcss: 8.4.24
-      yaml: 1.10.2
-    dev: true
-
-  /cssnano@5.1.14(postcss@8.4.30):
-    resolution: {integrity: sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      cssnano-preset-default: 5.2.13(postcss@8.4.30)
-      lilconfig: 2.1.0
-      postcss: 8.4.30
+      postcss: 8.4.31
       yaml: 1.10.2
     dev: true
 
@@ -13040,22 +12940,13 @@ packages:
     resolution: {integrity: sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==}
     dev: true
 
-  /icss-utils@5.1.0(postcss@8.4.24):
+  /icss-utils@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /icss-utils@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /idb@7.1.1:
@@ -15698,7 +15589,7 @@ packages:
       '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1)
       '@surma/rollup-plugin-off-main-thread': 2.2.3
       asyncro: 3.0.0
-      autoprefixer: 10.4.16(postcss@8.4.24)
+      autoprefixer: 10.4.16(postcss@8.4.31)
       babel-plugin-macros: 3.1.0
       babel-plugin-transform-async-to-promises: 0.8.18
       babel-plugin-transform-replace-expressions: 0.2.0(@babel/core@7.23.0)
@@ -15710,11 +15601,11 @@ packages:
       gzip-size: 6.0.0
       kleur: 4.1.5
       lodash.merge: 4.6.2
-      postcss: 8.4.24
+      postcss: 8.4.31
       pretty-bytes: 5.6.0
       rollup: 2.79.1
       rollup-plugin-bundle-size: 1.0.3
-      rollup-plugin-postcss: 4.0.2(postcss@8.4.24)
+      rollup-plugin-postcss: 4.0.2(postcss@8.4.31)
       rollup-plugin-terser: 7.0.2(rollup@2.79.1)
       rollup-plugin-typescript2: 0.32.1(rollup@2.79.1)(typescript@4.9.5)
       rollup-plugin-visualizer: 5.9.0(rollup@2.79.1)
@@ -17117,9 +17008,9 @@ packages:
     peerDependencies:
       webpack: ^4.0.0
     dependencies:
-      cssnano: 5.1.14(postcss@8.4.30)
+      cssnano: 5.1.14(postcss@8.4.31)
       last-call-webpack-plugin: 3.0.0
-      postcss: 8.4.30
+      postcss: 8.4.31
       webpack: 4.46.0
     dev: true
 
@@ -17672,22 +17563,12 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-calc@8.2.4(postcss@8.4.24):
+  /postcss-calc@8.2.4(postcss@8.4.31):
     resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
     peerDependencies:
       postcss: ^8.2.2
     dependencies:
-      postcss: 8.4.24
-      postcss-selector-parser: 6.0.11
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-calc@8.2.4(postcss@8.4.30):
-    resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
-    peerDependencies:
-      postcss: ^8.2.2
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
       postcss-value-parser: 4.2.0
     dev: true
@@ -17703,7 +17584,7 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-colormin@5.3.0(postcss@8.4.24):
+  /postcss-colormin@5.3.0(postcss@8.4.31):
     resolution: {integrity: sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
@@ -17712,20 +17593,7 @@ packages:
       browserslist: 4.21.10
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-colormin@5.3.0(postcss@8.4.30):
-    resolution: {integrity: sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      caniuse-api: 3.0.0
-      colord: 2.9.3
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -17737,25 +17605,14 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-convert-values@5.1.3(postcss@8.4.24):
+  /postcss-convert-values@5.1.3(postcss@8.4.31):
     resolution: {integrity: sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-convert-values@5.1.3(postcss@8.4.30):
-    resolution: {integrity: sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -17766,22 +17623,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-discard-comments@5.1.2(postcss@8.4.24):
+  /postcss-discard-comments@5.1.2(postcss@8.4.31):
     resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /postcss-discard-comments@5.1.2(postcss@8.4.30):
-    resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /postcss-discard-duplicates@4.0.2:
@@ -17791,22 +17639,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-discard-duplicates@5.1.0(postcss@8.4.24):
+  /postcss-discard-duplicates@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /postcss-discard-duplicates@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /postcss-discard-empty@4.0.1:
@@ -17816,22 +17655,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-discard-empty@5.1.1(postcss@8.4.24):
+  /postcss-discard-empty@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /postcss-discard-empty@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /postcss-discard-overridden@4.0.1:
@@ -17841,45 +17671,36 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-discard-overridden@5.1.0(postcss@8.4.24):
+  /postcss-discard-overridden@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.31
     dev: true
 
-  /postcss-discard-overridden@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
-    dev: true
-
-  /postcss-import@15.1.0(postcss@8.4.27):
+  /postcss-import@15.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       postcss: ^8.0.0
     dependencies:
-      postcss: 8.4.27
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
       resolve: 1.22.6
 
-  /postcss-js@4.0.1(postcss@8.4.27):
+  /postcss-js@4.0.1(postcss@8.4.31):
     resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
     engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.4.21
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.4.27
+      postcss: 8.4.31
 
-  /postcss-load-config@3.1.4(postcss@8.4.24):
+  /postcss-load-config@3.1.4(postcss@8.4.31):
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
     engines: {node: '>= 10'}
     peerDependencies:
@@ -17892,28 +17713,11 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.1.0
-      postcss: 8.4.24
+      postcss: 8.4.31
       yaml: 1.10.2
     dev: true
 
-  /postcss-load-config@3.1.4(postcss@8.4.27):
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 2.1.0
-      postcss: 8.4.27
-      yaml: 1.10.2
-    dev: true
-
-  /postcss-load-config@4.0.1(postcss@8.4.27):
+  /postcss-load-config@4.0.1(postcss@8.4.31):
     resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
     engines: {node: '>= 14'}
     peerDependencies:
@@ -17926,10 +17730,10 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.1.0
-      postcss: 8.4.27
+      postcss: 8.4.31
       yaml: 2.3.1
 
-  /postcss-loader@4.3.0(postcss@8.4.27)(webpack@4.46.0):
+  /postcss-loader@4.3.0(postcss@8.4.31)(webpack@4.46.0):
     resolution: {integrity: sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -17939,7 +17743,7 @@ packages:
       cosmiconfig: 7.1.0
       klona: 2.0.5
       loader-utils: 2.0.4
-      postcss: 8.4.27
+      postcss: 8.4.31
       schema-utils: 3.1.1
       semver: 7.5.4
       webpack: 4.46.0
@@ -17955,26 +17759,15 @@ packages:
       stylehacks: 4.0.3
     dev: true
 
-  /postcss-merge-longhand@5.1.7(postcss@8.4.24):
+  /postcss-merge-longhand@5.1.7(postcss@8.4.31):
     resolution: {integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
-      stylehacks: 5.1.1(postcss@8.4.24)
-    dev: true
-
-  /postcss-merge-longhand@5.1.7(postcss@8.4.30):
-    resolution: {integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
-      postcss-value-parser: 4.2.0
-      stylehacks: 5.1.1(postcss@8.4.30)
+      stylehacks: 5.1.1(postcss@8.4.31)
     dev: true
 
   /postcss-merge-rules@4.0.3:
@@ -17989,7 +17782,7 @@ packages:
       vendors: 1.0.4
     dev: true
 
-  /postcss-merge-rules@5.1.3(postcss@8.4.24):
+  /postcss-merge-rules@5.1.3(postcss@8.4.31):
     resolution: {integrity: sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
@@ -17997,21 +17790,8 @@ packages:
     dependencies:
       browserslist: 4.21.10
       caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /postcss-merge-rules@5.1.3(postcss@8.4.30):
-    resolution: {integrity: sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0(postcss@8.4.30)
-      postcss: 8.4.30
+      cssnano-utils: 3.1.0(postcss@8.4.31)
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
     dev: true
 
@@ -18023,23 +17803,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-minify-font-values@5.1.0(postcss@8.4.24):
+  /postcss-minify-font-values@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-minify-font-values@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18053,27 +17823,15 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-minify-gradients@5.1.1(postcss@8.4.24):
+  /postcss-minify-gradients@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-minify-gradients@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      colord: 2.9.3
-      cssnano-utils: 3.1.0(postcss@8.4.30)
-      postcss: 8.4.30
+      cssnano-utils: 3.1.0(postcss@8.4.31)
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18089,27 +17847,15 @@ packages:
       uniqs: 2.0.0
     dev: true
 
-  /postcss-minify-params@5.1.4(postcss@8.4.24):
+  /postcss-minify-params@5.1.4(postcss@8.4.31):
     resolution: {integrity: sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-minify-params@5.1.4(postcss@8.4.30):
-    resolution: {integrity: sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      cssnano-utils: 3.1.0(postcss@8.4.30)
-      postcss: 8.4.30
+      cssnano-utils: 3.1.0(postcss@8.4.31)
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18123,109 +17869,58 @@ packages:
       postcss-selector-parser: 3.1.2
     dev: true
 
-  /postcss-minify-selectors@5.2.1(postcss@8.4.24):
+  /postcss-minify-selectors@5.2.1(postcss@8.4.31):
     resolution: {integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
     dev: true
 
-  /postcss-minify-selectors@5.2.1(postcss@8.4.30):
-    resolution: {integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.24):
+  /postcss-modules-extract-imports@3.0.0(postcss@8.4.31):
     resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.31
     dev: true
 
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.30):
-    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.30
-    dev: true
-
-  /postcss-modules-local-by-default@4.0.0(postcss@8.4.24):
+  /postcss-modules-local-by-default@4.0.0(postcss@8.4.31):
     resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      icss-utils: 5.1.0(postcss@8.4.31)
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-modules-local-by-default@4.0.0(postcss@8.4.30):
-    resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.30)
-      postcss: 8.4.30
-      postcss-selector-parser: 6.0.11
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-modules-scope@3.0.0(postcss@8.4.24):
+  /postcss-modules-scope@3.0.0(postcss@8.4.31):
     resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.24
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
     dev: true
 
-  /postcss-modules-scope@3.0.0(postcss@8.4.30):
-    resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.30
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /postcss-modules-values@4.0.0(postcss@8.4.24):
+  /postcss-modules-values@4.0.0(postcss@8.4.31):
     resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.24)
-      postcss: 8.4.24
+      icss-utils: 5.1.0(postcss@8.4.31)
+      postcss: 8.4.31
     dev: true
 
-  /postcss-modules-values@4.0.0(postcss@8.4.30):
-    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      icss-utils: 5.1.0(postcss@8.4.30)
-      postcss: 8.4.30
-    dev: true
-
-  /postcss-modules@4.3.1(postcss@8.4.24):
+  /postcss-modules@4.3.1(postcss@8.4.31):
     resolution: {integrity: sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==}
     peerDependencies:
       postcss: ^8.0.0
@@ -18233,21 +17928,21 @@ packages:
       generic-names: 4.0.0
       icss-replace-symbols: 1.1.0
       lodash.camelcase: 4.3.0
-      postcss: 8.4.24
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.24)
-      postcss-modules-local-by-default: 4.0.0(postcss@8.4.24)
-      postcss-modules-scope: 3.0.0(postcss@8.4.24)
-      postcss-modules-values: 4.0.0(postcss@8.4.24)
+      postcss: 8.4.31
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.31)
+      postcss-modules-local-by-default: 4.0.0(postcss@8.4.31)
+      postcss-modules-scope: 3.0.0(postcss@8.4.31)
+      postcss-modules-values: 4.0.0(postcss@8.4.31)
       string-hash: 1.1.3
     dev: true
 
-  /postcss-nested@6.0.1(postcss@8.4.27):
+  /postcss-nested@6.0.1(postcss@8.4.31):
     resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
     dependencies:
-      postcss: 8.4.27
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
 
   /postcss-normalize-charset@4.0.1:
@@ -18257,22 +17952,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-normalize-charset@5.1.0(postcss@8.4.24):
+  /postcss-normalize-charset@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-    dev: true
-
-  /postcss-normalize-charset@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /postcss-normalize-display-values@4.0.2:
@@ -18284,23 +17970,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-display-values@5.1.0(postcss@8.4.24):
+  /postcss-normalize-display-values@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-display-values@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18314,23 +17990,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-positions@5.1.1(postcss@8.4.24):
+  /postcss-normalize-positions@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-positions@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18344,23 +18010,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-repeat-style@5.1.1(postcss@8.4.24):
+  /postcss-normalize-repeat-style@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-repeat-style@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18373,23 +18029,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-string@5.1.0(postcss@8.4.24):
+  /postcss-normalize-string@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-string@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18402,23 +18048,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-timing-functions@5.1.0(postcss@8.4.24):
+  /postcss-normalize-timing-functions@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-timing-functions@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18431,25 +18067,14 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-unicode@5.1.1(postcss@8.4.24):
+  /postcss-normalize-unicode@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-unicode@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18463,25 +18088,14 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-url@5.1.0(postcss@8.4.24):
+  /postcss-normalize-url@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       normalize-url: 6.1.0
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-url@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      normalize-url: 6.1.0
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18493,23 +18107,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-normalize-whitespace@5.1.1(postcss@8.4.24):
+  /postcss-normalize-whitespace@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-normalize-whitespace@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18522,25 +18126,14 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-ordered-values@5.1.3(postcss@8.4.24):
+  /postcss-ordered-values@5.1.3(postcss@8.4.31):
     resolution: {integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-utils: 3.1.0(postcss@8.4.24)
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-ordered-values@5.1.3(postcss@8.4.30):
-    resolution: {integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      cssnano-utils: 3.1.0(postcss@8.4.30)
-      postcss: 8.4.30
+      cssnano-utils: 3.1.0(postcss@8.4.31)
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18554,7 +18147,7 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-reduce-initial@5.1.1(postcss@8.4.24):
+  /postcss-reduce-initial@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
@@ -18562,18 +18155,7 @@ packages:
     dependencies:
       browserslist: 4.21.10
       caniuse-api: 3.0.0
-      postcss: 8.4.24
-    dev: true
-
-  /postcss-reduce-initial@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      caniuse-api: 3.0.0
-      postcss: 8.4.30
+      postcss: 8.4.31
     dev: true
 
   /postcss-reduce-transforms@4.0.2:
@@ -18586,23 +18168,13 @@ packages:
       postcss-value-parser: 3.3.1
     dev: true
 
-  /postcss-reduce-transforms@5.1.0(postcss@8.4.24):
+  /postcss-reduce-transforms@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /postcss-reduce-transforms@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -18638,24 +18210,13 @@ packages:
       svgo: 1.3.2
     dev: true
 
-  /postcss-svgo@5.1.0(postcss@8.4.24):
+  /postcss-svgo@5.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-value-parser: 4.2.0
-      svgo: 2.8.0
-    dev: true
-
-  /postcss-svgo@5.1.0(postcss@8.4.30):
-    resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-value-parser: 4.2.0
       svgo: 2.8.0
     dev: true
@@ -18669,23 +18230,13 @@ packages:
       uniqs: 2.0.0
     dev: true
 
-  /postcss-unique-selectors@5.1.1(postcss@8.4.24):
+  /postcss-unique-selectors@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      postcss: 8.4.24
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /postcss-unique-selectors@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
     dev: true
 
@@ -18713,25 +18264,8 @@ packages:
       source-map-js: 1.0.2
     dev: false
 
-  /postcss@8.4.24:
-    resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
-  /postcss@8.4.27:
-    resolution: {integrity: sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-
-  /postcss@8.4.30:
-    resolution: {integrity: sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==}
+  /postcss@8.4.31:
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
       nanoid: 3.3.6
@@ -18788,7 +18322,7 @@ packages:
       '@prefresh/babel-plugin': 0.4.4
       '@prefresh/webpack': 3.3.4(@prefresh/babel-plugin@0.4.4)(preact@10.17.1)(webpack@4.46.0)
       '@types/webpack': 4.41.33
-      autoprefixer: 10.4.16(postcss@8.4.27)
+      autoprefixer: 10.4.16(postcss@8.4.31)
       babel-esm-plugin: 0.9.0(webpack@4.46.0)
       babel-loader: 8.3.0(@babel/core@7.23.0)(webpack@4.46.0)
       babel-plugin-macros: 3.1.0
@@ -18821,9 +18355,9 @@ packages:
       optimize-css-assets-webpack-plugin: 6.0.1(webpack@4.46.0)
       ora: 5.4.1
       pnp-webpack-plugin: 1.7.0(typescript@5.2.2)
-      postcss: 8.4.27
-      postcss-load-config: 3.1.4(postcss@8.4.27)
-      postcss-loader: 4.3.0(postcss@8.4.27)(webpack@4.46.0)
+      postcss: 8.4.31
+      postcss-load-config: 3.1.4(postcss@8.4.31)
+      postcss-loader: 4.3.0(postcss@8.4.31)(webpack@4.46.0)
       preact: 10.17.1
       preact-render-to-string: 6.2.1(preact@10.17.1)
       progress-bar-webpack-plugin: 2.1.0(webpack@4.46.0)
@@ -20273,7 +19807,7 @@ packages:
       maxmin: 2.1.0
     dev: true
 
-  /rollup-plugin-postcss@4.0.2(postcss@8.4.24):
+  /rollup-plugin-postcss@4.0.2(postcss@8.4.31):
     resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -20281,13 +19815,13 @@ packages:
     dependencies:
       chalk: 4.1.2
       concat-with-sourcemaps: 1.1.0
-      cssnano: 5.1.14(postcss@8.4.24)
+      cssnano: 5.1.14(postcss@8.4.31)
       import-cwd: 3.0.0
       p-queue: 6.6.2
       pify: 5.0.0
-      postcss: 8.4.24
-      postcss-load-config: 3.1.4(postcss@8.4.24)
-      postcss-modules: 4.3.1(postcss@8.4.24)
+      postcss: 8.4.31
+      postcss-load-config: 3.1.4(postcss@8.4.31)
+      postcss-modules: 4.3.1(postcss@8.4.31)
       promise.series: 0.2.0
       resolve: 1.22.2
       rollup-pluginutils: 2.8.2
@@ -21528,25 +21062,14 @@ packages:
       postcss-selector-parser: 3.1.2
     dev: true
 
-  /stylehacks@5.1.1(postcss@8.4.24):
+  /stylehacks@5.1.1(postcss@8.4.31):
     resolution: {integrity: sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==}
     engines: {node: ^10 || ^12 || >=14.0}
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
       browserslist: 4.21.10
-      postcss: 8.4.24
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /stylehacks@5.1.1(postcss@8.4.30):
-    resolution: {integrity: sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
-    dependencies:
-      browserslist: 4.21.10
-      postcss: 8.4.30
+      postcss: 8.4.31
       postcss-selector-parser: 6.0.11
     dev: true
 
@@ -21687,11 +21210,11 @@ packages:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.0.0
-      postcss: 8.4.27
-      postcss-import: 15.1.0(postcss@8.4.27)
-      postcss-js: 4.0.1(postcss@8.4.27)
-      postcss-load-config: 4.0.1(postcss@8.4.27)
-      postcss-nested: 6.0.1(postcss@8.4.27)
+      postcss: 8.4.31
+      postcss-import: 15.1.0(postcss@8.4.31)
+      postcss-js: 4.0.1(postcss@8.4.31)
+      postcss-load-config: 4.0.1(postcss@8.4.31)
+      postcss-nested: 6.0.1(postcss@8.4.31)
       postcss-selector-parser: 6.0.11
       resolve: 1.22.2
       sucrase: 3.32.0
@@ -22239,7 +21762,7 @@ packages:
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss-load-config: 4.0.1(postcss@8.4.27)
+      postcss-load-config: 4.0.1(postcss@8.4.31)
       resolve-from: 5.0.0
       rollup: 3.29.4
       source-map: 0.8.0-beta.0
@@ -23225,7 +22748,7 @@ packages:
         optional: true
     dependencies:
       esbuild: 0.18.10
-      postcss: 8.4.30
+      postcss: 8.4.31
       rollup: 3.29.4
       terser: 5.20.0
     optionalDependencies:

From eb70a8b99adf2c9bcd41025f5e338af7b6999b6f Mon Sep 17 00:00:00 2001
From: Rotimi Best <rotimiibitoyeemma@gmail.com>
Date: Wed, 4 Oct 2023 15:25:26 +0100
Subject: [PATCH 22/26] chore: move display service to new folder structure
 (#946)

---
 .../displays/[displayId]/responded/route.ts   |   2 +-
 apps/web/app/api/v1/client/displays/route.ts  |   2 +-
 packages/lib/display/service.ts               | 176 ++++++++++++++++++
 packages/lib/survey/service.ts                |   2 +-
 4 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 packages/lib/display/service.ts

diff --git a/apps/web/app/api/v1/client/displays/[displayId]/responded/route.ts b/apps/web/app/api/v1/client/displays/[displayId]/responded/route.ts
index 8901832fc4..c9d6710216 100644
--- a/apps/web/app/api/v1/client/displays/[displayId]/responded/route.ts
+++ b/apps/web/app/api/v1/client/displays/[displayId]/responded/route.ts
@@ -1,5 +1,5 @@
 import { responses } from "@/lib/api/response";
-import { markDisplayResponded } from "@formbricks/lib/services/displays";
+import { markDisplayResponded } from "@formbricks/lib/display/service";
 import { NextResponse } from "next/server";
 
 export async function OPTIONS(): Promise<NextResponse> {
diff --git a/apps/web/app/api/v1/client/displays/route.ts b/apps/web/app/api/v1/client/displays/route.ts
index 7d46e99a8e..9ac23ee5b2 100644
--- a/apps/web/app/api/v1/client/displays/route.ts
+++ b/apps/web/app/api/v1/client/displays/route.ts
@@ -2,7 +2,7 @@ import { responses } from "@/lib/api/response";
 import { transformErrorToDetails } from "@/lib/api/validator";
 import { InvalidInputError } from "@formbricks/types/v1/errors";
 import { capturePosthogEvent } from "@formbricks/lib/posthogServer";
-import { createDisplay } from "@formbricks/lib/services/displays";
+import { createDisplay } from "@formbricks/lib/display/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { getTeamDetails } from "@formbricks/lib/services/teamDetails";
 import { TDisplay, ZDisplayInput } from "@formbricks/types/v1/displays";
diff --git a/packages/lib/display/service.ts b/packages/lib/display/service.ts
new file mode 100644
index 0000000000..82125f2a81
--- /dev/null
+++ b/packages/lib/display/service.ts
@@ -0,0 +1,176 @@
+import "server-only";
+
+import { prisma } from "@formbricks/database";
+import {
+  TDisplay,
+  TDisplayInput,
+  TDisplaysWithSurveyName,
+  ZDisplayInput,
+} from "@formbricks/types/v1/displays";
+import { ZId } from "@formbricks/types/v1/environment";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { Prisma } from "@prisma/client";
+import { revalidateTag } from "next/cache";
+import { cache } from "react";
+import { validateInputs } from "../utils/validate";
+import { transformPrismaPerson } from "../services/person";
+
+const selectDisplay = {
+  id: true,
+  createdAt: true,
+  updatedAt: true,
+  surveyId: true,
+  person: {
+    select: {
+      id: true,
+      createdAt: true,
+      updatedAt: true,
+      environmentId: true,
+      attributes: {
+        select: {
+          value: true,
+          attributeClass: {
+            select: {
+              name: true,
+            },
+          },
+        },
+      },
+    },
+  },
+  status: true,
+};
+
+export const getDisplaysCacheTag = (surveyId: string) => `surveys-${surveyId}-displays`;
+
+export const createDisplay = async (displayInput: TDisplayInput): Promise<TDisplay> => {
+  validateInputs([displayInput, ZDisplayInput]);
+  try {
+    const displayPrisma = await prisma.display.create({
+      data: {
+        survey: {
+          connect: {
+            id: displayInput.surveyId,
+          },
+        },
+        status: "seen",
+
+        ...(displayInput.personId && {
+          person: {
+            connect: {
+              id: displayInput.personId,
+            },
+          },
+        }),
+      },
+      select: selectDisplay,
+    });
+
+    const display: TDisplay = {
+      ...displayPrisma,
+      person: displayPrisma.person ? transformPrismaPerson(displayPrisma.person) : null,
+    };
+
+    if (displayInput.personId) {
+      revalidateTag(displayInput.personId);
+    }
+
+    if (displayInput.surveyId) {
+      revalidateTag(getDisplaysCacheTag(displayInput.surveyId));
+    }
+
+    return display;
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError("Database operation failed");
+    }
+
+    throw error;
+  }
+};
+
+export const markDisplayResponded = async (displayId: string): Promise<TDisplay> => {
+  validateInputs([displayId, ZId]);
+  try {
+    if (!displayId) throw new Error("Display ID is required");
+
+    const displayPrisma = await prisma.display.update({
+      where: {
+        id: displayId,
+      },
+      data: {
+        status: "responded",
+      },
+      select: selectDisplay,
+    });
+
+    if (!displayPrisma) {
+      throw new ResourceNotFoundError("Display", displayId);
+    }
+
+    const display: TDisplay = {
+      ...displayPrisma,
+      person: displayPrisma.person ? transformPrismaPerson(displayPrisma.person) : null,
+    };
+
+    return display;
+  } catch (error) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError("Database operation failed");
+    }
+
+    throw error;
+  }
+};
+
+export const getDisplaysOfPerson = cache(
+  async (personId: string): Promise<TDisplaysWithSurveyName[] | null> => {
+    validateInputs([personId, ZId]);
+    try {
+      const displaysPrisma = await prisma.display.findMany({
+        where: {
+          personId: personId,
+        },
+        select: {
+          id: true,
+          createdAt: true,
+          updatedAt: true,
+          surveyId: true,
+          survey: {
+            select: {
+              name: true,
+            },
+          },
+          status: true,
+        },
+      });
+
+      if (!displaysPrisma) {
+        throw new ResourceNotFoundError("Display from PersonId", personId);
+      }
+
+      let displays: TDisplaysWithSurveyName[] = [];
+
+      displaysPrisma.forEach((displayPrisma) => {
+        const display: TDisplaysWithSurveyName = {
+          id: displayPrisma.id,
+          createdAt: displayPrisma.createdAt,
+          updatedAt: displayPrisma.updatedAt,
+          person: null,
+          status: displayPrisma.status,
+          surveyId: displayPrisma.surveyId,
+          surveyName: displayPrisma.survey.name,
+        };
+        displays.push(display);
+      });
+
+      return displays;
+    } catch (error) {
+      if (error instanceof Prisma.PrismaClientKnownRequestError) {
+        throw new DatabaseError("Database operation failed");
+      }
+
+      throw error;
+    }
+  }
+);
diff --git a/packages/lib/survey/service.ts b/packages/lib/survey/service.ts
index b6d2ff5ed0..df3e4c3ac7 100644
--- a/packages/lib/survey/service.ts
+++ b/packages/lib/survey/service.ts
@@ -15,7 +15,7 @@ import { revalidateTag, unstable_cache } from "next/cache";
 import { z } from "zod";
 import { captureTelemetry } from "../telemetry";
 import { validateInputs } from "../utils/validate";
-import { getDisplaysCacheTag } from "../services/displays";
+import { getDisplaysCacheTag } from "../display/service";
 import { getResponsesCacheTag } from "../response/service";
 
 // surveys cache key and tags

From d9f3df8b0f7bf92c2ed097498316b6139f1aa321 Mon Sep 17 00:00:00 2001
From: Sagnik Sahoo <sahoosagnik1@gmail.com>
Date: Wed, 4 Oct 2023 19:57:24 +0530
Subject: [PATCH 23/26] fix: Single Use Link Preview is not correctly
 functioning (#938)

* fixing the preview link

* Update LinkSingleUseSurveyModal.tsx
---
 .../(analysis)/summary/components/LinkSingleUseSurveyModal.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx
index 422aae3de2..de51ea6395 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/LinkSingleUseSurveyModal.tsx
@@ -109,7 +109,7 @@ export default function LinkSingleUseSurveyModal({
               title="Preview survey"
               aria-label="Preview survey"
               className="flex justify-center"
-              href={`${defaultSurveyUrl}?suId=${singleUseIds[0]}preview=true`}
+              href={`${defaultSurveyUrl}?suId=${singleUseIds[0]}&preview=true`}
               target="_blank"
               EndIcon={EyeIcon}>
               Preview

From 99ec1ed4e9800c34efc199b2b743046f895f53ff Mon Sep 17 00:00:00 2001
From: Rotimi Best <rotimiibitoyeemma@gmail.com>
Date: Wed, 4 Oct 2023 15:29:49 +0100
Subject: [PATCH 24/26] fix: standardize error messaging in all service (#920)

* fix: standardize error messaging in all service

* fix: use unknownerror
---
 packages/lib/services/actions.ts     |  4 ++--
 packages/lib/services/activity.tsx   |  4 +++-
 packages/lib/services/displays.ts    |  4 +++-
 packages/lib/services/googleSheet.ts |  8 +++-----
 packages/lib/services/membership.ts  | 13 +++++++++----
 packages/lib/services/person.ts      |  4 ++--
 packages/lib/services/team.ts        | 12 ++++++++----
 packages/types/v1/errors.ts          |  9 +++++++++
 8 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/packages/lib/services/actions.ts b/packages/lib/services/actions.ts
index ffa8b2475a..08038ba032 100644
--- a/packages/lib/services/actions.ts
+++ b/packages/lib/services/actions.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import z from "zod";
 import { prisma } from "@formbricks/database";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
 import { TAction } from "@formbricks/types/v1/actions";
 import { ZId } from "@formbricks/types/v1/environment";
 import { Prisma } from "@prisma/client";
@@ -65,7 +65,7 @@ export const createAction = async (data: TJsActionInput) => {
   const session = await getSessionCached(sessionId);
 
   if (!session) {
-    throw new Error("Session not found");
+    throw new ResourceNotFoundError("Session", sessionId);
   }
 
   const actionClass = await getActionClassCached(name, environmentId);
diff --git a/packages/lib/services/activity.tsx b/packages/lib/services/activity.tsx
index 55ba044ffd..c9215812f6 100644
--- a/packages/lib/services/activity.tsx
+++ b/packages/lib/services/activity.tsx
@@ -5,6 +5,7 @@ import { TActivityFeedItem } from "@formbricks/types/v1/activity";
 import { validateInputs } from "../utils/validate";
 import { ZId } from "@formbricks/types/v1/environment";
 import { cache } from "react";
+import { ResourceNotFoundError } from "@formbricks/types/v1/errors";
 
 export const getActivityTimeline = cache(async (personId: string): Promise<TActivityFeedItem[]> => {
   validateInputs([personId, ZId]);
@@ -34,8 +35,9 @@ export const getActivityTimeline = cache(async (personId: string): Promise<TActi
       },
     },
   });
+
   if (!person) {
-    throw new Error("No such person found");
+    throw new ResourceNotFoundError("Person", personId);
   }
   const { attributes, displays, sessions } = person;
 
diff --git a/packages/lib/services/displays.ts b/packages/lib/services/displays.ts
index 5cbe1983d9..af7610a198 100644
--- a/packages/lib/services/displays.ts
+++ b/packages/lib/services/displays.ts
@@ -92,7 +92,9 @@ export const createDisplay = async (displayInput: TDisplayInput): Promise<TDispl
 export const markDisplayResponded = async (displayId: string): Promise<TDisplay> => {
   validateInputs([displayId, ZId]);
   try {
-    if (!displayId) throw new Error("Display ID is required");
+    if (!displayId) {
+      throw new ResourceNotFoundError("Display", displayId);
+    }
 
     const displayPrisma = await prisma.display.update({
       where: {
diff --git a/packages/lib/services/googleSheet.ts b/packages/lib/services/googleSheet.ts
index 1f8900a889..c7daae2b2b 100644
--- a/packages/lib/services/googleSheet.ts
+++ b/packages/lib/services/googleSheet.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import { prisma } from "@formbricks/database";
 import { Prisma } from "@prisma/client";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError, UnknownError } from "@formbricks/types/v1/errors";
 import { cache } from "react";
 import {
   TGoogleCredential,
@@ -89,8 +89,7 @@ export async function writeData(credentials: TGoogleCredential, spreadsheetId: s
       },
       (err: Error) => {
         if (err) {
-          throw new Error(`Error while appending data: ${err.message}`);
-        } else {
+          throw new UnknownError(`Error while appending data: ${err.message}`);
         }
       }
     );
@@ -104,8 +103,7 @@ export async function writeData(credentials: TGoogleCredential, spreadsheetId: s
       },
       (err: Error) => {
         if (err) {
-          throw new Error(`Error while appending data: ${err.message}`);
-        } else {
+          throw new UnknownError(`Error while appending data: ${err.message}`);
         }
       }
     );
diff --git a/packages/lib/services/membership.ts b/packages/lib/services/membership.ts
index 16f0123aaa..470cc72280 100644
--- a/packages/lib/services/membership.ts
+++ b/packages/lib/services/membership.ts
@@ -1,7 +1,7 @@
 import "server-only";
 
 import { prisma } from "@formbricks/database";
-import { ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { ResourceNotFoundError, DatabaseError, UnknownError } from "@formbricks/types/v1/errors";
 import { TMember, TMembership, TMembershipUpdateInput } from "@formbricks/types/v1/memberships";
 import { Prisma } from "@prisma/client";
 import { cache } from "react";
@@ -102,9 +102,9 @@ export const updateMembership = async (
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2016") {
       throw new ResourceNotFoundError("Membership", `userId: ${userId}, teamId: ${teamId}`);
-    } else {
-      throw error; // Re-throw any other errors
     }
+
+    throw error;
   }
 };
 
@@ -148,6 +148,11 @@ export const transferOwnership = async (currentOwnerId: string, newOwnerId: stri
       }),
     ]);
   } catch (error) {
-    throw new Error("Something went wrong");
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError("Database operation failed");
+    }
+
+    const message = error instanceof Error ? error.message : "";
+    throw new UnknownError(`Error while transfering ownership: ${message}`);
   }
 };
diff --git a/packages/lib/services/person.ts b/packages/lib/services/person.ts
index 21a89535b9..ae5bb4c0b2 100644
--- a/packages/lib/services/person.ts
+++ b/packages/lib/services/person.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import { prisma } from "@formbricks/database";
 import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError } from "@formbricks/types/v1/errors";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
 import { TPerson, TPersonUpdateInput } from "@formbricks/types/v1/people";
 import { Prisma } from "@prisma/client";
 import { revalidateTag, unstable_cache } from "next/cache";
@@ -250,7 +250,7 @@ export const getOrCreatePersonByUserId = async (userId: string, environmentId: s
     const userIdAttributeClass = await getAttributeClassByName(environmentId, "userId");
 
     if (!userIdAttributeClass) {
-      throw new Error("Attribute class not found for the given environmentId");
+      throw new ResourceNotFoundError("Attribute class not found for the given environment", environmentId);
     }
 
     const personPrisma = await prisma.person.create({
diff --git a/packages/lib/services/team.ts b/packages/lib/services/team.ts
index 63883dca4b..c7371ecc83 100644
--- a/packages/lib/services/team.ts
+++ b/packages/lib/services/team.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import { prisma } from "@formbricks/database";
 import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
+import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/v1/errors";
 import { TTeam, TTeamUpdateInput } from "@formbricks/types/v1/teams";
 import { createId } from "@paralleldrive/cuid2";
 import { Prisma } from "@prisma/client";
@@ -245,7 +245,7 @@ export const createDemoProduct = async (teamId: string) => {
 
   // check if updatedEnvironment exists and it has attributeClasses
   if (!updatedEnvironment || !updatedEnvironment.attributeClasses) {
-    throw new Error("Attribute classes could not be created");
+    throw new ValidationError("Attribute classes could not be created");
   }
 
   const attributeClasses = updatedEnvironment.attributeClasses;
@@ -332,8 +332,12 @@ export const createDemoProduct = async (teamId: string) => {
         })),
       }),
     ]);
-  } catch (err: any) {
-    throw new Error(err);
+  } catch (error: any) {
+    if (error instanceof Prisma.PrismaClientKnownRequestError) {
+      throw new DatabaseError("Database operation failed");
+    }
+
+    throw error;
   }
 
   // Create a function that creates a survey
diff --git a/packages/types/v1/errors.ts b/packages/types/v1/errors.ts
index e86054c477..1d2e8ee850 100644
--- a/packages/types/v1/errors.ts
+++ b/packages/types/v1/errors.ts
@@ -22,6 +22,14 @@ class ValidationError extends Error {
   }
 }
 
+class UnknownError extends Error {
+  statusCode = 500;
+  constructor(message: string) {
+    super(message);
+    this.name = "DatabaseError";
+  }
+}
+
 class DatabaseError extends Error {
   statusCode = 500;
   constructor(message: string) {
@@ -83,6 +91,7 @@ export {
   ValidationError,
   DatabaseError,
   UniqueConstraintError,
+  UnknownError,
   ForeignKeyConstraintError,
   OperationNotAllowedError,
   AuthenticationError,

From 61a850c4ea90bc3df503d2939ce8d5bd96cb80e1 Mon Sep 17 00:00:00 2001
From: Rotimi Best <rotimiibitoyeemma@gmail.com>
Date: Wed, 4 Oct 2023 15:41:41 +0100
Subject: [PATCH 25/26] fix: delete duplicate displays (#947)

---
 packages/lib/services/displays.ts | 178 ------------------------------
 1 file changed, 178 deletions(-)
 delete mode 100644 packages/lib/services/displays.ts

diff --git a/packages/lib/services/displays.ts b/packages/lib/services/displays.ts
deleted file mode 100644
index af7610a198..0000000000
--- a/packages/lib/services/displays.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import "server-only";
-
-import { prisma } from "@formbricks/database";
-import {
-  TDisplay,
-  TDisplayInput,
-  TDisplaysWithSurveyName,
-  ZDisplayInput,
-} from "@formbricks/types/v1/displays";
-import { ZId } from "@formbricks/types/v1/environment";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/v1/errors";
-import { Prisma } from "@prisma/client";
-import { revalidateTag } from "next/cache";
-import { cache } from "react";
-import { validateInputs } from "../utils/validate";
-import { transformPrismaPerson } from "./person";
-
-const selectDisplay = {
-  id: true,
-  createdAt: true,
-  updatedAt: true,
-  surveyId: true,
-  person: {
-    select: {
-      id: true,
-      createdAt: true,
-      updatedAt: true,
-      environmentId: true,
-      attributes: {
-        select: {
-          value: true,
-          attributeClass: {
-            select: {
-              name: true,
-            },
-          },
-        },
-      },
-    },
-  },
-  status: true,
-};
-
-export const getDisplaysCacheTag = (surveyId: string) => `surveys-${surveyId}-displays`;
-
-export const createDisplay = async (displayInput: TDisplayInput): Promise<TDisplay> => {
-  validateInputs([displayInput, ZDisplayInput]);
-  try {
-    const displayPrisma = await prisma.display.create({
-      data: {
-        survey: {
-          connect: {
-            id: displayInput.surveyId,
-          },
-        },
-        status: "seen",
-
-        ...(displayInput.personId && {
-          person: {
-            connect: {
-              id: displayInput.personId,
-            },
-          },
-        }),
-      },
-      select: selectDisplay,
-    });
-
-    const display: TDisplay = {
-      ...displayPrisma,
-      person: displayPrisma.person ? transformPrismaPerson(displayPrisma.person) : null,
-    };
-
-    if (displayInput.personId) {
-      revalidateTag(displayInput.personId);
-    }
-
-    if (displayInput.surveyId) {
-      revalidateTag(getDisplaysCacheTag(displayInput.surveyId));
-    }
-
-    return display;
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      throw new DatabaseError("Database operation failed");
-    }
-
-    throw error;
-  }
-};
-
-export const markDisplayResponded = async (displayId: string): Promise<TDisplay> => {
-  validateInputs([displayId, ZId]);
-  try {
-    if (!displayId) {
-      throw new ResourceNotFoundError("Display", displayId);
-    }
-
-    const displayPrisma = await prisma.display.update({
-      where: {
-        id: displayId,
-      },
-      data: {
-        status: "responded",
-      },
-      select: selectDisplay,
-    });
-
-    if (!displayPrisma) {
-      throw new ResourceNotFoundError("Display", displayId);
-    }
-
-    const display: TDisplay = {
-      ...displayPrisma,
-      person: displayPrisma.person ? transformPrismaPerson(displayPrisma.person) : null,
-    };
-
-    return display;
-  } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      throw new DatabaseError("Database operation failed");
-    }
-
-    throw error;
-  }
-};
-
-export const getDisplaysOfPerson = cache(
-  async (personId: string): Promise<TDisplaysWithSurveyName[] | null> => {
-    validateInputs([personId, ZId]);
-    try {
-      const displaysPrisma = await prisma.display.findMany({
-        where: {
-          personId: personId,
-        },
-        select: {
-          id: true,
-          createdAt: true,
-          updatedAt: true,
-          surveyId: true,
-          survey: {
-            select: {
-              name: true,
-            },
-          },
-          status: true,
-        },
-      });
-
-      if (!displaysPrisma) {
-        throw new ResourceNotFoundError("Display from PersonId", personId);
-      }
-
-      let displays: TDisplaysWithSurveyName[] = [];
-
-      displaysPrisma.forEach((displayPrisma) => {
-        const display: TDisplaysWithSurveyName = {
-          id: displayPrisma.id,
-          createdAt: displayPrisma.createdAt,
-          updatedAt: displayPrisma.updatedAt,
-          person: null,
-          status: displayPrisma.status,
-          surveyId: displayPrisma.surveyId,
-          surveyName: displayPrisma.survey.name,
-        };
-        displays.push(display);
-      });
-
-      return displays;
-    } catch (error) {
-      if (error instanceof Prisma.PrismaClientKnownRequestError) {
-        throw new DatabaseError("Database operation failed");
-      }
-
-      throw error;
-    }
-  }
-);

From 6758d2d318bb7c5ef7c8793977ef4389cb01646e Mon Sep 17 00:00:00 2001
From: Rotimi Best <rotimiibitoyeemma@gmail.com>
Date: Wed, 4 Oct 2023 16:00:03 +0100
Subject: [PATCH 26/26] chore: move actions service to new folder structure
 (#943)

* feat: move actions service

* fix: rename folder to be singular not plural

---------

Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
---
 .../[environmentId]/(actionsAndAttributes)/actions/actions.ts   | 2 +-
 .../(app)/environments/[environmentId]/settings/setup/page.tsx  | 2 +-
 .../web/app/(app)/environments/[environmentId]/surveys/page.tsx | 2 +-
 apps/web/app/api/v1/js/actions/route.ts                         | 2 +-
 packages/lib/{services/actions.ts => action/service.ts}         | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/lib/{services/actions.ts => action/service.ts} (100%)

diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts
index 0a82437d09..fc739ff3e0 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/actions/actions.ts
@@ -11,7 +11,7 @@ import {
   getActionCountInLast24Hours,
   getActionCountInLast7Days,
   getActionCountInLastHour,
-} from "@formbricks/lib/services/actions";
+} from "@formbricks/lib/action/service";
 import { getSurveysByActionClassId } from "@formbricks/lib/survey/service";
 import { AuthorizationError } from "@formbricks/types/v1/errors";
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/setup/page.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/setup/page.tsx
index 904069d470..a850c80ea5 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/setup/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/setup/page.tsx
@@ -4,7 +4,7 @@ import { updateEnvironmentAction } from "@/app/(app)/environments/[environmentId
 import EnvironmentNotice from "@/components/shared/EnvironmentNotice";
 import WidgetStatusIndicator from "@/components/shared/WidgetStatusIndicator";
 import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import { getActionsByEnvironmentId } from "@formbricks/lib/services/actions";
+import { getActionsByEnvironmentId } from "@formbricks/lib/action/service";
 import { getEnvironment } from "@formbricks/lib/services/environment";
 import { ErrorComponent } from "@formbricks/ui";
 import SettingsCard from "../SettingsCard";
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx
index 377d4a90e2..18ad886b6f 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx
@@ -4,7 +4,7 @@ import { updateEnvironmentAction } from "@/app/(app)/environments/[environmentId
 import ContentWrapper from "@/components/shared/ContentWrapper";
 import WidgetStatusIndicator from "@/components/shared/WidgetStatusIndicator";
 import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import { getActionsByEnvironmentId } from "@formbricks/lib/services/actions";
+import { getActionsByEnvironmentId } from "@formbricks/lib/action/service";
 import { getEnvironment } from "@formbricks/lib/services/environment";
 import { Metadata } from "next";
 import SurveysList from "./SurveyList";
diff --git a/apps/web/app/api/v1/js/actions/route.ts b/apps/web/app/api/v1/js/actions/route.ts
index 883f95260c..f5fcdc1ff2 100644
--- a/apps/web/app/api/v1/js/actions/route.ts
+++ b/apps/web/app/api/v1/js/actions/route.ts
@@ -1,6 +1,6 @@
 import { responses } from "@/lib/api/response";
 import { transformErrorToDetails } from "@/lib/api/validator";
-import { createAction } from "@formbricks/lib/services/actions";
+import { createAction } from "@formbricks/lib/action/service";
 import { ZJsActionInput } from "@formbricks/types/v1/js";
 import { NextResponse } from "next/server";
 
diff --git a/packages/lib/services/actions.ts b/packages/lib/action/service.ts
similarity index 100%
rename from packages/lib/services/actions.ts
rename to packages/lib/action/service.ts