Merge branch 'main' into main

.github/ISSUE_TEMPLATE/oss-gg-hack-submission.yml

@@ -1,7 +1,7 @@
 name: oss.gg hack submission 🕹️
 description: "Submit your contribution for the for the oss.gg hackathon"
-title: "[oss.gg hackathon]"
-labels: 🕹️ oss.gg, player submission
+title: "[🕹️]"
+labels: 🕹️ oss.gg, player submission, hacktoberfest
 assignees: []
 body:
   - type: textarea

LICENSE

@@ -1,9 +1,9 @@
-Copyright (c) 2023 Formbricks GmbH
+Copyright (c) 2024 Formbricks GmbH
 
 Portions of this software are licensed as follows:
 
 - All content that resides under the "packages/ee/" directory of this repository, if that directory exists, is licensed under the license defined in "packages/ee/LICENSE".
-- All content that resides under the "packages/js/", "packages/errors/" and "packages/api/" directories of this repository, if that directories exist, is licensed under the "MIT" license as defined in the "LICENSE" files of these packages.
+- All content that resides under the "packages/js/", "packages/react-native/" and "packages/api/" directories of this repository, if that directories exist, is licensed under the "MIT" license as defined in the "LICENSE" files of these packages.
 - All third party components incorporated into the Formbricks Software are licensed under the original license provided by the owner of the applicable component.
 - Content outside of the above mentioned directories or restrictions above is available under the "AGPLv3" license as defined below.
 

apps/demo/pages/app/index.tsx

