Merge branch 'feature/ai-summary' of https://github.com/formbricks/formbricks into 363-ai-fix-current-feature

Co-authored-by: Dhruwang <dhruwangjariwala18@gmail.com>

.env.example

@@ -180,3 +180,9 @@ UNSPLASH_ACCESS_KEY=
 
 # Disable custom cache handler if necessary (e.g. if deployed on Vercel)
 # CUSTOM_CACHE_DISABLED=1
+
+# Azure AI settings
+# AI_AZURE_RESSOURCE_NAME=
+# AI_AZURE_API_KEY=
+# AI_AZURE_EMBEDDINGS_DEPLOYMENT_ID=
+# AI_AZURE_LLM_DEPLOYMENT_ID=

.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

.github/workflows/e2e.yml

@@ -51,7 +51,6 @@ jobs:
           sed -i "s/NEXTAUTH_SECRET=.*/NEXTAUTH_SECRET=${RANDOM_KEY}/" .env
           sed -i "s/ENTERPRISE_LICENSE_KEY=.*/ENTERPRISE_LICENSE_KEY=${RANDOM_KEY}/" .env
           echo "E2E_TESTING=1" >> .env
-          echo "NEXT_PUBLIC_E2E_TESTING=1" >> .env
         shell: bash
 
       - name: Build App

.github/workflows/semantic-pull-requests.yml

@@ -20,6 +20,20 @@ jobs:
         id: lint_pr_title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            fix
+            feat
+            chore
+            docs
+            style
+            refactor
+            perf
+            test
+            build
+            ci
+            revert
+            ossgg
 
       - uses: marocchino/sticky-pull-request-comment@v2
         # When the previous steps fails, the workflow would stop. By adding this

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.tsx

@@ -1,6 +1,6 @@
 import type { AppProps } from "next/app";
 import Head from "next/head";
