Merge branch 'formbricks:main' into gitpod-doc

apps/formbricks-com/pages/formtribe/index.tsx

@@ -16,33 +16,34 @@ import { useEffect } from "react";
 const HowTo = [
   {
     step: "1",
-    header: "Pick an issue from the list below (or start with a side quest)",
+    header: "Pick a 'FormTribe 🔥' issue in our repository and comment.",
+    link: "https://formbricks.com/github",
   },
   {
     step: "2",
-    header: "Comment on the issue to signal that you started working on it.",
+    header: "Be the first to comment and get the issue assigned.",
   },
   {
     step: "3",
-    header: "Join our Discord to ask questions and submit side quests.",
-    link: "https://formbricks.com/discord",
+    header: "You now have 24h to open a draft PR ⏲️",
   },
   {
     step: "4",
-    header: "Code and open a PR with your contribution. ",
+    header: "If your PR looks promising, we'll work with you to get it merged.",
   },
   {
     step: "5",
-    header: "Get your PR merged and collect points.",
+    header: "For every merged PR you collect points ✨",
   },
   {
     step: "6",
-    header: "Tweet about your contribution and tag @formbricks",
+    header: "Solve side quests to increase your chances on the MacBook 👀",
+    link: "#prizes",
   },
   {
     step: "7",
-    header: "Solve side quests to increase your chances on the MacBook 👀",
-    link: "#prizes",
+    header: "Join our Discord to ask questions (and submit side quests).",
+    link: "https://formbricks.com/discord",
   },
 ];
 
@@ -560,6 +561,7 @@ export default function FormTribeHackathon() {
             <li>🎉 1 x MacBook Air M2</li>
             <li>🎉 3 x Limited FormTribe Premium Hoodie</li>
             <li>🎉 10 x Limited FormTribe Premium Shirt</li>
+            <li>🎉 10 x 250h for Gitpod</li>
             <li>🎉 50 x Sets of Formbricks Stickers</li>
           </ul>
         </div>
@@ -628,7 +630,7 @@ export default function FormTribeHackathon() {
           href="https://github.com/formbricks/formbricks/issues"
           target="_blank"
           className="mx-auto mt-12 bg-gradient-to-br from-[#032E1E] via-[#032E1E] to-[#013C27] px-20 text-white ">
-          View Issues on GitHub
+          View FormTribe Issues on GitHub
         </Button>
       </div>
 
@@ -669,7 +671,7 @@ export default function FormTribeHackathon() {
           href="https://formbricks.notion.site/FormTribe-Side-Quests-4ab3b294cfa04e94b77dfddd66378ea2?pvs=4"
           target="_blank"
           className="mt-6 bg-gradient-to-br from-[#032E1E] via-[#032E1E] to-[#013C27] text-white ">
-          Copy Notion Template
+          Keep track with Notion Template
         </Button>
       </div>
 

apps/web/app/s/[surveyId]/LinkSurvey.tsx

@@ -96,7 +96,7 @@ export default function LinkSurvey({
           formbricksSignature={product.formbricksSignature}
           onDisplay={async () => {
             if (!isPreview) {
-              const { id } = await createDisplay({ surveyId: survey.id }, window?.location?.origin);
+              const { id } = await createDisplay({ surveyId: survey.id }, webAppUrl);
               const newSurveyState = surveyState.copy();
               newSurveyState.updateDisplayId(id);
               setSurveyState(newSurveyState);

packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx

@@ -86,7 +86,7 @@ export default function MultipleChoiceSingleQuestion({
         <fieldset>
           <legend className="sr-only">Options</legend>
           <div className="relative max-h-[42vh] space-y-2 overflow-y-auto rounded-md bg-white py-0.5 pr-2">
-            {questionChoices.map((choice, idx) => (
+            {questionChoices.map((choice) => (
               <label
                 key={choice.id}
                 className={cn(
@@ -110,7 +110,9 @@ export default function MultipleChoiceSingleQuestion({
                     }}
                     checked={Array.isArray(value) && value.includes(choice.label)}
                     style={{ borderColor: brandColor, color: brandColor }}
-                    required={question.required && idx === 0}
+                    required={
+                      question.required && Array.isArray(value) && value.length ? false : question.required
+                    }
                   />
                   <span id={`${choice.id}-label`} className="ml-3 font-medium">
                     {choice.label}