@@ -60,7 +60,7 @@ const AppPage = ({}) => {
   }, []);
 
   return (
-    <div className="h-screen bg-white px-12 py-6 dark:bg-slate-800">
+    <div className="min-h-screen bg-white px-12 py-6 dark:bg-slate-800">
       <div className="flex flex-col justify-between md:flex-row">
         <div className="flex flex-col items-center gap-2 sm:flex-row">
           <SurveySwitch value="app" formbricks={formbricks} />
@@ -117,7 +117,7 @@ const AppPage = ({}) => {
         </div>
 
         <div className="md:grid md:grid-cols-3">
-          <div className="col-span-3 self-start rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-800">
+          <div className="col-span-3 self-start rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
             <h3 className="text-lg font-semibold dark:text-white">
               Reset person / pull data from Formbricks app
             </h3>

apps/demo/pages/website/index.tsx

@@ -56,8 +56,8 @@ const AppPage = ({}) => {
   });
 
   return (
-    <div className="h-screen bg-white px-12 py-6 dark:bg-slate-800">
-      <div className="flex flex-col items-center justify-between md:flex-row">
+    <div className="min-h-screen bg-white px-12 py-6 dark:bg-slate-800">
+      <div className="flex flex-col justify-between md:flex-row">
         <div className="flex flex-col items-center gap-2 sm:flex-row">
           <SurveySwitch value="website" formbricks={formbricks} />
           <div>
@@ -113,7 +113,7 @@ const AppPage = ({}) => {
         </div>
 
         <div className="md:grid md:grid-cols-3">
-          <div className="col-span-3 self-start rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-800">
+          <div className="col-span-3 self-start rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
             <h3 className="text-lg font-semibold dark:text-white">
               Reset person / pull data from Formbricks app
             </h3>

apps/docs/app/app-surveys/actions/page.mdx

@@ -4,25 +4,20 @@ import I1 from "./images/I1.webp";
 import I2 from "./images/I2.webp";
 
 export const metadata = {
-  title: "Using Actions in Formbricks | Fine-tuning User Moments",
+  title: "Using Actions in Formbricks",
   description:
     "Dive deep into how actions in Formbricks help products and organizations to engage users at precise moments in their journey. Discover the power of actions, from coding to no-code setups, to refine user targeting and generate richer, more detailed user insights.",
 };
 
 #### App Surveys
 
-# Actions & Targeting
+# Actions
 
-Understanding user thoughts and feelings at critical moments in their journey is pivotal. To achieve this, Formbricks uses user-centric actions that trigger surveys at precisely the right time. Actions are essentially notifications sent from your application to Formbricks when predefined user activities occur, making it possible to gather insights during key interactions.
-
-<Note>
-  Ensure that you’ve **initialized Formbricks with a userId** to fully utilize this feature along with other
-  app survey capabilities.
-</Note>
+Actions are predefined events within your app that prompt Formbricks to display a survey when triggered. These are detected by the Formbricks widget, which then presents the appropriate survey based on your predefined settings.
 
 ## **How Do Actions Work?**
 
-Actions in Formbricks App Surveys are deeply integrated with user activities within your app. When a user performs a specified action, the Formbricks widget detects this activity and can present a survey to that specific user if the trigger conditions match of that survey, while also recording the event. This capability ensures that surveys are not only triggered at the right time but are also tailored to the user’s recent interactions within the app. You can set up these actions through a user-friendly No-Code interface within the Formbricks dashboard.
+Actions in Formbricks App Surveys are deeply integrated with user activities within your app. When a user performs a specified action, the Formbricks widget detects this activity and can present a survey to that specific user if the trigger conditions match for that survey. This capability ensures that surveys are triggered at the right time. You can set up these actions through a user-friendly No-Code interface within the Formbricks dashboard.
 
 ## **Why Are Actions Useful?**
 
@@ -30,8 +25,7 @@ Actions are invaluable for enhancing survey relevance and effectiveness:
 
 - **Personalized Engagement**: Surveys triggered by user actions ensure content is highly relevant and engaging, matching each user’s current context.
 - **User Attributes**: By tying surveys to specific user attributes, such as activity levels or feature usage, you can customize the survey experience to reflect individual user profiles.
-- **User Segments**: Analyze action data to create detailed user segments, targeting specific groups with surveys that are pertinent to their behaviors or interactions within the app.
-- **User Targeting**: Precise targeting based on user actions and attributes ensures that surveys are shown only to users who meet certain criteria, enhancing the relevance and effectiveness of each survey.
+- **User Targeting**: Precise targeting based on user attributes ensures that surveys are shown only to users who meet certain criteria, enhancing the relevance and effectiveness of each survey.
 
 ## **Setting Up No-Code Actions**
 
@@ -127,5 +121,3 @@ return <button onClick={handleClick}>Click Me</button>;
 
 </CodeGroup>
 </Col>
-
-This documentation frames actions around user interactions, emphasizing the connection between the user's activities and the survey experience. By leveraging user-centric actions, you can create highly targeted and timely surveys that resonate with users and yield valuable insights.

apps/docs/app/app-surveys/advanced-targeting/page.mdx

@@ -1,39 +1,18 @@
-import { MdxImage } from "@/components/MdxImage";
-import { ResponsiveVideo } from "@/components/ResponsiveVideo";
-
-import GermansGpt from "./germans-gpt.webp";
-import Hni from "./hni.webp";
-import PowerUsers from "./power-users.webp";
-import RideHailing from "./ride-hailing.webp";
-import UpsellMiro from "./upsell-miro.webp";
-
 export const metadata = {
-  title: "Advanced Targeting for In-app Surveys | Formbricks",
+  title: "Advanced Targeting for App Surveys | Formbricks",
   description:
-    "Advanced Targeting allows you to show surveys to just the right group of people. You can target surveys based on user attributes, user events, and metadata. This helps you get more relevant feedback and make data-driven decisions.",
+    "Advanced Targeting allows you to show surveys to just the right group of people. You can target surveys based on user attributes, metadata, and other segments. This helps you get more relevant feedback and make data-driven decisions.",
 };
 
 #### App Surveys
 
 # Advanced Targeting
 
-<Note>
-  Targeting based on actions is deprecated in Advanced Targeting and will be removed soon. We recommend using
-  filters on user attributes to target the survey only to specific groups of users.
-</Note>
-
 Advanced Targeting allows you to show surveys to the right group of people. You can target surveys based on user attributes, device type, and more instead of spraying and praying. This helps you get more relevant feedback and make data-driven decisions. All of this without writing a single line of code.
 
-<ResponsiveVideo
-  title="Formbricks Multi-language Surveys"
-  src="https://www.youtube-nocookie.com/embed/0BQp6N4cXzU?si=KeBM7G7Ch1xtrsOm&amp;controls=0"
-/>
+# How to setup Advanced Targeting
 
-## How to setup Advanced Targeting
-
-<Note>
-  Advanced Targeting is available on the Pro plan!
-</Note>
+<Note>Advanced Targeting is only available on the Pro plan!</Note>
 
 1. On the Formbricks dashboard, click on **People** tab from the top navigation bar.
 
@@ -41,7 +20,7 @@ Advanced Targeting allows you to show surveys to the right group of people. You
 
 3. Give your segment a title & a description to help you remember what this segment is about.
 
-4. Now click on the **Add Filter** button to add a filter. You can filter based on actions, user attributes, other segments, devices, and more.
+4. Now click on the **Add Filter** button to add a filter. You can filter based on user attributes, other segments, devices, and more.
 
 5. To group a set of filters together, click on the Three Dots icon on the right side of the filter and click on **Create Group**.
 
@@ -50,32 +29,3 @@ Advanced Targeting allows you to show surveys to the right group of people. You
 7. Once you are happy with the segment, click on **Save Segment**.
 
 8. Now, when you create a survey, you can select this segment to target your survey to.
-
-## Examples:
-
-1. Let's say you want to upsell to: Miro, Loom, Figma, Slack and Asana.
-
-   <MdxImage
-     src={UpsellMiro}
-     alt="Upselling Opportunity"
-     quality="100"
-     className="max-w-full rounded-lg sm:max-w-3xl"
-   />
-
-2. Post-experience surveying for a ride hailing app where users who have taken more than 1 ride are shown a survey.
-
-   <MdxImage
-     src={RideHailing}
-     alt="Ride Hailing Targeting"
-     quality="100"
-     className="max-w-full rounded-lg sm:max-w-3xl"
-   />
-
-3. Sneak Peak: How we at Formbricks automate inviting power users to chat with us
-
-   <MdxImage
-     src={PowerUsers}
-     alt="Automate inviting power users to chat with us at Formbricks"
-     quality="100"
-     className="max-w-full rounded-lg sm:max-w-3xl"
-   />

apps/docs/app/best-practices/pmf-survey/page.mdx

@@ -37,8 +37,9 @@ To display the Product-Market Fit survey in your app you want to proceed as foll
 3. Setup the user action to display survey at good point in time
 
 <Note>
-  ## Formbricks Widget running? 
-  We assume that you have already installed the Formbricks Widget in your web app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide (15mins).](/app-surveys/quickstart)
+  ## Formbricks Widget running? We assume that you have already installed the Formbricks Widget in your web
+  app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide
+  (15mins).](/app-surveys/quickstart)
 </Note>
 
 ### 1. Create new PMF survey
@@ -69,25 +70,12 @@ _Want to change the button color? You can do so in the product settings!_
 
 Save, and move over to where the magic happens: The “Audience” tab.
 
-### 3. Pre-segment your audience (coming soon)
-
-<Note>
-  ## Filter by attribute coming soon We're working on pre-segmenting users by attributes. We will update this
-  manual in the next days.
-</Note>
+### 3. Pre-segment your audience
 
 To run this survey properly, you should pre-segment your user base. As touched upon earlier: if you ask every user you’ll get lots of opinions which are often misleading. You only want to gather feedback from people who invested the time to get to know and use your product:
 
 **Filter by attribute**: You can keep the logic to decide if a user has (or has not) experienced value in your application. This makes most sense if you want to use historic usage data to decide if a user qualifies or not. Create your logic and if it applies, send an attribute to Formbricks by e.g. `formbricks.setAttribute("Loyalty", "Experienced Value");` Here is the full manual on how to [set attributes](/app-surveys/user-identification).
 
-**Filter by actions (coming soon)**: Later, you can also segment users based on events tracked with Formbricks. However, this makes it impossible to use historic usage data (pre Formbricks usage). Here we will have a few options to achieve that:
-
-- Check the time passed since sign-up (e.g. signed up 4 weeks ago)
-- User has performed a specific action a certain number of times or (e.g. created 5 reports)
-- User has performed a combination of actions (e.g. created a report **and** invited a organization member)
-
-This way you make sure that you separate potentially misleading opinions from valuable insights.
-
 ### 4. Set up a trigger for the Product-Market Fit survey:
 
 You need a trigger to display the survey but in this case, the filtering does all the work. It’s up to you to decide to display the survey after the user viewed a specific subpage (pageURL) or after clicking an element. Have a look at the [Actions manual](/app-surveys/actions/) if you are not sure how to set them up:

apps/docs/app/developer-docs/rest-api/page.mdx

@@ -6,7 +6,7 @@ import ApiKeySecret from "./images/api-key-secret.webp";
 export const metadata = {
   title: "Formbricks API Overview: Public Client & Management API Breakdown",
   description:
-    "Formbricks provides a powerful API to manage your surveys, responses, users, displays, actions, attributes & webhooks programmatically. Get a detailed understanding of Formbricks' dual API offerings: the unauthenticated Public Client API optimized for client-side tasks and the secured Management API for advanced account operations. Choose the perfect fit for your integration needs and ensure robust data handling",
+    "Formbricks provides a powerful API to manage your surveys, responses, users, displays, attributes & webhooks programmatically. Get a detailed understanding of Formbricks' dual API offerings: the unauthenticated Public Client API optimized for client-side tasks and the secured Management API for advanced account operations. Choose the perfect fit for your integration needs and ensure robust data handling",
 };
 
 #### API
@@ -23,7 +23,6 @@ The [Public Client API](https://documenter.getpostman.com/view/11026000/2sA3Bq5X
 
 We currently have the following Client API methods exposed and below is their documentation attached in Postman:
 
-- [Actions API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#b8f3a10e-1642-4d82-a629-fef0a8c6c86c) - Create actions for a Person
 - [Displays API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#949272bf-daec-4d72-9b52-47af3d74a62c) - Mark Survey as Displayed or Update an existing Display by linking it with a Response for a Person
 - [People API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#ee3d2188-4253-4bca-9238-6b76455805a9) - Create & Update a Person (e.g. attributes, email, userId, etc)
 - [Responses API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#8c773032-536c-483c-a237-c7697347946e) - Create & Update a Response for a Survey

apps/docs/app/global/conditional-logic/page.mdx

@@ -1,136 +1,171 @@
 import { MdxImage } from "@/components/MdxImage";
-
-import StepEight from "./images/StepEight.webp";
-import StepFive from "./images/StepFive.webp";
-import StepFour from "./images/StepFour.webp";
-import StepOne from "./images/StepOne.webp";
-import StepSeven from "./images/StepSeven.webp";
-import StepSix from "./images/StepSix.webp";
-import StepThree from "./images/StepThree.webp";
-import StepTwo from "./images/StepTwo.webp";
+import ActionCalculateOperators from "./images/action-calculate-operators.webp";
+import ActionCalculateValue from "./images/action-calculate-value.webp";
+import ActionCalculateVariables from "./images/action-calculate-variables.webp";
+import ActionCalculate from "./images/action-calculate.webp";
+import ActionJump from "./images/action-jump.webp";
+import ActionOptions from "./images/action-options.webp";
+import ActionRequire from "./images/action-require.webp";
+import AddLogic from "./images/add-logic.webp";
+import ConditionChaining from "./images/condition-chaining.webp";
+import ConditionOperators from "./images/condition-operators.webp";
+import ConditionOptions from "./images/condition-options.webp";
+import ConditionValue from "./images/condition-value.webp";
+import Conditions from "./images/conditions.webp";
+import Editor from "./images/editor.webp";
+import QuestionLogic from "./images/question-logic.webp";
 
 export const metadata = {
-  title: "Conditional Logic in Formbricks Surveys",
+  title: "Conditional Logic",
   description:
-    "Enhance your surveys with Conditional Logic to create a dynamic and responsive survey experience. Guide respondents through different paths based on their answers, ensuring each survey is tailored to the user’s responses. This feature is applicable for all kinds of surveys!",
+    "Create complex survey logic with the Logic Editor. Use conditions, actions, and variables to create a personalized survey experience.",
 };
 
-# Conditional Logic
+# Logic Editor
 
-With Formbricks, enhance your surveys with Conditional Logic to create a dynamic and responsive survey experience. This feature allows you to guide respondents through different paths based on their answers, ensuring each survey is tailored to the user’s responses. This feature is applicable for all kinds of surveys!
+Create complex survey logic with the Logic Editor. Use conditions, actions, and variables to create a personalized survey experience.
 
-### Setting Up Conditional Logic
+<MdxImage src={Editor} alt="Logic Editor" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
 
-Conditional Logic can be applied to any question within your survey to direct the flow based on specific responses.
+## Terminology
 
-1. **Create or Edit a Question**: Start by adding a new question or editing an existing one within your survey.
+- **Condition**: A rule that determines when an action should be executed.
+- **Action**: A task that is executed when a condition is met.
+
+## **Creating Logic**
+
+1. **Add a Logic Block**: Click the `Add logic +` button to add a new logic block.
+
+<MdxImage src={AddLogic} alt="Add Logic" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Note>
+  You can add multiple logic blocks to a survey. Logic blocks are executed in the order they are added. You
+  can rearrange the order of logic blocks.
+</Note>
+
+2. **Add Conditions**: Add conditions to the logic block. Conditions are rules that determine when an action should be executed.
 
 <MdxImage
-  src={StepOne}
-  alt="Choose a link survey template"
+  src={Conditions}
+  alt="Add Conditions"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
-2. **Access Advanced Settings**: Click on **Advanced Settings** beneath the question setup area to access additional configuration options.
+Conditons can be based on:
 
-<MdxImage
-  src={StepTwo}
-  alt="Choose a link survey template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
-/>
+- **Question**: The answer to a question.
+- **Variable**: A variable value.
+- **Hidden Field**: The value of a hidden field.
 
-3. **Configure Logic Jumps**: Choose **Logic Jumps** to set up conditions that dictate the survey's progression based on responses.
+  2.a **Condition Options**: Choose from a list of available conditions.
 
-<MdxImage
-  src={StepThree}
-  alt="Choose a link survey template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
-/>
-
-### Configuring Logic Conditions
-
-Enhance survey interactivity by setting up triggers based on respondent answers. You can specify different paths for each type of response:
-
-**General Conditions (Available in All Question Types):**
-
-- **Answer Submitted/Skipped**: Initiate different survey paths based on whether a question is answered or skipped.
   <MdxImage
-    src={StepFour}
-    alt="Choose a link survey template"
+    src={ConditionOptions}
+    alt="Condition Options"
     quality="100"
-    className="max-w-full rounded-lg sm:max-w-3xl "
+    className="max-w-full rounded-lg sm:max-w-3xl"
   />
 
-**Choice-Based Conditions:**
+  2.b **Condition Operators**: Choose an operator to compare the condition value.
+
+  <MdxImage
+    src={ConditionOperators}
+    alt="Condition Operators"
+    quality="100"
+    className="max-w-full rounded-lg sm:max-w-3xl"
+  />
+
+  2.c **Condition Value**: Enter a value to compare the condition against.
+  Comparisons can be made against a fixed value or a dynamic value.
+  Dynamic values can be based on a question, variable, or hidden field.
+
+  <MdxImage
+    src={ConditionValue}
+    alt="Condition Value"
+    quality="100"
+    className="max-w-full rounded-lg sm:max-w-3xl"
+  />
+
+<Note>
+  - Conditions can be grouped. - Conditions can be combined using AND or OR operators. You can add multiple
+  conditions to a logic block. Conditions are evaluated in the order they are added.
+</Note>
 
 <MdxImage
-  src={StepFive}
-  alt="Choose a link survey template"
+  src={ConditionChaining}
+  alt="Condition Chaining"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
-- **One of Multiple Choice Values**: Activate if the answer is among selected options. (Single select and Multi select)
-- **Equals: Exactly the Selected Values**: Initiate a jump if the response matches exactly the selected values provided in the options. (Single select and Multi select)
-- **Includes All Selected Values**: Activate if all selected values match those chosen by the survey creator. (Multi select only)
+3. **Add Actions**: Add actions to the logic block. Actions are tasks that are executed when a condition is met.
 
-**Numeric Conditions (Rating & NPS Questions Only)**
+<Note>You can add multiple actions to a logic block. Actions are executed in the order they are added.</Note>
+
+- 3.a **Action Options**: Choose from a list of available actions.
+
+  <MdxImage
+    src={ActionOptions}
+    alt="Add Actions"
+    quality="100"
+    className="max-w-full rounded-lg sm:max-w-3xl"
+  />
+
+  Action is of the following types:
+
+  - **Calculate**: Perform a calculation. These variables are then available for use in other questions.
+
+    - Calculations can be performed on variables.
+    - Calculations can be based on fixed values or dynamic values.
+      <MdxImage
+        src={ActionCalculateVariables}
+        alt="Action Calculate Variables"
+        quality="100"
+        className="max-w-full rounded-lg sm:max-w-3xl"
+      />
+      <MdxImage
+        src={ActionCalculateOperators}
+        alt="Action Calculate Variables"
+        quality="100"
+        className="max-w-full rounded-lg sm:max-w-3xl"
+      />
+      <MdxImage
+        src={ActionCalculateValue}
+        alt="Action Calculate Variables"
+        quality="100"
+        className="max-w-full rounded-lg sm:max-w-3xl"
+      />
+      <MdxImage
+        src={ActionCalculate}
+        alt="Action Calculate"
+        quality="100"
+        className="max-w-full rounded-lg sm:max-w-3xl"
+      />
+
+  - **Require Answer**: Make a question required. Only the optional questions can be marked as required while filling the survey.
+    <MdxImage
+      src={ActionRequire}
+      alt="Action Require"
+      quality="100"
+      className="max-w-full rounded-lg sm:max-w-3xl"
+    />
+  - **Jump to Question**: Skip to a specific question. The user will be redirected to the specified question based on the condition.
+    <MdxImage
+      src={ActionJump}
+      alt="Action Jump"
+      quality="100"
+      className="max-w-full rounded-lg sm:max-w-3xl"
+    />
+
+4. **Save Logic**: Click the `Save` button to save the logic block.
+
+# Question Logic
+
+This logic is executed when the user answers the question. Logic can be as simple as showing a follow-up question based on the answer or as complex as calculating a score based on multiple answers.
 
 <MdxImage
-  src={StepSix}
-  alt="Choose a link survey template"
+  src={QuestionLogic}
+  alt="Question Logic"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
-
-- **Value Comparisons**: Initiate jumps based on numerical criteria—equals, does not equal, less than, less than or equal to, greater than, or greater than equal to.
-
-**Matrix-Specific Conditions**
-
-<MdxImage
-  src={StepSeven}
-  alt="Choose a link survey template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
-/>
-
-- **Submission Completeness**: Initiate based on whether the response is completely or partially submitted.
-
-### **Specifying Survey Paths**
-
-After setting conditions, you specify the paths to take when those conditions are met:
-
-- **Jump to a Specific Question**: Direct the respondent to a particular question elsewhere in the survey.
-- **Jump to Survey End**: Conclude the survey early based on the respondent's answers.
-
-<MdxImage
-  src={StepEight}
-  alt="Choose a link survey template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
-/>
-
-### **Multiple Logic Jumps**
-
-You can add multiple Logic Jumps to a single question. These jumps work in an **OR** fashion, meaning any of the conditions can initiate the specified survey path. The logic jumps are evaluated in the **order they are created**, and the first true condition will take precedence.
-
----
-
-### **Example Scenario**
-
-Suppose you’re conducting a survey about technology usage:
-
-1. **Question (Single Select)**: What devices do you use daily?
-2. **Answers**: Smartphone, Laptop, Tablet, None
-
-**Logic Jump Setup**:
-
-- If the respondent selects **None**, jump to the end of the survey.
-- If the respondent selects **Smartphone**, jump to a question specific to smartphone usage.
-
-This setup allows for a tailored survey experience that adapts to the respondent's input, making your data collection more targeted and efficient.
-
-That’s it! Now go and configure your surveys to bring down your survey fatigue to 0% and ask respondents through customized paths. Enhance their relevance and engagement with your survey, leading to higher quality responses and better data.

apps/docs/app/link-surveys/single-use-links/page.mdx

@@ -23,6 +23,10 @@ This guide will help you understand how to generate and use single-use links wit
 
 - The primary purpose of single-use links is to assure that no respondent submits a survey twice.
 
+<Note>
+Want to create up to 5,000 single-use links? Use our [API endpoint for that.](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#c49ef758-a78a-4ef4-a282-262621151f08).
+</Note>
+
 ## Using Single-Use Links with Formbricks
 
 Using single-use links with Formbricks is quite straight-forward:

apps/docs/app/link-surveys/user-identification/page.mdx

@@ -39,7 +39,7 @@ To link a response to a user in your Formbricks database, you can pass your inte
 
 ## Where do I find my userId?
 
-The `userId` we are refering to is the `userId` of your own system. For example, a user signs up to your app and gets the Id `ABC123` assigned then this is the Id you pass along in the URL parameter.
+The `userId` we are referring to is the `userId` of your own system. For example, a user signs up to your app and gets the Id `ABC123` assigned then this is the Id you pass along in the URL parameter.
 
 This allows you to connect the response to the user profile of this specific in the Formbricks database. You can then use the response data to create segments for further surveying or invite them to an interview, etc.
 

apps/docs/app/self-hosting/configuration/page.mdx

@@ -1,15 +1,15 @@
 import { MdxImage } from "@/components/MdxImage";
 
-import EntraIDAppReg01 from "./images/entra_app_reg_01.png";
-import EntraIDAppReg02 from "./images/entra_app_reg_02.png";
-import EntraIDAppReg03 from "./images/entra_app_reg_03.png";
-import EntraIDAppReg04 from "./images/entra_app_reg_04.png";
-import EntraIDAppReg05 from "./images/entra_app_reg_05.png";
-import EntraIDAppReg06 from "./images/entra_app_reg_06.png";
-import EntraIDAppReg07 from "./images/entra_app_reg_07.png";
-import EntraIDAppReg08 from "./images/entra_app_reg_08.png";
-import EntraIDAppReg09 from "./images/entra_app_reg_09.png";
-import EntraIDAppReg10 from "./images/entra_app_reg_10.png";
+import EntraIDAppReg01 from "./images/entra_app_reg_01.webp";
+import EntraIDAppReg02 from "./images/entra_app_reg_02.webp";
+import EntraIDAppReg03 from "./images/entra_app_reg_03.webp";
+import EntraIDAppReg04 from "./images/entra_app_reg_04.webp";
+import EntraIDAppReg05 from "./images/entra_app_reg_05.webp";
+import EntraIDAppReg06 from "./images/entra_app_reg_06.webp";
+import EntraIDAppReg07 from "./images/entra_app_reg_07.webp";
+import EntraIDAppReg08 from "./images/entra_app_reg_08.webp";
+import EntraIDAppReg09 from "./images/entra_app_reg_09.webp";
+import EntraIDAppReg10 from "./images/entra_app_reg_10.webp";
 
 export const metadata = {
   title: "Configure Formbricks with External auth providers",

apps/docs/app/website-surveys/actions/page.mdx

@@ -11,11 +11,9 @@ export const metadata = {
 
 #### Website Surveys
 
-# Actions & Targeting
+# Actions
 
-For public-facing websites, landing pages, and pages without user authentication walls, actions serve as effective triggers for displaying surveys. This method is particularly suitable for engaging general audiences, where **individual user tracking is not required or feasible**.
-
-Actions in this context are straightforward triggers based on interactions with your website, allowing you to capture feedback precisely when it's most relevant.
+Actions are triggers based on interactions with your website, allowing you to capture feedback precisely when it's most relevant.
 
 <Note>
   These actions operate **independently** as website surveys do not involve user identification. If you have
@@ -46,7 +44,7 @@ Formbricks provides an intuitive No-Code interface for configuring actions, enab
      src={StepOne}
      alt="Choose a link survey template"
      quality="100"
-     className="max-w-full rounded-lg sm:max-w-3xl "
+     className="max-w-full rounded-lg sm:max-w-3xl"
    />
 
 2. Now click on “Add Action”
@@ -55,7 +53,7 @@ Formbricks provides an intuitive No-Code interface for configuring actions, enab
      src={StepTwo}
      alt="Choose a link survey template"
      quality="100"
-     className="max-w-full rounded-lg sm:max-w-3xl "
+     className="max-w-full rounded-lg sm:max-w-3xl"
    />
 
 Here are four types of No-Code actions you can set up:

apps/docs/components/SideNavigation.tsx

@@ -53,7 +53,7 @@ export const SideNavigation = ({ pathname }) => {
                 onClick={() => setSelectedId(heading.id)}
                 className={`${
                   heading.id === selectedId
-                    ? "text-brand font-medium"
+                    ? "text-brand-dark font-medium"
                     : "font-normal text-slate-600 hover:text-slate-950 dark:text-white dark:hover:text-slate-50"
                 }`}>
                 {heading.text}

apps/docs/lib/navigation.ts

@@ -57,7 +57,7 @@ export const navigation: Array<NavGroup> = [
       {
         title: "Features",
         children: [
-          { title: "Actions & Targeting", href: "/website-surveys/actions-and-targeting" },
+          { title: "Actions", href: "/website-surveys/actions" },
           { title: "Show Survey to % of users", href: "/global/show-survey-to-percent-of-users" }, // app and website
           { title: "Recontact Options", href: "/app-surveys/recontact" },
           { title: "Hidden Fields", href: "/global/hidden-fields" }, // global

apps/docs/next.config.mjs

@@ -110,6 +110,11 @@ const nextConfig = {
         destination: "/global/schedule-start-end-dates",
         permanent: true,
       },
+      {
+        source: "/global/logic-editor",
+        destination: "/global/conditional-logic",
+        permanent: true,
+      },
       // Integrations
       {
         source: "/integrations/:path",

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks.tsx

@@ -1,9 +1,6 @@
 "use client";
 
-import Dance from "@/images/onboarding-dance.gif";
-import Lost from "@/images/onboarding-lost.gif";
 import { ArrowRight } from "lucide-react";
-import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 import { cn } from "@formbricks/lib/cn";
@@ -62,20 +59,21 @@ export const ConnectWithFormbricks = ({
         </div>
         <div
           className={cn(
-            "flex h-[30rem] w-1/2 flex-col items-center justify-center rounded-lg border bg-slate-200 text-center shadow",
-            widgetSetupCompleted ? "border-green-500 bg-green-100" : ""
+            "flex h-[30rem] w-1/2 flex-col items-center justify-center rounded-lg border text-center",
+            widgetSetupCompleted ? "border-green-500 bg-green-100" : "border-slate-300 bg-slate-200"
           )}>
           {widgetSetupCompleted ? (
             <div>
-              <Image src={Dance} alt="lost" height={250} />
-              <p className="mt-6 text-xl font-bold">Connection successful ✅</p>
+              <p className="text-3xl">Congrats!</p>
+              <p className="pt-4 text-sm font-medium text-slate-600">Well done! We&apos;re connected.</p>
             </div>
           ) : (
-            <div className="space-y-4">
-              <Image src={Lost} alt="lost" height={250} />
-              <p className="animate-pulse pt-4 text-sm font-semibold text-slate-700">
-                Waiting for your signal...
-              </p>
+            <div className="flex animate-pulse flex-col items-center space-y-4">
+              <span className="relative flex h-10 w-10">
+                <span className="animate-ping-slow absolute inline-flex h-full w-full rounded-full bg-slate-400 opacity-75"></span>
+                <span className="relative inline-flex h-10 w-10 rounded-full bg-slate-500"></span>
+              </span>
+              <p className="pt-4 text-sm font-medium text-slate-600">Waiting for your signal...</p>
             </div>
           )}
         </div>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/InviteOrganizationMember.tsx

@@ -102,7 +102,7 @@ export const InviteOrganizationMember = ({ organization, environmentId }: Invite
             <div className="flex w-full justify-end space-x-2">
               <Button
                 id="onboarding-inapp-invite-have-a-look-first"
-                className="font-normal text-slate-400"
+                className="text-slate-400"
                 variant="minimal"
                 onClick={(e) => {
                   e.preventDefault();

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/invite/page.tsx

@@ -33,7 +33,7 @@ const Page = async ({ params }: InvitePageProps) => {
     <div className="flex min-h-full min-w-full flex-col items-center justify-center">
       <Header
         title="Who is your favorite engineer?"
-        subtitle="Invite your tech-savvy co-worker to help with the setup 🤓"
+        subtitle="Invite your tech-savvy co-worker to help with the setup."
       />
       <div className="space-y-4 text-center">
         <p className="text-4xl font-medium text-slate-800"></p>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/page.tsx

@@ -28,10 +28,7 @@ const Page = async ({ params }: ConnectPageProps) => {
 
   return (
     <div className="flex min-h-full flex-col items-center justify-center py-10">
-      <Header
-        title={`Let's connect your product with Formbricks`}
-        subtitle="It takes less than 4 minutes, pinky promise!"
-      />
+      <Header title={`Let's connect your product with Formbricks`} subtitle="It takes less than 4 minutes." />
       <div className="space-y-4 text-center">
         <p className="text-4xl font-medium text-slate-800"></p>
         <p className="text-sm text-slate-500"></p>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/xm-templates.ts

@@ -12,215 +12,395 @@ export const XMSurveyDefault: TXMTemplate = {
   },
 };
 
-const NPSSurvey: TXMTemplate = {
-  ...XMSurveyDefault,
-  name: "NPS Survey",
-  questions: [
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.NPS,
-      headline: { default: "How likely are you to recommend {{productName}} to a friend or colleague?" },
-      required: true,
-      lowerLabel: { default: "Not at all likely" },
-      upperLabel: { default: "Extremely likely" },
-      isColorCodingEnabled: true,
-    },
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "To help us improve, can you describe the reason(s) for your rating?" },
-      required: false,
-      inputType: "text",
-    },
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Any other comments, feedback, or concerns?" },
-      required: false,
-      inputType: "text",
-    },
-  ],
-};
-
-const StarRatingSurvey: TXMTemplate = {
-  ...XMSurveyDefault,
-  name: "{{productName}}'s Rating Survey",
-  questions: [
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.Rating,
-      logic: [{ value: 3, condition: "lessEqual", destination: "tk9wpw2gxgb8fa6pbpp3qq5l" }],
-      range: 5,
-      scale: "number",
-      headline: { default: "How do you like {{productName}}?" },
-      required: true,
-      lowerLabel: { default: "Extremely dissatisfied" },
-      upperLabel: { default: "Extremely satisfied" },
-      isColorCodingEnabled: false,
-    },
-    {
-      id: createId(),
-      html: { default: '<p class="fb-editor-paragraph" dir="ltr"><span>This helps us a lot.</span></p>' },
-      type: TSurveyQuestionTypeEnum.CTA,
-      logic: [{ condition: "clicked", destination: XMSurveyDefault.endings[0].id }],
-      headline: { default: "Happy to hear 🙏 Please write a review for us!" },
-      required: true,
-      buttonUrl: "https://formbricks.com/github",
-      buttonLabel: { default: "Write review" },
-      buttonExternal: true,
-    },
-    {
-      id: "tk9wpw2gxgb8fa6pbpp3qq5l",
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Sorry to hear! What is ONE thing we can do better?" },
-      required: true,
-      subheader: { default: "Help us improve your experience." },
-      buttonLabel: { default: "Send" },
-      placeholder: { default: "Type your answer here..." },
-      inputType: "text",
-    },
-  ],
-};
-
-const CSATSurvey: TXMTemplate = {
-  ...XMSurveyDefault,
-  name: "{{productName}} CSAT",
-  questions: [
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.Rating,
-      logic: [{ value: 3, condition: "lessEqual", destination: "vyo4mkw4ln95ts4ya7qp2tth" }],
-      range: 5,
-      scale: "smiley",
-      headline: { default: "How satisfied are you with your {{productName}} experience?" },
-      required: true,
-      lowerLabel: { default: "Extremely dissatisfied" },
-      upperLabel: { default: "Extremely satisfied" },
-      isColorCodingEnabled: false,
-    },
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.OpenText,
-      logic: [{ condition: "submitted", destination: XMSurveyDefault.endings[0].id }],
-      headline: { default: "Lovely! Is there anything we can do to improve your experience?" },
-      required: false,
-      placeholder: { default: "Type your answer here..." },
-      inputType: "text",
-    },
-    {
-      id: "vyo4mkw4ln95ts4ya7qp2tth",
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Ugh, sorry! Is there anything we can do to improve your experience?" },
-      required: false,
-      placeholder: { default: "Type your answer here..." },
-      inputType: "text",
-    },
-  ],
-};
-
-const CESSurvey: TXMTemplate = {
-  ...XMSurveyDefault,
-  name: "CES Survey",
-  questions: [
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.Rating,
-      range: 5,
-      scale: "number",
-      headline: { default: "{{productName}} makes it easy for me to [ADD GOAL]" },
-      required: true,
-      lowerLabel: { default: "Disagree strongly" },
-      upperLabel: { default: "Agree strongly" },
-      isColorCodingEnabled: false,
-    },
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Thanks! How could we make it easier for you to [ADD GOAL]?" },
-      required: true,
-      placeholder: { default: "Type your answer here..." },
-      inputType: "text",
-    },
-  ],
-};
-
-const SmileysRatingSurvey: TXMTemplate = {
-  ...XMSurveyDefault,
-  name: "Smileys Survey",
-  questions: [
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.Rating,
-      logic: [{ value: 3, condition: "lessEqual", destination: "tk9wpw2gxgb8fa6pbpp3qq5l" }],
-      range: 5,
-      scale: "smiley",
-      headline: { default: "How do you like {{productName}}?" },
-      required: true,
-      lowerLabel: { default: "Not good" },
-      upperLabel: { default: "Very satisfied" },
-      isColorCodingEnabled: false,
-    },
-    {
-      id: createId(),
-      html: { default: '<p class="fb-editor-paragraph" dir="ltr"><span>This helps us a lot.</span></p>' },
-      type: TSurveyQuestionTypeEnum.CTA,
-      logic: [{ condition: "clicked", destination: XMSurveyDefault.endings[0].id }],
-      headline: { default: "Happy to hear 🙏 Please write a review for us!" },
-      required: true,
-      buttonUrl: "https://formbricks.com/github",
-      buttonLabel: { default: "Write review" },
-      buttonExternal: true,
-    },
-    {
-      id: "tk9wpw2gxgb8fa6pbpp3qq5l",
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Sorry to hear! What is ONE thing we can do better?" },
-      required: true,
-      subheader: { default: "Help us improve your experience." },
-      buttonLabel: { default: "Send" },
-      placeholder: { default: "Type your answer here..." },
-      inputType: "text",
-    },
-  ],
-};
-
-const eNPSSurvey: TXMTemplate = {
-  ...XMSurveyDefault,
-  name: "eNPS Survey",
-  questions: [
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.NPS,
-      headline: {
-        default: "How likely are you to recommend working at this company to a friend or colleague?",
+const NPSSurvey = (): TXMTemplate => {
+  return {
+    ...XMSurveyDefault,
+    name: "NPS Survey",
+    questions: [
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.NPS,
+        headline: { default: "How likely are you to recommend {{productName}} to a friend or colleague?" },
+        required: true,
+        lowerLabel: { default: "Not at all likely" },
+        upperLabel: { default: "Extremely likely" },
+        isColorCodingEnabled: true,
       },
-      required: false,
-      lowerLabel: { default: "Not at all likely" },
-      upperLabel: { default: "Extremely likely" },
-      isColorCodingEnabled: true,
-    },
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "To help us improve, can you describe the reason(s) for your rating?" },
-      required: false,
-      inputType: "text",
-    },
-    {
-      id: createId(),
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Any other comments, feedback, or concerns?" },
-      required: false,
-      inputType: "text",
-    },
-  ],
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "To help us improve, can you describe the reason(s) for your rating?" },
+        required: false,
+        inputType: "text",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Any other comments, feedback, or concerns?" },
+        required: false,
+        inputType: "text",
+      },
+    ],
+  };
+};
+
+const StarRatingSurvey = (): TXMTemplate => {
+  const reusableQuestionIds = [createId(), createId(), createId()];
+
+  return {
+    ...XMSurveyDefault,
+    name: "{{productName}}'s Rating Survey",
+    questions: [
+      {
+        id: reusableQuestionIds[0],
+        type: TSurveyQuestionTypeEnum.Rating,
+        logic: [
+          {
+            id: createId(),
+            conditions: {
+              id: createId(),
+              connector: "and",
+              conditions: [
+                {
+                  id: createId(),
+                  leftOperand: {
+                    value: reusableQuestionIds[0],
+                    type: "question",
+                  },
+                  operator: "isLessThanOrEqual",
+                  rightOperand: {
+                    type: "static",
+                    value: 3,
+                  },
+                },
+              ],
+            },
+            actions: [
+              {
+                id: createId(),
+                objective: "jumpToQuestion",
+                target: reusableQuestionIds[2],
+              },
+            ],
+          },
+        ],
+        range: 5,
+        scale: "number",
+        headline: { default: "How do you like {{productName}}?" },
+        required: true,
+        lowerLabel: { default: "Extremely dissatisfied" },
+        upperLabel: { default: "Extremely satisfied" },
+        isColorCodingEnabled: false,
+      },
+      {
+        id: reusableQuestionIds[1],
+        html: { default: '<p class="fb-editor-paragraph" dir="ltr"><span>This helps us a lot.</span></p>' },
+        type: TSurveyQuestionTypeEnum.CTA,
+        logic: [
+          {
+            id: createId(),
+            conditions: {
+              id: createId(),
+              connector: "and",
+              conditions: [
+                {
+                  id: createId(),
+                  leftOperand: {
+                    value: reusableQuestionIds[1],
+                    type: "question",
+                  },
+                  operator: "isClicked",
+                },
+              ],
+            },
+            actions: [
+              {
+                id: createId(),
+                objective: "jumpToQuestion",
+                target: XMSurveyDefault.endings[0].id,
+              },
+            ],
+          },
+        ],
+        headline: { default: "Happy to hear 🙏 Please write a review for us!" },
+        required: true,
+        buttonUrl: "https://formbricks.com/github",
+        buttonLabel: { default: "Write review" },
+        buttonExternal: true,
+      },
+      {
+        id: reusableQuestionIds[2],
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Sorry to hear! What is ONE thing we can do better?" },
+        required: true,
+        subheader: { default: "Help us improve your experience." },
+        buttonLabel: { default: "Send" },
+        placeholder: { default: "Type your answer here..." },
+        inputType: "text",
+      },
+    ],
+  };
+};
+
+const CSATSurvey = (): TXMTemplate => {
+  const reusableQuestionIds = [createId(), createId(), createId()];
+
+  return {
+    ...XMSurveyDefault,
+    name: "{{productName}} CSAT",
+    questions: [
+      {
+        id: reusableQuestionIds[0],
+        type: TSurveyQuestionTypeEnum.Rating,
+        logic: [
+          {
+            id: createId(),
+            conditions: {
+              id: createId(),
+              connector: "and",
+              conditions: [
+                {
+                  id: createId(),
+                  leftOperand: {
+                    value: reusableQuestionIds[0],
+                    type: "question",
+                  },
+                  operator: "isLessThanOrEqual",
+                  rightOperand: {
+                    type: "static",
+                    value: 3,
+                  },
+                },
+              ],
+            },
+            actions: [
+              {
+                id: createId(),
+                objective: "jumpToQuestion",
+                target: reusableQuestionIds[2],
+              },
+            ],
+          },
+        ],
+        range: 5,
+        scale: "smiley",
+        headline: { default: "How satisfied are you with your {{productName}} experience?" },
+        required: true,
+        lowerLabel: { default: "Extremely dissatisfied" },
+        upperLabel: { default: "Extremely satisfied" },
+        isColorCodingEnabled: false,
+      },
+      {
+        id: reusableQuestionIds[1],
+        type: TSurveyQuestionTypeEnum.OpenText,
+        logic: [
+          {
+            id: createId(),
+            conditions: {
+              id: createId(),
+              connector: "and",
+              conditions: [
+                {
+                  id: createId(),
+                  leftOperand: {
+                    value: reusableQuestionIds[1],
+                    type: "question",
+                  },
+                  operator: "isSubmitted",
+                },
+              ],
+            },
+            actions: [
+              {
+                id: createId(),
+                objective: "jumpToQuestion",
+                target: XMSurveyDefault.endings[0].id,
+              },
+            ],
+          },
+        ],
+        headline: { default: "Lovely! Is there anything we can do to improve your experience?" },
+        required: false,
+        placeholder: { default: "Type your answer here..." },
+        inputType: "text",
+      },
+      {
+        id: reusableQuestionIds[2],
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Ugh, sorry! Is there anything we can do to improve your experience?" },
+        required: false,
+        placeholder: { default: "Type your answer here..." },
+        inputType: "text",
+      },
+    ],
+  };
+};
+
+const CESSurvey = (): TXMTemplate => {
+  return {
+    ...XMSurveyDefault,
+    name: "CES Survey",
+    questions: [
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.Rating,
+        range: 5,
+        scale: "number",
+        headline: { default: "{{productName}} makes it easy for me to [ADD GOAL]" },
+        required: true,
+        lowerLabel: { default: "Disagree strongly" },
+        upperLabel: { default: "Agree strongly" },
+        isColorCodingEnabled: false,
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Thanks! How could we make it easier for you to [ADD GOAL]?" },
+        required: true,
+        placeholder: { default: "Type your answer here..." },
+        inputType: "text",
+      },
+    ],
+  };
+};
+
+const SmileysRatingSurvey = (): TXMTemplate => {
+  const reusableQuestionIds = [createId(), createId(), createId()];
+
+  return {
+    ...XMSurveyDefault,
+    name: "Smileys Survey",
+    questions: [
+      {
+        id: reusableQuestionIds[0],
+        type: TSurveyQuestionTypeEnum.Rating,
+        logic: [
+          {
+            id: createId(),
+            conditions: {
+              id: createId(),
+              connector: "and",
+              conditions: [
+                {
+                  id: createId(),
+                  leftOperand: {
+                    value: reusableQuestionIds[0],
+                    type: "question",
+                  },
+                  operator: "isLessThanOrEqual",
+                  rightOperand: {
+                    type: "static",
+                    value: 3,
+                  },
+                },
+              ],
+            },
+            actions: [
+              {
+                id: createId(),
+                objective: "jumpToQuestion",
+                target: reusableQuestionIds[2],
+              },
+            ],
+          },
+        ],
+        range: 5,
+        scale: "smiley",
+        headline: { default: "How do you like {{productName}}?" },
+        required: true,
+        lowerLabel: { default: "Not good" },
+        upperLabel: { default: "Very satisfied" },
+        isColorCodingEnabled: false,
+      },
+      {
+        id: reusableQuestionIds[1],
+        html: { default: '<p class="fb-editor-paragraph" dir="ltr"><span>This helps us a lot.</span></p>' },
+        type: TSurveyQuestionTypeEnum.CTA,
+        logic: [
+          {
+            id: createId(),
+            conditions: {
+              id: createId(),
+              connector: "and",
+              conditions: [
+                {
+                  id: createId(),
+                  leftOperand: {
+                    value: reusableQuestionIds[1],
+                    type: "question",
+                  },
+                  operator: "isClicked",
+                },
+              ],
+            },
+            actions: [
+              {
+                id: createId(),
+                objective: "jumpToQuestion",
+                target: XMSurveyDefault.endings[0].id,
+              },
+            ],
+          },
+        ],
+        headline: { default: "Happy to hear 🙏 Please write a review for us!" },
+        required: true,
+        buttonUrl: "https://formbricks.com/github",
+        buttonLabel: { default: "Write review" },
+        buttonExternal: true,
+      },
+      {
+        id: reusableQuestionIds[2],
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Sorry to hear! What is ONE thing we can do better?" },
+        required: true,
+        subheader: { default: "Help us improve your experience." },
+        buttonLabel: { default: "Send" },
+        placeholder: { default: "Type your answer here..." },
+        inputType: "text",
+      },
+    ],
+  };
+};
+
+const eNPSSurvey = (): TXMTemplate => {
+  return {
+    ...XMSurveyDefault,
+    name: "eNPS Survey",
+    questions: [
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.NPS,
+        headline: {
+          default: "How likely are you to recommend working at this company to a friend or colleague?",
+        },
+        required: false,
+        lowerLabel: { default: "Not at all likely" },
+        upperLabel: { default: "Extremely likely" },
+        isColorCodingEnabled: true,
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "To help us improve, can you describe the reason(s) for your rating?" },
+        required: false,
+        inputType: "text",
+      },
+      {
+        id: createId(),
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Any other comments, feedback, or concerns?" },
+        required: false,
+        inputType: "text",
+      },
+    ],
+  };
 };
 
 export const XMTemplates: TXMTemplate[] = [
-  NPSSurvey,
-  StarRatingSurvey,
-  CSATSurvey,
-  CESSurvey,
-  SmileysRatingSurvey,
-  eNPSSurvey,
+  NPSSurvey(),
+  StarRatingSurvey(),
+  CSATSurvey(),
+  CESSurvey(),
+  SmileysRatingSurvey(),
+  eNPSSurvey(),
 ];

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/products/new/settings/components/ProductSettings.tsx

@@ -7,7 +7,7 @@ import { useRouter } from "next/navigation";
 import { useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { getFormattedErrorMessage } from "@formbricks/lib/actionClient/helper";
-import { FORMBRICKS_PRODUCT_ID_LS, FORMBRICKS_SURVEYS_FILTERS_KEY_LS } from "@formbricks/lib/localStorage";
+import { FORMBRICKS_SURVEYS_FILTERS_KEY_LS } from "@formbricks/lib/localStorage";
 import { PREVIEW_SURVEY } from "@formbricks/lib/styling/constants";
 import {
   TProductConfigChannel,
@@ -64,8 +64,6 @@ export const ProductSettings = ({
         );
         if (productionEnvironment) {
           if (typeof window !== "undefined") {
-            localStorage.setItem(FORMBRICKS_PRODUCT_ID_LS, productionEnvironment.productId);
-
             // Rmove filters when creating a new product
             localStorage.removeItem(FORMBRICKS_SURVEYS_FILTERS_KEY_LS);
           }

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddressQuestionForm.tsx

@@ -1,12 +1,13 @@
 "use client";
 
 import { PlusIcon } from "lucide-react";
+import { useEffect } from "react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyAddressQuestion } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
 import { Button } from "@formbricks/ui/components/Button";
 import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import { QuestionToggleTable } from "@formbricks/ui/components/QuestionToggleTable";
 
 interface AddressQuestionFormProps {
   localSurvey: TSurvey;
@@ -32,6 +33,64 @@ export const AddressQuestionForm = ({
 }: AddressQuestionFormProps): JSX.Element => {
   const surveyLanguageCodes = extractLanguageCodes(localSurvey.languages ?? []);
 
+  const fields = [
+    {
+      id: "addressLine1",
+      label: "Address Line 1",
+      ...question.addressLine1,
+    },
+    {
+      id: "addressLine2",
+      label: "Address Line 2",
+      ...question.addressLine2,
+    },
+    {
+      id: "city",
+      label: "City",
+      ...question.city,
+    },
+    {
+      id: "state",
+      label: "State",
+      ...question.state,
+    },
+    {
+      id: "zip",
+      label: "Zip",
+      ...question.zip,
+    },
+    {
+      id: "country",
+      label: "Country",
+      ...question.country,
+    },
+  ];
+
+  useEffect(() => {
+    const allFieldsAreOptional = [
+      question.addressLine1,
+      question.addressLine2,
+      question.city,
+      question.state,
+      question.zip,
+      question.country,
+    ]
+      .filter((field) => field.show)
+      .every((field) => !field.required);
+
+    if (allFieldsAreOptional) {
+      updateQuestion(questionIdx, { required: false });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    question.addressLine1,
+    question.addressLine2,
+    question.city,
+    question.state,
+    question.zip,
+    question.country,
+  ]);
+
   return (
     <form>
       <QuestionFormInput
@@ -81,73 +140,30 @@ export const AddressQuestionForm = ({
             Add Description
           </Button>
         )}
-        <div className="mt-2 font-medium">Settings</div>
-        <AdvancedOptionToggle
-          isChecked={question.isAddressLine1Required}
-          onToggle={() =>
+
+        <QuestionToggleTable
+          type="address"
+          fields={fields}
+          onShowToggle={(field, show) => {
             updateQuestion(questionIdx, {
-              isAddressLine1Required: !question.isAddressLine1Required,
-              required: true,
-            })
-          }
-          htmlId="isAddressRequired"
-          title="Required: Address Line 1"
-          description=""
-          childBorder
-          customContainerClass="p-0 mt-4"></AdvancedOptionToggle>
-        <AdvancedOptionToggle
-          isChecked={question.isAddressLine2Required}
-          onToggle={() =>
+              [field.id]: {
+                show,
+                required: field.required,
+              },
+              // when show changes, and the field is required, the question should be required
+              ...(show && field.required && { required: true }),
+            });
+          }}
+          onRequiredToggle={(field, required) => {
             updateQuestion(questionIdx, {
-              isAddressLine2Required: !question.isAddressLine2Required,
+              [field.id]: {
+                show: field.show,
+                required,
+              },
               required: true,
-            })
-          }
-          htmlId="isAddressLine2Required"
-          title="Required: Address Line 2"
-          description=""
-          childBorder
-          customContainerClass="p-0 mt-4"></AdvancedOptionToggle>
-        <AdvancedOptionToggle
-          isChecked={question.isCityRequired}
-          onToggle={() =>
-            updateQuestion(questionIdx, { isCityRequired: !question.isCityRequired, required: true })
-          }
-          htmlId="isCityRequired"
-          title="Required: City / Town"
-          description=""
-          childBorder
-          customContainerClass="p-0 mt-4"></AdvancedOptionToggle>
-        <AdvancedOptionToggle
-          isChecked={question.isStateRequired}
-          onToggle={() =>
-            updateQuestion(questionIdx, { isStateRequired: !question.isStateRequired, required: true })
-          }
-          htmlId="isStateRequired"
-          title="Required: State / Region"
-          description=""
-          childBorder
-          customContainerClass="p-0 mt-4"></AdvancedOptionToggle>
-        <AdvancedOptionToggle
-          isChecked={question.isZipRequired}
-          onToggle={() =>
-            updateQuestion(questionIdx, { isZipRequired: !question.isZipRequired, required: true })
-          }
-          htmlId="isZipRequired"
-          title="Required: ZIP / Post Code"
-          description=""
-          childBorder
-          customContainerClass="p-0 mt-4"></AdvancedOptionToggle>
-        <AdvancedOptionToggle
-          isChecked={question.isCountryRequired}
-          onToggle={() =>
-            updateQuestion(questionIdx, { isCountryRequired: !question.isCountryRequired, required: true })
-          }
-          htmlId="iscountryRequired"
-          title="Required: Country"
-          description=""
-          childBorder
-          customContainerClass="p-0 mt-4"></AdvancedOptionToggle>
+            });
+          }}
+        />
       </div>
     </form>
   );

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AdvancedSettings.tsx

@@ -1,6 +1,6 @@
+import { ConditionalLogic } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/ConditionalLogic";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyQuestion } from "@formbricks/types/surveys/types";
-import { LogicEditor } from "./LogicEditor";
 import { UpdateQuestionId } from "./UpdateQuestionId";
 
 interface AdvancedSettingsProps {
@@ -19,16 +19,14 @@ export const AdvancedSettings = ({
   attributeClasses,
 }: AdvancedSettingsProps) => {
   return (
-    <div>
-      <div className="mb-4">
-        <LogicEditor
-          question={question}
-          updateQuestion={updateQuestion}
-          localSurvey={localSurvey}
-          questionIdx={questionIdx}
-          attributeClasses={attributeClasses}
-        />
-      </div>
+    <div className="flex flex-col gap-4">
+      <ConditionalLogic
+        question={question}
+        updateQuestion={updateQuestion}
+        localSurvey={localSurvey}
+        questionIdx={questionIdx}
+        attributeClasses={attributeClasses}
+      />
 
       <UpdateQuestionId
         question={question}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/ConditionalLogic.tsx

@@ -0,0 +1,199 @@
+import { LogicEditor } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor";
+import {
+  getDefaultOperatorForQuestion,
+  replaceEndingCardHeadlineRecall,
+} from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
+import { createId } from "@paralleldrive/cuid2";
+import {
+  ArrowDownIcon,
+  ArrowUpIcon,
+  CopyIcon,
+  EllipsisVerticalIcon,
+  PlusIcon,
+  SplitIcon,
+  TrashIcon,
+} from "lucide-react";
+import { useMemo } from "react";
+import { duplicateLogicItem } from "@formbricks/lib/surveyLogic/utils";
+import { replaceHeadlineRecall } from "@formbricks/lib/utils/recall";
+import { TAttributeClass } from "@formbricks/types/attribute-classes";
+import { TSurvey, TSurveyLogic, TSurveyQuestion } from "@formbricks/types/surveys/types";
+import { Button } from "@formbricks/ui/components/Button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@formbricks/ui/components/DropdownMenu";
+import { Label } from "@formbricks/ui/components/Label";
+
+interface ConditionalLogicProps {
+  localSurvey: TSurvey;
+  questionIdx: number;
+  question: TSurveyQuestion;
+  updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
+  attributeClasses: TAttributeClass[];
+}
+
+export function ConditionalLogic({
+  attributeClasses,
+  localSurvey,
+  question,
+  questionIdx,
+  updateQuestion,
+}: ConditionalLogicProps) {
+  const transformedSurvey = useMemo(() => {
+    let modifiedSurvey = replaceHeadlineRecall(localSurvey, "default", attributeClasses);
+    modifiedSurvey = replaceEndingCardHeadlineRecall(modifiedSurvey, "default", attributeClasses);
+
+    return modifiedSurvey;
+  }, [localSurvey, attributeClasses]);
+
+  const addLogic = () => {
+    const operator = getDefaultOperatorForQuestion(question);
+
+    const initialCondition: TSurveyLogic = {
+      id: createId(),
+      conditions: {
+        id: createId(),
+        connector: "and",
+        conditions: [
+          {
+            id: createId(),
+            leftOperand: {
+              value: question.id,
+              type: "question",
+            },
+            operator,
+          },
+        ],
+      },
+      actions: [
+        {
+          id: createId(),
+          objective: "jumpToQuestion",
+          target: "",
+        },
+      ],
+    };
+
+    updateQuestion(questionIdx, {
+      logic: [...(question?.logic ?? []), initialCondition],
+    });
+  };
+
+  const handleRemoveLogic = (logicItemIdx: number) => {
+    const logicCopy = structuredClone(question.logic ?? []);
+    logicCopy.splice(logicItemIdx, 1);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const moveLogic = (from: number, to: number) => {
+    const logicCopy = structuredClone(question.logic ?? []);
+    const [movedItem] = logicCopy.splice(from, 1);
+    logicCopy.splice(to, 0, movedItem);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const duplicateLogic = (logicItemIdx: number) => {
+    const logicCopy = structuredClone(question.logic ?? []);
+    const logicItem = logicCopy[logicItemIdx];
+    const newLogicItem = duplicateLogicItem(logicItem);
+    logicCopy.splice(logicItemIdx + 1, 0, newLogicItem);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  return (
+    <div className="mt-2">
+      <Label className="flex gap-2">
+        Conditional Logic
+        <SplitIcon className="h-4 w-4 rotate-90" />
+      </Label>
+
+      {question.logic && question.logic.length > 0 && (
+        <div className="mt-2 flex flex-col gap-4">
+          {question.logic.map((logicItem, logicItemIdx) => (
+            <div
+              key={logicItem.id}
+              className="flex w-full grow items-start gap-2 rounded-lg border border-slate-200 bg-slate-50 p-4">
+              <LogicEditor
+                localSurvey={transformedSurvey}
+                logicItem={logicItem}
+                updateQuestion={updateQuestion}
+                question={question}
+                questionIdx={questionIdx}
+                logicIdx={logicItemIdx}
+                isLast={logicItemIdx === (question.logic ?? []).length - 1}
+              />
+
+              <DropdownMenu>
+                <DropdownMenuTrigger>
+                  <EllipsisVerticalIcon className="h-4 w-4 text-slate-700 hover:text-slate-950" />
+                </DropdownMenuTrigger>
+                <DropdownMenuContent>
+                  <DropdownMenuItem
+                    className="flex items-center gap-2"
+                    onClick={() => {
+                      duplicateLogic(logicItemIdx);
+                    }}>
+                    <CopyIcon className="h-4 w-4" />
+                    Duplicate
+                  </DropdownMenuItem>
+                  <DropdownMenuItem
+                    className="flex items-center gap-2"
+                    disabled={logicItemIdx === 0}
+                    onClick={() => {
+                      moveLogic(logicItemIdx, logicItemIdx - 1);
+                    }}>
+                    <ArrowUpIcon className="h-4 w-4" />
+                    Move up
+                  </DropdownMenuItem>
+                  <DropdownMenuItem
+                    className="flex items-center gap-2"
+                    disabled={logicItemIdx === (question.logic ?? []).length - 1}
+                    onClick={() => {
+                      moveLogic(logicItemIdx, logicItemIdx + 1);
+                    }}>
+                    <ArrowDownIcon className="h-4 w-4" />
+                    Move down
+                  </DropdownMenuItem>
+                  <DropdownMenuItem
+                    className="flex items-center gap-2"
+                    onClick={() => {
+                      handleRemoveLogic(logicItemIdx);
+                    }}>
+                    <TrashIcon className="h-4 w-4" />
+                    Remove
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
+            </div>
+          ))}
+        </div>
+      )}
+
+      <div className="mt-2 flex items-center space-x-2">
+        <Button
+          id="logicJumps"
+          className="bg-slate-100 hover:bg-slate-50"
+          type="button"
+          name="logicJumps"
+          size="sm"
+          variant="secondary"
+          EndIcon={PlusIcon}
+          onClick={addLogic}>
+          Add logic
+        </Button>
+      </div>
+    </div>
+  );
+}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/ContactInfoQuestionForm.tsx

@@ -0,0 +1,157 @@
+"use client";
+
+import { PlusIcon } from "lucide-react";
+import { useEffect } from "react";
+import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
+import { TAttributeClass } from "@formbricks/types/attribute-classes";
+import { TSurvey, TSurveyContactInfoQuestion } from "@formbricks/types/surveys/types";
+import { Button } from "@formbricks/ui/components/Button";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import { QuestionToggleTable } from "@formbricks/ui/components/QuestionToggleTable";
+
+interface ContactInfoQuestionFormProps {
+  localSurvey: TSurvey;
+  question: TSurveyContactInfoQuestion;
+  questionIdx: number;
+  updateQuestion: (questionIdx: number, updatedAttributes: Partial<TSurveyContactInfoQuestion>) => void;
+  lastQuestion: boolean;
+  isInvalid: boolean;
+  selectedLanguageCode: string;
+  setSelectedLanguageCode: (language: string) => void;
+  attributeClasses: TAttributeClass[];
+}
+
+export const ContactInfoQuestionForm = ({
+  question,
+  questionIdx,
+  updateQuestion,
+  isInvalid,
+  localSurvey,
+  selectedLanguageCode,
+  setSelectedLanguageCode,
+  attributeClasses,
+}: ContactInfoQuestionFormProps): JSX.Element => {
+  const surveyLanguageCodes = extractLanguageCodes(localSurvey.languages ?? []);
+
+  const fields = [
+    {
+      id: "firstName",
+      label: "First Name",
+      ...question.firstName,
+    },
+    {
+      id: "lastName",
+      label: "Last Name",
+      ...question.lastName,
+    },
+    {
+      id: "email",
+      label: "Email",
+      ...question.email,
+    },
+    {
+      id: "phone",
+      label: "Phone",
+      ...question.phone,
+    },
+    {
+      id: "company",
+      label: "Company",
+      ...question.company,
+    },
+  ];
+
+  useEffect(() => {
+    const allFieldsAreOptional = [
+      question.firstName,
+      question.lastName,
+      question.email,
+      question.phone,
+      question.company,
+    ]
+      .filter((field) => field.show)
+      .every((field) => !field.required);
+
+    if (allFieldsAreOptional) {
+      updateQuestion(questionIdx, { required: false });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [question.firstName, question.lastName, question.email, question.phone, question.company]);
+
+  return (
+    <form>
+      <QuestionFormInput
+        id="headline"
+        value={question.headline}
+        label={"Question*"}
+        localSurvey={localSurvey}
+        questionIdx={questionIdx}
+        isInvalid={isInvalid}
+        updateQuestion={updateQuestion}
+        selectedLanguageCode={selectedLanguageCode}
+        setSelectedLanguageCode={setSelectedLanguageCode}
+        attributeClasses={attributeClasses}
+      />
+
+      <div>
+        {question.subheader !== undefined && (
+          <div className="inline-flex w-full items-center">
+            <div className="w-full">
+              <QuestionFormInput
+                id="subheader"
+                value={question.subheader}
+                label={"Description"}
+                localSurvey={localSurvey}
+                questionIdx={questionIdx}
+                isInvalid={isInvalid}
+                updateQuestion={updateQuestion}
+                selectedLanguageCode={selectedLanguageCode}
+                setSelectedLanguageCode={setSelectedLanguageCode}
+                attributeClasses={attributeClasses}
+              />
+            </div>
+          </div>
+        )}
+        {question.subheader === undefined && (
+          <Button
+            size="sm"
+            variant="minimal"
+            className="mt-4"
+            type="button"
+            onClick={() => {
+              updateQuestion(questionIdx, {
+                subheader: createI18nString("", surveyLanguageCodes),
+              });
+            }}>
+            <PlusIcon className="mr-1 h-4 w-4" />
+            Add Description
+          </Button>
+        )}
+
+        <QuestionToggleTable
+          type="contact"
+          fields={fields}
+          onShowToggle={(field, show) => {
+            updateQuestion(questionIdx, {
+              [field.id]: {
+                show,
+                required: field.required,
+              },
+              // when show changes, and the field is required, the question should be required
+              ...(show && field.required && { required: true }),
+            });
+          }}
+          onRequiredToggle={(field, required) => {
+            updateQuestion(questionIdx, {
+              [field.id]: {
+                show: field.show,
+                required,
+              },
+              required: true,
+            });
+          }}
+        />
+      </div>
+    </form>
+  );
+};

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditEndingCard.tsx

@@ -3,7 +3,7 @@
 import { EditorCardMenu } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu";
 import { EndScreenForm } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EndScreenForm";
 import { RedirectUrlForm } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/RedirectUrlForm";
-import { formatTextWithSlashes } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/util";
+import { formatTextWithSlashes } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { createId } from "@paralleldrive/cuid2";

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu.tsx

@@ -17,7 +17,6 @@ import {
   TSurveyQuestion,
   TSurveyQuestionTypeEnum,
   TSurveyRedirectUrlCard,
-  ZSurveyQuestion,
 } from "@formbricks/types/surveys/types";
 import { ConfirmationModal } from "@formbricks/ui/components/ConfirmationModal";
 import {
@@ -60,9 +59,13 @@ export const EditorCardMenu = ({
   isCxMode = false,
 }: EditorCardMenuProps) => {
   const [logicWarningModal, setLogicWarningModal] = useState(false);
-  const [changeToType, setChangeToType] = useState(
-    card.type !== "endScreen" && card.type !== "redirectToUrl" ? card.type : undefined
-  );
+  const [changeToType, setChangeToType] = useState(() => {
+    if (card.type !== "endScreen" && card.type !== "redirectToUrl") {
+      return card.type;
+    }
+
+    return undefined;
+  });
   const isDeleteDisabled =
     cardType === "question"
       ? survey.questions.length === 1
@@ -71,65 +74,57 @@ export const EditorCardMenu = ({
   const availableQuestionTypes = isCxMode ? CX_QUESTIONS_NAME_MAP : QUESTIONS_NAME_MAP;
 
   const changeQuestionType = (type?: TSurveyQuestionTypeEnum) => {
-    const parseResult = ZSurveyQuestion.safeParse(card);
-    if (parseResult.success && type) {
-      const question = parseResult.data;
-      const { headline, required, subheader, imageUrl, videoUrl, buttonLabel, backButtonLabel } = question;
+    if (!type) return;
 
-      const questionDefaults = getQuestionDefaults(type, product);
+    const { headline, required, subheader, imageUrl, videoUrl, buttonLabel, backButtonLabel } =
+      card as TSurveyQuestion;
 
-      // if going from single select to multi select or vice versa, we need to keep the choices as well
-
-      if (
-        (type === TSurveyQuestionTypeEnum.MultipleChoiceSingle &&
-          question.type === TSurveyQuestionTypeEnum.MultipleChoiceMulti) ||
-        (type === TSurveyQuestionTypeEnum.MultipleChoiceMulti &&
-          question.type === TSurveyQuestionTypeEnum.MultipleChoiceSingle)
-      ) {
-        updateCard(cardIdx, {
-          choices: question.choices,
-          type,
-          logic: undefined,
-        });
-
-        return;
-      }
+    const questionDefaults = getQuestionDefaults(type, product);
 
+    if (
+      (type === TSurveyQuestionTypeEnum.MultipleChoiceSingle &&
+        card.type === TSurveyQuestionTypeEnum.MultipleChoiceMulti) ||
+      (type === TSurveyQuestionTypeEnum.MultipleChoiceMulti &&
+        card.type === TSurveyQuestionTypeEnum.MultipleChoiceSingle)
+    ) {
       updateCard(cardIdx, {
-        ...questionDefaults,
+        choices: card.choices,
         type,
-        headline,
-        subheader,
-        required,
-        imageUrl,
-        videoUrl,
-        buttonLabel,
-        backButtonLabel,
         logic: undefined,
       });
+
+      return;
     }
+
+    updateCard(cardIdx, {
+      ...questionDefaults,
+      type,
+      headline,
+      subheader,
+      required,
+      imageUrl,
+      videoUrl,
+      buttonLabel,
+      backButtonLabel,
+      logic: undefined,
+    });
   };
 
   const addQuestionCardBelow = (type: TSurveyQuestionTypeEnum) => {
-    const parseResult = ZSurveyQuestion.safeParse(card);
-    if (parseResult.success) {
-      const question = parseResult.data;
-      const questionDefaults = getQuestionDefaults(type, product);
+    const questionDefaults = getQuestionDefaults(type, product);
 
-      addCard(
-        {
-          ...questionDefaults,
-          type,
-          id: createId(),
-          required: true,
-        },
-        cardIdx + 1
-      );
+    addCard(
+      {
+        ...questionDefaults,
+        type,
+        id: createId(),
+        required: true,
+      },
+      cardIdx + 1
+    );
 
-      // scroll to the new question
-      const section = document.getElementById(`${question.id}`);
-      section?.scrollIntoView({ behavior: "smooth", block: "end", inline: "end" });
-    }
+    const section = document.getElementById(`${card.id}`);
+    section?.scrollIntoView({ behavior: "smooth", block: "end", inline: "end" });
   };
 
   const addEndingCardBelow = () => {
@@ -177,28 +172,24 @@ export const EditorCardMenu = ({
 
                 <DropdownMenuSubContent className="ml-2 border border-slate-200 text-slate-600 hover:text-slate-700">
                   {Object.entries(availableQuestionTypes).map(([type, name]) => {
-                    const parsedResult = ZSurveyQuestion.safeParse(card);
-                    if (parsedResult.success) {
-                      const question = parsedResult.data;
-                      if (type === question.type) return null;
-                      return (
-                        <DropdownMenuItem
-                          key={type}
-                          className="min-h-8 cursor-pointer"
-                          onClick={() => {
-                            setChangeToType(type as TSurveyQuestionTypeEnum);
-                            if (question.logic) {
-                              setLogicWarningModal(true);
-                              return;
-                            }
+                    if (type === card.type) return null;
+                    return (
+                      <DropdownMenuItem
+                        key={type}
+                        className="min-h-8 cursor-pointer"
+                        onClick={() => {
+                          setChangeToType(type as TSurveyQuestionTypeEnum);
+                          if ((card as TSurveyQuestion).logic) {
+                            setLogicWarningModal(true);
+                            return;
+                          }
 
-                            changeQuestionType(type as TSurveyQuestionTypeEnum);
-                          }}>
-                          {QUESTIONS_ICON_MAP[type as TSurveyQuestionTypeEnum]}
-                          <span className="ml-2">{name}</span>
-                        </DropdownMenuItem>
-                      );
-                    }
+                          changeQuestionType(type as TSurveyQuestionTypeEnum);
+                        }}>
+                        {QUESTIONS_ICON_MAP[type as TSurveyQuestionTypeEnum]}
+                        <span className="ml-2">{name}</span>
+                      </DropdownMenuItem>
+                    );
                   })}
                 </DropdownMenuSubContent>
               </DropdownMenuSub>

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/HiddenFieldsCard.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { findHiddenFieldUsedInLogic } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { EyeOff } from "lucide-react";
 import { useState } from "react";
@@ -65,6 +66,25 @@ export const HiddenFieldsCard = ({
     });
   };
 
+  const handleDeleteHiddenField = (fieldId: string) => {
+    const quesIdx = findHiddenFieldUsedInLogic(localSurvey, fieldId);
+
+    if (quesIdx !== -1) {
+      toast.error(
+        `${fieldId} is used in logic of question ${quesIdx + 1}. Please remove it from logic first.`
+      );
+      return;
+    }
+
+    updateSurvey(
+      {
+        enabled: true,
+        fieldIds: localSurvey.hiddenFields?.fieldIds?.filter((q) => q !== fieldId),
+      },
+      fieldId
+    );
+  };
+
   return (
     <div className={cn(open ? "shadow-lg" : "shadow-md", "group z-10 flex flex-row rounded-lg bg-white")}>
       <div
@@ -111,15 +131,7 @@ export const HiddenFieldsCard = ({
                 return (
                   <Tag
                     key={fieldId}
-                    onDelete={() => {
-                      updateSurvey(
-                        {
-                          enabled: true,
-                          fieldIds: localSurvey.hiddenFields?.fieldIds?.filter((q) => q !== fieldId),
-                        },
-                        fieldId
-                      );
-                    }}
+                    onDelete={(fieldId) => handleDeleteHiddenField(fieldId)}
                     tagId={fieldId}
                     tagName={fieldId}
                   />

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditor.tsx

@@ -1,483 +1,51 @@
-import {
-  ArrowDownIcon,
-  ChevronDown,
-  CornerDownRightIcon,
-  HelpCircle,
-  SplitIcon,
-  TrashIcon,
-} from "lucide-react";
-import Image from "next/image";
-import { useMemo, useState } from "react";
-import { toast } from "react-hot-toast";
-import { getLocalizedValue } from "@formbricks/lib/i18n/utils";
-import { structuredClone } from "@formbricks/lib/pollyfills/structuredClone";
-import { replaceHeadlineRecall } from "@formbricks/lib/utils/recall";
-import { TAttributeClass } from "@formbricks/types/attribute-classes";
-import {
-  TSurvey,
-  TSurveyLogic,
-  TSurveyLogicCondition,
-  TSurveyQuestion,
-  TSurveyQuestionTypeEnum,
-} from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/components/Button";
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuTrigger,
-} from "@formbricks/ui/components/DropdownMenu";
-import { Input } from "@formbricks/ui/components/Input";
-import { Label } from "@formbricks/ui/components/Label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@formbricks/ui/components/Select";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/components/Tooltip";
+import { LogicEditorActions } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditorActions";
+import { LogicEditorConditions } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditorConditions";
+import { ArrowRightIcon } from "lucide-react";
+import { TSurvey, TSurveyLogic, TSurveyQuestion } from "@formbricks/types/surveys/types";
 
 interface LogicEditorProps {
   localSurvey: TSurvey;
-  questionIdx: number;
-  question: TSurveyQuestion;
+  logicItem: TSurveyLogic;
   updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
-  attributeClasses: TAttributeClass[];
+  question: TSurveyQuestion;
+  questionIdx: number;
+  logicIdx: number;
+  isLast: boolean;
 }
 
-type LogicConditions = {
-  [K in TSurveyLogicCondition]: {
-    label: string;
-    values: string[] | null;
-    unique?: boolean;
-    multiSelect?: boolean;
-  };
-};
-
-const conditions = {
-  openText: ["submitted", "skipped"],
-  multipleChoiceSingle: ["submitted", "skipped", "equals", "notEquals", "includesOne"],
-  multipleChoiceMulti: ["submitted", "skipped", "includesAll", "includesOne", "equals"],
-  nps: [
-    "equals",
-    "notEquals",
-    "lessThan",
-    "lessEqual",
-    "greaterThan",
-    "greaterEqual",
-    "submitted",
-    "skipped",
-  ],
-  rating: [
-    "equals",
-    "notEquals",
-    "lessThan",
-    "lessEqual",
-    "greaterThan",
-    "greaterEqual",
-    "submitted",
-    "skipped",
-  ],
-  cta: ["clicked", "skipped"],
-  consent: ["skipped", "accepted"],
-  pictureSelection: ["submitted", "skipped", "includesAll", "includesOne", "equals"],
-  fileUpload: ["uploaded", "notUploaded"],
-  cal: ["skipped", "booked"],
-  matrix: ["isCompletelySubmitted", "isPartiallySubmitted", "skipped"],
-  address: ["submitted", "skipped"],
-  ranking: ["submitted", "skipped"],
-};
-
-export const LogicEditor = ({
+export function LogicEditor({
   localSurvey,
+  logicItem,
+  updateQuestion,
   question,
   questionIdx,
-  updateQuestion,
-  attributeClasses,
-}: LogicEditorProps) => {
-  const [searchValue, setSearchValue] = useState<string>("");
-  const showDropdownSearch = question.type !== "pictureSelection";
-  const transformedSurvey = useMemo(() => {
-    return replaceHeadlineRecall(localSurvey, "default", attributeClasses);
-  }, [localSurvey, attributeClasses]);
-
-  const questionValues: string[] = useMemo(() => {
-    if ("choices" in question) {
-      if (question.type === "pictureSelection") {
-        return question.choices.map((choice) => choice.id);
-      } else {
-        return question.choices.map((choice) => getLocalizedValue(choice.label, "default"));
-      }
-    } else if ("range" in question) {
-      return Array.from({ length: question.range ? question.range : 0 }, (_, i) => (i + 1).toString());
-    } else if (question.type === TSurveyQuestionTypeEnum.NPS) {
-      return Array.from({ length: 11 }, (_, i) => (i + 0).toString());
-    }
-
-    return [];
-  }, [question]);
-
-  const logicConditions: LogicConditions = {
-    submitted: {
-      label: "is submitted",
-      values: null,
-      unique: true,
-    },
-    skipped: {
-      label: "is skipped",
-      values: null,
-      unique: true,
-    },
-    accepted: {
-      label: "is accepted",
-      values: null,
-      unique: true,
-    },
-    clicked: {
-      label: "is clicked",
-      values: null,
-      unique: true,
-    },
-    equals: {
-      label: "equals",
-      values: questionValues,
-    },
-    notEquals: {
-      label: "does not equal",
-      values: questionValues,
-    },
-    lessThan: {
-      label: "is less than",
-      values: questionValues,
-    },
-    lessEqual: {
-      label: "is less or equal to",
-      values: questionValues,
-    },
-    greaterThan: {
-      label: "is greater than",
-      values: questionValues,
-    },
-    greaterEqual: {
-      label: "is greater or equal to",
-      values: questionValues,
-    },
-    includesAll: {
-      label: "includes all of",
-      values: questionValues,
-      multiSelect: true,
-    },
-    includesOne: {
-      label: "includes one of",
-      values: questionValues,
-      multiSelect: true,
-    },
-    uploaded: {
-      label: "has uploaded file",
-      values: null,
-      unique: true,
-    },
-    notUploaded: {
-      label: "has not uploaded file",
-      values: null,
-      unique: true,
-    },
-    booked: {
-      label: "has a call booked",
-      values: null,
-      unique: true,
-    },
-    isCompletelySubmitted: {
-      label: "is completely submitted",
-      values: null,
-      unique: true,
-    },
-    isPartiallySubmitted: {
-      label: "is partially submitted",
-      values: null,
-      unique: true,
-    },
-  };
-
-  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("Please fill current logic jumps first.", {
-          icon: "🤓",
-        });
-        return;
-      }
-    }
-
-    const newLogic: TSurveyLogic[] = !question.logic ? [] : question.logic;
-    newLogic.push({
-      condition: undefined,
-      value: undefined,
-      destination: undefined,
-    });
-    updateQuestion(questionIdx, { logic: newLogic });
-  };
-
-  const updateLogic = (logicIdx: number, updatedAttributes: any) => {
-    const currentLogic: any = question.logic ? question.logic[logicIdx] : undefined;
-    if (!currentLogic) return;
-
-    // clean logic value if not needed or if condition changed between multiSelect and singleSelect conditions
-    const updatedCondition = updatedAttributes?.condition;
-    const currentCondition = currentLogic?.condition;
-    const updatedLogicCondition = logicConditions[updatedCondition];
-    const currentLogicCondition = logicConditions[currentCondition];
-    if (updatedCondition) {
-      if (updatedLogicCondition?.multiSelect && !currentLogicCondition?.multiSelect) {
-        updatedAttributes.value = [];
-      } else if (
-        (!updatedLogicCondition?.multiSelect && currentLogicCondition?.multiSelect) ||
-        updatedLogicCondition?.values === null
-      ) {
-        updatedAttributes.value = undefined;
-      }
-    }
-
-    const newLogic = !question.logic
-      ? []
-      : question.logic.map((logic, idx) => {
-          if (idx === logicIdx) {
-            return { ...logic, ...updatedAttributes };
-          }
-          return logic;
-        });
-
-    updateQuestion(questionIdx, { logic: newLogic });
-  };
-
-  const updateMultiSelectLogic = (logicIdx: number, checked: boolean, value: string) => {
-    const newLogic = !question.logic
-      ? []
-      : question.logic.map((logic, idx) => {
-          if (idx === logicIdx) {
-            const newValues = !logic.value ? [] : logic.value;
-            if (checked) {
-              newValues.push(value);
-            } else {
-              newValues.splice(newValues.indexOf(value), 1);
-            }
-            return { ...logic, value: Array.from(new Set(newValues)) };
-          }
-          return logic;
-        });
-
-    updateQuestion(questionIdx, { logic: newLogic });
-  };
-
-  const deleteLogic = (logicIdx: number) => {
-    const updatedLogic = !question.logic ? [] : structuredClone(question.logic);
-    updatedLogic.splice(logicIdx, 1);
-    updateQuestion(questionIdx, { logic: updatedLogic });
-  };
-
-  if (!(question.type in conditions)) {
-    return <></>;
-  }
-
-  const getLogicDisplayValue = (value: string | string[]): string => {
-    if (question.type === "pictureSelection") {
-      if (Array.isArray(value)) {
-        return value
-          .map((val) => {
-            const choiceIndex = question.choices.findIndex((choice) => choice.id === val);
-            return `Picture ${choiceIndex + 1}`;
-          })
-          .join(", ");
-      } else {
-        const choiceIndex = question.choices.findIndex((choice) => choice.id === value);
-        return `Picture ${choiceIndex + 1}`;
-      }
-    } else if (Array.isArray(value)) {
-      return value.join(", ");
-    }
-    return value;
-  };
-
-  const getOptionPreview = (value: string) => {
-    if (question.type === "pictureSelection") {
-      const choice = question.choices.find((choice) => choice.id === value);
-      if (choice) {
-        return <Image src={choice.imageUrl} alt={"Picture"} width={20} height={12} className="rounded-xs" />;
-      }
-    }
-  };
-
+  logicIdx,
+  isLast,
+}: LogicEditorProps) {
   return (
-    <div className="mt-3">
-      <Label>Logic Jumps</Label>
-
-      {question?.logic && question?.logic?.length !== 0 && (
-        <div className="mt-2 space-y-3">
-          {question?.logic?.map((logic, logicIdx) => (
-            <div key={logicIdx} className="flex items-center space-x-2 space-y-1 text-xs xl:text-sm">
-              <div>
-                <CornerDownRightIcon className="h-4 w-4" />
-              </div>
-              <p className="text-slate-800">If this answer</p>
-
-              <Select value={logic.condition} onValueChange={(e) => updateLogic(logicIdx, { condition: e })}>
-                <SelectTrigger className="min-w-fit flex-1">
-                  <SelectValue placeholder="Select condition" className="text-xs lg:text-sm" />
-                </SelectTrigger>
-                <SelectContent>
-                  {conditions[question.type].map(
-                    (condition) =>
-                      !(question.required && (condition === "skipped" || condition === "notUploaded")) && (
-                        <SelectItem
-                          key={condition}
-                          value={condition}
-                          title={logicConditions[condition].label}
-                          className="text-xs lg:text-sm">
-                          {logicConditions[condition].label}
-                        </SelectItem>
-                      )
-                  )}
-                </SelectContent>
-              </Select>
-
-              {logic.condition && logicConditions[logic.condition].values != null && (
-                <DropdownMenu>
-                  <DropdownMenuTrigger className="z-10 cursor-pointer" asChild>
-                    <div className="flex h-10 w-full items-center justify-between overflow-hidden rounded-md border border-slate-300 bg-transparent px-3 py-2 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50">
-                      {!logic.value || logic.value?.length === 0 ? (
-                        <p className="line-clamp-1 text-slate-400" title="Select match type">
-                          Select match type
-                        </p>
-                      ) : (
-                        <p className="line-clamp-1" title={getLogicDisplayValue(logic.value)}>
-                          {getLogicDisplayValue(logic.value)}
-                        </p>
-                      )}
-                      <ChevronDown className="h-4 w-4 shrink-0 opacity-50" />
-                    </div>
-                  </DropdownMenuTrigger>
-                  <DropdownMenuContent
-                    className="w-40 bg-slate-50 text-slate-700"
-                    align="start"
-                    side="bottom">
-                    {showDropdownSearch && (
-                      <Input
-                        autoFocus
-                        placeholder="Search options"
-                        className="mb-1 w-full bg-white"
-                        onChange={(e) => setSearchValue(e.target.value)}
-                        value={searchValue}
-                        onKeyDown={(e) => e.stopPropagation()}
-                      />
-                    )}
-                    <div className="max-h-72 overflow-y-auto overflow-x-hidden">
-                      {logicConditions[logic.condition].values
-                        ?.filter((value) => value.includes(searchValue))
-                        ?.map((value) => (
-                          <DropdownMenuCheckboxItem
-                            key={value}
-                            title={value}
-                            checked={
-                              !logicConditions[logic.condition].multiSelect
-                                ? logic.value === value
-                                : logic.value?.includes(value)
-                            }
-                            onSelect={(e) => e.preventDefault()}
-                            onCheckedChange={(e) =>
-                              !logicConditions[logic.condition].multiSelect
-                                ? updateLogic(logicIdx, { value })
-                                : updateMultiSelectLogic(logicIdx, e, value)
-                            }>
-                            <div className="flex space-x-2">
-                              {question.type === "pictureSelection" && getOptionPreview(value)}
-                              <p>{getLogicDisplayValue(value)}</p>
-                            </div>
-                          </DropdownMenuCheckboxItem>
-                        ))}
-                    </div>
-                  </DropdownMenuContent>
-                </DropdownMenu>
-              )}
-
-              <p className="text-slate-800">jump to</p>
-
-              <Select
-                value={logic.destination}
-                onValueChange={(e) => updateLogic(logicIdx, { destination: e })}>
-                <SelectTrigger className="w-fit overflow-hidden">
-                  <SelectValue placeholder="Select question" />
-                </SelectTrigger>
-                <SelectContent>
-                  {transformedSurvey.questions.map(
-                    (question, idx) =>
-                      idx !== questionIdx && (
-                        <SelectItem
-                          key={question.id}
-                          value={question.id}
-                          title={getLocalizedValue(question.headline, "default")}>
-                          <div className="w-96">
-                            <p className="truncate text-left">
-                              {idx + 1}
-                              {". "}
-                              {getLocalizedValue(question.headline, "default")}
-                            </p>
-                          </div>
-                        </SelectItem>
-                      )
-                  )}
-                  {localSurvey.endings.map((ending) => {
-                    return (
-                      <SelectItem value={ending.id}>
-                        {ending.type === "endScreen"
-                          ? getLocalizedValue(ending.headline, "default")
-                          : ending.label}
-                      </SelectItem>
-                    );
-                  })}
-                </SelectContent>
-              </Select>
-              <div>
-                <TrashIcon
-                  className="h-4 w-4 cursor-pointer text-slate-400"
-                  onClick={() => deleteLogic(logicIdx)}
-                />
-              </div>
-            </div>
-          ))}
-          <div className="flex flex-wrap items-center space-x-2 py-1 text-sm">
-            <ArrowDownIcon className="h-4 w-4" />
-            <p className="text-slate-700">All other answers will continue to the next question</p>
-          </div>
+    <div className="flex w-full grow flex-col gap-4 overflow-x-auto pb-2 text-sm">
+      <LogicEditorConditions
+        conditions={logicItem.conditions}
+        updateQuestion={updateQuestion}
+        question={question}
+        questionIdx={questionIdx}
+        localSurvey={localSurvey}
+        logicIdx={logicIdx}
+      />
+      <LogicEditorActions
+        logicItem={logicItem}
+        logicIdx={logicIdx}
+        question={question}
+        updateQuestion={updateQuestion}
+        localSurvey={localSurvey}
+        questionIdx={questionIdx}
+      />
+      {isLast ? (
+        <div className="flex flex-wrap items-center space-x-2">
+          <ArrowRightIcon className="h-4 w-4" />
+          <p className="text-slate-700">All other answers will continue to the next question</p>
         </div>
-      )}
-
-      <div className="mt-2 flex items-center space-x-2">
-        <Button
-          id="logicJumps"
-          type="button"
-          name="logicJumps"
-          size="sm"
-          variant="secondary"
-          StartIcon={SplitIcon}
-          onClick={() => addLogic()}>
-          Add logic
-        </Button>
-        <TooltipProvider delayDuration={50}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <HelpCircle className="ml-2 inline h-4 w-4 cursor-default text-slate-500" />
-            </TooltipTrigger>
-            <TooltipContent className="max-w-[300px]" side="top">
-              With logic jumps you can skip questions based on the responses users give.
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      </div>
+      ) : null}
     </div>
   );
-};
+}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditorActions.tsx

@@ -0,0 +1,236 @@
+import {
+  actionObjectiveOptions,
+  getActionOperatorOptions,
+  getActionTargetOptions,
+  getActionValueOptions,
+  getActionVariableOptions,
+} from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
+import { createId } from "@paralleldrive/cuid2";
+import { CopyIcon, CornerDownRightIcon, EllipsisVerticalIcon, PlusIcon, TrashIcon } from "lucide-react";
+import { getUpdatedActionBody } from "@formbricks/lib/surveyLogic/utils";
+import {
+  TActionNumberVariableCalculateOperator,
+  TActionObjective,
+  TActionTextVariableCalculateOperator,
+  TActionVariableValueType,
+  TSurvey,
+  TSurveyLogic,
+  TSurveyLogicAction,
+  TSurveyQuestion,
+} from "@formbricks/types/surveys/types";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@formbricks/ui/components/DropdownMenu";
+import { InputCombobox } from "@formbricks/ui/components/InputCombobox";
+
+interface LogicEditorActions {
+  localSurvey: TSurvey;
+  logicItem: TSurveyLogic;
+  logicIdx: number;
+  question: TSurveyQuestion;
+  updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
+  questionIdx: number;
+}
+
+export function LogicEditorActions({
+  localSurvey,
+  logicItem,
+  logicIdx,
+  question,
+  updateQuestion,
+  questionIdx,
+}: LogicEditorActions) {
+  const actions = logicItem.actions;
+
+  const handleActionsChange = (
+    operation: "remove" | "addBelow" | "duplicate" | "update",
+    actionIdx: number,
+    action?: TSurveyLogicAction
+  ) => {
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const currentLogicItem = logicCopy[logicIdx];
+    const actionsClone = currentLogicItem.actions;
+
+    switch (operation) {
+      case "remove":
+        actionsClone.splice(actionIdx, 1);
+        break;
+      case "addBelow":
+        actionsClone.splice(actionIdx + 1, 0, { id: createId(), objective: "jumpToQuestion", target: "" });
+        break;
+      case "duplicate":
+        actionsClone.splice(actionIdx + 1, 0, { ...actionsClone[actionIdx], id: createId() });
+        break;
+      case "update":
+        if (!action) return;
+        actionsClone[actionIdx] = action;
+        break;
+    }
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleObjectiveChange = (actionIdx: number, objective: TActionObjective) => {
+    const action = actions[actionIdx];
+    const actionBody = getUpdatedActionBody(action, objective);
+    handleActionsChange("update", actionIdx, actionBody);
+  };
+
+  const handleValuesChange = (actionIdx: number, values: Partial<TSurveyLogicAction>) => {
+    const action = actions[actionIdx];
+    const actionBody = { ...action, ...values } as TSurveyLogicAction;
+    handleActionsChange("update", actionIdx, actionBody);
+  };
+
+  return (
+    <div className="flex grow gap-2">
+      <CornerDownRightIcon className="mt-3 h-4 w-4 shrink-0" />
+      <div className="flex grow flex-col gap-y-2">
+        {actions?.map((action, idx) => (
+          <div key={action.id} className="flex grow items-center justify-between gap-x-2">
+            <div className="block w-9 shrink-0">{idx === 0 ? "Then" : "and"}</div>
+            <div className="flex grow items-center gap-x-2">
+              <InputCombobox
+                id={`action-${idx}-objective`}
+                key={`objective-${action.id}`}
+                showSearch={false}
+                options={actionObjectiveOptions}
+                value={action.objective}
+                onChangeValue={(val: TActionObjective) => {
+                  handleObjectiveChange(idx, val);
+                }}
+                comboboxClasses="grow"
+              />
+              {action.objective !== "calculate" && (
+                <InputCombobox
+                  id={`action-${idx}-target`}
+                  key={`target-${action.id}`}
+                  showSearch={false}
+                  options={getActionTargetOptions(action, localSurvey, questionIdx)}
+                  value={action.target}
+                  onChangeValue={(val: string) => {
+                    handleValuesChange(idx, {
+                      target: val,
+                    });
+                  }}
+                  comboboxClasses="grow"
+                />
+              )}
+              {action.objective === "calculate" && (
+                <>
+                  <InputCombobox
+                    id={`action-${idx}-variableId`}
+                    key={`variableId-${action.id}`}
+                    showSearch={false}
+                    options={getActionVariableOptions(localSurvey)}
+                    value={action.variableId}
+                    onChangeValue={(val: string) => {
+                      handleValuesChange(idx, {
+                        variableId: val,
+                        value: {
+                          type: "static",
+                          value: "",
+                        },
+                      });
+                    }}
+                    comboboxClasses="grow"
+                    emptyDropdownText="Add a variable to calculate"
+                  />
+                  <InputCombobox
+                    id={`action-${idx}-operator`}
+                    key={`operator-${action.id}`}
+                    showSearch={false}
+                    options={getActionOperatorOptions(
+                      localSurvey.variables.find((v) => v.id === action.variableId)?.type
+                    )}
+                    value={action.operator}
+                    onChangeValue={(
+                      val: TActionTextVariableCalculateOperator | TActionNumberVariableCalculateOperator
+                    ) => {
+                      handleValuesChange(idx, {
+                        operator: val,
+                      });
+                    }}
+                    comboboxClasses="grow"
+                  />
+                  <InputCombobox
+                    id={`action-${idx}-value`}
+                    key={`value-${action.id}`}
+                    withInput={true}
+                    clearable={true}
+                    value={action.value?.value ?? ""}
+                    inputProps={{
+                      placeholder: "Value",
+                      type: localSurvey.variables.find((v) => v.id === action.variableId)?.type || "text",
+                    }}
+                    groupedOptions={getActionValueOptions(action.variableId, localSurvey)}
+                    onChangeValue={(val, option, fromInput) => {
+                      const fieldType = option?.meta?.type as TActionVariableValueType;
+
+                      if (!fromInput && fieldType !== "static") {
+                        handleValuesChange(idx, {
+                          value: {
+                            type: fieldType,
+                            value: val as string,
+                          },
+                        });
+                      } else if (fromInput) {
+                        handleValuesChange(idx, {
+                          value: {
+                            type: "static",
+                            value: val as string,
+                          },
+                        });
+                      }
+                    }}
+                    comboboxClasses="grow shrink-0"
+                  />
+                </>
+              )}
+            </div>
+            <DropdownMenu>
+              <DropdownMenuTrigger id={`actions-${idx}-dropdown`}>
+                <EllipsisVerticalIcon className="h-4 w-4 text-slate-700 hover:text-slate-950" />
+              </DropdownMenuTrigger>
+
+              <DropdownMenuContent>
+                <DropdownMenuItem
+                  className="flex items-center gap-2"
+                  onClick={() => {
+                    handleActionsChange("addBelow", idx);
+                  }}>
+                  <PlusIcon className="h-4 w-4" />
+                  Add action below
+                </DropdownMenuItem>
+
+                <DropdownMenuItem
+                  className="flex items-center gap-2"
+                  disabled={actions.length === 1}
+                  onClick={() => {
+                    handleActionsChange("remove", idx);
+                  }}>
+                  <TrashIcon className="h-4 w-4" />
+                  Remove
+                </DropdownMenuItem>
+
+                <DropdownMenuItem
+                  className="flex items-center gap-2"
+                  onClick={() => {
+                    handleActionsChange("duplicate", idx);
+                  }}>
+                  <CopyIcon className="h-4 w-4" />
+                  Duplicate
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditorConditions.tsx

@@ -0,0 +1,347 @@
+import {
+  getConditionOperatorOptions,
+  getConditionValueOptions,
+  getDefaultOperatorForQuestion,
+  getMatchValueProps,
+} from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
+import { createId } from "@paralleldrive/cuid2";
+import { CopyIcon, EllipsisVerticalIcon, PlusIcon, TrashIcon, WorkflowIcon } from "lucide-react";
+import { cn } from "@formbricks/lib/cn";
+import {
+  addConditionBelow,
+  createGroupFromResource,
+  duplicateCondition,
+  isConditionGroup,
+  removeCondition,
+  toggleGroupConnector,
+  updateCondition,
+} from "@formbricks/lib/surveyLogic/utils";
+import {
+  TConditionGroup,
+  TDynamicLogicField,
+  TRightOperand,
+  TSingleCondition,
+  TSurvey,
+  TSurveyLogicConditionsOperator,
+  TSurveyQuestion,
+} from "@formbricks/types/surveys/types";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@formbricks/ui/components/DropdownMenu";
+import { InputCombobox, TComboboxOption } from "@formbricks/ui/components/InputCombobox";
+
+interface LogicEditorConditionsProps {
+  conditions: TConditionGroup;
+  updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
+  question: TSurveyQuestion;
+  localSurvey: TSurvey;
+  questionIdx: number;
+  logicIdx: number;
+  depth?: number;
+}
+
+export function LogicEditorConditions({
+  conditions,
+  logicIdx,
+  question,
+  localSurvey,
+  questionIdx,
+  updateQuestion,
+  depth = 0,
+}: LogicEditorConditionsProps) {
+  const handleAddConditionBelow = (resourceId: string) => {
+    const operator = getDefaultOperatorForQuestion(question);
+
+    const condition: TSingleCondition = {
+      id: createId(),
+      leftOperand: {
+        value: question.id,
+        type: "question",
+      },
+      operator,
+    };
+
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const logicItem = logicCopy[logicIdx];
+    addConditionBelow(logicItem.conditions, resourceId, condition);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleConnectorChange = (groupId: string) => {
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const logicItem = logicCopy[logicIdx];
+    toggleGroupConnector(logicItem.conditions, groupId);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleRemoveCondition = (resourceId: string) => {
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const logicItem = logicCopy[logicIdx];
+    removeCondition(logicItem.conditions, resourceId);
+
+    // Remove the logic item if there are zero conditions left
+    if (logicItem.conditions.conditions.length === 0) {
+      logicCopy.splice(logicIdx, 1);
+    }
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleDuplicateCondition = (resourceId: string) => {
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const logicItem = logicCopy[logicIdx];
+    duplicateCondition(logicItem.conditions, resourceId);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleCreateGroup = (resourceId: string) => {
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const logicItem = logicCopy[logicIdx];
+    createGroupFromResource(logicItem.conditions, resourceId);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleUpdateCondition = (resourceId: string, updateConditionBody: Partial<TSingleCondition>) => {
+    const logicCopy = structuredClone(question.logic) ?? [];
+    const logicItem = logicCopy[logicIdx];
+    updateCondition(logicItem.conditions, resourceId, updateConditionBody);
+
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
+
+  const handleQuestionChange = (condition: TSingleCondition, value: string, option?: TComboboxOption) => {
+    handleUpdateCondition(condition.id, {
+      leftOperand: {
+        value,
+        type: option?.meta?.type as TDynamicLogicField,
+      },
+      operator: "isSkipped",
+      rightOperand: undefined,
+    });
+  };
+
+  const handleOperatorChange = (condition: TSingleCondition, value: TSurveyLogicConditionsOperator) => {
+    if (value !== condition.operator) {
+      handleUpdateCondition(condition.id, {
+        operator: value,
+        rightOperand: undefined,
+      });
+    }
+  };
+
+  const handleRightOperandChange = (
+    condition: TSingleCondition,
+    value: string | number | string[],
+    option?: TComboboxOption
+  ) => {
+    const type = (option?.meta?.type as TRightOperand["type"]) || "static";
+
+    switch (type) {
+      case "question":
+      case "hiddenField":
+      case "variable":
+        handleUpdateCondition(condition.id, {
+          rightOperand: {
+            value: value as string,
+            type,
+          },
+        });
+        break;
+      case "static":
+        handleUpdateCondition(condition.id, {
+          rightOperand: {
+            value,
+            type,
+          },
+        });
+        break;
+    }
+  };
+
+  const renderCondition = (
+    condition: TSingleCondition | TConditionGroup,
+    index: number,
+    parentConditionGroup: TConditionGroup
+  ) => {
+    const connector = parentConditionGroup.connector;
+    if (isConditionGroup(condition)) {
+      return (
+        <div key={condition.id} className="flex items-start justify-between gap-4">
+          {index === 0 ? (
+            <div>When</div>
+          ) : (
+            <div
+              className={cn("w-14", index === 1 && "cursor-pointer underline")}
+              onClick={() => {
+                if (index !== 1) return;
+                handleConnectorChange(parentConditionGroup.id);
+              }}>
+              {connector}
+            </div>
+          )}
+          <div className="rounded-lg border border-slate-400 p-3">
+            <LogicEditorConditions
+              conditions={condition}
+              updateQuestion={updateQuestion}
+              localSurvey={localSurvey}
+              question={question}
+              questionIdx={questionIdx}
+              logicIdx={logicIdx}
+              depth={depth + 1}
+            />
+          </div>
+          <div className="mt-2">
+            <DropdownMenu>
+              <DropdownMenuTrigger>
+                <EllipsisVerticalIcon className="h-4 w-4 text-slate-700 hover:text-slate-950" />
+              </DropdownMenuTrigger>
+              <DropdownMenuContent>
+                <DropdownMenuItem
+                  className="flex items-center gap-2"
+                  onClick={() => {
+                    handleAddConditionBelow(condition.id);
+                  }}>
+                  <PlusIcon className="h-4 w-4" />
+                  Add condition below
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  className="flex items-center gap-2"
+                  disabled={depth === 0 && conditions.conditions.length === 1}
+                  onClick={() => handleRemoveCondition(condition.id)}>
+                  <TrashIcon className="h-4 w-4" />
+                  Remove
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
+        </div>
+      );
+    }
+
+    const conditionValueOptions = getConditionValueOptions(localSurvey, questionIdx);
+    const conditionOperatorOptions = getConditionOperatorOptions(condition, localSurvey);
+    const { show, options, showInput = false, inputType } = getMatchValueProps(condition, localSurvey);
+
+    const allowMultiSelect = ["equalsOneOf", "includesAllOf", "includesOneOf"].includes(condition.operator);
+    return (
+      <div key={condition.id} className="flex items-center gap-x-2">
+        <div className="w-10 shrink-0">
+          {index === 0 ? (
+            "When"
+          ) : (
+            <div
+              className={cn("w-14", index === 1 && "cursor-pointer underline")}
+              onClick={() => {
+                if (index !== 1) return;
+                handleConnectorChange(parentConditionGroup.id);
+              }}>
+              {connector}
+            </div>
+          )}
+        </div>
+        <InputCombobox
+          id={`condition-${depth}-${index}-conditionValue`}
+          key="conditionValue"
+          showSearch={false}
+          groupedOptions={conditionValueOptions}
+          value={condition.leftOperand.value}
+          onChangeValue={(val: string, option) => {
+            handleQuestionChange(condition, val, option);
+          }}
+          comboboxClasses="grow"
+        />
+        <InputCombobox
+          id={`condition-${depth}-${index}-conditionOperator`}
+          key="conditionOperator"
+          showSearch={false}
+          options={conditionOperatorOptions}
+          value={condition.operator}
+          onChangeValue={(val: TSurveyLogicConditionsOperator) => {
+            handleOperatorChange(condition, val);
+          }}
+          comboboxClasses="grow min-w-[150px]"
+        />
+        {show && (
+          <InputCombobox
+            id={`condition-${depth}-${index}-conditionMatchValue`}
+            withInput={showInput}
+            inputProps={{
+              type: inputType,
+              placeholder: "Value",
+            }}
+            key="conditionMatchValue"
+            showSearch={false}
+            groupedOptions={options}
+            allowMultiSelect={allowMultiSelect}
+            showCheckIcon={allowMultiSelect}
+            comboboxClasses="grow min-w-[180px] max-w-[300px]"
+            value={condition.rightOperand?.value}
+            clearable={true}
+            onChangeValue={(val, option) => {
+              handleRightOperandChange(condition, val, option);
+            }}
+          />
+        )}
+        <DropdownMenu>
+          <DropdownMenuTrigger id={`condition-${depth}-${index}-dropdown`}>
+            <EllipsisVerticalIcon className="h-4 w-4 text-slate-700 hover:text-slate-950" />
+          </DropdownMenuTrigger>
+          <DropdownMenuContent>
+            <DropdownMenuItem
+              className="flex items-center gap-2"
+              onClick={() => {
+                handleAddConditionBelow(condition.id);
+              }}>
+              <PlusIcon className="h-4 w-4" />
+              Add condition below
+            </DropdownMenuItem>
+            <DropdownMenuItem
+              className="flex items-center gap-2"
+              disabled={depth === 0 && conditions.conditions.length === 1}
+              onClick={() => handleRemoveCondition(condition.id)}>
+              <TrashIcon className="h-4 w-4" />
+              Remove
+            </DropdownMenuItem>
+            <DropdownMenuItem
+              className="flex items-center gap-2"
+              onClick={() => handleDuplicateCondition(condition.id)}>
+              <CopyIcon className="h-4 w-4" />
+              Duplicate
+            </DropdownMenuItem>
+            <DropdownMenuItem
+              className="flex items-center gap-2"
+              onClick={() => handleCreateGroup(condition.id)}>
+              <WorkflowIcon className="h-4 w-4" />
+              Create group
+            </DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+    );
+  };
+
+  return (
+    <div className="flex flex-col gap-y-2">
+      {conditions?.conditions.map((condition, index) => renderCondition(condition, index, conditions))}
+    </div>
+  );
+}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/MultipleChoiceQuestionForm.tsx

@@ -1,11 +1,13 @@
 "use client";
 
+import { findOptionUsedInLogic } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { DndContext } from "@dnd-kit/core";
 import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { createId } from "@paralleldrive/cuid2";
 import { PlusIcon } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
-import { createI18nString, extractLanguageCodes, getLocalizedValue } from "@formbricks/lib/i18n/utils";
+import toast from "react-hot-toast";
+import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import {
   TI18nString,
@@ -74,8 +76,6 @@ export const MultipleChoiceQuestionForm = ({
   };
 
   const updateChoice = (choiceIdx: number, updatedAttributes: { label: TI18nString }) => {
-    const newLabel = updatedAttributes.label.en;
-    const oldLabel = question.choices[choiceIdx].label;
     let newChoices: any[] = [];
     if (question.choices) {
       newChoices = question.choices.map((choice, idx) => {
@@ -84,19 +84,9 @@ export const MultipleChoiceQuestionForm = ({
       });
     }
 
-    let newLogic: any[] = [];
-    question.logic?.forEach((logic) => {
-      let newL: string | string[] | undefined = logic.value;
-      if (Array.isArray(logic.value)) {
-        newL = logic.value.map((value) =>
-          value === getLocalizedValue(oldLabel, selectedLanguageCode) ? newLabel : value
-        );
-      } else {
-        newL = logic.value === getLocalizedValue(oldLabel, selectedLanguageCode) ? newLabel : logic.value;
-      }
-      newLogic.push({ ...logic, value: newL });
+    updateQuestion(questionIdx, {
+      choices: newChoices,
     });
-    updateQuestion(questionIdx, { choices: newChoices, logic: newLogic });
   };
 
   const addChoice = (choiceIdx?: number) => {
@@ -138,23 +128,27 @@ export const MultipleChoiceQuestionForm = ({
   };
 
   const deleteChoice = (choiceIdx: number) => {
+    const choiceToDelete = question.choices[choiceIdx].id;
+
+    if (choiceToDelete !== "other") {
+      const questionIdx = findOptionUsedInLogic(localSurvey, question.id, choiceToDelete);
+      if (questionIdx !== -1) {
+        toast.error(
+          `This option is used in logic for question ${questionIdx + 1}. Please fix the logic first before deleting.`
+        );
+        return;
+      }
+    }
+
     const newChoices = !question.choices ? [] : question.choices.filter((_, idx) => idx !== choiceIdx);
     const choiceValue = question.choices[choiceIdx].label[selectedLanguageCode];
     if (isInvalidValue === choiceValue) {
       setisInvalidValue(null);
     }
-    let newLogic: any[] = [];
-    question.logic?.forEach((logic) => {
-      let newL: string | string[] | undefined = logic.value;
-      if (Array.isArray(logic.value)) {
-        newL = logic.value.filter((value) => value !== choiceValue);
-      } else {
-        newL = logic.value !== choiceValue ? logic.value : undefined;
-      }
-      newLogic.push({ ...logic, value: newL });
-    });
 
-    updateQuestion(questionIdx, { choices: newChoices, logic: newLogic });
+    updateQuestion(questionIdx, {
+      choices: newChoices,
+    });
   };
 
   useEffect(() => {

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/PictureSelectionForm.tsx

@@ -39,22 +39,10 @@ export const PictureSelectionForm = ({
     // Filter out the deleted choice from the choices array
     const newChoices = question.choices?.filter((choice) => choice.id !== choiceValue) || [];
 
-    // Update the logic, removing the deleted choice value
-    const newLogic =
-      question.logic?.map((logic) => {
-        let updatedValue = logic.value;
-
-        if (Array.isArray(logic.value)) {
-          updatedValue = logic.value.filter((value) => value !== choiceValue);
-        } else if (logic.value === choiceValue) {
-          updatedValue = undefined;
-        }
-
-        return { ...logic, value: updatedValue };
-      }) || [];
-
     // Update the question with new choices and logic
-    updateQuestion(questionIdx, { choices: newChoices, logic: newLogic });
+    updateQuestion(questionIdx, {
+      choices: newChoices,
+    });
   };
 
   const handleFileInputChanges = (urls: string[]) => {

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionCard.tsx

@@ -1,7 +1,8 @@
 "use client";
 
+import { ContactInfoQuestionForm } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/ContactInfoQuestionForm";
 import { RankingQuestionForm } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/RankingQuestionForm";
-import { formatTextWithSlashes } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/util";
+import { formatTextWithSlashes } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import * as Collapsible from "@radix-ui/react-collapsible";
@@ -94,16 +95,25 @@ export const QuestionCard = ({
   };
 
   const getIsRequiredToggleDisabled = (): boolean => {
-    if (question.type === "address") {
+    if (question.type === TSurveyQuestionTypeEnum.Address) {
       return [
-        question.isAddressLine1Required,
-        question.isAddressLine2Required,
-        question.isCityRequired,
-        question.isCountryRequired,
-        question.isStateRequired,
-        question.isZipRequired,
-      ].some((condition) => condition === true);
+        question.addressLine1,
+        question.addressLine2,
+        question.city,
+        question.state,
+        question.zip,
+        question.country,
+      ]
+        .filter((field) => field.show)
+        .some((condition) => condition.required === true);
     }
+
+    if (question.type === TSurveyQuestionTypeEnum.ContactInfo) {
+      return [question.firstName, question.lastName, question.email, question.phone, question.company]
+        .filter((field) => field.show)
+        .some((condition) => condition.required === true);
+    }
+
     return false;
   };
 
@@ -383,6 +393,18 @@ export const QuestionCard = ({
               isInvalid={isInvalid}
               attributeClasses={attributeClasses}
             />
+          ) : question.type === TSurveyQuestionTypeEnum.ContactInfo ? (
+            <ContactInfoQuestionForm
+              localSurvey={localSurvey}
+              question={question}
+              questionIdx={questionIdx}
+              updateQuestion={updateQuestion}
+              lastQuestion={lastQuestion}
+              selectedLanguageCode={selectedLanguageCode}
+              setSelectedLanguageCode={setSelectedLanguageCode}
+              isInvalid={isInvalid}
+              attributeClasses={attributeClasses}
+            />
           ) : null}
           <div className="mt-4">
             <Collapsible.Root open={openAdvanced} onOpenChange={setOpenAdvanced} className="mt-5">

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/QuestionsView.tsx

@@ -1,6 +1,8 @@
 "use client";
 
 import { AddEndingCardButton } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/AddEndingCardButton";
+import { SurveyVariablesCard } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCard";
+import { findQuestionUsedInLogic } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import {
   DndContext,
   DragEndEvent,
@@ -16,11 +18,18 @@ import toast from "react-hot-toast";
 import { MultiLanguageCard } from "@formbricks/ee/multi-language/components/multi-language-card";
 import { addMultiLanguageLabels, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { structuredClone } from "@formbricks/lib/pollyfills/structuredClone";
+import { isConditionGroup } from "@formbricks/lib/surveyLogic/utils";
 import { getDefaultEndingCard } from "@formbricks/lib/templates";
 import { checkForEmptyFallBackValue, extractRecallInfo } from "@formbricks/lib/utils/recall";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TOrganizationBillingPlan } from "@formbricks/types/organizations";
 import { TProduct } from "@formbricks/types/product";
+import {
+  TConditionGroup,
+  TSingleCondition,
+  TSurveyLogic,
+  TSurveyLogicAction,
+} from "@formbricks/types/surveys/types";
 import { TSurvey, TSurveyQuestion } from "@formbricks/types/surveys/types";
 import { findQuestionsWithCyclicLogic } from "@formbricks/types/surveys/validation";
 import {
@@ -77,22 +86,75 @@ export const QuestionsView = ({
 
   const surveyLanguages = localSurvey.languages;
   const [backButtonLabel, setbackButtonLabel] = useState(null);
+
   const handleQuestionLogicChange = (survey: TSurvey, compareId: string, updatedId: string): TSurvey => {
-    survey.questions.forEach((question) => {
-      if (question.headline[selectedLanguageCode].includes(`recall:${compareId}`)) {
-        question.headline[selectedLanguageCode] = question.headline[selectedLanguageCode].replaceAll(
-          `recall:${compareId}`,
-          `recall:${updatedId}`
-        );
+    const updateConditions = (conditions: TConditionGroup): TConditionGroup => {
+      return {
+        ...conditions,
+        conditions: conditions?.conditions.map((condition) => {
+          if (isConditionGroup(condition)) {
+            return updateConditions(condition);
+          } else {
+            return updateSingleCondition(condition);
+          }
+        }),
+      };
+    };
+
+    const updateSingleCondition = (condition: TSingleCondition): TSingleCondition => {
+      let updatedCondition = { ...condition };
+
+      if (condition.leftOperand.value === compareId) {
+        updatedCondition.leftOperand = { ...condition.leftOperand, value: updatedId };
       }
-      if (!question.logic) return;
-      question.logic.forEach((rule) => {
-        if (rule.destination === compareId) {
-          rule.destination = updatedId;
+
+      if (condition.rightOperand?.type === "question" && condition.rightOperand?.value === compareId) {
+        updatedCondition.rightOperand = { ...condition.rightOperand, value: updatedId };
+      }
+
+      return updatedCondition;
+    };
+
+    const updateActions = (actions: TSurveyLogicAction[]): TSurveyLogicAction[] => {
+      return actions.map((action) => {
+        let updatedAction = { ...action };
+
+        if (updatedAction.objective === "jumpToQuestion" && updatedAction.target === compareId) {
+          updatedAction.target = updatedId;
         }
+
+        if (updatedAction.objective === "requireAnswer" && updatedAction.target === compareId) {
+          updatedAction.target = updatedId;
+        }
+
+        return updatedAction;
       });
-    });
-    return survey;
+    };
+
+    return {
+      ...survey,
+      questions: survey.questions.map((question) => {
+        let updatedQuestion = { ...question };
+
+        if (question.headline[selectedLanguageCode].includes(`recall:${compareId}`)) {
+          question.headline[selectedLanguageCode] = question.headline[selectedLanguageCode].replaceAll(
+            `recall:${compareId}`,
+            `recall:${updatedId}`
+          );
+        }
+
+        // Update advanced logic
+        if (question.logic) {
+          updatedQuestion.logic = question.logic.map((logicRule: TSurveyLogic) => ({
+            ...logicRule,
+            conditions: updateConditions(logicRule.conditions),
+            actions: updateActions(logicRule.actions),
+          }));
+        }
+
+        return updatedQuestion;
+      }),
+    };
   };
 
   useEffect(() => {
@@ -211,6 +273,14 @@ export const QuestionsView = ({
     const activeQuestionIdTemp = activeQuestionId ?? localSurvey.questions[0].id;
     let updatedSurvey: TSurvey = { ...localSurvey };
 
+    // checking if this question is used in logic of any other question
+    const quesIdx = findQuestionUsedInLogic(localSurvey, questionId);
+
+    if (quesIdx !== -1) {
+      toast.error(`This question is used in logic of question ${quesIdx + 1}.`);
+      return;
+    }
+
     // check if we are recalling from this question for every language
     updatedSurvey.questions.forEach((question) => {
       for (const [languageCode, headline] of Object.entries(question.headline)) {
@@ -223,7 +293,7 @@ export const QuestionsView = ({
       }
     });
     updatedSurvey.questions.splice(questionIdx, 1);
-    updatedSurvey = handleQuestionLogicChange(updatedSurvey, questionId, "");
+
     const firstEndingCard = localSurvey.endings[0];
     setLocalSurvey(updatedSurvey);
     delete internalQuestionIdMap[questionId];
@@ -448,12 +518,12 @@ export const QuestionsView = ({
               activeQuestionId={activeQuestionId}
             />
 
-            {/* <SurveyVariablesCard
-          localSurvey={localSurvey}
-          setLocalSurvey={setLocalSurvey}
-          activeQuestionId={activeQuestionId}
-          setActiveQuestionId={setActiveQuestionId}
-        /> */}
+            <SurveyVariablesCard
+              localSurvey={localSurvey}
+              setLocalSurvey={setLocalSurvey}
+              activeQuestionId={activeQuestionId}
+              setActiveQuestionId={setActiveQuestionId}
+            />
 
             <MultiLanguageCard
               localSurvey={localSurvey}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SettingsView.tsx

@@ -73,7 +73,6 @@ export const SettingsView = ({
             setLocalSurvey={setLocalSurvey}
             environmentId={environment.id}
             attributeClasses={attributeClasses}
-            actionClasses={actionClasses}
             segments={segments}
             initialSegment={segments.find((segment) => segment.id === localSurvey.segment?.id)}
           />

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyEditor.tsx

@@ -132,101 +132,97 @@ export const SurveyEditor = ({
   }
 
   return (
-    <>
-      <div className="flex h-full w-full flex-col">
-        <SurveyMenuBar
-          setLocalSurvey={setLocalSurvey}
-          localSurvey={localSurvey}
-          survey={survey}
-          environment={environment}
-          activeId={activeView}
-          setActiveId={setActiveView}
-          setInvalidQuestions={setInvalidQuestions}
-          product={localProduct}
-          responseCount={responseCount}
-          selectedLanguageCode={selectedLanguageCode}
-          setSelectedLanguageCode={setSelectedLanguageCode}
-          isCxMode={isCxMode}
-        />
-        <div className="relative z-0 flex flex-1 overflow-hidden">
-          <main
-            className="relative z-0 w-1/2 flex-1 overflow-y-auto bg-slate-50 focus:outline-none"
-            ref={surveyEditorRef}>
-            <QuestionsAudienceTabs
-              activeId={activeView}
-              setActiveId={setActiveView}
-              isCxMode={isCxMode}
-              isStylingTabVisible={!!product.styling.allowStyleOverwrite}
-            />
+    <div className="flex h-full w-full flex-col">
+      <SurveyMenuBar
+        setLocalSurvey={setLocalSurvey}
+        localSurvey={localSurvey}
+        survey={survey}
+        environment={environment}
+        activeId={activeView}
+        setActiveId={setActiveView}
+        setInvalidQuestions={setInvalidQuestions}
+        product={localProduct}
+        responseCount={responseCount}
+        selectedLanguageCode={selectedLanguageCode}
+        setSelectedLanguageCode={setSelectedLanguageCode}
+        isCxMode={isCxMode}
+      />
+      <div className="relative z-0 flex flex-1 overflow-hidden">
+        <main
+          className="relative z-0 w-1/2 flex-1 overflow-y-auto bg-slate-50 focus:outline-none"
+          ref={surveyEditorRef}>
+          <QuestionsAudienceTabs
+            activeId={activeView}
+            setActiveId={setActiveView}
+            isCxMode={isCxMode}
+            isStylingTabVisible={!!product.styling.allowStyleOverwrite}
+          />
 
-            {activeView === "questions" && (
-              <QuestionsView
-                localSurvey={localSurvey}
-                setLocalSurvey={setLocalSurvey}
-                activeQuestionId={activeQuestionId}
-                setActiveQuestionId={setActiveQuestionId}
-                product={localProduct}
-                invalidQuestions={invalidQuestions}
-                setInvalidQuestions={setInvalidQuestions}
-                selectedLanguageCode={selectedLanguageCode ? selectedLanguageCode : "default"}
-                setSelectedLanguageCode={setSelectedLanguageCode}
-                isMultiLanguageAllowed={isMultiLanguageAllowed}
-                isFormbricksCloud={isFormbricksCloud}
-                attributeClasses={attributeClasses}
-                plan={plan}
-                isCxMode={isCxMode}
-              />
-            )}
-
-            {activeView === "styling" && product.styling.allowStyleOverwrite && (
-              <StylingView
-                colors={colors}
-                environment={environment}
-                localSurvey={localSurvey}
-                setLocalSurvey={setLocalSurvey}
-                product={localProduct}
-                styling={styling ?? null}
-                setStyling={setStyling}
-                localStylingChanges={localStylingChanges}
-                setLocalStylingChanges={setLocalStylingChanges}
-                isUnsplashConfigured={isUnsplashConfigured}
-                isCxMode={isCxMode}
-              />
-            )}
-
-            {activeView === "settings" && (
-              <SettingsView
-                environment={environment}
-                organizationId={organizationId}
-                localSurvey={localSurvey}
-                setLocalSurvey={setLocalSurvey}
-                actionClasses={actionClasses}
-                attributeClasses={attributeClasses}
-                segments={segments}
-                responseCount={responseCount}
-                membershipRole={membershipRole}
-                isUserTargetingAllowed={isUserTargetingAllowed}
-                isFormbricksCloud={isFormbricksCloud}
-                product={localProduct}
-              />
-            )}
-          </main>
-
-          <aside className="group hidden flex-1 flex-shrink-0 items-center justify-center overflow-hidden border-l border-slate-200 bg-slate-100 shadow-inner md:flex md:flex-col">
-            <PreviewSurvey
-              survey={localSurvey}
-              questionId={activeQuestionId}
+          {activeView === "questions" && (
+            <QuestionsView
+              localSurvey={localSurvey}
+              setLocalSurvey={setLocalSurvey}
+              activeQuestionId={activeQuestionId}
+              setActiveQuestionId={setActiveQuestionId}
               product={localProduct}
-              environment={environment}
-              previewType={
-                localSurvey.type === "app" || localSurvey.type === "website" ? "modal" : "fullwidth"
-              }
-              languageCode={selectedLanguageCode}
-              onFileUpload={async (file) => file.name}
+              invalidQuestions={invalidQuestions}
+              setInvalidQuestions={setInvalidQuestions}
+              selectedLanguageCode={selectedLanguageCode ? selectedLanguageCode : "default"}
+              setSelectedLanguageCode={setSelectedLanguageCode}
+              isMultiLanguageAllowed={isMultiLanguageAllowed}
+              isFormbricksCloud={isFormbricksCloud}
+              attributeClasses={attributeClasses}
+              plan={plan}
+              isCxMode={isCxMode}
             />
-          </aside>
-        </div>
+          )}
+
+          {activeView === "styling" && product.styling.allowStyleOverwrite && (
+            <StylingView
+              colors={colors}
+              environment={environment}
+              localSurvey={localSurvey}
+              setLocalSurvey={setLocalSurvey}
+              product={localProduct}
+              styling={styling ?? null}
+              setStyling={setStyling}
+              localStylingChanges={localStylingChanges}
+              setLocalStylingChanges={setLocalStylingChanges}
+              isUnsplashConfigured={isUnsplashConfigured}
+              isCxMode={isCxMode}
+            />
+          )}
+
+          {activeView === "settings" && (
+            <SettingsView
+              environment={environment}
+              organizationId={organizationId}
+              localSurvey={localSurvey}
+              setLocalSurvey={setLocalSurvey}
+              actionClasses={actionClasses}
+              attributeClasses={attributeClasses}
+              segments={segments}
+              responseCount={responseCount}
+              membershipRole={membershipRole}
+              isUserTargetingAllowed={isUserTargetingAllowed}
+              isFormbricksCloud={isFormbricksCloud}
+              product={localProduct}
+            />
+          )}
+        </main>
+
+        <aside className="group hidden flex-1 flex-shrink-0 items-center justify-center overflow-hidden border-l border-slate-200 bg-slate-100 shadow-inner md:flex md:flex-col">
+          <PreviewSurvey
+            survey={localSurvey}
+            questionId={activeQuestionId}
+            product={localProduct}
+            environment={environment}
+            previewType={localSurvey.type === "app" || localSurvey.type === "website" ? "modal" : "fullwidth"}
+            languageCode={selectedLanguageCode}
+            onFileUpload={async (file) => file.name}
+          />
+        </aside>
       </div>
-    </>
+    </div>
   );
 };

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx

@@ -192,7 +192,9 @@ export const SurveyMenuBar = ({
 
           toast.error(`${messageSplit} ${invalidLanguageLabels.join(", ")}`);
         } else {
-          toast.error(currentError.message);
+          toast.error(currentError.message, {
+            className: "w-fit !max-w-md",
+          });
         }
 
         return false;

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCard.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import * as Collapsible from "@radix-ui/react-collapsible";
+import { FileDigitIcon } from "lucide-react";
 import { cn } from "@formbricks/lib/cn";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { SurveyVariablesCardItem } from "./SurveyVariablesCardItem";
@@ -37,7 +38,9 @@ export const SurveyVariablesCard = ({
           open ? "bg-slate-50" : "bg-white group-hover:bg-slate-50",
           "flex w-10 items-center justify-center rounded-l-lg border-b border-l border-t group-aria-expanded:rounded-bl-none"
         )}>
-        <p>🪣</p>
+        <div className="flex w-full justify-center">
+          <FileDigitIcon className="h-4 w-4" />
+        </div>
       </div>
       <Collapsible.Root
         open={open}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyVariablesCardItem.tsx

@@ -1,9 +1,11 @@
 "use client";
 
+import { findVariableUsedInLogic } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { createId } from "@paralleldrive/cuid2";
 import { TrashIcon } from "lucide-react";
 import React, { useCallback, useEffect } from "react";
 import { useForm } from "react-hook-form";
+import toast from "react-hot-toast";
 import { extractRecallInfo } from "@formbricks/lib/utils/recall";
 import { TSurvey, TSurveyVariable } from "@formbricks/types/surveys/types";
 import { Button } from "@formbricks/ui/components/Button";
@@ -78,11 +80,19 @@ export const SurveyVariablesCardItem = ({
     return () => subscription.unsubscribe();
   }, [form, mode, editSurveyVariable]);
 
-  const onVaribleDelete = (variable: TSurveyVariable) => {
+  const onVariableDelete = (variable: TSurveyVariable) => {
     const questions = [...localSurvey.questions];
 
-    // find if this variable is used in any question's recall and remove it for every language
+    const quesIdx = findVariableUsedInLogic(localSurvey, variable.id);
 
+    if (quesIdx !== -1) {
+      toast.error(
+        `${variable.name} is used in logic of question ${quesIdx + 1}. Please remove it from logic first.`
+      );
+      return;
+    }
+
+    // find if this variable is used in any question's recall and remove it for every language
     questions.forEach((question) => {
       for (const [languageCode, headline] of Object.entries(question.headline)) {
         if (headline.includes(`recall:${variable.id}`)) {
@@ -216,7 +226,7 @@ export const SurveyVariablesCardItem = ({
                 type="button"
                 size="sm"
                 className="whitespace-nowrap"
-                onClick={() => onVaribleDelete(variable)}>
+                onClick={() => onVariableDelete(variable)}>
                 <TrashIcon className="h-4 w-4" />
               </Button>
             )}

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/logicRuleEngine.ts

@@ -0,0 +1,456 @@
+import { TSurveyQuestionTypeEnum, ZSurveyLogicConditionsOperator } from "@formbricks/types/surveys/types";
+
+export const logicRules = {
+  question: {
+    [`${TSurveyQuestionTypeEnum.OpenText}.text`]: {
+      options: [
+        {
+          label: "equals",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "does not equal",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: "contains",
+          value: ZSurveyLogicConditionsOperator.Enum.contains,
+        },
+        {
+          label: "does not contain",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotContain,
+        },
+        {
+          label: "starts with",
+          value: ZSurveyLogicConditionsOperator.Enum.startsWith,
+        },
+        {
+          label: "does not start with",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotStartWith,
+        },
+        {
+          label: "ends with",
+          value: ZSurveyLogicConditionsOperator.Enum.endsWith,
+        },
+        {
+          label: "does not end with",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEndWith,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [`${TSurveyQuestionTypeEnum.OpenText}.number`]: {
+      options: [
+        {
+          label: "=",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "!=",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: ">",
+          value: ZSurveyLogicConditionsOperator.Enum.isGreaterThan,
+        },
+        {
+          label: "<",
+          value: ZSurveyLogicConditionsOperator.Enum.isLessThan,
+        },
+        {
+          label: ">=",
+          value: ZSurveyLogicConditionsOperator.Enum.isGreaterThanOrEqual,
+        },
+        {
+          label: "<=",
+          value: ZSurveyLogicConditionsOperator.Enum.isLessThanOrEqual,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.MultipleChoiceSingle]: {
+      options: [
+        {
+          label: "equals",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "does not equal",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: "equals one of",
+          value: ZSurveyLogicConditionsOperator.Enum.equalsOneOf,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.MultipleChoiceMulti]: {
+      options: [
+        {
+          label: "equals",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "does not equal",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: "includes all of",
+          value: ZSurveyLogicConditionsOperator.Enum.includesAllOf,
+        },
+        {
+          label: "includes one of",
+          value: ZSurveyLogicConditionsOperator.Enum.includesOneOf,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.PictureSelection]: {
+      options: [
+        {
+          label: "equals",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "does not equal",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: "includes all of",
+          value: ZSurveyLogicConditionsOperator.Enum.includesAllOf,
+        },
+        {
+          label: "includes one of",
+          value: ZSurveyLogicConditionsOperator.Enum.includesOneOf,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Rating]: {
+      options: [
+        {
+          label: "=",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "!=",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: ">",
+          value: ZSurveyLogicConditionsOperator.Enum.isGreaterThan,
+        },
+        {
+          label: "<",
+          value: ZSurveyLogicConditionsOperator.Enum.isLessThan,
+        },
+        {
+          label: ">=",
+          value: ZSurveyLogicConditionsOperator.Enum.isGreaterThanOrEqual,
+        },
+        {
+          label: "<=",
+          value: ZSurveyLogicConditionsOperator.Enum.isLessThanOrEqual,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.NPS]: {
+      options: [
+        {
+          label: "=",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "!=",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: ">",
+          value: ZSurveyLogicConditionsOperator.Enum.isGreaterThan,
+        },
+        {
+          label: "<",
+          value: ZSurveyLogicConditionsOperator.Enum.isLessThan,
+        },
+        {
+          label: ">=",
+          value: ZSurveyLogicConditionsOperator.Enum.isGreaterThanOrEqual,
+        },
+        {
+          label: "<=",
+          value: ZSurveyLogicConditionsOperator.Enum.isLessThanOrEqual,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.CTA]: {
+      options: [
+        {
+          label: "is clicked",
+          value: ZSurveyLogicConditionsOperator.Enum.isClicked,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Consent]: {
+      options: [
+        {
+          label: "is accepted",
+          value: ZSurveyLogicConditionsOperator.Enum.isAccepted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Date]: {
+      options: [
+        {
+          label: "equals",
+          value: ZSurveyLogicConditionsOperator.Enum.equals,
+        },
+        {
+          label: "does not equal",
+          value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+        },
+        {
+          label: "is before",
+          value: ZSurveyLogicConditionsOperator.Enum.isBefore,
+        },
+        {
+          label: "is after",
+          value: ZSurveyLogicConditionsOperator.Enum.isAfter,
+        },
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.FileUpload]: {
+      options: [
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Ranking]: {
+      options: [
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Cal]: {
+      options: [
+        {
+          label: "is booked",
+          value: ZSurveyLogicConditionsOperator.Enum.isBooked,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Matrix]: {
+      options: [
+        {
+          label: "is partially submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isPartiallySubmitted,
+        },
+        {
+          label: "is completely submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isCompletelySubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+    [TSurveyQuestionTypeEnum.Address]: {
+      options: [
+        {
+          label: "is submitted",
+          value: ZSurveyLogicConditionsOperator.Enum.isSubmitted,
+        },
+        {
+          label: "is skipped",
+          value: ZSurveyLogicConditionsOperator.Enum.isSkipped,
+        },
+      ],
+    },
+  },
+  ["variable.text"]: {
+    options: [
+      {
+        label: "equals",
+        value: ZSurveyLogicConditionsOperator.Enum.equals,
+      },
+      {
+        label: "does not equal",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+      },
+      {
+        label: "contains",
+        value: ZSurveyLogicConditionsOperator.Enum.contains,
+      },
+      {
+        label: "does not contain",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotContain,
+      },
+      {
+        label: "starts with",
+        value: ZSurveyLogicConditionsOperator.Enum.startsWith,
+      },
+      {
+        label: "does not start with",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotStartWith,
+      },
+      {
+        label: "ends with",
+        value: ZSurveyLogicConditionsOperator.Enum.endsWith,
+      },
+      {
+        label: "does not end with",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotEndWith,
+      },
+    ],
+  },
+  ["variable.number"]: {
+    options: [
+      {
+        label: "=",
+        value: ZSurveyLogicConditionsOperator.Enum.equals,
+      },
+      {
+        label: "!=",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+      },
+      {
+        label: ">",
+        value: ZSurveyLogicConditionsOperator.Enum.isGreaterThan,
+      },
+      {
+        label: "<",
+        value: ZSurveyLogicConditionsOperator.Enum.isLessThan,
+      },
+      {
+        label: ">=",
+        value: ZSurveyLogicConditionsOperator.Enum.isGreaterThanOrEqual,
+      },
+      {
+        label: "<=",
+        value: ZSurveyLogicConditionsOperator.Enum.isLessThanOrEqual,
+      },
+    ],
+  },
+  hiddenField: {
+    options: [
+      {
+        label: "equals",
+        value: ZSurveyLogicConditionsOperator.Enum.equals,
+      },
+      {
+        label: "does not equal",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
+      },
+      {
+        label: "contains",
+        value: ZSurveyLogicConditionsOperator.Enum.contains,
+      },
+      {
+        label: "does not contain",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotContain,
+      },
+      {
+        label: "starts with",
+        value: ZSurveyLogicConditionsOperator.Enum.startsWith,
+      },
+      {
+        label: "does not start with",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotStartWith,
+      },
+      {
+        label: "ends with",
+        value: ZSurveyLogicConditionsOperator.Enum.endsWith,
+      },
+      {
+        label: "does not end with",
+        value: ZSurveyLogicConditionsOperator.Enum.doesNotEndWith,
+      },
+    ],
+  },
+};
+
+export type TLogicRuleOption = (typeof logicRules.question)[keyof typeof logicRules.question]["options"];

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/util.tsx

@@ -1,18 +0,0 @@
-// formats the text to highlight specific parts of the text with slashes
-export const formatTextWithSlashes = (text: string) => {
-  const regex = /\/(.*?)\\/g;
-  const parts = text.split(regex);
-
-  return parts.map((part, index) => {
-    // Check if the part was inside slashes
-    if (index % 2 !== 0) {
-      return (
-        <span key={index} className="mx-1 rounded-md bg-slate-100 p-1 px-2 text-xs">
-          {part}
-        </span>
-      );
-    } else {
-      return part;
-    }
-  });
-};

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/validation.ts

@@ -178,6 +178,11 @@ export const isEndingCardValid = (
   surveyLanguages: TSurveyLanguage[]
 ) => {
   if (card.type === "endScreen") {
+    const parseResult = z.string().url().safeParse(card.buttonLink);
+    if (card.buttonLabel !== undefined && !parseResult.success) {
+      return false;
+    }
+
     return (
       isContentValid(card.headline, surveyLanguages) &&
       isContentValid(card.subheader, surveyLanguages) &&
@@ -188,7 +193,6 @@ export const isEndingCardValid = (
     if (parseResult.success) {
       return card.label?.trim() !== "";
     } else {
-      toast.error("Invalid Redirect Url in Ending card");
       return false;
     }
   }

apps/web/app/(app)/environments/[environmentId]/(people)/segments/components/EditSegmentModal.tsx

@@ -2,7 +2,6 @@
 
 import { UsersIcon } from "lucide-react";
 import { SegmentSettings } from "@formbricks/ee/advanced-targeting/components/segment-settings";
-import { TActionClass } from "@formbricks/types/action-classes";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSegment, TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { ModalWithTabs } from "@formbricks/ui/components/ModalWithTabs";
@@ -16,7 +15,6 @@ interface EditSegmentModalProps {
   currentSegment: TSegmentWithSurveyNames;
   segments: TSegment[];
   attributeClasses: TAttributeClass[];
-  actionClasses: TActionClass[];
   isAdvancedTargetingAllowed: boolean;
   isFormbricksCloud: boolean;
 }
@@ -26,7 +24,6 @@ export const EditSegmentModal = ({
   open,
   setOpen,
   currentSegment,
-  actionClasses,
   attributeClasses,
   segments,
   isAdvancedTargetingAllowed,
@@ -36,7 +33,6 @@ export const EditSegmentModal = ({
     if (isAdvancedTargetingAllowed) {
       return (
         <SegmentSettings
-          actionClasses={actionClasses}
           attributeClasses={attributeClasses}
           environmentId={environmentId}
           initialSegment={currentSegment}

apps/web/app/(app)/environments/[environmentId]/(people)/segments/components/SegmentTable.tsx

@@ -1,4 +1,3 @@
-import { TActionClass } from "@formbricks/types/action-classes";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSegment } from "@formbricks/types/segment";
 import { SegmentTableDataRowContainer } from "./SegmentTableDataRowContainer";
@@ -6,13 +5,11 @@ import { SegmentTableDataRowContainer } from "./SegmentTableDataRowContainer";
 type TSegmentTableProps = {
   segments: TSegment[];
   attributeClasses: TAttributeClass[];
-  actionClasses: TActionClass[];
   isAdvancedTargetingAllowed: boolean;
 };
 
 export const SegmentTable = ({
   segments,
-  actionClasses,
   attributeClasses,
   isAdvancedTargetingAllowed,
 }: TSegmentTableProps) => {
@@ -32,7 +29,6 @@ export const SegmentTable = ({
             <SegmentTableDataRowContainer
               currentSegment={segment}
               segments={segments}
-              actionClasses={actionClasses}
               attributeClasses={attributeClasses}
               isAdvancedTargetingAllowed={isAdvancedTargetingAllowed}
             />

apps/web/app/(app)/environments/[environmentId]/(people)/segments/components/SegmentTableDataRow.tsx

@@ -3,7 +3,6 @@
 import { format, formatDistanceToNow } from "date-fns";
 import { UsersIcon } from "lucide-react";
 import { useState } from "react";
-import { TActionClass } from "@formbricks/types/action-classes";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSegment, TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { EditSegmentModal } from "./EditSegmentModal";
@@ -12,14 +11,12 @@ type TSegmentTableDataRowProps = {
   currentSegment: TSegmentWithSurveyNames;
   segments: TSegment[];
   attributeClasses: TAttributeClass[];
-  actionClasses: TActionClass[];
   isAdvancedTargetingAllowed: boolean;
   isFormbricksCloud: boolean;
 };
 
 export const SegmentTableDataRow = ({
   currentSegment,
-  actionClasses,
   attributeClasses,
   segments,
   isAdvancedTargetingAllowed,
@@ -65,7 +62,6 @@ export const SegmentTableDataRow = ({
         open={isEditSegmentModalOpen}
         setOpen={setIsEditSegmentModalOpen}
         currentSegment={currentSegment}
-        actionClasses={actionClasses}
         attributeClasses={attributeClasses}
         segments={segments}
         isAdvancedTargetingAllowed={isAdvancedTargetingAllowed}

apps/web/app/(app)/environments/[environmentId]/(people)/segments/components/SegmentTableDataRowContainer.tsx

@@ -1,6 +1,5 @@
 import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
 import { getSurveysBySegmentId } from "@formbricks/lib/survey/service";
-import { TActionClass } from "@formbricks/types/action-classes";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSegment } from "@formbricks/types/segment";
 import { SegmentTableDataRow } from "./SegmentTableDataRow";
@@ -9,14 +8,12 @@ type TSegmentTableDataRowProps = {
   currentSegment: TSegment;
   segments: TSegment[];
   attributeClasses: TAttributeClass[];
-  actionClasses: TActionClass[];
   isAdvancedTargetingAllowed: boolean;
 };
 
 export const SegmentTableDataRowContainer = async ({
   currentSegment,
   segments,
-  actionClasses,
   attributeClasses,
   isAdvancedTargetingAllowed,
 }: TSegmentTableDataRowProps) => {
@@ -38,7 +35,6 @@ export const SegmentTableDataRowContainer = async ({
         inactiveSurveys,
       }}
       segments={segments}
-      actionClasses={actionClasses}
       attributeClasses={attributeClasses}
       isAdvancedTargetingAllowed={isAdvancedTargetingAllowed}
       isFormbricksCloud={IS_FORMBRICKS_CLOUD}

apps/web/app/(app)/environments/[environmentId]/(people)/segments/page.tsx

@@ -3,7 +3,6 @@ import { BasicCreateSegmentModal } from "@/app/(app)/environments/[environmentId
 import { SegmentTable } from "@/app/(app)/environments/[environmentId]/(people)/segments/components/SegmentTable";
 import { CreateSegmentModal } from "@formbricks/ee/advanced-targeting/components/create-segment-modal";
 import { getAdvancedTargetingPermission } from "@formbricks/ee/lib/service";
-import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
 import { getEnvironment } from "@formbricks/lib/environment/service";
@@ -13,11 +12,10 @@ import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
 const Page = async ({ params }) => {
-  const [environment, segments, attributeClasses, actionClasses, organization] = await Promise.all([
+  const [environment, segments, attributeClasses, organization] = await Promise.all([
     getEnvironment(params.environmentId),
     getSegments(params.environmentId),
     getAttributeClasses(params.environmentId),
-    getActionClasses(params.environmentId),
     getOrganizationByEnvironmentId(params.environmentId),
   ]);
 
@@ -41,7 +39,6 @@ const Page = async ({ params }) => {
     isAdvancedTargetingAllowed ? (
       <CreateSegmentModal
         environmentId={params.environmentId}
-        actionClasses={actionClasses}
         attributeClasses={attributeClasses}
         segments={filteredSegments}
       />
@@ -60,7 +57,6 @@ const Page = async ({ params }) => {
       </PageHeader>
       <SegmentTable
         segments={filteredSegments}
-        actionClasses={actionClasses}
         attributeClasses={attributeClasses}
         isAdvancedTargetingAllowed={isAdvancedTargetingAllowed}
       />

apps/web/app/(app)/environments/[environmentId]/components/EnvironmentStorageHandler.tsx

@@ -0,0 +1,18 @@
+"use client";
+
+import { useEffect } from "react";
+import { FORMBRICKS_ENVIRONMENT_ID_LS } from "@formbricks/lib/localStorage";
+
+interface EnvironmentStorageHandlerProps {
+  environmentId: string;
+}
+
+const EnvironmentStorageHandler = ({ environmentId }: EnvironmentStorageHandlerProps) => {
+  useEffect(() => {
+    localStorage.setItem(FORMBRICKS_ENVIRONMENT_ID_LS, environmentId);
+  }, [environmentId]);
+
+  return null;
+};
+
+export default EnvironmentStorageHandler;

apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx

@@ -32,7 +32,6 @@ import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
 import { cn } from "@formbricks/lib/cn";
-import { FORMBRICKS_PRODUCT_ID_LS, FORMBRICKS_SURVEYS_FILTERS_KEY_LS } from "@formbricks/lib/localStorage";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { capitalizeFirstLetter } from "@formbricks/lib/utils/strings";
 import { TEnvironment } from "@formbricks/types/environment";
@@ -119,16 +118,6 @@ export const MainNavigation = ({
     }
   }, [organization]);
 
-  useEffect(() => {
-    if (typeof window === "undefined") return;
-
-    const productId = localStorage.getItem(FORMBRICKS_PRODUCT_ID_LS);
-    const targetProduct = products.find((product) => product.id === productId);
-    if (targetProduct && productId && product && product.id !== targetProduct.id) {
-      router.push(`/products/${targetProduct.id}/`);
-    }
-  }, []);
-
   const sortedOrganizations = useMemo(() => {
     return [...organizations].sort((a, b) => a.name.localeCompare(b.name));
   }, [organizations]);
@@ -155,12 +144,6 @@ export const MainNavigation = ({
   }, [products]);
 
   const handleEnvironmentChangeByProduct = (productId: string) => {
-    if (typeof window !== "undefined") {
-      localStorage.setItem(FORMBRICKS_PRODUCT_ID_LS, productId);
-
-      // Remove filters when switching products
-      localStorage.removeItem(FORMBRICKS_SURVEYS_FILTERS_KEY_LS);
-    }
     router.push(`/products/${productId}/`);
   };
 

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.tsx

@@ -53,6 +53,7 @@ export type IntegrationModalInputs = {
   table: string;
   survey: string;
   questions: string[];
+  includeVariables: boolean;
   includeHiddenFields: boolean;
   includeMetadata: boolean;
 };
@@ -97,8 +98,9 @@ export const AddIntegrationModal = ({
       const { index: _index, ...rest } = defaultData;
       reset(rest);
       fetchTable(defaultData.base);
-      setIncludeHiddenFields(defaultData.includeHiddenFields);
-      setIncludeMetadata(defaultData.includeMetadata);
+      setIncludeVariables(!!defaultData.includeVariables);
+      setIncludeHiddenFields(!!defaultData.includeHiddenFields);
+      setIncludeMetadata(!!defaultData.includeMetadata);
     } else {
       reset();
     }
@@ -106,6 +108,12 @@ export const AddIntegrationModal = ({
   }, [isEditMode]);
 
   const survey = watch("survey");
+  const includeVariables = watch("includeVariables");
+
+  const setIncludeVariables = (includeVariables: boolean) => {
+    setValue("includeVariables", includeVariables);
+  };
+
   const selectedSurvey = surveys.find((item) => item.id === survey);
   const submitHandler = async (data: IntegrationModalInputs) => {
     try {
@@ -136,6 +144,7 @@ export const AddIntegrationModal = ({
         baseId: data.base,
         tableId: data.table,
         tableName: currentTable?.name ?? "",
+        includeVariables: data.includeVariables,
         includeHiddenFields,
         includeMetadata,
       };
@@ -335,6 +344,8 @@ export const AddIntegrationModal = ({
                   </div>
                 </div>
                 <AdditionalIntegrationSettings
+                  includeVariables={includeVariables}
+                  setIncludeVariables={setIncludeVariables}
                   includeHiddenFields={includeHiddenFields}
                   includeMetadata={includeMetadata}
                   setIncludeHiddenFields={setIncludeHiddenFields}

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/ManageIntegration.tsx

@@ -108,6 +108,7 @@ export const ManageIntegration = (props: ManageIntegrationProps) => {
                   questions: data.questionIds,
                   survey: data.surveyId,
                   table: data.tableId,
+                  includeVariables: !!data.includeVariables,
                   includeHiddenFields: !!data.includeHiddenFields,
                   includeMetadata: !!data.includeMetadata,
                   index,

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal.tsx

@@ -62,6 +62,7 @@ export const AddIntegrationModal = ({
   const [spreadsheetUrl, setSpreadsheetUrl] = useState("");
   const [isDeleting, setIsDeleting] = useState<boolean>(false);
   const existingIntegrationData = googleSheetIntegration?.config?.data;
+  const [includeVariables, setIncludeVariables] = useState(false);
   const [includeHiddenFields, setIncludeHiddenFields] = useState(false);
   const [includeMetadata, setIncludeMetadata] = useState(false);
   const googleSheetIntegrationData: TIntegrationGoogleSheetsInput = {
@@ -89,6 +90,7 @@ export const AddIntegrationModal = ({
         })!
       );
       setSelectedQuestions(selectedIntegration.questionIds);
+      setIncludeVariables(!!selectedIntegration.includeVariables);
       setIncludeHiddenFields(!!selectedIntegration.includeHiddenFields);
       setIncludeMetadata(!!selectedIntegration.includeMetadata);
       return;
@@ -127,6 +129,7 @@ export const AddIntegrationModal = ({
           ? "All questions"
           : "Selected questions";
       integrationData.createdAt = new Date();
+      integrationData.includeVariables = includeVariables;
       integrationData.includeHiddenFields = includeHiddenFields;
       integrationData.includeMetadata = includeMetadata;
       if (selectedIntegration) {
@@ -229,7 +232,7 @@ export const AddIntegrationModal = ({
                 <div className="space-y-4">
                   <div>
                     <Label htmlFor="Surveys">Questions</Label>
-                    <div className="mt-1 max-h-[15vh] overflow-y-auto rounded-lg border border-slate-200">
+                    <div className="mt-1 max-h-[15vh] overflow-y-auto overflow-x-hidden rounded-lg border border-slate-200">
                       <div className="grid content-center rounded-lg bg-slate-50 p-3 text-left text-sm text-slate-900">
                         {replaceHeadlineRecall(selectedSurvey, "default", attributeClasses)?.questions.map(
                           (question) => (
@@ -256,6 +259,8 @@ export const AddIntegrationModal = ({
                     </div>
                   </div>
                   <AdditionalIntegrationSettings
+                    includeVariables={includeVariables}
+                    setIncludeVariables={setIncludeVariables}
                     includeHiddenFields={includeHiddenFields}
                     includeMetadata={includeMetadata}
                     setIncludeHiddenFields={setIncludeHiddenFields}