-import "../styles/globals.css";
+import "@formbricks/ui/globals.css";
 
 const App = ({ Component, pageProps }: AppProps) => {
   return (

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/demo/styles/globals.css

@@ -1,26 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-/* Example on overriding packages/js colors */
-.dark {
-  --fb-brand-color: red;
-  --fb-brand-text-color: white;
-  --fb-border-color: green;
-  --fb-border-color-highlight: var(--slate-500);
-  --fb-focus-color: red;
-  --fb-heading-color: yellow;
-  --fb-subheading-color: green;
-  --fb-info-text-color: orange;
-  --fb-signature-text-color: blue;
-  --fb-survey-background-color: black;
-  --fb-accent-background-color: rgb(13, 13, 12);
-  --fb-accent-background-color-selected: red;
-  --fb-placeholder-color: white;
-  --fb-shadow-color: yellow;
-  --fb-rating-fill: var(--yellow-300);
-  --fb-rating-hover: var(--yellow-500);
-  --fb-back-btn-border: currentColor;
-  --fb-submit-btn-border: transparent;
-  --fb-rating-selected: black;
-}

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/docs-feedback/page.mdx

@@ -129,10 +129,8 @@ Locate that file. We are using the [Tailwind Template “Syntax”](https://tail
 ```tsx
 import { useRouter } from "next/router";
 import { useState } from "react";
-
-import { Button } from "@formbricks/ui/Button";
-import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
-
+import { Button } from "@formbricks/ui/components/Button";
+import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/components/Popover";
 import { handleFeedbackSubmit, updateFeedback } from "../../lib/handleFeedbackSubmit";
 
 export const DocsFeedback = () => {

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/contributing/get-started/components/FAQ.tsx

@@ -1,4 +1,9 @@
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@formbricks/ui/Accordion";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@formbricks/ui/components/Accordion";
 import { FaqJsonLdComponent } from "./FAQPageJsonLd";
 
 const FAQ_DATA = [

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/shareable-dashboards/page.mdx

@@ -0,0 +1,75 @@
+import { MdxImage } from "@/components/MdxImage";
+
+import StepOne from "./images/1-publish-to-web.webp";
+import StepTwo from "./images/2-warning-publish.webp";
+import StepThree from "./images/3-share-link.webp";
+
+export const metadata = {
+  title: "Shareable Dashboards",
+  description:
+    "Create shareable links to dashboards of specific surveys.",
+};
+
+# Shareable Dashboards
+
+Formbricks allows you to create public, shareable versions of your survey results dashboards. This feature enables you to easily share survey results with stakeholders, team members, or the public without granting access to your Formbricks account.
+
+## How To Publish Survey Results
+
+1. **Go to survey summary**: Choose the survey for which you want to create a shareable dashboard and go to its summary page.
+
+2. **Share results**: Click the "Share results" and then "Publish to web".
+
+<MdxImage
+  src={StepOne}
+  alt="Go to survey summary"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+3. **Confirm**: Click "Publish to public web" (it's public).
+
+<MdxImage
+  src={StepTwo}
+  alt="Go to survey summary"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+4. **Share link**: Formbricks has generated a unique URL for your public dashboard. Share it around.
+
+<MdxImage
+  src={StepThree}
+  alt="Go to survey summary"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+<Note>Whoever has access to the link can access the survey results.</Note>
+
+## How To Unpublish Survey Results
+
+Unpublish is very simple: Go to "Share results" -> "Unpublish from web" -> "Unpublish".
+
+<MdxImage
+  src={StepThree}
+  alt="Go to survey summary"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+## Key Features
+
+- **Read-only access**: Viewers can see survey results but cannot modify data or settings.
+- **Real-time updates**: The shared dashboard reflects current survey data in real-time.
+- **Filters included**: Visitors can access all filters to dissect the data.
+- **Revocable access**: You can disable the shared link at any time to restrict access.
+
+## Use Cases
+
+- Share results with clients or stakeholders
+- Publish survey findings to your website or blog
+- Collaborate with team members without sharing account credentials
+- Create transparency by making certain survey results public
+
+Shareable dashboards provide a simple yet powerful way to disseminate survey insights while maintaining control over your Formbricks account and data.

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

@@ -38,7 +38,7 @@ These variables are present inside your machine’s docker-compose file. Restart
 | S3_SECRET_KEY                | Secret key for S3.                                                                                             | optional                                                | (resolved by the AWS SDK) |
 | S3_REGION                    | Region for S3.                                                                                                 | optional                                                | (resolved by the AWS SDK) |
 | S3_BUCKET_NAME               | S3 bucket name for data storage. Formbricks enables S3 storage when this is set.                               | optional (required if S3 is enabled)                    |                           |
-| S3_ENDPOINT                  | Endpoint for S3.                                                                                               | optional                                                | (resolved by the AWS SDK) |
+| S3_ENDPOINT_URL              | Endpoint for S3.                                                                                               | optional                                                | (resolved by the AWS SDK) |
 | PRIVACY_URL                  | URL for privacy policy.                                                                                        | optional                                                |                           |
 | TERMS_URL                    | URL for terms of service.                                                                                      | optional                                                |                           |
 | IMPRINT_URL                  | URL for imprint.                                                                                               | optional                                                |                           |

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/ResponsiveVideo.tsx

@@ -1,15 +1,17 @@
-// ResponsiveVideo.js
+// ResponsiveVideo.tsx
 export const ResponsiveVideo = ({ src, title }) => {
   return (
-    <div className="relative w-full overflow-hidden pt-[56.25%]">
-      <iframe
-        src={src}
-        title={title}
-        frameBorder="0"
-        className="absolute left-0 top-0 h-full w-full"
-        referrerPolicy="strict-origin-when-cross-origin"
-        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-        allowFullScreen></iframe>
+    <div className="max-w-[1280px]">
+      <div className="relative w-full overflow-hidden pt-[56.25%]">
+        <iframe
+          src={src}
+          title={title}
+          frameBorder="0"
+          className="absolute left-0 top-0 h-full w-full"
+          referrerPolicy="strict-origin-when-cross-origin"
+          allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+          allowFullScreen></iframe>
+      </div>
     </div>
   );
 };

apps/docs/lib/navigation.ts

@@ -44,6 +44,7 @@ export const navigation: Array<NavGroup> = [
           { title: "Limit submissions", href: "/global/limit-submissions" }, // global
           { title: "Recall Functionality", href: "/global/recall" }, // global
           { title: "Partial Submissions", href: "/global/partial-submissions" }, // global
+          { title: "Shareable Dashboards", href: "/global/shareable-dashboards" },
         ],
       },
     ],
@@ -56,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
@@ -68,6 +69,7 @@ export const navigation: Array<NavGroup> = [
           { title: "Limit submissions", href: "/global/limit-submissions" }, // global
           { title: "Recall Functionality", href: "/global/recall" }, // global
           { title: "Partial Submissions", href: "/global/partial-submissions" }, // global
+          { title: "Shareable Dashboards", href: "/global/shareable-dashboards" },
         ],
       },
     ],
@@ -91,6 +93,7 @@ export const navigation: Array<NavGroup> = [
           { title: "User Metadata", href: "/global/metadata" },
           { title: "Custom Styling", href: "/global/overwrite-styling" }, // global
           { title: "Conditional Logic", href: "/global/conditional-logic" },
+          { title: "Shareable Dashboards", href: "/global/shareable-dashboards" },
           { title: "Start & End Dates", href: "/global/custom-start-end-conditions" },
           { title: "Limit submissions", href: "/global/limit-submissions" }, // global
           { title: "Recall Functionality", href: "/global/recall" },

apps/storybook/tailwind.config.js

@@ -1,5 +1,5 @@
 /** @type {import('tailwindcss').Config} */
-import base from "../../packages/config-tailwind/tailwind.config";
+import base from "../../packages/ui/tailwind.config";
 
 export default {
   ...base,

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

@@ -1,15 +1,12 @@
 "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";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TProductConfigChannel } from "@formbricks/types/product";
-import { Button } from "@formbricks/ui/Button";
+import { Button } from "@formbricks/ui/components/Button";
 import { OnboardingSetupInstructions } from "./OnboardingSetupInstructions";
 
 interface ConnectWithFormbricksProps {
@@ -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

@@ -7,9 +7,9 @@ import { FormProvider, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { z } from "zod";
 import { TOrganization } from "@formbricks/types/organizations";
-import { Button } from "@formbricks/ui/Button";
-import { FormControl, FormError, FormField, FormItem, FormLabel } from "@formbricks/ui/Form";
-import { Input } from "@formbricks/ui/Input";
+import { Button } from "@formbricks/ui/components/Button";
+import { FormControl, FormError, FormField, FormItem, FormLabel } from "@formbricks/ui/components/Form";
+import { Input } from "@formbricks/ui/components/Input";
 
 interface InviteOrganizationMemberProps {
   organization: TOrganization;
@@ -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/components/OnboardingSetupInstructions.tsx

@@ -4,10 +4,10 @@ import "prismjs/themes/prism.css";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { TProductConfigChannel } from "@formbricks/types/product";
-import { Button } from "@formbricks/ui/Button";
-import { CodeBlock } from "@formbricks/ui/CodeBlock";
-import { TabBar } from "@formbricks/ui/TabBar";
-import { Html5Icon, NpmIcon } from "@formbricks/ui/icons";
+import { Button } from "@formbricks/ui/components/Button";
+import { CodeBlock } from "@formbricks/ui/components/CodeBlock";
+import { TabBar } from "@formbricks/ui/components/TabBar";
+import { Html5Icon, NpmIcon } from "@formbricks/ui/components/icons";
 
 const tabs = [
   { id: "html", label: "HTML", icon: <Html5Icon /> },

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

@@ -5,8 +5,8 @@ import { notFound, redirect } from "next/navigation";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface InvitePageProps {
   params: {
@@ -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

@@ -1,11 +1,10 @@
 import { ConnectWithFormbricks } from "@/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks";
-import { getCustomHeadline } from "@/app/(app)/(onboarding)/lib/utils";
 import { XIcon } from "lucide-react";
 import { WEBAPP_URL } from "@formbricks/lib/constants";
 import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface ConnectPageProps {
   params: {
@@ -26,16 +25,10 @@ const Page = async ({ params }: ConnectPageProps) => {
   }
 
   const channel = product.config.channel || null;
-  const industry = product.config.industry || null;
-
-  const customHeadline = getCustomHeadline(channel, industry);
 
   return (
     <div className="flex min-h-full flex-col items-center justify-center py-10">
-      <Header
-        title={`Let's connect your ${customHeadline} 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/components/XMTemplateList.tsx

@@ -12,7 +12,7 @@ import { TProduct } from "@formbricks/types/product";
 import { TSurveyCreateInput } from "@formbricks/types/surveys/types";
 import { TXMTemplate } from "@formbricks/types/templates";
 import { TUser } from "@formbricks/types/user";
-import { createSurveyAction } from "@formbricks/ui/TemplateList/actions";
+import { createSurveyAction } from "@formbricks/ui/components/TemplateList/actions";
 
 interface XMTemplateListProps {
   product: TProduct;

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/page.tsx

@@ -6,8 +6,8 @@ import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getOrganizationIdFromEnvironmentId } from "@formbricks/lib/organization/utils";
 import { getProductByEnvironmentId, getProducts } from "@formbricks/lib/product/service";
 import { getUser } from "@formbricks/lib/user/service";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface XMTemplatePageProps {
   params: {

apps/web/app/(app)/(onboarding)/lib/utils.ts

@@ -1,13 +1,12 @@
-import { TProductConfigChannel, TProductConfigIndustry } from "@formbricks/types/product";
+import { TProductConfigChannel } from "@formbricks/types/product";
 
-export const getCustomHeadline = (channel?: TProductConfigChannel, industry?: TProductConfigIndustry) => {
-  const combinations = {
-    "website+eCommerce": "web shop",
-    "website+saas": "landing page",
-    "website+other": "website",
-    "app+eCommerce": "shopping app",
-    "app+saas": "SaaS app",
-    "app+other": "app",
-  };
-  return combinations[`${channel}+${industry}`] || "product";
+export const getCustomHeadline = (channel?: TProductConfigChannel) => {
+  switch (channel) {
+    case "website":
+      return "Let's get the most out of your website traffic!";
+    case "app":
+      return "Let's research what your users need!";
+    default:
+      return "You maintain a product, how exciting!";
+  }
 };

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/layout.tsx

@@ -7,7 +7,7 @@ import { canUserAccessOrganization } from "@formbricks/lib/organization/auth";
 import { getOrganization } from "@formbricks/lib/organization/service";
 import { getUser } from "@formbricks/lib/user/service";
 import { AuthorizationError } from "@formbricks/types/errors";
-import { ToasterClient } from "@formbricks/ui/ToasterClient";
+import { ToasterClient } from "@formbricks/ui/components/ToasterClient";
 
 const ProductOnboardingLayout = async ({ children, params }) => {
   const session = await getServerSession(authOptions);

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/products/new/channel/page.tsx

@@ -1,8 +1,8 @@
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
 import { GlobeIcon, GlobeLockIcon, LinkIcon, XIcon } from "lucide-react";
 import { getProducts } from "@formbricks/lib/product/service";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface ChannelPageProps {
   params: {

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/products/new/industry/page.tsx

@@ -3,8 +3,8 @@ import { HeartIcon, MonitorIcon, ShoppingCart, XIcon } from "lucide-react";
 import { notFound } from "next/navigation";
 import { getProducts } from "@formbricks/lib/product/service";
 import { TProductConfigChannel } from "@formbricks/types/product";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface IndustryPageProps {
   params: {

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/products/new/mode/page.tsx

@@ -1,8 +1,8 @@
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
 import { HeartIcon, ListTodoIcon, XIcon } from "lucide-react";
 import { getProducts } from "@formbricks/lib/product/service";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface ModePageProps {
   params: {

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

@@ -1,6 +1,5 @@
 "use client";
 
-import { getCustomHeadline } from "@/app/(app)/(onboarding)/lib/utils";
 import { createProductAction } from "@/app/(app)/environments/[environmentId]/actions";
 import { zodResolver } from "@hookform/resolvers/zod";
 import Image from "next/image";
@@ -8,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,
@@ -17,8 +16,8 @@ import {
   TProductUpdateInput,
   ZProductUpdateInput,
 } from "@formbricks/types/product";
-import { Button } from "@formbricks/ui/Button";
-import { ColorPicker } from "@formbricks/ui/ColorPicker";
+import { Button } from "@formbricks/ui/components/Button";
+import { ColorPicker } from "@formbricks/ui/components/ColorPicker";
 import {
   FormControl,
   FormDescription,
@@ -27,9 +26,9 @@ import {
   FormItem,
   FormLabel,
   FormProvider,
-} from "@formbricks/ui/Form";
-import { Input } from "@formbricks/ui/Input";
-import { SurveyInline } from "@formbricks/ui/Survey";
+} from "@formbricks/ui/components/Form";
+import { Input } from "@formbricks/ui/components/Input";
+import { SurveyInline } from "@formbricks/ui/components/Survey";
 
 interface ProductSettingsProps {
   organizationId: string;
@@ -65,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);
           }
@@ -133,9 +130,7 @@ export const ProductSettings = ({
                 <FormItem className="w-full space-y-4">
                   <div>
                     <FormLabel>Product name</FormLabel>
-                    <FormDescription>
-                      What is your {getCustomHeadline(channel, industry)} called?
-                    </FormDescription>
+                    <FormDescription>What is your product called?</FormDescription>
                   </div>
                   <FormControl>
                     <div>

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

@@ -3,10 +3,9 @@ import { ProductSettings } from "@/app/(app)/(onboarding)/organizations/[organiz
 import { XIcon } from "lucide-react";
 import { DEFAULT_BRAND_COLOR } from "@formbricks/lib/constants";
 import { getProducts } from "@formbricks/lib/product/service";
-import { startsWithVowel } from "@formbricks/lib/utils/strings";
 import { TProductConfigChannel, TProductConfigIndustry, TProductMode } from "@formbricks/types/product";
-import { Button } from "@formbricks/ui/Button";
-import { Header } from "@formbricks/ui/Header";
+import { Button } from "@formbricks/ui/components/Button";
+import { Header } from "@formbricks/ui/components/Header";
 
 interface ProductSettingsPageProps {
   params: {
@@ -24,7 +23,7 @@ const Page = async ({ params, searchParams }: ProductSettingsPageProps) => {
   const industry = searchParams.industry || null;
   const mode = searchParams.mode || "surveys";
 
-  const customHeadline = getCustomHeadline(channel, industry);
+  const customHeadline = getCustomHeadline(channel);
   const products = await getProducts(params.organizationId);
 
   return (
@@ -36,7 +35,7 @@ const Page = async ({ params, searchParams }: ProductSettingsPageProps) => {
         />
       ) : (
         <Header
-          title={`You maintain ${startsWithVowel(customHeadline) ? "an " + customHeadline : "a " + customHeadline}, how exciting!`}
+          title={customHeadline}
           subtitle="Get 2x more responses matching surveys with your brand and UI"
         />
       )}

apps/web/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer.tsx

@@ -2,7 +2,7 @@ import { LucideProps } from "lucide-react";
 import Link from "next/link";
 import { ForwardRefExoticComponent, RefAttributes } from "react";
 import { cn } from "@formbricks/lib/cn";
-import { OptionCard } from "@formbricks/ui/OptionCard";
+import { OptionCard } from "@formbricks/ui/components/OptionCard";
 
 interface OnboardingOptionsContainerProps {
   options: {

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/layout.tsx

@@ -9,8 +9,8 @@ import { getEnvironment } from "@formbricks/lib/environment/service";
 import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
 import { getUser } from "@formbricks/lib/user/service";
 import { AuthorizationError } from "@formbricks/types/errors";
-import { DevEnvironmentBanner } from "@formbricks/ui/DevEnvironmentBanner";
-import { ToasterClient } from "@formbricks/ui/ToasterClient";
+import { DevEnvironmentBanner } from "@formbricks/ui/components/DevEnvironmentBanner";
+import { ToasterClient } from "@formbricks/ui/components/ToasterClient";
 
 const EnvLayout = async ({ children, params }) => {
   const session = await getServerSession(authOptions);

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

@@ -2,7 +2,7 @@
 
 import { TActionClass } from "@formbricks/types/action-classes";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { ModalWithTabs } from "@formbricks/ui/ModalWithTabs";
+import { ModalWithTabs } from "@formbricks/ui/components/ModalWithTabs";
 import { CreateNewActionTab } from "./CreateNewActionTab";
 import { SavedActionsTab } from "./SavedActionsTab";
 

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/AdvancedOptionToggle";
-import { Button } from "@formbricks/ui/Button";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+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/BackgroundStylingCard.tsx

@@ -6,9 +6,9 @@ import { UseFormReturn } from "react-hook-form";
 import { cn } from "@formbricks/lib/cn";
 import { TProductStyling } from "@formbricks/types/product";
 import { TSurveyStyling } from "@formbricks/types/surveys/types";
-import { Badge } from "@formbricks/ui/Badge";
-import { FormControl, FormDescription, FormField, FormItem, FormLabel } from "@formbricks/ui/Form";
-import { Slider } from "@formbricks/ui/Slider";
+import { Badge } from "@formbricks/ui/components/Badge";
+import { FormControl, FormDescription, FormField, FormItem, FormLabel } from "@formbricks/ui/components/Form";
+import { Slider } from "@formbricks/ui/components/Slider";
 import { SurveyBgSelectorTab } from "./SurveyBgSelectorTab";
 
 interface BackgroundStylingCardProps {

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

@@ -4,10 +4,10 @@ import { useState } from "react";
 import { LocalizedEditor } from "@formbricks/ee/multi-language/components/localized-editor";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyCTAQuestion } from "@formbricks/types/surveys/types";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { OptionsSwitch } from "@formbricks/ui/OptionsSwitch";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { OptionsSwitch } from "@formbricks/ui/components/OptionsSwitch";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 const options = [
   {

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

@@ -3,11 +3,11 @@ import { useEffect, useState } from "react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyCalQuestion } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 interface CalQuestionFormProps {
   localSurvey: TSurvey;

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

@@ -8,12 +8,12 @@ import { cn } from "@formbricks/lib/cn";
 import { COLOR_DEFAULTS } from "@formbricks/lib/styling/constants";
 import { TProduct, TProductStyling } from "@formbricks/types/product";
 import { TSurveyStyling, TSurveyType } from "@formbricks/types/surveys/types";
-import { Badge } from "@formbricks/ui/Badge";
-import { CardArrangementTabs } from "@formbricks/ui/CardArrangementTabs";
-import { ColorPicker } from "@formbricks/ui/ColorPicker";
-import { FormControl, FormDescription, FormField, FormItem, FormLabel } from "@formbricks/ui/Form";
-import { Slider } from "@formbricks/ui/Slider";
-import { Switch } from "@formbricks/ui/Switch";
+import { Badge } from "@formbricks/ui/components/Badge";
+import { CardArrangementTabs } from "@formbricks/ui/components/CardArrangementTabs";
+import { ColorPicker } from "@formbricks/ui/components/ColorPicker";
+import { FormControl, FormDescription, FormField, FormItem, FormLabel } from "@formbricks/ui/components/Form";
+import { Slider } from "@formbricks/ui/components/Slider";
+import { Switch } from "@formbricks/ui/components/Switch";
 
 type CardStylingSettingsProps = {
   open: boolean;

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

@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { ColorPicker } from "@formbricks/ui/ColorPicker";
+import { ColorPicker } from "@formbricks/ui/components/ColorPicker";
 
 interface ColorSurveyBgProps {
   handleBgChange: (bg: string, bgType: string) => void;

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

@@ -4,7 +4,6 @@ import {
   replaceEndingCardHeadlineRecall,
 } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { createId } from "@paralleldrive/cuid2";
-import { debounce } from "lodash";
 import {
   ArrowDownIcon,
   ArrowUpIcon,
@@ -14,19 +13,19 @@ import {
   SplitIcon,
   TrashIcon,
 } from "lucide-react";
-import { useEffect, useMemo, useState } from "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/Button";
+import { Button } from "@formbricks/ui/components/Button";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@formbricks/ui/DropdownMenu";
-import { Label } from "@formbricks/ui/Label";
+} from "@formbricks/ui/components/DropdownMenu";
+import { Label } from "@formbricks/ui/components/Label";
 
 interface ConditionalLogicProps {
   localSurvey: TSurvey;
@@ -43,16 +42,6 @@ export function ConditionalLogic({
   questionIdx,
   updateQuestion,
 }: ConditionalLogicProps) {
-  const [questionLogic, setQuestionLogic] = useState(question.logic);
-
-  const debouncedUpdateQuestion = useMemo(() => debounce(updateQuestion, 500), [updateQuestion]);
-
-  useEffect(() => {
-    debouncedUpdateQuestion(questionIdx, {
-      logic: questionLogic,
-    });
-  }, [questionLogic]);
-
   const transformedSurvey = useMemo(() => {
     let modifiedSurvey = replaceHeadlineRecall(localSurvey, "default", attributeClasses);
     modifiedSurvey = replaceEndingCardHeadlineRecall(modifiedSurvey, "default", attributeClasses);
@@ -60,10 +49,6 @@ export function ConditionalLogic({
     return modifiedSurvey;
   }, [localSurvey, attributeClasses]);
 
-  const updateQuestionLogic = (_questionIdx: number, updatedAttributes: any) => {
-    setQuestionLogic(updatedAttributes.logic);
-  };
-
   const addLogic = () => {
     const operator = getDefaultOperatorForQuestion(question);
 
@@ -92,37 +77,37 @@ export function ConditionalLogic({
       ],
     };
 
-    updateQuestionLogic(questionIdx, {
-      logic: [...(questionLogic ?? []), initialCondition],
+    updateQuestion(questionIdx, {
+      logic: [...(question?.logic ?? []), initialCondition],
     });
   };
 
   const handleRemoveLogic = (logicItemIdx: number) => {
-    const logicCopy = structuredClone(questionLogic ?? []);
+    const logicCopy = structuredClone(question.logic ?? []);
     logicCopy.splice(logicItemIdx, 1);
 
-    updateQuestionLogic(questionIdx, {
+    updateQuestion(questionIdx, {
       logic: logicCopy,
     });
   };
 
   const moveLogic = (from: number, to: number) => {
-    const logicCopy = structuredClone(questionLogic ?? []);
+    const logicCopy = structuredClone(question.logic ?? []);
     const [movedItem] = logicCopy.splice(from, 1);
     logicCopy.splice(to, 0, movedItem);
 
-    updateQuestionLogic(questionIdx, {
+    updateQuestion(questionIdx, {
       logic: logicCopy,
     });
   };
 
   const duplicateLogic = (logicItemIdx: number) => {
-    const logicCopy = structuredClone(questionLogic ?? []);
+    const logicCopy = structuredClone(question.logic ?? []);
     const logicItem = logicCopy[logicItemIdx];
     const newLogicItem = duplicateLogicItem(logicItem);
     logicCopy.splice(logicItemIdx + 1, 0, newLogicItem);
 
-    updateQuestionLogic(questionIdx, {
+    updateQuestion(questionIdx, {
       logic: logicCopy,
     });
   };
@@ -134,21 +119,20 @@ export function ConditionalLogic({
         <SplitIcon className="h-4 w-4 rotate-90" />
       </Label>
 
-      {questionLogic && questionLogic.length > 0 && (
+      {question.logic && question.logic.length > 0 && (
         <div className="mt-2 flex flex-col gap-4">
-          {questionLogic.map((logicItem, logicItemIdx) => (
+          {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={updateQuestionLogic}
+                updateQuestion={updateQuestion}
                 question={question}
-                questionLogic={questionLogic}
                 questionIdx={questionIdx}
                 logicIdx={logicItemIdx}
-                isLast={logicItemIdx === (questionLogic ?? []).length - 1}
+                isLast={logicItemIdx === (question.logic ?? []).length - 1}
               />
 
               <DropdownMenu>
@@ -175,7 +159,7 @@ export function ConditionalLogic({
                   </DropdownMenuItem>
                   <DropdownMenuItem
                     className="flex items-center gap-2"
-                    disabled={logicItemIdx === (questionLogic ?? []).length - 1}
+                    disabled={logicItemIdx === (question.logic ?? []).length - 1}
                     onClick={() => {
                       moveLogic(logicItemIdx, logicItemIdx + 1);
                     }}>

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

@@ -4,8 +4,8 @@ import { useState } from "react";
 import { LocalizedEditor } from "@formbricks/ee/multi-language/components/localized-editor";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyConsentQuestion } from "@formbricks/types/surveys/types";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 interface ConsentQuestionFormProps {
   localSurvey: TSurvey;

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/CreateNewActionTab.tsx

@@ -11,13 +11,13 @@ import {
   ZActionClassInput,
 } from "@formbricks/types/action-classes";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { FormControl, FormError, FormField, FormItem, FormLabel } from "@formbricks/ui/Form";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { TabToggle } from "@formbricks/ui/TabToggle";
-import { CodeActionForm } from "@formbricks/ui/organisms/CodeActionForm";
-import { NoCodeActionForm } from "@formbricks/ui/organisms/NoCodeActionForm";
+import { Button } from "@formbricks/ui/components/Button";
+import { FormControl, FormError, FormField, FormItem, FormLabel } from "@formbricks/ui/components/Form";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { TabToggle } from "@formbricks/ui/components/TabToggle";
+import { CodeActionForm } from "@formbricks/ui/components/organisms/CodeActionForm";
+import { NoCodeActionForm } from "@formbricks/ui/components/organisms/NoCodeActionForm";
 import { createActionClassAction } from "../actions";
 
 interface CreateNewActionTabProps {

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

@@ -2,10 +2,10 @@ import { PlusIcon } from "lucide-react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyDateQuestion } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { Label } from "@formbricks/ui/Label";
-import { OptionsSwitch } from "@formbricks/ui/OptionsSwitch";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { Button } from "@formbricks/ui/components/Button";
+import { Label } from "@formbricks/ui/components/Label";
+import { OptionsSwitch } from "@formbricks/ui/components/OptionsSwitch";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 interface IDateQuestionFormProps {
   localSurvey: TSurvey;

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

@@ -14,8 +14,8 @@ import { recallToHeadline } from "@formbricks/lib/utils/recall";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TOrganizationBillingPlan } from "@formbricks/types/organizations";
 import { TSurvey, TSurveyEndScreenCard, TSurveyRedirectUrlCard } from "@formbricks/types/surveys/types";
-import { OptionsSwitch } from "@formbricks/ui/OptionsSwitch";
-import { TooltipRenderer } from "@formbricks/ui/Tooltip";
+import { OptionsSwitch } from "@formbricks/ui/components/OptionsSwitch";
+import { TooltipRenderer } from "@formbricks/ui/components/Tooltip";
 
 interface EditEndingCardProps {
   localSurvey: TSurvey;

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

@@ -8,10 +8,10 @@ import { LocalizedEditor } from "@formbricks/ee/multi-language/components/locali
 import { cn } from "@formbricks/lib/cn";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyWelcomeCard } from "@formbricks/types/surveys/types";
-import { FileInput } from "@formbricks/ui/FileInput";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
-import { Switch } from "@formbricks/ui/Switch";
+import { FileInput } from "@formbricks/ui/components/FileInput";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import { Switch } from "@formbricks/ui/components/Switch";
 
 interface EditWelcomeCardProps {
   localSurvey: TSurvey;

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

@@ -18,7 +18,7 @@ import {
   TSurveyQuestionTypeEnum,
   TSurveyRedirectUrlCard,
 } from "@formbricks/types/surveys/types";
-import { ConfirmationModal } from "@formbricks/ui/ConfirmationModal";
+import { ConfirmationModal } from "@formbricks/ui/components/ConfirmationModal";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -27,7 +27,7 @@ import {
   DropdownMenuSubContent,
   DropdownMenuSubTrigger,
   DropdownMenuTrigger,
-} from "@formbricks/ui/DropdownMenu";
+} from "@formbricks/ui/components/DropdownMenu";
 
 interface EditorCardMenuProps {
   survey: TSurvey;

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

@@ -4,10 +4,10 @@ import { useState } from "react";
 import { getLocalizedValue } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyEndScreenCard } from "@formbricks/types/surveys/types";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
-import { Switch } from "@formbricks/ui/Switch";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import { Switch } from "@formbricks/ui/components/Switch";
 
 interface EndScreenFormProps {
   localSurvey: TSurvey;

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

@@ -11,10 +11,10 @@ import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TAllowedFileExtension, ZAllowedFileExtension } from "@formbricks/types/common";
 import { TProduct } from "@formbricks/types/product";
 import { TSurvey, TSurveyFileUploadQuestion } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 interface FileUploadFormProps {
   localSurvey: TSurvey;

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

@@ -9,9 +9,9 @@ import { COLOR_DEFAULTS } from "@formbricks/lib/styling/constants";
 import { mixColor } from "@formbricks/lib/utils/colors";
 import { TProductStyling } from "@formbricks/types/product";
 import { TSurveyStyling } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { ColorPicker } from "@formbricks/ui/ColorPicker";
-import { FormControl, FormDescription, FormField, FormItem, FormLabel } from "@formbricks/ui/Form";
+import { Button } from "@formbricks/ui/components/Button";
+import { ColorPicker } from "@formbricks/ui/components/ColorPicker";
+import { FormControl, FormDescription, FormField, FormItem, FormLabel } from "@formbricks/ui/components/Form";
 
 type FormStylingSettingsProps = {
   open: boolean;

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

@@ -9,11 +9,11 @@ import { cn } from "@formbricks/lib/cn";
 import { extractRecallInfo } from "@formbricks/lib/utils/recall";
 import { TSurvey, TSurveyHiddenFields } from "@formbricks/types/surveys/types";
 import { validateId } from "@formbricks/types/surveys/validation";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { Switch } from "@formbricks/ui/Switch";
-import { Tag } from "@formbricks/ui/Tag";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { Switch } from "@formbricks/ui/components/Switch";
+import { Tag } from "@formbricks/ui/components/Tag";
 
 interface HiddenFieldsCardProps {
   localSurvey: TSurvey;

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

@@ -10,9 +10,9 @@ import { TEnvironment } from "@formbricks/types/environment";
 import { TProduct } from "@formbricks/types/product";
 import { TSegment } from "@formbricks/types/segment";
 import { TSurvey, TSurveyType } from "@formbricks/types/surveys/types";
-import { Badge } from "@formbricks/ui/Badge";
-import { Label } from "@formbricks/ui/Label";
-import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
+import { Badge } from "@formbricks/ui/components/Badge";
+import { Label } from "@formbricks/ui/components/Label";
+import { RadioGroup, RadioGroupItem } from "@formbricks/ui/components/RadioGroup";
 
 interface HowToSendCardProps {
   localSurvey: TSurvey;

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

@@ -1,4 +1,4 @@
-import { FileInput } from "@formbricks/ui/FileInput";
+import { FileInput } from "@formbricks/ui/components/FileInput";
 
 interface UploadImageSurveyBgProps {
   environmentId: string;

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

@@ -8,7 +8,6 @@ interface LogicEditorProps {
   logicItem: TSurveyLogic;
   updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
   question: TSurveyQuestion;
-  questionLogic: TSurveyLogic[];
   questionIdx: number;
   logicIdx: number;
   isLast: boolean;
@@ -19,7 +18,6 @@ export function LogicEditor({
   logicItem,
   updateQuestion,
   question,
-  questionLogic,
   questionIdx,
   logicIdx,
   isLast,
@@ -37,7 +35,7 @@ export function LogicEditor({
       <LogicEditorActions
         logicItem={logicItem}
         logicIdx={logicIdx}
-        questionLogic={questionLogic}
+        question={question}
         updateQuestion={updateQuestion}
         localSurvey={localSurvey}
         questionIdx={questionIdx}

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

@@ -1,390 +0,0 @@
-import {
-  actionObjectiveOptions,
-  getActionOperatorOptions,
-} from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
-import {
-  CopyIcon,
-  EllipsisVerticalIcon,
-  EyeOffIcon,
-  FileDigitIcon,
-  FileType2Icon,
-  PlusIcon,
-  TrashIcon,
-} from "lucide-react";
-import React, { useCallback, useMemo } from "react";
-import { getLocalizedValue } from "@formbricks/lib/i18n/utils";
-import { questionIconMapping } from "@formbricks/lib/utils/questions";
-import {
-  TActionNumberVariableCalculateOperator,
-  TActionObjective,
-  TActionTextVariableCalculateOperator,
-  TActionVariableValueType,
-  TSurvey,
-  TSurveyLogicAction,
-  TSurveyQuestion,
-  TSurveyQuestionTypeEnum,
-} from "@formbricks/types/surveys/types";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@formbricks/ui/DropdownMenu";
-import { InputCombobox, TComboboxGroupedOption, TComboboxOption } from "@formbricks/ui/InputCombobox";
-
-interface LogicEditorActionProps {
-  action: TSurveyLogicAction;
-  actionIdx: number;
-  handleObjectiveChange: (actionIdx: number, val: TActionObjective) => void;
-  handleValuesChange: (actionIdx: number, values: any) => void;
-  handleActionsChange: (operation: "remove" | "addBelow" | "duplicate", actionIdx: number) => void;
-  isRemoveDisabled: boolean;
-  questions: TSurveyQuestion[];
-  endings: TSurvey["endings"];
-  variables: TSurvey["variables"];
-  questionIdx: number;
-  hiddenFields: {
-    enabled: boolean;
-    fieldIds?: string[] | undefined;
-  };
-}
-
-const _LogicEditorAction = ({
-  action,
-  actionIdx,
-  handleActionsChange,
-  handleObjectiveChange,
-  handleValuesChange,
-  isRemoveDisabled,
-  questions,
-  endings,
-  variables,
-  questionIdx,
-  hiddenFields,
-}: LogicEditorActionProps) => {
-  const actionTargetOptions = useMemo((): TComboboxOption[] => {
-    let filteredQuestions = questions.filter((_, idx) => idx !== questionIdx);
-
-    if (action.objective === "requireAnswer") {
-      filteredQuestions = filteredQuestions.filter((question) => !question.required);
-    }
-
-    const questionOptions = filteredQuestions.map((question) => {
-      return {
-        icon: questionIconMapping[question.type],
-        label: getLocalizedValue(question.headline, "default"),
-        value: question.id,
-      };
-    });
-
-    if (action.objective === "requireAnswer") return questionOptions;
-
-    const endingCardOptions = endings.map((ending) => {
-      return {
-        label:
-          ending.type === "endScreen"
-            ? getLocalizedValue(ending.headline, "default") || "End Screen"
-            : ending.label || "Redirect Thank you card",
-        value: ending.id,
-      };
-    });
-
-    return [...questionOptions, ...endingCardOptions];
-  }, [action.objective, endings, questionIdx, questions]);
-
-  const actionVariableOptions = useMemo((): TComboboxOption[] => {
-    return variables.map((variable) => {
-      return {
-        icon: variable.type === "number" ? FileDigitIcon : FileType2Icon,
-        label: variable.name,
-        value: variable.id,
-        meta: {
-          variableType: variable.type,
-        },
-      };
-    });
-  }, [variables]);
-
-  const getActionValueOptions = useCallback(
-    (variableId: string): TComboboxGroupedOption[] => {
-      const hiddenFieldIds = hiddenFields?.fieldIds ?? [];
-
-      const hiddenFieldsOptions = hiddenFieldIds.map((field) => {
-        return {
-          icon: EyeOffIcon,
-          label: field,
-          value: field,
-          meta: {
-            type: "hiddenField",
-          },
-        };
-      });
-
-      const selectedVariable = variables.find((variable) => variable.id === variableId);
-      const filteredVariables = variables.filter((variable) => variable.id !== variableId);
-
-      if (!selectedVariable) return [];
-
-      if (selectedVariable.type === "text") {
-        const allowedQuestions = questions.filter((question) =>
-          [
-            TSurveyQuestionTypeEnum.OpenText,
-            TSurveyQuestionTypeEnum.MultipleChoiceSingle,
-            TSurveyQuestionTypeEnum.Rating,
-            TSurveyQuestionTypeEnum.NPS,
-            TSurveyQuestionTypeEnum.Date,
-          ].includes(question.type)
-        );
-
-        const questionOptions = allowedQuestions.map((question) => {
-          return {
-            icon: questionIconMapping[question.type],
-            label: getLocalizedValue(question.headline, "default"),
-            value: question.id,
-            meta: {
-              type: "question",
-            },
-          };
-        });
-
-        const stringVariables = filteredVariables.filter((variable) => variable.type === "text");
-        const variableOptions = stringVariables.map((variable) => {
-          return {
-            icon: FileType2Icon,
-            label: variable.name,
-            value: variable.id,
-            meta: {
-              type: "variable",
-            },
-          };
-        });
-
-        const groupedOptions: TComboboxGroupedOption[] = [];
-
-        if (questionOptions.length > 0) {
-          groupedOptions.push({
-            label: "Questions",
-            value: "questions",
-            options: questionOptions,
-          });
-        }
-
-        if (variableOptions.length > 0) {
-          groupedOptions.push({
-            label: "Variables",
-            value: "variables",
-            options: variableOptions,
-          });
-        }
-
-        if (hiddenFieldsOptions.length > 0) {
-          groupedOptions.push({
-            label: "Hidden Fields",
-            value: "hiddenFields",
-            options: hiddenFieldsOptions,
-          });
-        }
-
-        return groupedOptions;
-      } else if (selectedVariable.type === "number") {
-        const allowedQuestions = questions.filter((question) =>
-          [TSurveyQuestionTypeEnum.Rating, TSurveyQuestionTypeEnum.NPS].includes(question.type)
-        );
-
-        const questionOptions = allowedQuestions.map((question) => {
-          return {
-            icon: questionIconMapping[question.type],
-            label: getLocalizedValue(question.headline, "default"),
-            value: question.id,
-            meta: {
-              type: "question",
-            },
-          };
-        });
-
-        const numberVariables = filteredVariables.filter((variable) => variable.type === "number");
-        const variableOptions = numberVariables.map((variable) => {
-          return {
-            icon: FileDigitIcon,
-            label: variable.name,
-            value: variable.id,
-            meta: {
-              type: "variable",
-            },
-          };
-        });
-
-        const groupedOptions: TComboboxGroupedOption[] = [];
-
-        if (questionOptions.length > 0) {
-          groupedOptions.push({
-            label: "Questions",
-            value: "questions",
-            options: questionOptions,
-          });
-        }
-
-        if (variableOptions.length > 0) {
-          groupedOptions.push({
-            label: "Variables",
-            value: "variables",
-            options: variableOptions,
-          });
-        }
-
-        if (hiddenFieldsOptions.length > 0) {
-          groupedOptions.push({
-            label: "Hidden Fields",
-            value: "hiddenFields",
-            options: hiddenFieldsOptions,
-          });
-        }
-
-        return groupedOptions;
-      }
-
-      return [];
-    },
-    [hiddenFields?.fieldIds, questions, variables]
-  );
-
-  return (
-    <div key={action.id} className="flex grow items-center justify-between gap-x-2">
-      <div className="block w-9 shrink-0">{actionIdx === 0 ? "Then" : "and"}</div>
-      <div className="flex grow items-center gap-x-2">
-        <InputCombobox
-          id={`action-${actionIdx}-objective`}
-          key={`objective-${action.id}`}
-          showSearch={false}
-          options={actionObjectiveOptions}
-          value={action.objective}
-          onChangeValue={(val: TActionObjective) => {
-            handleObjectiveChange(actionIdx, val);
-          }}
-          comboboxClasses="grow"
-        />
-        {action.objective !== "calculate" && (
-          <InputCombobox
-            id={`action-${actionIdx}-target`}
-            key={`target-${action.id}`}
-            showSearch={false}
-            options={actionTargetOptions}
-            value={action.target}
-            onChangeValue={(val: string) => {
-              handleValuesChange(actionIdx, {
-                target: val,
-              });
-            }}
-            comboboxClasses="grow"
-          />
-        )}
-        {action.objective === "calculate" && (
-          <>
-            <InputCombobox
-              id={`action-${actionIdx}-variableId`}
-              key={`variableId-${action.id}`}
-              showSearch={false}
-              options={actionVariableOptions}
-              value={action.variableId}
-              onChangeValue={(val: string) => {
-                handleValuesChange(actionIdx, {
-                  variableId: val,
-                  value: {
-                    type: "static",
-                    value: "",
-                  },
-                });
-              }}
-              comboboxClasses="grow"
-              emptyDropdownText="Add a variable to calculate"
-            />
-            <InputCombobox
-              id={`action-${actionIdx}-operator`}
-              key={`operator-${action.id}`}
-              showSearch={false}
-              options={getActionOperatorOptions(variables.find((v) => v.id === action.variableId)?.type)}
-              value={action.operator}
-              onChangeValue={(
-                val: TActionTextVariableCalculateOperator | TActionNumberVariableCalculateOperator
-              ) => {
-                handleValuesChange(actionIdx, {
-                  operator: val,
-                });
-              }}
-              comboboxClasses="grow"
-            />
-            <InputCombobox
-              id={`action-${actionIdx}-value`}
-              key={`value-${action.id}`}
-              withInput={true}
-              clearable={true}
-              value={action.value?.value ?? ""}
-              inputProps={{
-                placeholder: "Value",
-                type: variables.find((v) => v.id === action.variableId)?.type || "text",
-              }}
-              groupedOptions={getActionValueOptions(action.variableId)}
-              onChangeValue={(val, option, fromInput) => {
-                const fieldType = option?.meta?.type as TActionVariableValueType;
-
-                if (!fromInput && fieldType !== "static") {
-                  handleValuesChange(actionIdx, {
-                    value: {
-                      type: fieldType,
-                      value: val as string,
-                    },
-                  });
-                } else if (fromInput) {
-                  handleValuesChange(actionIdx, {
-                    value: {
-                      type: "static",
-                      value: val as string,
-                    },
-                  });
-                }
-              }}
-              comboboxClasses="grow shrink-0"
-            />
-          </>
-        )}
-      </div>
-      <DropdownMenu>
-        <DropdownMenuTrigger id={`actions-${actionIdx}-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", actionIdx);
-            }}>
-            <PlusIcon className="h-4 w-4" />
-            Add action below
-          </DropdownMenuItem>
-
-          <DropdownMenuItem
-            className="flex items-center gap-2"
-            disabled={isRemoveDisabled}
-            onClick={() => {
-              handleActionsChange("remove", actionIdx);
-            }}>
-            <TrashIcon className="h-4 w-4" />
-            Remove
-          </DropdownMenuItem>
-
-          <DropdownMenuItem
-            className="flex items-center gap-2"
-            onClick={() => {
-              handleActionsChange("duplicate", actionIdx);
-            }}>
-            <CopyIcon className="h-4 w-4" />
-            Duplicate
-          </DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-  );
-};
-
-export const LogicEditorAction = React.memo(_LogicEditorAction);

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

@@ -1,110 +1,236 @@
-import { LogicEditorAction } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditorAction";
+import {
+  actionObjectiveOptions,
+  getActionOperatorOptions,
+  getActionTargetOptions,
+  getActionValueOptions,
+  getActionVariableOptions,
+} from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { createId } from "@paralleldrive/cuid2";
-import { CornerDownRightIcon } from "lucide-react";
-import React, { useCallback, useMemo } from "react";
+import { CopyIcon, CornerDownRightIcon, EllipsisVerticalIcon, PlusIcon, TrashIcon } from "lucide-react";
 import { getUpdatedActionBody } from "@formbricks/lib/surveyLogic/utils";
-import { TActionObjective, TSurvey, TSurveyLogic, TSurveyLogicAction } from "@formbricks/types/surveys/types";
+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;
-  questionLogic: TSurveyLogic[];
+  question: TSurveyQuestion;
   updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
   questionIdx: number;
 }
 
-export const LogicEditorActions = ({
+export function LogicEditorActions({
   localSurvey,
   logicItem,
   logicIdx,
-  questionLogic,
+  question,
   updateQuestion,
   questionIdx,
-}: LogicEditorActions) => {
+}: LogicEditorActions) {
   const actions = logicItem.actions;
 
-  const handleActionsChange = useCallback(
-    (
-      operation: "remove" | "addBelow" | "duplicate" | "update",
-      actionIdx: number,
-      action?: TSurveyLogicAction
-    ) => {
-      const currentLogicCopy = structuredClone(logicItem);
-      const actionsClone = currentLogicCopy.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;
-      }
+    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;
+    }
 
-      const updatedLogic = questionLogic.map((item, idx) => (idx === logicIdx ? currentLogicCopy : item));
+    updateQuestion(questionIdx, {
+      logic: logicCopy,
+    });
+  };
 
-      updateQuestion(questionIdx, {
-        logic: updatedLogic,
-      });
-    },
-    [logicIdx, logicItem, questionIdx, questionLogic]
-  );
+  const handleObjectiveChange = (actionIdx: number, objective: TActionObjective) => {
+    const action = actions[actionIdx];
+    const actionBody = getUpdatedActionBody(action, objective);
+    handleActionsChange("update", actionIdx, actionBody);
+  };
 
-  const handleObjectiveChange = useCallback(
-    (actionIdx: number, objective: TActionObjective) => {
-      const action = actions[actionIdx];
-      const actionBody = getUpdatedActionBody(action, objective);
-      handleActionsChange("update", actionIdx, actionBody);
-    },
-    [actions]
-  );
-
-  const handleValuesChange = useCallback(
-    (actionIdx: number, values: Partial<TSurveyLogicAction>) => {
-      const action = actions[actionIdx];
-      const actionBody = { ...action, ...values } as TSurveyLogicAction;
-      handleActionsChange("update", actionIdx, actionBody);
-    },
-    [actions]
-  );
-
-  const questions = useMemo(() => localSurvey.questions, [localSurvey.questions]);
-  const endings = useMemo(() => localSurvey.endings, [localSurvey.endings]);
-  const variables = useMemo(() => localSurvey.variables, [localSurvey.variables]);
-  const hiddenFields = useMemo(() => localSurvey.hiddenFields, [localSurvey.hiddenFields]);
+  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) => (
-          <LogicEditorAction
-            action={action}
-            actionIdx={idx}
-            handleActionsChange={handleActionsChange}
-            handleObjectiveChange={handleObjectiveChange}
-            handleValuesChange={handleValuesChange}
-            endings={endings}
-            isRemoveDisabled={actions.length === 1}
-            questions={questions}
-            variables={variables}
-            questionIdx={questionIdx}
-            hiddenFields={hiddenFields}
-          />
+          <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

@@ -30,8 +30,8 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@formbricks/ui/DropdownMenu";
-import { InputCombobox, TComboboxOption } from "@formbricks/ui/InputCombobox";
+} from "@formbricks/ui/components/DropdownMenu";
+import { InputCombobox, TComboboxOption } from "@formbricks/ui/components/InputCombobox";
 
 interface LogicEditorConditionsProps {
   conditions: TConditionGroup;
@@ -88,7 +88,7 @@ export function LogicEditorConditions({
     const logicItem = logicCopy[logicIdx];
     removeCondition(logicItem.conditions, resourceId);
 
-    // Remove the logic item if there are no conditions left
+    // Remove the logic item if there are zero conditions left
     if (logicItem.conditions.conditions.length === 0) {
       logicCopy.splice(logicIdx, 1);
     }

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

@@ -4,9 +4,9 @@ import { PlusIcon, TrashIcon } from "lucide-react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TI18nString, TSurvey, TSurveyMatrixQuestion } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { Button } from "@formbricks/ui/components/Button";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 import { isLabelValidForAllLanguages } from "../lib/validation";
 
 interface MatrixQuestionFormProps {

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

@@ -16,10 +16,16 @@ import {
   TSurveyMultipleChoiceQuestion,
   TSurveyQuestionTypeEnum,
 } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@formbricks/ui/Select";
+import { Button } from "@formbricks/ui/components/Button";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@formbricks/ui/components/Select";
 import { QuestionOptionChoice } from "./QuestionOptionChoice";
 
 interface OpenQuestionFormProps {

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

@@ -4,9 +4,9 @@ import { PlusIcon } from "lucide-react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyNPSQuestion } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { Button } from "@formbricks/ui/Button";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { Button } from "@formbricks/ui/components/Button";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 interface NPSQuestionFormProps {
   localSurvey: TSurvey;

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

@@ -8,10 +8,10 @@ import {
   TSurveyOpenTextQuestion,
   TSurveyOpenTextQuestionInputType,
 } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { Label } from "@formbricks/ui/Label";
-import { OptionsSwitch } from "@formbricks/ui/OptionsSwitch";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { Button } from "@formbricks/ui/components/Button";
+import { Label } from "@formbricks/ui/components/Label";
+import { OptionsSwitch } from "@formbricks/ui/components/OptionsSwitch";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 
 const questionTypes = [
   { value: "text", label: "Text", icon: <MessageSquareTextIcon className="h-4 w-4" /> },

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

@@ -4,11 +4,11 @@ import { cn } from "@formbricks/lib/cn";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyPictureSelectionQuestion } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { FileInput } from "@formbricks/ui/FileInput";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
-import { Switch } from "@formbricks/ui/Switch";
+import { Button } from "@formbricks/ui/components/Button";
+import { FileInput } from "@formbricks/ui/components/FileInput";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import { Switch } from "@formbricks/ui/components/Switch";
 
 interface PictureSelectionFormProps {
   localSurvey: TSurvey;

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

@@ -2,9 +2,9 @@
 
 import { cn } from "@formbricks/lib/cn";
 import { TPlacement } from "@formbricks/types/common";
-import { Label } from "@formbricks/ui/Label";
-import { getPlacementStyle } from "@formbricks/ui/PreviewSurvey/lib/utils";
-import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
+import { Label } from "@formbricks/ui/components/Label";
+import { getPlacementStyle } from "@formbricks/ui/components/PreviewSurvey/lib/utils";
+import { RadioGroup, RadioGroupItem } from "@formbricks/ui/components/RadioGroup";
 
 const placements = [
   { name: "Bottom Right", value: "bottomRight", disabled: false },

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

@@ -1,5 +1,6 @@
 "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/utils";
 import { useSortable } from "@dnd-kit/sortable";
@@ -18,9 +19,9 @@ import {
   TSurveyQuestion,
   TSurveyQuestionTypeEnum,
 } from "@formbricks/types/surveys/types";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
-import { Switch } from "@formbricks/ui/Switch";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import { Switch } from "@formbricks/ui/components/Switch";
 import { AddressQuestionForm } from "./AddressQuestionForm";
 import { AdvancedSettings } from "./AdvancedSettings";
 import { CTAQuestionForm } from "./CTAQuestionForm";
@@ -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/QuestionOptionChoice.tsx

@@ -12,7 +12,7 @@ import {
   TSurveyQuestionChoice,
   TSurveyRankingQuestion,
 } from "@formbricks/types/surveys/types";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 import { isLabelValidForAllLanguages } from "../lib/validation";
 
 interface ChoiceProps {

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

@@ -264,7 +264,6 @@ export const QuestionsView = ({
         }
       }
     });
-
     setLocalSurvey(updatedSurvey);
     validateSurveyQuestion(updatedSurvey.questions[questionIdx]);
   };

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

@@ -13,10 +13,16 @@ import {
   TSurvey,
   TSurveyRankingQuestion,
 } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@formbricks/ui/Select";
+import { Button } from "@formbricks/ui/components/Button";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@formbricks/ui/components/Select";
 import { QuestionOptionChoice } from "./QuestionOptionChoice";
 
 interface RankingQuestionFormProps {

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

@@ -2,10 +2,10 @@ import { HashIcon, PlusIcon, SmileIcon, StarIcon } from "lucide-react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyRatingQuestion } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { Button } from "@formbricks/ui/Button";
-import { Label } from "@formbricks/ui/Label";
-import { QuestionFormInput } from "@formbricks/ui/QuestionFormInput";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { Button } from "@formbricks/ui/components/Button";
+import { Label } from "@formbricks/ui/components/Label";
+import { QuestionFormInput } from "@formbricks/ui/components/QuestionFormInput";
 import { Dropdown } from "./RatingTypeDropdown";
 
 interface RatingQuestionFormProps {

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

@@ -5,10 +5,10 @@ import { CheckIcon } from "lucide-react";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { RadioGroup, RadioGroupItem } from "@formbricks/ui/RadioGroup";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { RadioGroup, RadioGroupItem } from "@formbricks/ui/components/RadioGroup";
 
 interface DisplayOption {
   id: "displayOnce" | "displayMultiple" | "respondMultiple" | "displaySome";

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

@@ -1,6 +1,6 @@
 import { TSurveyRedirectUrlCard } from "@formbricks/types/surveys/types";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
 
 interface RedirectUrlFormProps {
   endingCard: TSurveyRedirectUrlCard;

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

@@ -7,11 +7,11 @@ import { KeyboardEventHandler, useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import { cn } from "@formbricks/lib/cn";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { DatePicker } from "@formbricks/ui/DatePicker";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { Switch } from "@formbricks/ui/Switch";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { DatePicker } from "@formbricks/ui/components/DatePicker";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
+import { Switch } from "@formbricks/ui/components/Switch";
 
 interface ResponseOptionsCardProps {
   localSurvey: TSurvey;

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

@@ -2,7 +2,7 @@ import { Code2Icon, MousePointerClickIcon, SparklesIcon } from "lucide-react";
 import { useState } from "react";
 import { TActionClass } from "@formbricks/types/action-classes";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { Input } from "@formbricks/ui/Input";
+import { Input } from "@formbricks/ui/components/Input";
 
 interface SavedActionsTabProps {
   actionClasses: TActionClass[];

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/StylingView.tsx

@@ -8,8 +8,8 @@ import { TEnvironment } from "@formbricks/types/environment";
 import { TProduct, TProductStyling } from "@formbricks/types/product";
 import { TBaseStyling } from "@formbricks/types/styling";
 import { TSurvey, TSurveyStyling } from "@formbricks/types/surveys/types";
-import { AlertDialog } from "@formbricks/ui/AlertDialog";
-import { Button } from "@formbricks/ui/Button";
+import { AlertDialog } from "@formbricks/ui/components/AlertDialog";
+import { Button } from "@formbricks/ui/components/Button";
 import {
   FormControl,
   FormDescription,
@@ -17,8 +17,8 @@ import {
   FormItem,
   FormLabel,
   FormProvider,
-} from "@formbricks/ui/Form";
-import { Switch } from "@formbricks/ui/Switch";
+} from "@formbricks/ui/components/Form";
+import { Switch } from "@formbricks/ui/components/Switch";
 import { BackgroundStylingCard } from "./BackgroundStylingCard";
 import { CardStylingSettings } from "./CardStylingSettings";
 import { FormStylingSettings } from "./FormStylingSettings";

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

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { TabBar } from "@formbricks/ui/TabBar";
+import { TabBar } from "@formbricks/ui/components/TabBar";
 import { AnimatedSurveyBg } from "./AnimatedSurveyBg";
 import { ColorSurveyBg } from "./ColorSurveyBg";
 import { UploadImageSurveyBg } from "./ImageSurveyBg";

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

@@ -12,7 +12,7 @@ import { TOrganizationBillingPlan } from "@formbricks/types/organizations";
 import { TProduct } from "@formbricks/types/product";
 import { TSegment } from "@formbricks/types/segment";
 import { TSurvey, TSurveyEditorTabs, TSurveyStyling } from "@formbricks/types/surveys/types";
-import { PreviewSurvey } from "@formbricks/ui/PreviewSurvey";
+import { PreviewSurvey } from "@formbricks/ui/components/PreviewSurvey";
 import { refetchProductAction } from "../actions";
 import { LoadingSkeleton } from "./LoadingSkeleton";
 import { QuestionsAudienceTabs } from "./QuestionsStylingSettingsTabs";
@@ -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

@@ -20,10 +20,10 @@ import {
   ZSurveyEndScreenCard,
   ZSurveyRedirectUrlCard,
 } from "@formbricks/types/surveys/types";
-import { AlertDialog } from "@formbricks/ui/AlertDialog";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
+import { AlertDialog } from "@formbricks/ui/components/AlertDialog";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/components/Tooltip";
 import { updateSurveyAction } from "../actions";
 import { isSurveyValid } from "../lib/validation";
 

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

@@ -6,8 +6,8 @@ import Link from "next/link";
 import { useState } from "react";
 import { TPlacement } from "@formbricks/types/common";
 import { TSurvey, TSurveyProductOverwrites } from "@formbricks/types/surveys/types";
-import { Label } from "@formbricks/ui/Label";
-import { Switch } from "@formbricks/ui/Switch";
+import { Label } from "@formbricks/ui/components/Label";
+import { Switch } from "@formbricks/ui/components/Switch";
 import { Placement } from "./Placement";
 
 interface SurveyPlacementCardProps {

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

@@ -8,11 +8,17 @@ 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/Button";
-import { FormControl, FormField, FormItem, FormProvider } from "@formbricks/ui/Form";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@formbricks/ui/Select";
+import { Button } from "@formbricks/ui/components/Button";
+import { FormControl, FormField, FormItem, FormProvider } from "@formbricks/ui/components/Form";
+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";
 
 interface SurveyVariablesCardItemProps {
   variable?: TSurveyVariable;

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

@@ -13,15 +13,15 @@ import { isAdvancedSegment } from "@formbricks/lib/segment/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TBaseFilter, TSegment, TSegmentCreateInput, TSegmentUpdateInput } from "@formbricks/types/segment";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { AlertDialog } from "@formbricks/ui/AlertDialog";
-import { BasicAddFilterModal } from "@formbricks/ui/BasicAddFilterModal";
-import { BasicSegmentEditor } from "@formbricks/ui/BasicSegmentEditor";
-import { Button } from "@formbricks/ui/Button";
-import { LoadSegmentModal } from "@formbricks/ui/LoadSegmentModal";
-import { SaveAsNewSegmentModal } from "@formbricks/ui/SaveAsNewSegmentModal";
-import { SegmentTitle } from "@formbricks/ui/SegmentTitle";
-import { TargetingIndicator } from "@formbricks/ui/TargetingIndicator";
-import { UpgradePlanNotice } from "@formbricks/ui/UpgradePlanNotice";
+import { AlertDialog } from "@formbricks/ui/components/AlertDialog";
+import { BasicAddFilterModal } from "@formbricks/ui/components/BasicAddFilterModal";
+import { BasicSegmentEditor } from "@formbricks/ui/components/BasicSegmentEditor";
+import { Button } from "@formbricks/ui/components/Button";
+import { LoadSegmentModal } from "@formbricks/ui/components/LoadSegmentModal";
+import { SaveAsNewSegmentModal } from "@formbricks/ui/components/SaveAsNewSegmentModal";
+import { SegmentTitle } from "@formbricks/ui/components/SegmentTitle";
+import { TargetingIndicator } from "@formbricks/ui/components/TargetingIndicator";
+import { UpgradePlanNotice } from "@formbricks/ui/components/UpgradePlanNotice";
 import {
   cloneBasicSegmentAction,
   createBasicSegmentAction,

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

@@ -6,9 +6,9 @@ import UnsplashImage from "next/image";
 import { useEffect, useRef, useState } from "react";
 import toast from "react-hot-toast";
 import { TSurveyBackgroundBgType } from "@formbricks/types/surveys/types";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { LoadingSpinner } from "@formbricks/ui/LoadingSpinner";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
+import { LoadingSpinner } from "@formbricks/ui/components/LoadingSpinner";
 import { getImagesFromUnsplashAction, triggerDownloadUnsplashImageAction } from "../actions";
 
 interface ImageFromUnsplashSurveyBgProps {

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

@@ -4,9 +4,9 @@ import { useState } from "react";
 import toast from "react-hot-toast";
 import { TSurvey, TSurveyQuestion } from "@formbricks/types/surveys/types";
 import { validateId } from "@formbricks/types/surveys/validation";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
-import { Label } from "@formbricks/ui/Label";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
+import { Label } from "@formbricks/ui/components/Label";
 
 interface UpdateQuestionIdProps {
   localSurvey: TSurvey;

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

@@ -14,9 +14,9 @@ import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { TActionClass } from "@formbricks/types/action-classes";
 import { TMembershipRole } from "@formbricks/types/memberships";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@formbricks/ui/AdvancedOptionToggle";
-import { Button } from "@formbricks/ui/Button";
-import { Input } from "@formbricks/ui/Input";
+import { AdvancedOptionToggle } from "@formbricks/ui/components/AdvancedOptionToggle";
+import { Button } from "@formbricks/ui/components/Button";
+import { Input } from "@formbricks/ui/components/Input";
 import { AddActionModal } from "./AddActionModal";
 
 interface WhenToSendCardProps {

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

@@ -1,8 +1,8 @@
 import { EyeOffIcon, FileDigitIcon, FileType2Icon } from "lucide-react";
-import { HTMLInputTypeAttribute, useMemo } from "react";
+import { HTMLInputTypeAttribute } from "react";
 import { getLocalizedValue } from "@formbricks/lib/i18n/utils";
 import { isConditionGroup } from "@formbricks/lib/surveyLogic/utils";
-import { questionIconMapping, questionTypes } from "@formbricks/lib/utils/questions";
+import { questionTypes } from "@formbricks/lib/utils/questions";
 import { recallToHeadline } from "@formbricks/lib/utils/recall";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import {
@@ -18,7 +18,7 @@ import {
   TSurveyQuestionTypeEnum,
   TSurveyVariable,
 } from "@formbricks/types/surveys/types";
-import { TComboboxGroupedOption, TComboboxOption } from "@formbricks/ui/InputCombobox";
+import { TComboboxGroupedOption, TComboboxOption } from "@formbricks/ui/components/InputCombobox";
 import { TLogicRuleOption, logicRules } from "./logicRuleEngine";
 
 // formats the text to highlight specific parts of the text with slashes
@@ -40,6 +40,14 @@ export const formatTextWithSlashes = (text: string) => {
   });
 };
 
+const questionIconMapping = questionTypes.reduce(
+  (prev, curr) => ({
+    ...prev,
+    [curr.id]: curr.icon,
+  }),
+  {}
+);
+
 export const getConditionValueOptions = (
   localSurvey: TSurvey,
   currQuestionIdx: number
@@ -748,6 +756,55 @@ export const getMatchValueProps = (
   return { show: false, options: [] };
 };
 
+export const getActionTargetOptions = (
+  action: TSurveyLogicAction,
+  localSurvey: TSurvey,
+  currQuestionIdx: number
+): TComboboxOption[] => {
+  let questions = localSurvey.questions.filter((_, idx) => idx !== currQuestionIdx);
+
+  if (action.objective === "requireAnswer") {
+    questions = questions.filter((question) => !question.required);
+  }
+
+  const questionOptions = questions.map((question) => {
+    return {
+      icon: questionIconMapping[question.type],
+      label: getLocalizedValue(question.headline, "default"),
+      value: question.id,
+    };
+  });
+
+  if (action.objective === "requireAnswer") return questionOptions;
+
+  const endingCardOptions = localSurvey.endings.map((ending) => {
+    return {
+      label:
+        ending.type === "endScreen"
+          ? getLocalizedValue(ending.headline, "default") || "End Screen"
+          : ending.label || "Redirect Thank you card",
+      value: ending.id,
+    };
+  });
+
+  return [...questionOptions, ...endingCardOptions];
+};
+
+export const getActionVariableOptions = (localSurvey: TSurvey): TComboboxOption[] => {
+  const variables = localSurvey.variables ?? [];
+
+  return variables.map((variable) => {
+    return {
+      icon: variable.type === "number" ? FileDigitIcon : FileType2Icon,
+      label: variable.name,
+      value: variable.id,
+      meta: {
+        variableType: variable.type,
+      },
+    };
+  });
+};
+
 export const getActionOperatorOptions = (variableType?: TSurveyVariable["type"]): TComboboxOption[] => {
   if (variableType === "number") {
     return [
@@ -787,6 +844,151 @@ export const getActionOperatorOptions = (variableType?: TSurveyVariable["type"])
   return [];
 };
 
+export const getActionValueOptions = (variableId: string, localSurvey: TSurvey): TComboboxGroupedOption[] => {
+  const hiddenFields = localSurvey.hiddenFields?.fieldIds ?? [];
+  let variables = localSurvey.variables ?? [];
+  const questions = localSurvey.questions;
+
+  const hiddenFieldsOptions = hiddenFields.map((field) => {
+    return {
+      icon: EyeOffIcon,
+      label: field,
+      value: field,
+      meta: {
+        type: "hiddenField",
+      },
+    };
+  });
+
+  const selectedVariable = variables.find((variable) => variable.id === variableId);
+
+  variables = variables.filter((variable) => variable.id !== variableId);
+
+  if (!selectedVariable) return [];
+
+  if (selectedVariable.type === "text") {
+    const allowedQuestions = questions.filter((question) =>
+      [
+        TSurveyQuestionTypeEnum.OpenText,
+        TSurveyQuestionTypeEnum.MultipleChoiceSingle,
+        TSurveyQuestionTypeEnum.Rating,
+        TSurveyQuestionTypeEnum.NPS,
+        TSurveyQuestionTypeEnum.Date,
+      ].includes(question.type)
+    );
+
+    const questionOptions = allowedQuestions.map((question) => {
+      return {
+        icon: questionIconMapping[question.type],
+        label: getLocalizedValue(question.headline, "default"),
+        value: question.id,
+        meta: {
+          type: "question",
+        },
+      };
+    });
+
+    const stringVariables = variables.filter((variable) => variable.type === "text");
+
+    const variableOptions = stringVariables.map((variable) => {
+      return {
+        icon: FileType2Icon,
+        label: variable.name,
+        value: variable.id,
+        meta: {
+          type: "variable",
+        },
+      };
+    });
+
+    const groupedOptions: TComboboxGroupedOption[] = [];
+
+    if (questionOptions.length > 0) {
+      groupedOptions.push({
+        label: "Questions",
+        value: "questions",
+        options: questionOptions,
+      });
+    }
+
+    if (variableOptions.length > 0) {
+      groupedOptions.push({
+        label: "Variables",
+        value: "variables",
+        options: variableOptions,
+      });
+    }
+
+    if (hiddenFieldsOptions.length > 0) {
+      groupedOptions.push({
+        label: "Hidden Fields",
+        value: "hiddenFields",
+        options: hiddenFieldsOptions,
+      });
+    }
+
+    return groupedOptions;
+  } else if (selectedVariable.type === "number") {
+    const allowedQuestions = questions.filter((question) =>
+      [TSurveyQuestionTypeEnum.Rating, TSurveyQuestionTypeEnum.NPS].includes(question.type)
+    );
+
+    const questionOptions = allowedQuestions.map((question) => {
+      return {
+        icon: questionIconMapping[question.type],
+        label: getLocalizedValue(question.headline, "default"),
+        value: question.id,
+        meta: {
+          type: "question",
+        },
+      };
+    });
+
+    const numberVariables = variables.filter((variable) => variable.type === "number");
+
+    const variableOptions = numberVariables.map((variable) => {
+      return {
+        icon: FileDigitIcon,
+        label: variable.name,
+        value: variable.id,
+        meta: {
+          type: "variable",
+        },
+      };
+    });
+
+    const groupedOptions: TComboboxGroupedOption[] = [];
+
+    if (questionOptions.length > 0) {
+      groupedOptions.push({
+        label: "Questions",
+        value: "questions",
+        options: questionOptions,
+      });
+    }
+
+    if (variableOptions.length > 0) {
+      groupedOptions.push({
+        label: "Variables",
+        value: "variables",
+        options: variableOptions,
+      });
+    }
+
+    if (hiddenFieldsOptions.length > 0) {
+      groupedOptions.push({
+        label: "Hidden Fields",
+        value: "hiddenFields",
+        options: hiddenFieldsOptions,
+      });
+    }
+
+    return groupedOptions;
+  }
+
+  return [];
+};
+
 const isUsedInLeftOperand = (
   leftOperand: TLeftOperand,
   type: "question" | "hiddenField" | "variable",

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)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx

@@ -12,7 +12,7 @@ import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
 import { getResponseCountBySurveyId } from "@formbricks/lib/response/service";
 import { getSegments } from "@formbricks/lib/segment/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
-import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
+import { ErrorComponent } from "@formbricks/ui/components/ErrorComponent";
 import { SurveyEditor } from "./components/SurveyEditor";
 
 export const generateMetadata = async ({ params }) => {

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/templates/components/BackButton.tsx

@@ -2,7 +2,7 @@
 
 import { ArrowLeftIcon } from "lucide-react";
 import { useRouter } from "next/navigation";
-import { Button } from "@formbricks/ui/Button";
+import { Button } from "@formbricks/ui/components/Button";
 
 export const BackButton = () => {
   const router = useRouter();

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/templates/components/TemplateContainer.tsx

@@ -7,9 +7,9 @@ import type { TEnvironment } from "@formbricks/types/environment";
 import type { TProduct, TProductConfigChannel, TProductConfigIndustry } from "@formbricks/types/product";
 import type { TTemplate, TTemplateRole } from "@formbricks/types/templates";
 import { TUser } from "@formbricks/types/user";
-import { PreviewSurvey } from "@formbricks/ui/PreviewSurvey";
-import { SearchBox } from "@formbricks/ui/SearchBox";
-import { TemplateList } from "@formbricks/ui/TemplateList";
+import { PreviewSurvey } from "@formbricks/ui/components/PreviewSurvey";
+import { SearchBar } from "@formbricks/ui/components/SearchBar";
+import { TemplateList } from "@formbricks/ui/components/TemplateList";
 import { minimalSurvey } from "../../lib/minimalSurvey";
 
 type TemplateContainerWithPreviewProps = {
@@ -39,14 +39,11 @@ export const TemplateContainerWithPreview = ({
           <div className="mb-3 ml-6 mt-6 flex flex-col items-center justify-between md:flex-row md:items-end">
             <h1 className="text-2xl font-bold text-slate-800">Create a new survey</h1>
             <div className="px-6">
-              <SearchBox
-                autoFocus
+              <SearchBar
                 value={templateSearch ?? ""}
-                onChange={(e) => setTemplateSearch(e.target.value)}
+                onChange={setTemplateSearch}
                 placeholder={"Search..."}
-                className="block rounded-md border border-slate-100 bg-white shadow-sm focus:border-slate-500 focus:outline-none focus:ring-0 sm:text-sm md:w-auto"
-                type="search"
-                name="search"
+                className="border-slate-700"
               />
             </div>
           </div>

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/templates/loading.tsx

@@ -1,4 +1,4 @@
-import { LoadingSpinner } from "@formbricks/ui/LoadingSpinner";
+import { LoadingSpinner } from "@formbricks/ui/components/LoadingSpinner";
 
 const Loading = () => {
   return <LoadingSpinner />;

apps/web/app/(app)/billing-confirmation/components/ConfirmationPage.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { Button } from "@formbricks/ui/Button";
-import { Confetti } from "@formbricks/ui/Confetti";
+import { Button } from "@formbricks/ui/components/Button";
+import { Confetti } from "@formbricks/ui/components/Confetti";
 
 interface ConfirmationPageProps {
   environmentId: string;