tweaks

.devcontainer/Dockerfile

@@ -0,0 +1,16 @@
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
+ARG VARIANT=20
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment if you want to install an additional version of node using nvm
+# ARG EXTRA_NODE_VERSION=10
+# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
+
+# [Optional] Uncomment if you want to install more global node modules
+# RUN su node -c "npm install -g <your-package-list-here>"
+
+RUN su node -c "npm install -g pnpm"

.devcontainer/devcontainer.json

@@ -1,6 +1,28 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node-postgres
+// Update the VARIANT arg in docker-compose.yml to pick a Node.js version
 {
-  "features": {},
-  "image": "mcr.microsoft.com/devcontainers/universal:2",
-  "postAttachCommand": "pnpm go",
-  "postCreateCommand": "cp .env.example .env && sed -i '/^ENCRYPTION_KEY=/c\\ENCRYPTION_KEY='$(openssl rand -hex 32) .env && sed -i '/^NEXTAUTH_SECRET=/c\\NEXTAUTH_SECRET='$(openssl rand -hex 32) .env && sed -i '/^CRON_SECRET=/c\\CRON_SECRET='$(openssl rand -hex 32) .env && pnpm install && pnpm db:migrate:dev"
+  // Configure tool-specific properties.
+  "customizations": {
+    // Configure properties specific to VS Code.
+    "vscode": {
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": ["dbaeumer.vscode-eslint"]
+    }
+  },
+
+  "dockerComposeFile": "docker-compose.yml",
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // This can be used to network with other containers or with the host.
+  "forwardPorts": [3000, 5432, 8025],
+
+  "name": "Node.js & PostgreSQL",
+  "postAttachCommand": "pnpm dev --filter=@formbricks/web... --filter=@formbricks/demo...",
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "cp .env.example .env && sed -i '/^ENCRYPTION_KEY=/c\\ENCRYPTION_KEY='$(openssl rand -hex 32) .env && sed -i '/^NEXTAUTH_SECRET=/c\\NEXTAUTH_SECRET='$(openssl rand -hex 32) .env && sed -i '/^CRON_SECRET=/c\\CRON_SECRET='$(openssl rand -hex 32) .env && pnpm install && pnpm db:migrate:dev",
+  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "node",
+  "service": "app",
+  "workspaceFolder": "/workspace"
 }

.devcontainer/docker-compose.yml

@@ -0,0 +1,51 @@
+version: "3.8"
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        # Update 'VARIANT' to pick an LTS version of Node.js: 20, 18, 16, 14.
+        # Append -bullseye or -buster to pin to an OS version.
+        # Use -bullseye variants on local arm64/Apple Silicon.
+        VARIANT: "20"
+
+    volumes:
+      - ..:/workspace:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
+    network_mode: service:db
+    # Uncomment the next line to use a non-root user for all processes.
+    # user: node
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+  db:
+    image: pgvector/pgvector:pg17
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_DB: formbricks
+    # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+  mailhog:
+    image: mailhog/mailhog
+    network_mode: service:app
+    logging:
+      driver:
+        "none" # disable saving logs
+        #    ports:
+      #    - 8025:8025 # web ui
+      # 1025:1025 # smtp server
+
+volumes:
+  postgres-data: null

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,13 +10,6 @@ body:
       description: A summary of the issue. This needs to be a clear detailed-rich summary.
     validations:
       required: true
-  - type: textarea
-    id: issue-expected-behavior
-    attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: false
   - type: textarea
     id: other-information
     attributes:

.gitpod.Dockerfile

@@ -0,0 +1,6 @@
+FROM gitpod/workspace-full
+
+# Install custom tools, runtime, etc.
+RUN brew install yq 
+
+RUN pnpm install turbo --global

.gitpod.yml

@@ -0,0 +1,74 @@
+tasks:
+  - name: demo
+    init: |
+      gp sync-await init-install && 
+      bash .gitpod/setup-demo.bash
+    command: |
+      cd apps/demo && 
+      cp .env.example .env &&
+      sed -i -r "s#^(NEXT_PUBLIC_FORMBRICKS_API_HOST=).*#\1 $(gp url 3000)#" .env &&
+      gp sync-await init && 
+      turbo --filter "@formbricks/demo" go
+
+  - name: Init Formbricks
+    init: |
+      cp .env.example .env &&
+      bash .gitpod/init.bash && 
+      turbo --filter "@formbricks/js" build && 
+      gp sync-done init-install
+    command: |
+      gp sync-done init && 
+      gp tasks list &&
+      gp ports await 3002 && gp ports await 3000 && gp open apps/demo/.env && gp preview $(gp url 3002) --external
+
+  - name: web
+    init: |
+      gp sync-await init-install && 
+      bash .gitpod/setup-web.bash &&
+      turbo --filter "@formbricks/database" db:down
+    command: |
+      gp sync-await init &&
+      cp .env.example .env &&
+      sed -i -r "s#^(WEBAPP_URL=).*#\1 $(gp url 3000)#" .env &&
+      RANDOM_ENCRYPTION_KEY=$(openssl rand -hex 32)
+      sed -i 's/^ENCRYPTION_KEY=.*/ENCRYPTION_KEY='"$RANDOM_ENCRYPTION_KEY"'/' .env
+      turbo --filter "@formbricks/web" go
+
+image:
+  file: .gitpod.Dockerfile
+
+ports:
+  - port: 3000
+    visibility: public
+    onOpen: open-browser
+  - port: 3001
+    visibility: public
+    onOpen: ignore
+  - port: 3002
+    visibility: public
+    onOpen: ignore
+  - port: 5432
+    visibility: public
+    onOpen: ignore
+  - port: 1025
+    visibility: public
+    onOpen: ignore
+  - port: 8025
+    visibility: public
+    onOpen: open-browser
+
+github:
+  prebuilds:
+    master: true
+    pullRequests: true
+    addComment: true
+
+vscode:
+  extensions:
+    - "ban.spellright"
+    - "bradlc.vscode-tailwindcss"
+    - "DavidAnson.vscode-markdownlint"
+    - "dbaeumer.vscode-eslint"
+    - "esbenp.prettier-vscode"
+    - "Prisma.prisma"
+    - "yzhang.markdown-all-in-one"

CONTRIBUTING.md

@@ -18,7 +18,7 @@ Ready to dive into the code and make a real impact? Here's your path:
 
 1. **Read our Best Practices**: [It takes 5 minutes](https://formbricks.com/docs/developer-docs/contributing/get-started) but will help you save hours 🤓
 
-1. **Fork the Repository:** Fork our repository or use [Gitpod](https://gitpod.io) or use [Github Codespaces](https://github.com/features/codespaces) to get started instantly.
+1. **Fork the Repository:** Fork our repository or use [Gitpod](https://formbricks.com/docs/developer-docs/contributing/gitpod) or use [Codespaces](https://formbricks.com/docs/developer-docs/contributing/codespaces)
 
 1. **Tweak and Transform:** Work your coding magic and apply your changes.
 

LICENSE

@@ -2,7 +2,7 @@ Copyright (c) 2024 Formbricks GmbH
 
 Portions of this software are licensed as follows:
 
-- All content that resides under the "apps/web/modules/ee" directory of this repository, if these directories exist, is licensed under the license defined in "apps/web/modules/ee/LICENSE".
+- All content that resides under the "packages/ee/", "apps/web/modules/ee" & "apps/web/app/(ee)" directories of this repository, if these directories exist, is licensed under the license defined in "packages/ee/LICENSE".
 - 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.

README.md

@@ -228,7 +228,7 @@ The Formbricks core application is licensed under the [AGPLv3 Open Source Licens
 
 ### The Enterprise Edition
 
-Additional to the AGPL licensed Formbricks core, this repository contains code licensed under an Enterprise license. The [code](https://github.com/formbricks/formbricks/tree/main/apps/web/modules/ee) and [license](https://github.com/formbricks/formbricks/blob/main/apps/web/modules/ee/LICENSE) for the enterprise functionality can be found in the `/apps/web/modules/ee` folder of this repository. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an [Enterprise License Key](https://formbricks.com/docs/self-hosting/enterprise) to unlock it.
+Additional to the AGPL licensed Formbricks core, this repository contains code licensed under an Enterprise license. The [code](https://github.com/formbricks/formbricks/tree/main/packages/ee) and [license](https://github.com/formbricks/formbricks/blob/main/packages/ee/LICENSE) for the enterprise functionality can be found in the `/packages/ee` folder of this repository. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an [Enterprise License Key](https://formbricks.com/docs/self-hosting/enterprise) to unlock it.
 
 ### White-Labeling Formbricks and Other Licensing Needs
 

apps/demo-react-native/package.json

@@ -15,8 +15,7 @@
     "@formbricks/react-native": "workspace:*",
     "expo": "51.0.26",
     "expo-status-bar": "1.12.1",
-    "react": "19.0.0-rc-ed15d500-20241110",
-    "react-dom": "19.0.0-rc-ed15d500-20241110",
+    "react": "18.3.1",
     "react-native": "0.74.4",
     "react-native-webview": "13.8.6"
   },

apps/demo-react-native/src/app.tsx

@@ -1,5 +1,4 @@
 import { StatusBar } from "expo-status-bar";
-import type { JSX } from "react";
 import { Button, LogBox, StyleSheet, Text, View } from "react-native";
 import Formbricks, { track } from "@formbricks/react-native";
 

apps/demo/package.json

@@ -14,9 +14,9 @@
     "@formbricks/js": "workspace:*",
     "@formbricks/ui": "workspace:*",
     "lucide-react": "0.452.0",
-    "next": "15.0.3",
-    "react": "19.0.0-rc-ed15d500-20241110",
-    "react-dom": "19.0.0-rc-ed15d500-20241110"
+    "next": "14.2.16",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@formbricks/eslint-config": "workspace:*",

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

@@ -10,11 +10,6 @@ export const metadata = {
 
 # SDK: Formbricks API
 
-<Note>
-  The API SDK is currently in beta and APIs are subject to change. We will do our best to notify you of any
-  changes.
-</Note>
-
 ### Overview
 
 The Formbricks Client API Wrapper is a lightweight package designed to simplify the integration of Formbricks API endpoints into your JavaScript (JS) or TypeScript (TS) projects. With this wrapper, you can easily interact with Formbricks API endpoints without the need for complex setup or manual HTTP requests.

apps/docs/app/developer-docs/contributing/get-started/page.mdx

@@ -14,7 +14,11 @@ We are so happy that you are interested in contributing to Formbricks 🤗 There
 
 - **Issues**: Spotted a bug? Has deployment gone wrong? Do you have user feedback? [Raise an issue](https://github.com/formbricks/formbricks/issues/new/choose) for the fastest response.
 - **Feature requests**: Raise an issue for these and tag it as an Enhancement. We love every idea. Please [open a feature request](https://github.com/formbricks/formbricks/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.yml&title=%5BFEATURE%5D) clearly describing the problem you want to solve.
-- **Creating a PR**: Please fork the repository, make your changes and create a new pull request if you want to make an update. Please talk to us first before starting development of more complex features. Small fixes are always welcome!
+- **How we Code at Formbricks**: [View this Notion document](https://formbricks.notion.site/How-we-code-at-Formbricks-8bcaa0304a20445db4871831149c0cf5?pvs=4) and understand the coding practises we follow so that you can adhere to them for uniformity.
+- **Creating a PR**: Please fork the repository, make your changes and create a new pull request if you want to make an update.
+- **E2E Tests**: [Understand how we write E2E tests](https://formbricks.notion.site/Formbricks-End-to-End-Tests-06dc830d71604deaa8da24714540f7ab?pvs=4) and make sure to consider writing a test whenever you ship a feature.
+- **New Question Types**:[Follow this guide](https://formbricks.notion.site/Guidelines-for-Implementing-a-New-Question-Type-9ac0d1c362714addb24b9abeb326d1c1?pvs=4) to keep everything in mind when you want to add a new question type.
+- **How to create a service**: [Read this document to understand how we use services](https://formbricks.notion.site/How-to-create-a-service-8e0c035704bb40cb9ea5e5beeeeabd67?pvs=4). This is particulalry important when you need to write a new one.
 
 ## Talk to us first
 
@@ -30,8 +34,8 @@ Once you open a PR, you will get a message from the CLA bot to fill out the form
 
 We currently officially support the below methods to set up your development environment for Formbricks:
 
-- [Gitpod](https://gitpod.io)
-- [GitHub Codespaces](https://github.com/features/codespaces)
+- [Gitpod](/developer-docs/contributing/gitpod)
+- [GitHub Codespaces](/developer-docs/contributing/codespaces)
 - [Local Machine Setup](#local-machine-setup)
 
 Both Gitpod and GitHub Codespaces have a **generous free tier** to explore and develop. For junior developers we suggest using either of these, because you can dive into coding within minutes, not hours.

apps/docs/app/developer-docs/contributing/gitpod/page.mdx

@@ -0,0 +1,172 @@
+import { MdxImage } from "@/components/MdxImage";
+
+import GitpodAuth from "./images/auth.webp";
+import GitpodNewWorkspace from "./images/new-workspace.webp";
+import GitpodPorts from "./images/ports.webp";
+import GitpodPreparing from "./images/preparing.webp";
+import GitpodRunning from "./images/running.webp";
+
+export const metadata = {
+  title: "Formbricks Open Source Contribution Guide: How to Enhance yourself and Contribute to Formbricks",
+  description:
+    "Join the Formbricks community and learn how to effectively contribute. From raising issues and feature requests to creating PRs, discover the best practices and communicate with our responsive team on Discord",
+};
+
+#### Contributing
+
+# Gitpod Guide
+
+    **Building custom image for the workspace:**
+    - This includes : Installing `yq` and `turbo` globally before the workspace starts. This is accomplished within the `.gitpod.Dockerfile` along with starting upon a base custom image building on [workspace-full](https://hub.docker.com/r/workspace-full/dockerfile).
+
+    **Initialization of Formbricks:**
+     - During the prebuilds phase, we initialize Formbricks by performing the following tasks:
+        1. Setting up environment variables.
+        2. Installing monorepo dependencies.
+        3. Installing Docker images by extracting them from the `packages/database/docker-compose.yml` file.
+        4. Building the @formbricks/js component.
+     - When the workspace starts:
+        1. Wait for the web and demo apps to launch on Gitpod. This automatically opens the `apps/demo/.env` file. Utilize dynamic localhost URLs (e.g., `localhost:3000` for signup and `localhost:8025` for email confirmation) to configure `NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID`. After creating your account and finding the `ID` in the URL at `localhost:3000`, replace `YOUR_ENVIRONMENT_ID` in the `.env` file located in `app/demo`.
+
+    **Web Component Initialization:**
+     - We initialize the @formbricks/web component during prebuilds. This involves:
+        1. Installing build dependencies for the `@formbricks/web#go` task from turbo.json in prebuilds to save time.
+        2. Starting PostgreSQL and Mailhog containers for running migrations in prebuilds.
+        3. To prevent the "Init" task from running indefinitely due to prebuild rules, a cleanup `docker compose down` step i.e. `db:down` is added to `turbo.json`. This step is designed to halt the execution of containers that are currently running.
+     - When the workspace starts:
+        1. Initializing environment variables.
+        2. Replacing `NEXT_PUBLIC_WEBAPP_URL` to take in Gitpod URL's ports when running on VSCode browser.
+        3. Starting the `@formbricks/web` dev environment.
+
+    **Demo Component Initialization:**
+     - Similar to the web component, the demo component is also initialized during prebuilds. This includes:
+        1. Installing build dependencies for the `formbricks/demo#go` task from turbo.json in prebuilds to save time.
+        2. Caching hits and replaying builds from the `@formbricks/js` component.
+     - When the workspace starts:
+        1. Initializing environment variables.
+        2. Replaces `NEXT_PUBLIC_FORMBRICKS_API_HOST` to take in Gitpod URL's ports when running on VSCode browser.
+        3. Starting the `@formbricks/demo` dev environment.
+
+    **Github Prebuilds Configuration:**
+     - This configures Github Prebuilds for the master branch, pull requests, and adding comments. This helps automate the prebuild process for the specified branches and actions.
+
+    **VSCode Extensions:**
+     - This includes a list of VSCode extensions that are added to the configuration when using Gitpod. These extensions can enhance the development experience within Gitpod.
+
+### 1. Browser Redirection
+
+After clicking the one-click setup button, Gitpod will open a new tab or window. Please ensure that your browser allows redirection to successfully access the services:
+
+### 2. Authorizing in Gitpod
+
+<MdxImage
+  src={GitpodAuth}
+  alt="Gitpod Auth Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- This is the Gitpod Authentication Page. It appears when you click the "Open in GitPod" button and Gitpod
+needs to authenticate your access to the workspace. Click on 'Continue With Github' to authorize your GitPod
+session.
+
+### 3. Creating a New Workspace
+
+<MdxImage
+  src={GitpodNewWorkspace}
+  alt="Gitpod New workspace Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- After authentication, Gitpod asks to create a new workspace for you. This page displays the configurations
+of your workspace. - You can use either choose either VS Code Browser or VS Code Desktop editor with the
+'Standard Class' for your workspace class. - If you opt for the VS Code Desktop, follow the following steps 1.
+Gitpod will prompt you to grant access to the VSCode app. Once approved, install the GitPod extension from the
+VSCode Marketplace and follow the prompts to authorize the integration. 2. Change the `WEBAPP_URL` to
+`https://localhost:3000`
+
+### 4. Gitpod preparing the created Workspace
+
+<MdxImage
+  src={GitpodPreparing}
+  alt="Gitpod Preparing workspace Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- Gitpod is preparing your workspace with all the necessary dependencies and configurations. You will see this
+page while Gitpod sets up your development environment.
+
+### 5. Gitpod running the Workspace
+
+<MdxImage
+  src={GitpodRunning}
+  alt="Gitpod Running Workspace Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- Once the workspace is fully prepared, voila, it enters the running state. You can start working on your
+project in this environment.
+
+### Ports and Services
+
+Here are the ports and corresponding URLs for the services within your Gitpod environment:
+
+- **Port 3000**:
+
+  - **Service**: Demo App
+  - **Description**: This port hosts the demo application of your project. You can access and interact with your application's demo by navigating to this port.
+
+- **Port 3001**:
+
+  - **Service**: Formbricks website
+  - **Description**: This port hosts the [Formbricks](https://formbricks.com) website, which contains documents, pricing, blogs, best practices, and concierge service.
+
+- **Port 3002**:
+
+  - **Service**: Formbricks In-product Survey Demo App
+  - **Description**: This app helps you test your app & website surveys. You can create and test user actions, create and update user attributes, etc.
+
+- **Port 5432**:
+
+  - **Service**: PostgreSQL Database Server
+  - **Description**: The PostgreSQL DB is hosted on this port.
+
+- **Port 1025**:
+
+  - **Service**: SMTP server
+  - **Description**: SMTP Server for sending and receiving email messages. This server is responsible for handling email communication.
+
+- **Port 8025**:
+  - **Service**: Mailhog
+
+### Accessing port URLs
+
+1. **Direct URL Composition**:
+
+- You can access the dedicated port URL by pre-pending the port number to the workspace URL.
+- For example, if you want to access port 3000, you can use the URL format: `3000-yourworkspace.ws-eu45.gitpod.io`.
+
+2. **Using [gp CLI](https://www.gitpod.io/docs/references-cli)**:
+
+- Gitpod provides a convenient command, `gp url`, to quickly retrieve the URL for a specific port.
+- Simply use the command followed by the desired port number. For example, to get the URL for port 3000, run: `gp url 3000`.
+
+3. **Listing All Open Port URLs**:
+
+- If you prefer to see a list of all open port URLs at once, you can use the `gp ports list` command.
+- Running this command will display a list of ports along with their corresponding URLs.
+
+4. **Viewing All Ports in Panel**:
+
+- Gitpod also offers a user-friendly 'Ports' tab in the Gitpod panel.
+- Click on the 'Ports' tab to view a list of all open ports and their respective URLs.
+
+{" "}
+
+<MdxImage
+  src={GitpodPorts}
+  alt="Gitpod Ports tab"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+These URLs and port numbers represent various services and endpoints within your Gitpod environment. You can access and interact with these services by the Port URL for the respective service.

apps/docs/app/developer-docs/integrations/n8n/page.mdx

@@ -26,20 +26,15 @@ export const metadata = {
 
 # n8n Setup
 
-<Note>
-  The Formbricks n8n node is currently only available in the n8n self-hosted version as a community node. To
-  install it go to "Settings" -> "Community Nodes" and install @formbricks/n8n-nodes-formbricks.
-</Note>
-
 n8n allows you to build flexible workflows focused on deep data integration. And with sharable templates and a user-friendly UI, the less technical people on your team can collaborate on them too. Unlike other tools, complexity is not a limitation. So you can build whatever you want — without stressing over budget. Hook up Formbricks with n8n and you can send your data to 350+ other apps. Here is how to do it.
 
-## Step 1: Setup your survey incl. `questionId` for every question
-
 <Note>
-  Nailed down your survey? Any changes in the survey cause additional work in the n8n node. It makes sense to
-  first settle on the survey you want to run and then get to setting up n8n.
+  Nail down your survey? Any changes in the survey cause additional work in the n8n node. It makes
+  sense to first settle on the survey you want to run and then get to setting up n8n.
 </Note>
 
+## Step 1: Setup your survey incl. `questionId` for every question
+
 When setting up the node your life will be easier when you change the `questionId`s of your survey questions. You can only do so **before** you publish your survey.
 
 <MdxImage

apps/docs/app/developer-docs/react-native-in-app-surveys/page.mdx

@@ -10,11 +10,6 @@ export const metadata = {
 
 # React Native: In App Surveys
 
-<Note>
-  The React Native SDK is currently in beta and APIs are subject to change. We will do our best to notify you
-  of any changes.
-</Note>
-
 ### Overview
 
 The Formbricks React Native SDK can be used for seamlessly integrating App Surveys into your React Native Apps. Here, w'll explore how to leverage the SDK for in app surveys. The SDK is [available on npm.](https://www.npmjs.com/package/@formbricks/react-native)

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

@@ -13,11 +13,6 @@ export const metadata = {
 
 # API Overview
 
-<Note>
-  The Formbricks API is currently in beta and is subject to change. We will do our best to notify you of any
-  changes.
-</Note>
-
 Formbricks offers two types of APIs: the **Public Client API** and the **Management API**. Each API serves a different purpose, has different authentication requirements, and provides access to different data and settings.
 
 View our [API Documentation](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh) in more than 30 frameworks and languages.

apps/docs/app/global/access-roles/page.mdx

@@ -6,7 +6,7 @@ import IndvInvite from "./images/individual-invite.webp";
 import MenuItem from "./images/organization-settings-menu.webp";
 
 export const metadata = {
-  title: "User Management",
+  title: "Organization Access Roles",
   description:
     "Assign different roles to organization members to grant them specific rights like creating surveys, viewing responses, or managing organization members.",
 };
@@ -134,7 +134,7 @@ There are two ways to invite organization members: One by one or in bulk.
 
 <Note>
   Access Roles is a feature of the **Enterprise Edition**. In the **Community Edition** and on the **Free**
-  and **Startup** plan in the Cloud you can invite unlimited organization members as `Owners`.
+  and **Startup** plan in the Cloud you can invite unlimited organization members as `Admins`.
 </Note>
 
 Formbricks sends an email to the organization member with an invitation link. The organization member can accept the invitation or create a new account by clicking on the link.

apps/docs/app/global/recall/page.mdx

@@ -1,75 +1,131 @@
 import { MdxImage } from "@/components/MdxImage";
-import SurveyEmbed from "@/components/SurveyEmbed";
+
+import StepEight from "./images/StepEight.webp";
+import StepFive from "./images/StepFive.webp";
+import StepFour from "./images/StepFour.webp";
 import StepOne from "./images/StepOne.webp";
+import StepSeven from "./images/StepSeven.webp";
+import StepSix from "./images/StepSix.webp";
 import StepThree from "./images/StepThree.webp";
 import StepTwo from "./images/StepTwo.webp";
 
 export const metadata = {
-  title: "Recall Data in Formbricks Surveys",
+  title: "Recall Functionality for Formbricks Surveys",
   description:
-    "Personalize your surveys by dynamically inserting data from URL parameters or previous answers into questions and descriptions. The Recall Data feature helps create engaging, adaptive survey experiences tailored to each respondent."};
+    "Enhance your surveys with the Recall Functionality to create more engaging and personalized experiences. This feature allows users to dynamically include responses from previous answers in subsequent questions or descriptions, adapting the survey content based on individual responses.",
+};
 
-# Recall Data
+# Recall Functionality
 
-Personalize your surveys by dynamically inserting data from URL parameters or previous answers into questions and descriptions. The Recall Data feature helps create engaging, adaptive survey experiences tailored to each respondent.
+Enhance your surveys with the Recall Functionality to create more engaging and personalized experiences. This feature allows users to dynamically include responses from previous answers in subsequent questions or descriptions, adapting the survey content based on individual responses.
 
-## Recall Sources
-You can recall data from the following sources:
-
-- The response of a previous question
-- The URL using a [Hidden Field](/docs/global/hidden-fields)
-
-## Recalling from a previous question
+### **How to Insert Recall References**
 
 <Note>
   The recall functionality is disabled on the first question of the survey since there’s no preceding question
-  to recall data from.
+  to recall
 </Note>
 
-### **Pre-requisite**
-
-Ensure the answer you wish to recall precedes the question in which it will be recalled. Here’s an example of setting up the first question:
-
-<MdxImage
-  src={StepThree}
-  alt="Survey setup example with link survey template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
-/>
-
-### **Step 1: Recall Data**
-
-Type **`@`** in the question or description field where you want to insert a recall. This triggers a dropdown menu listing all preceding questions. Select the question you want to recall data from.
-
-<MdxImage
-  src={StepTwo}
-  alt="Dropdown menu for recalling data in survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
-/>
-
-### **Step 2: Set a Fallback**
-
-To ensure the survey remains coherent when a response is missing (or the question is optional), you should set a fallback option.
+**Pre-requisite:** Ensure the answer you wish to recall precedes the question in which it will be recalled. Here’s an example of setting up the first question:
 
 <MdxImage
   src={StepOne}
-  alt="Setting fallback option in survey question"
+  alt="Choose a link survey template"
   quality="100"
   className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
-## Recalling from the URL
-1. Create a hidden field, [here is how →](/docs/global/hidden-fields)
-2. Use the `@` symbol in a question or description to recall the value of the hidden field
-3. Set a fallback in case the hidden field is not being filled by a URL parameter
-4. Use [Data Prefilling](/docs/link-surveys/data-prefilling) to set the hidden field value when the survey is accessed
+### **Steps to Initiate Recall**
 
+1. **Initiate Recall**: In the survey editor, type **`@`** in the question or description field where you want to insert a recall. This triggers a dropdown menu listing all preceding questions.
 
+<MdxImage
+  src={StepTwo}
+  alt="Choose a link survey template"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl "
+/>
 
-## Live Demo
+2. **Select a Question**: Navigate through the dropdown to choose your question. The first question is automatically focused, making it easy to select by pressing **`ENTER`**. Once selected, the question becomes a linked placeholder within the text field.
 
-<SurveyEmbed surveyUrl="https://app.formbricks.com/s/cm393eiiq0001kxphzc6lbbku" />
+### **Configuring Fallback Options**
+
+To ensure the survey remains coherent when a response is missing (or the question is optional), you can set a fallback option.
+
+<MdxImage
+  src={StepThree}
+  alt="Choose a link survey template"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl "
+/>
+
+1. **Access Fallback Settings**: Click the linked placeholder to open the configuration pop-up for fallback settings.
+2. **Set Fallback Text**: Input the fallback text that should appear if the recalled question lacks a response. This text ensures smooth survey progression.
+
+### **Example of Recall Usage**
+
+For example, you might structure a survey about favorite fruits as follows:
+
+- **Question 1**: "What is your favorite fruit?"
+- **Question 2**: "Why do you like `@What is your favorite fruit?` so much?"
+
+If "Question 1" is unanswered, you can set a fallback like "the fruit" to make "Question 2" read: "Why do you like the fruit so much?"
+
+### **User Experience**
+
+If a respondent answers “Mango” to the first question, the recall functionality automatically adjusts the following question to "Why is Mango your favorite?”
+
+<MdxImage
+  src={StepFour}
+  alt="Choose a link survey template"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl "
+/>
+
+As you can see, the questions that use this recall automatically use the response value:
+
+<MdxImage
+  src={StepFive}
+  alt="Choose a link survey template"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl "
+/>
+
+<MdxImage
+  src={StepSix}
+  alt="Choose a link survey template"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl "
+/>
+
+### **Visual Indicators in UI**
+
+When setting up your questions, the UI will visually indicate where recalls are used:
+
+- **Recall Indicators**: Linked questions will be highlighted with a light grey background in the survey editor, making it clear where dynamic content is being utilized.
+- **Fallback Indicators**: Any fallbacks set will also be displayed in a subtle yet distinct manner, ensuring you are aware of all conditional text paths in your survey.
+
+### Response Summary Page
+
+On the Formbricks dashboard, summary responses and individual response cards reflect recalled information, ensuring data coherence and enhancing analysis.
+
+- Summary Tab
+
+  <MdxImage
+    src={StepSeven}
+    alt="Choose a link survey template"
+    quality="100"
+    className="max-w-full rounded-lg sm:max-w-3xl "
+  />
+
+- Response Card:
+
+  <MdxImage
+    src={StepEight}
+    alt="Choose a link survey template"
+    quality="100"
+    className="max-w-full rounded-lg sm:max-w-3xl "
+  />
 
 ## **Conclusion**
 

apps/docs/app/layout.tsx

@@ -5,7 +5,6 @@ import "@/styles/tailwind.css";
 import glob from "fast-glob";
 import { type Metadata } from "next";
 import { Jost } from "next/font/google";
-import Script from "next/script";
 
 export const metadata: Metadata = {
   title: {
@@ -28,18 +27,6 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => {
 
   return (
     <html lang="en" className="h-full" suppressHydrationWarning>
-      <head>
-        {process.env.NEXT_PUBLIC_LAYER_API_KEY && (
-          <Script
-            strategy="afterInteractive"
-            src="https://storage.googleapis.com/generic-assets/buildwithlayer-widget-4.js"
-            primary-color="#00C4B8"
-            api-key={process.env.NEXT_PUBLIC_LAYER_API_KEY}
-            walkthrough-enabled="false"
-            design-style="copilot"
-          />
-        )}
-      </head>
       <body className={`flex min-h-full bg-white antialiased dark:bg-zinc-900 ${jost.className}`}>
         <Providers>
           <div className="w-full">

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

@@ -19,7 +19,7 @@ The Formbricks Core source code is licensed under AGPLv3 and available on GitHub
 
 ## Enterprise Edition License
 
-Additional to the AGPLv3 licensed Formbricks core, the Formbricks repository contains code licensed under our **[Enterprise License](https://github.com/formbricks/formbricks/blob/main/apps/web/modules/ee/LICENSE)**. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an **Enterprise License Key** to unlock it. For the pricing, please refer to [Formbricks Pricing](https://formbricks.com/pricing).
+Additional to the AGPLv3 licensed Formbricks core, the Formbricks repository contains code licensed under our **[Enterprise License](https://github.com/formbricks/formbricks/blob/main/packages/ee/LICENSE)**. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an **Enterprise License Key** to unlock it. For the pricing, please refer to [Formbricks Pricing](https://formbricks.com/pricing).
 
 ### When do I need an Enterprise License?
 
@@ -64,7 +64,7 @@ The Formbricks core application is licensed under the **[AGPLv3 Open Source Lice
 
 ### The Enterprise Edition
 
-Additional to the AGPL licensed Formbricks core, this repository contains code licensed under an Enterprise license. The **[code](https://github.com/formbricks/formbricks/tree/main/apps/web/modules/ee)** and **[license](https://github.com/formbricks/formbricks/blob/main/apps/web/modules/ee/LICENSE)** for the enterprise functionality can be found in the `/apps/web/modules/ee` folder of this repository. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an **[Enterprise License Key](https://formbricks.com/docs/self-hosting/enterprise)** to unlock it.
+Additional to the AGPL licensed Formbricks core, this repository contains code licensed under an Enterprise License. The **[code](https://github.com/formbricks/formbricks/tree/main/packages/ee)** and **[license](https://github.com/formbricks/formbricks/blob/main/packages/ee/LICENSE)** for the enterprise functionality can be found in the `/packages/ee` folder of this repository. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an **Enterprise License Key** to unlock it.
 
 ## White-Labeling Formbricks and Other Licensing Needs
 

apps/docs/app/self-hosting/migration-guide/page.mdx

@@ -8,123 +8,6 @@ export const metadata = {
 
 # Migration Guide
 
-## v2.7
-
-<Note>
-  This release sets the foundation for our upcoming AI features, currently in private beta. Formbricks now
-  requires the `pgvector` extension to be installed in the PostgreSQL database. For users of our one-click
-  setup, simply use the `pgvector/pgvector:pg15` image instead of `postgres:15-alpine`.
-</Note>
-
-Formbricks v2.7 includes all the features and improvements developed by the community during hacktoberfest 2024. Additionally we introduce an advanced team-based access control system (requires Formbricks Enterprise Edition).
-
-### Additional Updates
-
-If you previously used organization-based access control (enterprise feature) as well as the `DEFAULT_ORGANIZATION_ROLE` environment variable, make sure to update the value to one of the following roles: `owner`, `manager`, `member`. Read more about the new roles in the [Docs](/global/access-roles).
-
-### Steps to Migrate
-
-This guide is for users who are self-hosting Formbricks using our one-click setup. If you are using a different setup, you might adjust the commands accordingly.
-
-To run all these steps, please navigate to the `formbricks` folder where your `docker-compose.yml` file is located.
-
-1. **Backup your Database**: This is a crucial step. Please make sure to backup your database before proceeding with the upgrade. You can use the following command to backup your database:
-
-<Col>
-<CodeGroup title="Backup Postgres">
-
-```bash
-docker exec formbricks-postgres-1 pg_dump -Fc -U postgres -d formbricks > formbricks_pre_v2.7_$(date +%Y%m%d_%H%M%S).dump
-```
-
-</CodeGroup>
-</Col>
-
-<Note>
-  If you run into “No such container”, use `docker ps` to find your container name, e.g.
-  `formbricks_postgres_1`.
-</Note>
-
-<Note>
-  If you prefer storing the backup as an `*.sql` file remove the `-Fc` (custom format) option. In case of a
-  restore scenario you will need to use `psql` then with an empty `formbricks` database.
-</Note>
-
-2. If you use an older `docker-compose.yml` file from the one-click setup, modify it to use the `pgvector/pgvector:pg15` image instead of `postgres:15-alpine`:
-
-```yaml
-services:
-  postgres:
-    image: pgvector/pgvector:pg15
-    volumes:
-      - postgres:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_DB=postgres
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
-    ports:
-      - 5432:5432
-```
-
-3. Pull the latest version of Formbricks:
-
-<Col>
-<CodeGroup title="Stop the containers">
-
-```bash
-docker compose pull
-```
-
-</CodeGroup>
-</Col>
-
-4. Stop the running Formbricks instance & remove the related containers:
-
-<Col>
-<CodeGroup title="Stop the containers">
-
-```bash
-docker compose down
-```
-
-</CodeGroup>
-</Col>
-
-5. Restarting the containers with the latest version of Formbricks:
-
-<Col>
-<CodeGroup title="Restart the containers">
-
-```bash
-docker compose up -d
-```
-
-</CodeGroup>
-</Col>
-
-6. Now let's migrate the data to the latest schema:
-
-<Note>To find your Docker Network name for your Postgres Database, find it using `docker network ls`</Note>
-
-<Col>
-<CodeGroup title="Migrate the data">
-
-```bash
-docker pull ghcr.io/formbricks/data-migrations:latest && \
-docker run --rm \
-  --network=formbricks_default \
-  -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \
-  -e UPGRADE_TO_VERSION="v2.7" \
-  ghcr.io/formbricks/data-migrations:v2.7.0
-```
-
-</CodeGroup>
-</Col>
-
-The above command will migrate your data to the latest schema. This is a crucial step to migrate your existing data to the new structure. Only if the script runs successful, changes are made to the database. The script can safely run multiple times.
-
-7. That's it! Once the migration is complete, you can **now access your Formbricks instance** at the same URL as before.
-
 ## v2.6
 
 Formbricks v2.6 introduces advanced logic jumps for surveys, allowing you to add more advanced branching logic to your surveys including variables, and/or conditions and many more. This release also includes a lot of bug fixes, big performance improvements to website and app surveys and a lot of stability improvements.

apps/docs/lib/navigation.ts

@@ -126,7 +126,7 @@ export const navigation: Array<NavGroup> = [
           { title: "Zapier", href: "/developer-docs/integrations/zapier" },
         ],
       },
-      { title: "User Management", href: "/global/access-roles" },
+      { title: "Organization and User Management", href: "/global/access-roles" },
       { title: "Styling Theme", href: "/global/styling-theme" },
     ],
   },
@@ -156,6 +156,8 @@ export const navigation: Array<NavGroup> = [
         title: "Contributing",
         children: [
           { title: "Get started", href: "/developer-docs/contributing/get-started" },
+          { title: "Codespaces", href: "/developer-docs/contributing/codespaces" },
+          { title: "Gitpod", href: "/developer-docs/contributing/gitpod" },
           { title: "Troubleshooting", href: "/developer-docs/contributing/troubleshooting" },
         ],
       },

apps/docs/package.json

@@ -24,7 +24,7 @@
     "@mapbox/rehype-prism": "0.9.0",
     "@mdx-js/loader": "3.0.1",
     "@mdx-js/react": "3.0.1",
-    "@next/mdx": "15.0.3",
+    "@next/mdx": "14.2.15",
     "@paralleldrive/cuid2": "2.2.2",
     "@sindresorhus/slugify": "2.2.1",
     "@tailwindcss/typography": "0.5.15",
@@ -39,7 +39,7 @@
     "lucide-react": "0.452.0",
     "mdast-util-to-string": "4.0.0",
     "mdx-annotations": "0.1.4",
-    "next": "15.0.3",
+    "next": "14.2.16",
     "next-plausible": "3.12.2",
     "next-seo": "6.6.0",
     "next-sitemap": "4.2.3",
@@ -47,8 +47,8 @@
     "node-fetch": "3.3.2",
     "prism-react-renderer": "2.4.0",
     "prismjs": "1.29.0",
-    "react": "19.0.0-rc-ed15d500-20241110",
-    "react-dom": "19.0.0-rc-ed15d500-20241110",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-highlight-words": "0.20.0",
     "react-markdown": "9.0.1",
     "react-responsive-embed": "2.1.0",

apps/storybook/package.json

@@ -13,8 +13,8 @@
   "dependencies": {
     "@formbricks/ui": "workspace:*",
     "eslint-plugin-react-refresh": "0.4.12",
-    "react": "19.0.0-rc-ed15d500-20241110",
-    "react-dom": "19.0.0-rc-ed15d500-20241110"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@chromatic-com/storybook": "2.0.2",

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

@@ -19,11 +19,7 @@ interface InviteOrganizationMemberProps {
 
 const ZInviteOrganizationMemberDetails = z.object({
   email: z.string().email(),
-  inviteMessage: z
-    .string()
-    .trim()
-    .min(1)
-    .refine((value) => !/https?:\/\/|<script/i.test(value), "Invite message cannot contain URLs or scripts"),
+  inviteMessage: z.string().trim().min(1),
 });
 type TInviteOrganizationMemberDetails = z.infer<typeof ZInviteOrganizationMemberDetails>;
 

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

@@ -10,13 +10,12 @@ import { Button } from "@formbricks/ui/components/Button";
 import { Header } from "@formbricks/ui/components/Header";
 
 interface InvitePageProps {
-  params: Promise<{
+  params: {
     environmentId: string;
-  }>;
+  };
 }
 
-const Page = async (props: InvitePageProps) => {
-  const params = await props.params;
+const Page = async ({ params }: InvitePageProps) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {

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

@@ -8,13 +8,12 @@ import { Button } from "@formbricks/ui/components/Button";
 import { Header } from "@formbricks/ui/components/Header";
 
 interface ConnectPageProps {
-  params: Promise<{
+  params: {
     environmentId: string;
-  }>;
+  };
 }
 
-const Page = async (props: ConnectPageProps) => {
-  const params = await props.params;
+const Page = async ({ params }: ConnectPageProps) => {
   const t = await getTranslations();
   const environment = await getEnvironment(params.environmentId);
 

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

@@ -4,11 +4,7 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { hasUserEnvironmentAccess } from "@formbricks/lib/environment/auth";
 import { AuthorizationError } from "@formbricks/types/errors";
 
-const OnboardingLayout = async (props) => {
-  const params = await props.params;
-
-  const { children } = props;
-
+const OnboardingLayout = async ({ children, params }) => {
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {
     return redirect(`/auth/login`);

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

@@ -11,13 +11,12 @@ import { Button } from "@formbricks/ui/components/Button";
 import { Header } from "@formbricks/ui/components/Header";
 
 interface XMTemplatePageProps {
-  params: Promise<{
+  params: {
     environmentId: string;
-  }>;
+  };
 }
 
-const Page = async (props: XMTemplatePageProps) => {
-  const params = await props.params;
+const Page = async ({ params }: XMTemplatePageProps) => {
   const session = await getServerSession(authOptions);
   const environment = await getEnvironment(params.environmentId);
   const t = await getTranslations();

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

@@ -11,7 +11,7 @@ import { ZId } from "@formbricks/types/common";
 import { DatabaseError } from "@formbricks/types/errors";
 
 export const getTeamsByOrganizationId = reactCache(
-  async (organizationId: string): Promise<TOrganizationTeam[] | null> =>
+  (organizationId: string): Promise<TOrganizationTeam[] | null> =>
     cache(
       async () => {
         validateInputs([organizationId, ZId]);

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

@@ -5,11 +5,7 @@ import { getEnvironments } from "@formbricks/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getUserProducts } from "@formbricks/lib/product/service";
 
-const LandingLayout = async (props) => {
-  const params = await props.params;
-
-  const { children } = props;
-
+const LandingLayout = async ({ children, params }) => {
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {
     return redirect(`/auth/login`);

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

@@ -1,15 +1,14 @@
 import { LandingSidebar } from "@/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar";
-import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/utils";
 import { getServerSession } from "next-auth";
 import { getTranslations } from "next-intl/server";
 import { notFound, redirect } from "next/navigation";
+import { getEnterpriseLicense } from "@formbricks/ee/lib/service";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getOrganization, getOrganizationsByUserId } from "@formbricks/lib/organization/service";
 import { getUser } from "@formbricks/lib/user/service";
 import { Header } from "@formbricks/ui/components/Header";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {

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

@@ -9,11 +9,7 @@ import { getUser } from "@formbricks/lib/user/service";
 import { AuthorizationError } from "@formbricks/types/errors";
 import { ToasterClient } from "@formbricks/ui/components/ToasterClient";
 
-const ProductOnboardingLayout = async (props) => {
-  const params = await props.params;
-
-  const { children } = props;
-
+const ProductOnboardingLayout = async ({ children, params }) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {

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

@@ -4,11 +4,7 @@ import { authOptions } from "@formbricks/lib/authOptions";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 
-const OnboardingLayout = async (props) => {
-  const params = await props.params;
-
-  const { children } = props;
-
+const OnboardingLayout = async ({ children, params }) => {
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {
     return redirect(`/auth/login`);

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

@@ -9,13 +9,12 @@ import { Button } from "@formbricks/ui/components/Button";
 import { Header } from "@formbricks/ui/components/Header";
 
 interface ChannelPageProps {
-  params: Promise<{
+  params: {
     organizationId: string;
-  }>;
+  };
 }
 
-const Page = async (props: ChannelPageProps) => {
-  const params = await props.params;
+const Page = async ({ params }: ChannelPageProps) => {
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {
     return redirect(`/auth/login`);

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

@@ -9,13 +9,12 @@ import { Button } from "@formbricks/ui/components/Button";
 import { Header } from "@formbricks/ui/components/Header";
 
 interface ModePageProps {
-  params: Promise<{
+  params: {
     organizationId: string;
-  }>;
+  };
 }
 
-const Page = async (props: ModePageProps) => {
-  const params = await props.params;
+const Page = async ({ params }: ModePageProps) => {
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {
     return redirect(`/auth/login`);

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

@@ -1,11 +1,11 @@
 import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
 import { getCustomHeadline } from "@/app/(app)/(onboarding)/lib/utils";
 import { ProductSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/products/new/settings/components/ProductSettings";
-import { getRoleManagementPermission } from "@/modules/ee/license-check/lib/utils";
 import { XIcon } from "lucide-react";
 import { getServerSession } from "next-auth";
 import { getTranslations } from "next-intl/server";
 import { redirect } from "next/navigation";
+import { getRoleManagementPermission } from "@formbricks/ee/lib/service";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { DEFAULT_BRAND_COLOR, DEFAULT_LOCALE } from "@formbricks/lib/constants";
 import { getOrganization } from "@formbricks/lib/organization/service";
@@ -16,19 +16,17 @@ import { Button } from "@formbricks/ui/components/Button";
 import { Header } from "@formbricks/ui/components/Header";
 
 interface ProductSettingsPageProps {
-  params: Promise<{
+  params: {
     organizationId: string;
-  }>;
-  searchParams: Promise<{
+  };
+  searchParams: {
     channel?: TProductConfigChannel;
     industry?: TProductConfigIndustry;
     mode?: TProductMode;
-  }>;
+  };
 }
 
-const Page = async (props: ProductSettingsPageProps) => {
-  const searchParams = await props.searchParams;
-  const params = await props.params;
+const Page = async ({ params, searchParams }: ProductSettingsPageProps) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
 

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

@@ -13,11 +13,7 @@ import { AuthorizationError } from "@formbricks/types/errors";
 import { DevEnvironmentBanner } from "@formbricks/ui/components/DevEnvironmentBanner";
 import { ToasterClient } from "@formbricks/ui/components/ToasterClient";
 
-const SurveyEditorEnvironmentLayout = async (props) => {
-  const params = await props.params;
-
-  const { children } = props;
-
+const SurveyEditorEnvironmentLayout = async ({ children, params }) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
   if (!session || !session.user) {

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

@@ -4,7 +4,7 @@ import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInpu
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { type JSX, useEffect } from "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";

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

@@ -4,7 +4,7 @@ import { LocalizedEditor } from "@/modules/ee/multi-language-surveys/components/
 import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInput";
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { useTranslations } from "next-intl";
-import { type JSX, useState } from "react";
+import { useState } from "react";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyCTAQuestion } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";

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

@@ -1,7 +1,7 @@
 import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInput";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { type JSX, useEffect, useState } from "react";
+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";

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

@@ -41,8 +41,8 @@ export const CardStylingSettings = ({
   const surveyTypeDerived = isAppSurvey ? "App" : "Link";
   const isLogoVisible = !!product.logo?.url;
 
-  const linkCardArrangement = form.watch("cardArrangement.linkSurveys") ?? "straight";
-  const appCardArrangement = form.watch("cardArrangement.appSurveys") ?? "straight";
+  const linkCardArrangement = form.watch("cardArrangement.linkSurveys") ?? "simple";
+  const appCardArrangement = form.watch("cardArrangement.appSurveys") ?? "simple";
   const roundness = form.watch("roundness") ?? 8;
 
   const [parent] = useAutoAnimate();

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

@@ -87,12 +87,10 @@ export function ConditionalLogic({
 
   const handleRemoveLogic = (logicItemIdx: number) => {
     const logicCopy = structuredClone(question.logic ?? []);
-    const isLast = logicCopy.length === 1;
     logicCopy.splice(logicItemIdx, 1);
 
     updateQuestion(questionIdx, {
       logic: logicCopy,
-      logicFallback: isLast ? undefined : question.logicFallback,
     });
   };
 

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

@@ -3,7 +3,7 @@
 import { LocalizedEditor } from "@/modules/ee/multi-language-surveys/components/localized-editor";
 import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInput";
 import { useTranslations } from "next-intl";
-import { type JSX, useState } from "react";
+import { useState } from "react";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyConsentQuestion } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";

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

@@ -4,7 +4,7 @@ import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInpu
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { type JSX, useEffect } from "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";

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

@@ -2,7 +2,6 @@ import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInpu
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import type { JSX } from "react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyDateQuestion } from "@formbricks/types/surveys/types";

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

@@ -3,17 +3,13 @@
 import { EditorCardMenu } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EditorCardMenu";
 import { EndScreenForm } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/EndScreenForm";
 import { RedirectUrlForm } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/RedirectUrlForm";
-import {
-  findEndingCardUsedInLogic,
-  formatTextWithSlashes,
-} from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
+import { formatTextWithSlashes } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/lib/utils";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { createId } from "@paralleldrive/cuid2";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { GripIcon, Handshake, Undo2 } from "lucide-react";
 import { useTranslations } from "next-intl";
-import toast from "react-hot-toast";
 import { cn } from "@formbricks/lib/cn";
 import { recallToHeadline } from "@formbricks/lib/utils/recall";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
@@ -97,14 +93,6 @@ export const EditEndingCard = ({
   };
 
   const deleteEndingCard = () => {
-    // checking if this ending card is used in logic
-    const quesIdx = findEndingCardUsedInLogic(localSurvey, endingCard.id);
-
-    if (quesIdx !== -1) {
-      toast.error(t("environments.surveys.edit.ending_card_used_in_logic", { questionIndex: quesIdx + 1 }));
-      return;
-    }
-
     setLocalSurvey((prevSurvey) => {
       const updatedEndings = prevSurvey.endings.filter((_, index) => index !== endingCardIndex);
       return { ...prevSurvey, endings: updatedEndings };

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

@@ -142,30 +142,6 @@ export const EditorCardMenu = ({
 
   return (
     <div className="flex space-x-2">
-      <ArrowUpIcon
-        className={cn(
-          "h-4 cursor-pointer text-slate-500",
-          cardIdx === 0 ? "cursor-not-allowed opacity-50" : "hover:text-slate-600"
-        )}
-        onClick={(e) => {
-          if (cardIdx !== 0) {
-            e.stopPropagation();
-            moveCard(cardIdx, true);
-          }
-        }}
-      />
-      <ArrowDownIcon
-        className={cn(
-          "h-4 cursor-pointer text-slate-500",
-          lastCard ? "cursor-not-allowed opacity-50" : "hover:text-slate-600"
-        )}
-        onClick={(e) => {
-          if (!lastCard) {
-            e.stopPropagation();
-            moveCard(cardIdx, false);
-          }
-        }}
-      />
       <CopyIcon
         className="h-4 cursor-pointer text-slate-500 hover:text-slate-600"
         onClick={(e) => {

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

@@ -6,7 +6,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { PlusIcon, XCircleIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
-import { type JSX, useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import { toast } from "react-hot-toast";
 import { extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { createI18nString } from "@formbricks/lib/i18n/utils";

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

@@ -2,17 +2,7 @@ import { LogicEditorActions } from "@/app/(app)/(survey-editor)/environments/[en
 import { LogicEditorConditions } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/LogicEditorConditions";
 import { ArrowRightIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { ReactElement, useMemo } from "react";
-import { getLocalizedValue } from "@formbricks/lib/i18n/utils";
-import { QUESTIONS_ICON_MAP } from "@formbricks/lib/utils/questions";
 import { TSurvey, TSurveyLogic, TSurveyQuestion } from "@formbricks/types/surveys/types";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@formbricks/ui/components/Select";
 
 interface LogicEditorProps {
   localSurvey: TSurvey;
@@ -34,36 +24,6 @@ export function LogicEditor({
   isLast,
 }: LogicEditorProps) {
   const t = useTranslations();
-
-  const fallbackOptions = useMemo(() => {
-    let options: {
-      icon?: ReactElement;
-      label: string;
-      value: string;
-    }[] = [];
-
-    localSurvey.questions.forEach((ques) => {
-      if (ques.id === question.id) return null;
-      options.push({
-        icon: QUESTIONS_ICON_MAP[ques.type],
-        label: getLocalizedValue(ques.headline, "default"),
-        value: ques.id,
-      });
-    });
-
-    localSurvey.endings.forEach((ending) => {
-      options.push({
-        label:
-          ending.type === "endScreen"
-            ? getLocalizedValue(ending.headline, "default") || t("environments.surveys.edit.end_screen_card")
-            : ending.label || t("environments.surveys.edit.redirect_thank_you_card"),
-        value: ending.id,
-      });
-    });
-
-    return options;
-  }, [localSurvey.questions, localSurvey.endings, question.id, t]);
-
   return (
     <div className="flex w-full grow flex-col gap-4 overflow-x-auto pb-2 text-sm">
       <LogicEditorConditions
@@ -83,36 +43,11 @@ export function LogicEditor({
         questionIdx={questionIdx}
       />
       {isLast ? (
-        <div className="flex items-center space-x-2">
+        <div className="flex flex-wrap items-center space-x-2">
           <ArrowRightIcon className="h-4 w-4" />
-          <p className="text-nowrap text-slate-700">
-            {t("environments.surveys.edit.all_other_answers_will_continue_to")}
+          <p className="text-slate-700">
+            {t("environments.surveys.edit.all_other_answers_will_continue_to_the_next_question")}
           </p>
-          <Select
-            autoComplete="true"
-            defaultValue={question.logicFallback || "defaultSelection"}
-            onValueChange={(val) => {
-              updateQuestion(questionIdx, {
-                logicFallback: val === "defaultSelection" ? undefined : val,
-              });
-            }}>
-            <SelectTrigger className="w-auto bg-white">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem key="fallback_default_selection" value={"defaultSelection"}>
-                {t("environments.surveys.edit.next_question")}
-              </SelectItem>
-              {fallbackOptions.map((option) => (
-                <SelectItem key={`fallback_${option.value}`} value={option.value}>
-                  <div className="flex items-center gap-2">
-                    {option.icon}
-                    {option.label}
-                  </div>
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
         </div>
       ) : null}
     </div>

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

@@ -244,13 +244,7 @@ export function LogicEditorConditions({
     const conditionOperatorOptions = getConditionOperatorOptions(condition, localSurvey);
     const { show, options, showInput = false, inputType } = getMatchValueProps(condition, localSurvey, t);
 
-    const allowMultiSelect = [
-      "equalsOneOf",
-      "includesAllOf",
-      "includesOneOf",
-      "doesNotIncludeOneOf",
-      "doesNotIncludeAllOf",
-    ].includes(condition.operator);
+    const allowMultiSelect = ["equalsOneOf", "includesAllOf", "includesOneOf"].includes(condition.operator);
     return (
       <div key={condition.id} className="flex items-center gap-x-2">
         <div className="w-10 shrink-0">

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

@@ -4,7 +4,6 @@ import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInpu
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { PlusIcon, TrashIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import type { JSX } from "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";

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

@@ -8,7 +8,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { createId } from "@paralleldrive/cuid2";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { type JSX, useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import toast from "react-hot-toast";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";

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

@@ -4,7 +4,6 @@ import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInpu
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import type { JSX } from "react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TSurvey, TSurveyNPSQuestion } from "@formbricks/types/surveys/types";

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

@@ -4,7 +4,6 @@ import { QuestionFormInput } from "@/modules/surveys/components/QuestionFormInpu
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { HashIcon, LinkIcon, MailIcon, MessageSquareTextIcon, PhoneIcon, PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import type { JSX } from "react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import {

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

@@ -3,7 +3,6 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { createId } from "@paralleldrive/cuid2";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import type { JSX } from "react";
 import { cn } from "@formbricks/lib/cn";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";

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

@@ -1,6 +1,6 @@
 import { PaintbrushIcon, Rows3Icon, SettingsIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { type JSX, useMemo } from "react";
+import { useMemo } from "react";
 import { cn } from "@formbricks/lib/cn";
 import { TSurveyEditorTabs } from "@formbricks/types/surveys/types";
 

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

@@ -7,7 +7,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { createId } from "@paralleldrive/cuid2";
 import { PlusIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { type JSX, useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { createI18nString, extractLanguageCodes } from "@formbricks/lib/i18n/utils";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TI18nString, TSurvey, TSurveyRankingQuestion } from "@formbricks/types/surveys/types";

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

@@ -130,15 +130,21 @@ export const ResponseOptionsCard = ({
   };
 
   const handleRunOnDateChange = (date: Date) => {
-    const utcDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0, 0));
-    setRunOnDate(utcDate);
-    setLocalSurvey({ ...localSurvey, runOnDate: utcDate ?? null });
+    const equivalentDate = date?.getDate();
+    date?.setUTCHours(0, 0, 0, 0);
+    date?.setDate(equivalentDate);
+
+    setRunOnDate(date);
+    setLocalSurvey({ ...localSurvey, runOnDate: date ?? null });
   };
 
   const handleCloseOnDateChange = (date: Date) => {
-    const utcDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0, 0));
-    setCloseOnDate(utcDate);
-    setLocalSurvey({ ...localSurvey, closeOnDate: utcDate ?? null });
+    const equivalentDate = date?.getDate();
+    date?.setUTCHours(0, 0, 0, 0);
+    date?.setDate(equivalentDate);
+
+    setCloseOnDate(date);
+    setLocalSurvey({ ...localSurvey, closeOnDate: date ?? null });
   };
 
   const handleClosedSurveyMessageChange = ({

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

@@ -2,10 +2,12 @@ import { RotateCcwIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import React, { useEffect, useMemo, useState } from "react";
-import { UseFormReturn, useForm } from "react-hook-form";
+import { UseFormReturn, useForm, useWatch } from "react-hook-form";
 import toast from "react-hot-toast";
+import { COLOR_DEFAULTS } from "@formbricks/lib/styling/constants";
 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/components/AlertDialog";
 import { Button } from "@formbricks/ui/components/Button";
@@ -51,8 +53,50 @@ export const StylingView = ({
 }: StylingViewProps) => {
   const t = useTranslations();
 
+  const stylingDefaults: TBaseStyling = useMemo(() => {
+    let stylingDefaults: TBaseStyling;
+    const isOverwriteEnabled = localSurvey.styling?.overwriteThemeStyling ?? false;
+
+    if (isOverwriteEnabled) {
+      const { overwriteThemeStyling, ...baseSurveyStyles } = localSurvey.styling ?? {};
+      stylingDefaults = baseSurveyStyles;
+    } else {
+      const { allowStyleOverwrite, ...baseProductStyles } = product.styling ?? {};
+      stylingDefaults = baseProductStyles;
+    }
+
+    return {
+      brandColor: { light: stylingDefaults.brandColor?.light ?? COLOR_DEFAULTS.brandColor },
+      questionColor: { light: stylingDefaults.questionColor?.light ?? COLOR_DEFAULTS.questionColor },
+      inputColor: { light: stylingDefaults.inputColor?.light ?? COLOR_DEFAULTS.inputColor },
+      inputBorderColor: { light: stylingDefaults.inputBorderColor?.light ?? COLOR_DEFAULTS.inputBorderColor },
+      cardBackgroundColor: {
+        light: stylingDefaults.cardBackgroundColor?.light ?? COLOR_DEFAULTS.cardBackgroundColor,
+      },
+      cardBorderColor: { light: stylingDefaults.cardBorderColor?.light ?? COLOR_DEFAULTS.cardBorderColor },
+      cardShadowColor: { light: stylingDefaults.cardShadowColor?.light ?? COLOR_DEFAULTS.cardShadowColor },
+      highlightBorderColor: stylingDefaults.highlightBorderColor?.light
+        ? {
+            light: stylingDefaults.highlightBorderColor.light,
+          }
+        : undefined,
+      isDarkModeEnabled: stylingDefaults.isDarkModeEnabled ?? false,
+      roundness: stylingDefaults.roundness ?? 8,
+      cardArrangement: stylingDefaults.cardArrangement ?? {
+        linkSurveys: "simple",
+        appSurveys: "simple",
+      },
+      background: stylingDefaults.background,
+      hideProgressBar: stylingDefaults.hideProgressBar ?? false,
+      isLogoHidden: stylingDefaults.isLogoHidden ?? false,
+    };
+  }, [localSurvey.styling, product.styling]);
+
   const form = useForm<TSurveyStyling>({
-    defaultValues: localSurvey.styling ?? product.styling,
+    defaultValues: {
+      ...localSurvey.styling,
+      ...stylingDefaults,
+    },
   });
 
   const overwriteThemeStyling = form.watch("overwriteThemeStyling");
@@ -89,17 +133,20 @@ export const StylingView = ({
     }
   }, [overwriteThemeStyling]);
 
+  const watchedValues = useWatch({
+    control: form.control,
+  });
+
   useEffect(() => {
-    form.watch((data: TSurveyStyling) => {
-      setLocalSurvey((prev) => ({
-        ...prev,
-        styling: {
-          ...prev.styling,
-          ...data,
-        },
-      }));
-    });
-  }, [setLocalSurvey]);
+    // @ts-expect-error
+    setLocalSurvey((prev) => ({
+      ...prev,
+      styling: {
+        ...prev.styling,
+        ...watchedValues,
+      },
+    }));
+  }, [watchedValues, setLocalSurvey]);
 
   const defaultProductStyling = useMemo(() => {
     const { styling: productStyling } = product;

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

@@ -344,7 +344,9 @@ export const SurveyMenuBar = ({
                   <AlertTriangleIcon className="h-5 w-5 text-amber-400" />
                 </TooltipTrigger>
                 <TooltipContent side={"top"} className="lg:hidden">
-                  <p className="py-2 text-center text-xs text-slate-500 dark:text-slate-400">{cautionText}</p>
+                  <p className="py-2 text-center text-xs text-slate-500 dark:text-slate-400">
+                    {t(cautionText)}
+                  </p>
                 </TooltipContent>
               </Tooltip>
             </TooltipProvider>

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

@@ -116,14 +116,6 @@ export const logicRules = {
           label: "environments.surveys.edit.does_not_equal",
           value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
         },
-        {
-          label: "environments.surveys.edit.does_not_include_one_of",
-          value: ZSurveyLogicConditionsOperator.Enum.doesNotIncludeOneOf,
-        },
-        {
-          label: "environments.surveys.edit.does_not_include_all_of",
-          value: ZSurveyLogicConditionsOperator.Enum.doesNotIncludeAllOf,
-        },
         {
           label: "environments.surveys.edit.includes_all_of",
           value: ZSurveyLogicConditionsOperator.Enum.includesAllOf,
@@ -152,14 +144,6 @@ export const logicRules = {
           label: "environments.surveys.edit.does_not_equal",
           value: ZSurveyLogicConditionsOperator.Enum.doesNotEqual,
         },
-        {
-          label: "environments.surveys.edit.does_not_include_one_of",
-          value: ZSurveyLogicConditionsOperator.Enum.doesNotIncludeOneOf,
-        },
-        {
-          label: "environments.surveys.edit.does_not_include_all_of",
-          value: ZSurveyLogicConditionsOperator.Enum.doesNotIncludeAllOf,
-        },
         {
           label: "environments.surveys.edit.includes_all_of",
           value: ZSurveyLogicConditionsOperator.Enum.includesAllOf,

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

@@ -1060,9 +1060,7 @@ export const findQuestionUsedInLogic = (survey: TSurvey, questionId: TSurveyQues
   };
 
   return survey.questions.findIndex(
-    (question) =>
-      question.logicFallback === questionId ||
-      (question.id !== questionId && question.logic?.some(isUsedInLogicRule))
+    (question) => question.logic && question.id !== questionId && question.logic.some(isUsedInLogicRule)
   );
 };
 
@@ -1147,17 +1145,3 @@ export const findHiddenFieldUsedInLogic = (survey: TSurvey, hiddenFieldId: strin
 
   return survey.questions.findIndex((question) => question.logic?.some(isUsedInLogicRule));
 };
-
-export const findEndingCardUsedInLogic = (survey: TSurvey, endingCardId: string): number => {
-  const isUsedInAction = (action: TSurveyLogicAction): boolean => {
-    return action.objective === "jumpToQuestion" && action.target === endingCardId;
-  };
-
-  const isUsedInLogicRule = (logicRule: TSurveyLogic): boolean => {
-    return logicRule.actions.some(isUsedInAction);
-  };
-
-  return survey.questions.findIndex(
-    (question) => question.logicFallback === endingCardId || question.logic?.some(isUsedInLogicRule)
-  );
-};

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

@@ -1,11 +1,8 @@
-import {
-  getAdvancedTargetingPermission,
-  getMultiLanguagePermission,
-} from "@/modules/ee/license-check/lib/utils";
 import { getProductPermissionByUserId } from "@/modules/ee/teams/lib/roles";
 import { getTeamPermissionFlags } from "@/modules/ee/teams/utils/teams";
 import { getServerSession } from "next-auth";
 import { getTranslations } from "next-intl/server";
+import { getAdvancedTargetingPermission, getMultiLanguagePermission } from "@formbricks/ee/lib/service";
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { authOptions } from "@formbricks/lib/authOptions";
@@ -27,17 +24,14 @@ import { getUserLocale } from "@formbricks/lib/user/service";
 import { ErrorComponent } from "@formbricks/ui/components/ErrorComponent";
 import { SurveyEditor } from "./components/SurveyEditor";
 
-export const generateMetadata = async (props) => {
-  const params = await props.params;
+export const generateMetadata = async ({ params }) => {
   const survey = await getSurvey(params.surveyId);
   return {
     title: survey?.name ? `${survey?.name} | Editor` : "Editor",
   };
 };
 
-const Page = async (props) => {
-  const searchParams = await props.searchParams;
-  const params = await props.params;
+const Page = async ({ params, searchParams }) => {
   const t = await getTranslations();
   const [
     survey,
@@ -54,7 +48,7 @@ const Page = async (props) => {
     getProductByEnvironmentId(params.environmentId),
     getEnvironment(params.environmentId),
     getActionClasses(params.environmentId),
-    getAttributeClasses(params.environmentId, undefined, { skipArchived: true }),
+    getAttributeClasses(params.environmentId),
     getResponseCountBySurveyId(params.surveyId),
     getOrganizationByEnvironmentId(params.environmentId),
     getServerSession(authOptions),

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

@@ -14,19 +14,17 @@ import { TTemplateRole } from "@formbricks/types/templates";
 import { TemplateContainerWithPreview } from "./components/TemplateContainer";
 
 interface SurveyTemplateProps {
-  params: Promise<{
+  params: {
     environmentId: string;
-  }>;
-  searchParams: Promise<{
+  };
+  searchParams: {
     channel?: TProductConfigChannel;
     industry?: TProductConfigIndustry;
     role?: TTemplateRole;
-  }>;
+  };
 }
 
-const Page = async (props: SurveyTemplateProps) => {
-  const searchParams = await props.searchParams;
-  const params = await props.params;
+const Page = async ({ params, searchParams }: SurveyTemplateProps) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
   const environmentId = params.environmentId;

apps/web/app/(app)/billing-confirmation/page.tsx

@@ -3,8 +3,7 @@ import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper
 
 export const dynamic = "force-dynamic";
 
-const Page = async (props) => {
-  const searchParams = await props.searchParams;
+const Page = ({ searchParams }) => {
   const { environmentId } = searchParams;
 
   return (

apps/web/app/(app)/environments/[environmentId]/(people)/attributes/actions.ts

@@ -20,17 +20,13 @@ export const getSegmentsByAttributeClassAction = authenticatedActionClient
       userId: ctx.user.id,
       organizationId: await getOrganizationIdFromEnvironmentId(parsedInput.environmentId),
       access: [
-        {
-          type: "organization",
-          roles: ["owner", "manager"],
-        },
         {
           type: "productTeam",
-          minPermission: "read",
           productId: await getProductIdFromEnvironmentId(parsedInput.environmentId),
         },
       ],
     });
+
     const segments = await getSegmentsByAttributeClassName(
       parsedInput.environmentId,
       parsedInput.attributeClass.name

apps/web/app/(app)/environments/[environmentId]/(people)/attributes/components/AttributeClassesTable.tsx

@@ -4,7 +4,6 @@ import { useTranslations } from "next-intl";
 import { useMemo, useState } from "react";
 import { TAttributeClass } from "@formbricks/types/attribute-classes";
 import { TUserLocale } from "@formbricks/types/user";
-import { Label } from "@formbricks/ui/components/Label";
 import { Switch } from "@formbricks/ui/components/Switch";
 import { AttributeDetailModal } from "./AttributeDetailModal";
 import { AttributeClassDataRow } from "./AttributeRowData";
@@ -50,15 +49,8 @@ export const AttributeClassesTable = ({
       {hasArchived && (
         <div className="my-4 flex items-center justify-end text-right">
           <div className="flex items-center text-sm font-medium">
-            <Label htmlFor="showArchivedToggle" className="cursor-pointer">
-              {t("environments.attributes.show_archived")}
-            </Label>
-            <Switch
-              id="showArchivedToggle"
-              className="mx-3"
-              checked={showArchived}
-              onCheckedChange={toggleShowArchived}
-            />
+            {t("environments.attributes.show_archived")}
+            <Switch className="mx-3" checked={showArchived} onCheckedChange={toggleShowArchived} />
           </div>
         </div>
       )}

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

@@ -21,8 +21,7 @@ export const metadata: Metadata = {
   title: "Attributes",
 };
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   let attributeClasses = await getAttributeClasses(params.environmentId);
   const t = await getTranslations();
   const product = await getProductByEnvironmentId(params.environmentId);

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

@@ -9,11 +9,7 @@ import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/ser
 import { getProductByEnvironmentId } from "@formbricks/lib/product/service";
 import { AuthorizationError } from "@formbricks/types/errors";
 
-const ConfigLayout = async (props) => {
-  const params = await props.params;
-
-  const { children } = props;
-
+const ConfigLayout = async ({ children, params }) => {
   const t = await getTranslations();
   const [organization, session] = await Promise.all([
     getOrganizationByEnvironmentId(params.environmentId),

apps/web/app/(app)/environments/[environmentId]/(people)/people/[personId]/components/ResponseSection.tsx

@@ -54,7 +54,7 @@ export const ResponseSection = async ({
 
   const productPermission = await getProductPermissionByUserId(session.user.id, product.id);
 
-  const locale = await findMatchingLocale();
+  const locale = findMatchingLocale();
 
   return (
     <ResponseTimeline

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

@@ -19,8 +19,7 @@ import { getTagsByEnvironmentId } from "@formbricks/lib/tag/service";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const t = await getTranslations();
   const [environment, environmentTags, product, session, organization, person, attributes, attributeClasses] =
     await Promise.all([

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

@@ -192,9 +192,9 @@ export const PersonTable = ({
         />
         <div className="w-full overflow-x-auto rounded-xl border border-slate-200">
           <Table className="w-full" style={{ tableLayout: "fixed" }}>
-            <TableHeader className="pointer-events-auto">
+            <TableHeader>
               {table.getHeaderGroups().map((headerGroup) => (
-                <TableRow key={headerGroup.id}>
+                <tr key={headerGroup.id}>
                   <SortableContext items={columnOrder} strategy={horizontalListSortingStrategy}>
                     {headerGroup.headers.map((header) => (
                       <DataTableHeader
@@ -204,7 +204,7 @@ export const PersonTable = ({
                       />
                     ))}
                   </SortableContext>
-                </TableRow>
+                </tr>
               ))}
             </TableHeader>
 

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

@@ -16,8 +16,7 @@ import { Button } from "@formbricks/ui/components/Button";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
-  const params = await props.params;
+const Page = async ({ params }: { params: { environmentId: string } }) => {
   const t = await getTranslations();
   const session = await getServerSession(authOptions);
 

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

@@ -2,11 +2,11 @@ import { PersonSecondaryNavigation } from "@/app/(app)/environments/[environment
 import { BasicCreateSegmentModal } from "@/app/(app)/environments/[environmentId]/(people)/segments/components/BasicCreateSegmentModal";
 import { SegmentTable } from "@/app/(app)/environments/[environmentId]/(people)/segments/components/SegmentTable";
 import { CreateSegmentModal } from "@/modules/ee/advanced-targeting/components/create-segment-modal";
-import { getAdvancedTargetingPermission } from "@/modules/ee/license-check/lib/utils";
 import { getProductPermissionByUserId } from "@/modules/ee/teams/lib/roles";
 import { getTeamPermissionFlags } from "@/modules/ee/teams/utils/teams";
 import { getServerSession } from "next-auth";
 import { getTranslations } from "next-intl/server";
+import { getAdvancedTargetingPermission } from "@formbricks/ee/lib/service";
 import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
@@ -19,13 +19,12 @@ import { getSegments } from "@formbricks/lib/segment/service";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const t = await getTranslations();
   const [environment, segments, attributeClasses, organization, product] = await Promise.all([
     getEnvironment(params.environmentId),
     getSegments(params.environmentId),
-    getAttributeClasses(params.environmentId, undefined, { skipArchived: true }),
+    getAttributeClasses(params.environmentId),
     getOrganizationByEnvironmentId(params.environmentId),
     getProductByEnvironmentId(params.environmentId),
   ]);

apps/web/app/(app)/environments/[environmentId]/actions.ts

@@ -2,8 +2,8 @@
 
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client-middleware";
-import { getIsMultiOrgEnabled } from "@/modules/ee/license-check/lib/utils";
 import { z } from "zod";
+import { getIsMultiOrgEnabled } from "@formbricks/ee/lib/service";
 import { createMembership } from "@formbricks/lib/membership/service";
 import { createOrganization } from "@formbricks/lib/organization/service";
 import { createProduct } from "@formbricks/lib/product/service";

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

@@ -1,16 +1,12 @@
 "use client";
 
-import { createActionClassAction } from "@/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/actions";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { Code2Icon, MousePointerClickIcon, SparklesIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { useEffect, useMemo, useState } from "react";
-import toast from "react-hot-toast";
+import { useEffect, useState } from "react";
 import { convertDateTimeStringShort } from "@formbricks/lib/time";
 import { capitalizeFirstLetter } from "@formbricks/lib/utils/strings";
-import { TActionClass, TActionClassInput, TActionClassInputCode } from "@formbricks/types/action-classes";
-import { TEnvironment } from "@formbricks/types/environment";
-import { Button } from "@formbricks/ui/components/Button";
+import { TActionClass } from "@formbricks/types/action-classes";
 import { ErrorComponent } from "@formbricks/ui/components/ErrorComponent";
 import { Label } from "@formbricks/ui/components/Label";
 import { LoadingSpinner } from "@formbricks/ui/components/LoadingSpinner";
@@ -19,25 +15,15 @@ import { getActiveInactiveSurveysAction } from "../actions";
 interface ActivityTabProps {
   actionClass: TActionClass;
   environmentId: string;
-  environment: TEnvironment;
-  otherEnvActionClasses: TActionClass[];
-  otherEnvironment: TEnvironment;
-  isReadOnly: boolean;
 }
 
-export const ActionActivityTab = ({
-  actionClass,
-  otherEnvActionClasses,
-  otherEnvironment,
-  environmentId,
-  environment,
-  isReadOnly,
-}: ActivityTabProps) => {
+export const ActionActivityTab = ({ actionClass, environmentId }: ActivityTabProps) => {
   const t = useTranslations();
   const [activeSurveys, setActiveSurveys] = useState<string[] | undefined>();
   const [inactiveSurveys, setInactiveSurveys] = useState<string[] | undefined>();
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
+
   useEffect(() => {
     setLoading(true);
 
@@ -46,6 +32,7 @@ export const ActionActivityTab = ({
       const getActiveInactiveSurveysResponse = await getActiveInactiveSurveysAction({
         actionClassId: actionClass.id,
       });
+      console.log(getActiveInactiveSurveysResponse, "randike");
       if (getActiveInactiveSurveysResponse?.data) {
         setActiveSurveys(getActiveInactiveSurveysResponse.data.activeSurveys);
         setInactiveSurveys(getActiveInactiveSurveysResponse.data.inactiveSurveys);
@@ -59,57 +46,6 @@ export const ActionActivityTab = ({
     updateState();
   }, [actionClass.id, environmentId]);
 
-  const actionClassNames = useMemo(
-    () => otherEnvActionClasses.map((actionClass) => actionClass.name),
-    [otherEnvActionClasses]
-  );
-
-  const actionClassKeys = useMemo(() => {
-    const codeActionClasses: TActionClassInputCode[] = otherEnvActionClasses.filter(
-      (actionClass) => actionClass.type === "code"
-    ) as TActionClassInputCode[];
-
-    return codeActionClasses.map((actionClass) => actionClass.key);
-  }, [otherEnvActionClasses]);
-
-  const copyAction = async (data: TActionClassInput) => {
-    const { type } = data;
-    let copyName = data.name;
-    try {
-      if (isReadOnly) {
-        throw new Error(t("common.you_are_not_authorised_to_perform_this_action"));
-      }
-
-      if (copyName && actionClassNames.includes(copyName)) {
-        while (actionClassNames.includes(copyName)) {
-          copyName += " (copy)";
-        }
-      }
-
-      if (type === "code" && data.key && actionClassKeys.includes(data.key)) {
-        throw new Error(t("environments.actions.action_with_key_already_exists", { key: data.key }));
-      }
-
-      let updatedAction = {
-        ...data,
-        name: copyName.trim(),
-        environmentId: otherEnvironment.id,
-      };
-
-      const createActionClassResponse = await createActionClassAction({
-        action: updatedAction as TActionClassInput,
-      });
-
-      if (!createActionClassResponse?.data) {
-        throw new Error(t("environments.actions.action_copy_failed", {}));
-      }
-
-      toast.success(t("environments.actions.action_copied_successfully"));
-    } catch (e: any) {
-      toast.error(e.message);
-    }
-  };
-
   if (loading) return <LoadingSpinner />;
   if (error) return <ErrorComponent />;
 
@@ -163,22 +99,6 @@ export const ActionActivityTab = ({
             <p className="text-sm text-slate-700">{capitalizeFirstLetter(actionClass.type)}</p>
           </div>
         </div>
-        <div className="">
-          <Label className="text-xs font-normal text-slate-500">Environment</Label>
-          <div className="items-center-center flex gap-2">
-            <p className="text-xs text-slate-700">
-              {environment.type === "development" ? "Development" : "Production"}
-            </p>
-            <Button
-              onClick={() => {
-                copyAction(actionClass);
-              }}
-              className="m-0 p-0 text-xs font-medium text-black underline underline-offset-4 focus:ring-0 focus:ring-offset-0"
-              variant="minimal">
-              {environment.type === "development" ? "Copy to Production" : "Copy to Development"}
-            </Button>
-          </div>
-        </div>
       </div>
     </div>
   );

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

@@ -1,28 +1,21 @@
 "use client";
 
-import { type JSX, useState } from "react";
+import { useState } from "react";
 import { TActionClass } from "@formbricks/types/action-classes";
-import { TEnvironment } from "@formbricks/types/environment";
 import { ActionDetailModal } from "./ActionDetailModal";
 
 interface ActionClassesTableProps {
   environmentId: string;
   actionClasses: TActionClass[];
-  environment: TEnvironment;
   children: [JSX.Element, JSX.Element[]];
   isReadOnly: boolean;
-  otherEnvironment: TEnvironment;
-  otherEnvActionClasses: TActionClass[];
 }
 
 export const ActionClassesTable = ({
   environmentId,
   actionClasses,
-  environment,
   children: [TableHeading, actionRows],
   isReadOnly,
-  otherEnvActionClasses,
-  otherEnvironment,
 }: ActionClassesTableProps) => {
   const [isActionDetailModalOpen, setActionDetailModalOpen] = useState(false);
 
@@ -55,14 +48,11 @@ export const ActionClassesTable = ({
       {activeActionClass && (
         <ActionDetailModal
           environmentId={environmentId}
-          environment={environment}
           open={isActionDetailModalOpen}
           setOpen={setActionDetailModalOpen}
           actionClasses={actionClasses}
           actionClass={activeActionClass}
           isReadOnly={isReadOnly}
-          otherEnvActionClasses={otherEnvActionClasses}
-          otherEnvironment={otherEnvironment}
         />
       )}
     </>

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

@@ -1,21 +1,17 @@
 import { Code2Icon, MousePointerClickIcon, SparklesIcon } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { TActionClass } from "@formbricks/types/action-classes";
-import { TEnvironment } from "@formbricks/types/environment";
 import { ModalWithTabs } from "@formbricks/ui/components/ModalWithTabs";
 import { ActionActivityTab } from "./ActionActivityTab";
 import { ActionSettingsTab } from "./ActionSettingsTab";
 
 interface ActionDetailModalProps {
   environmentId: string;
-  environment: TEnvironment;
   open: boolean;
   setOpen: (v: boolean) => void;
   actionClass: TActionClass;
   actionClasses: TActionClass[];
   isReadOnly: boolean;
-  otherEnvironment: TEnvironment;
-  otherEnvActionClasses: TActionClass[];
 }
 
 export const ActionDetailModal = ({
@@ -24,25 +20,13 @@ export const ActionDetailModal = ({
   setOpen,
   actionClass,
   actionClasses,
-  environment,
   isReadOnly,
-  otherEnvActionClasses,
-  otherEnvironment,
 }: ActionDetailModalProps) => {
   const t = useTranslations();
   const tabs = [
     {
       title: t("common.activity"),
-      children: (
-        <ActionActivityTab
-          otherEnvActionClasses={otherEnvActionClasses}
-          otherEnvironment={otherEnvironment}
-          isReadOnly={isReadOnly}
-          environment={environment}
-          actionClass={actionClass}
-          environmentId={environmentId}
-        />
-      ),
+      children: <ActionActivityTab actionClass={actionClass} environmentId={environmentId} />,
     },
     {
       title: t("common.settings"),

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

@@ -10,7 +10,6 @@ import { getTranslations } from "next-intl/server";
 import { redirect } from "next/navigation";
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
 import { authOptions } from "@formbricks/lib/authOptions";
-import { getEnvironments } from "@formbricks/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { getAccessFlags } from "@formbricks/lib/membership/utils";
 import { getOrganizationByEnvironmentId } from "@formbricks/lib/organization/service";
@@ -23,8 +22,7 @@ export const metadata: Metadata = {
   title: "Actions",
 };
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const session = await getServerSession(authOptions);
   const t = await getTranslations();
   const [actionClasses, organization, product] = await Promise.all([
@@ -32,7 +30,7 @@ const Page = async (props) => {
     getOrganizationByEnvironmentId(params.environmentId),
     getProductByEnvironmentId(params.environmentId),
   ]);
-  const locale = await findMatchingLocale();
+  const locale = findMatchingLocale();
 
   if (!session) {
     throw new Error(t("common.session_not_found"));
@@ -46,17 +44,6 @@ const Page = async (props) => {
     throw new Error(t("common.product_not_found"));
   }
 
-  const environments = await getEnvironments(product.id);
-  const currentEnvironment = environments.find((env) => env.id === params.environmentId);
-
-  if (!currentEnvironment) {
-    throw new Error(t("common.environment_not_found"));
-  }
-
-  const otherEnvironment = environments.filter((env) => env.id !== params.environmentId)[0];
-
-  const otherEnvActionClasses = await getActionClasses(otherEnvironment.id);
-
   const currentUserMembership = await getMembershipByUserIdOrganizationId(session?.user.id, organization.id);
   const { isMember, isBilling } = getAccessFlags(currentUserMembership?.role);
 
@@ -82,9 +69,6 @@ const Page = async (props) => {
     <PageContentWrapper>
       <PageHeader pageTitle={t("common.actions")} cta={!isReadOnly ? renderAddActionButton() : undefined} />
       <ActionClassesTable
-        environment={currentEnvironment}
-        otherEnvironment={otherEnvironment}
-        otherEnvActionClasses={otherEnvActionClasses}
         environmentId={params.environmentId}
         actionClasses={actionClasses}
         isReadOnly={isReadOnly}>

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

@@ -1,10 +1,10 @@
 import { MainNavigation } from "@/app/(app)/environments/[environmentId]/components/MainNavigation";
 import { TopControlBar } from "@/app/(app)/environments/[environmentId]/components/TopControlBar";
 import { getIsAIEnabled } from "@/app/lib/utils";
-import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/utils";
 import { getProductPermissionByUserId } from "@/modules/ee/teams/lib/roles";
 import type { Session } from "next-auth";
 import { getTranslations } from "next-intl/server";
+import { getEnterpriseLicense } from "@formbricks/ee/lib/service";
 import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
 import { getEnvironment, getEnvironments } from "@formbricks/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
@@ -59,13 +59,15 @@ export const EnvironmentLayout = async ({ environmentId, session, children }: En
 
   const currentUserMembership = await getMembershipByUserIdOrganizationId(session?.user.id, organization.id);
   const membershipRole = currentUserMembership?.role;
-  const { isMember } = getAccessFlags(membershipRole);
+  const { isOwner, isManager } = getAccessFlags(membershipRole);
+
+  const isOwnerOrManager = isOwner || isManager;
 
   const { features, lastChecked, isPendingDowngrade, active } = await getEnterpriseLicense();
 
   const productPermission = await getProductPermissionByUserId(session.user.id, environment.productId);
 
-  if (isMember && !productPermission) {
+  if (!isOwnerOrManager && !productPermission) {
     throw new Error(t("common.product_permission_not_found"));
   }
 

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

@@ -222,7 +222,7 @@ export const MainNavigation = ({
     {
       label: t("common.billing"),
       href: `/environments/${environment.id}/settings/billing`,
-      hidden: !isFormbricksCloud,
+      hidden: !isFormbricksCloud || isPricingDisabled,
       icon: CreditCardIcon,
     },
     {
@@ -481,11 +481,7 @@ export const MainNavigation = ({
                   {dropdownNavigation.map(
                     (link) =>
                       !link.hidden && (
-                        <Link
-                          href={link.href}
-                          target={link.target}
-                          className="flex w-full items-center"
-                          key={link.label}>
+                        <Link href={link.href} target={link.target} className="flex w-full items-center">
                           <DropdownMenuItem>
                             <link.icon className="mr-2 h-4 w-4" strokeWidth={1.5} />
                             {link.label}

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

@@ -21,8 +21,7 @@ import { GoBackButton } from "@formbricks/ui/components/GoBackButton";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const t = await getTranslations();
   const isEnabled = !!AIRTABLE_CLIENT_ID;
   const [session, surveys, integrations, environment, attributeClasses] = await Promise.all([
@@ -54,7 +53,7 @@ const Page = async (props) => {
     airtableArray = await getAirtableTables(params.environmentId);
   }
 
-  const locale = await findMatchingLocale();
+  const locale = findMatchingLocale();
 
   const currentUserMembership = await getMembershipByUserIdOrganizationId(
     session?.user.id,

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

@@ -24,8 +24,7 @@ import { GoBackButton } from "@formbricks/ui/components/GoBackButton";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const t = await getTranslations();
   const isEnabled = !!(GOOGLE_SHEETS_CLIENT_ID && GOOGLE_SHEETS_CLIENT_SECRET && GOOGLE_SHEETS_REDIRECT_URL);
   const [session, surveys, integrations, environment, attributeClasses] = await Promise.all([
@@ -52,7 +51,7 @@ const Page = async (props) => {
     (integration): integration is TIntegrationGoogleSheets => integration.type === "googleSheets"
   );
 
-  const locale = await findMatchingLocale();
+  const locale = findMatchingLocale();
 
   const currentUserMembership = await getMembershipByUserIdOrganizationId(
     session?.user.id,

apps/web/app/(app)/environments/[environmentId]/integrations/notion/page.tsx

@@ -26,8 +26,7 @@ import { GoBackButton } from "@formbricks/ui/components/GoBackButton";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const t = await getTranslations();
   const enabled = !!(
     NOTION_OAUTH_CLIENT_ID &&
@@ -81,7 +80,7 @@ const Page = async (props) => {
   return (
     <PageContentWrapper>
       <GoBackButton url={`${WEBAPP_URL}/environments/${params.environmentId}/integrations`} />
-      <PageHeader pageTitle={t("environments.integrations.notion.notion_integration")} />
+      <PageHeader pageTitle={"environments.integrations.notion.notion_integration"} />
       <NotionWrapper
         enabled={enabled}
         surveys={surveys}

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

@@ -25,8 +25,7 @@ import { Card } from "@formbricks/ui/components/IntegrationCard";
 import { PageContentWrapper } from "@formbricks/ui/components/PageContentWrapper";
 import { PageHeader } from "@formbricks/ui/components/PageHeader";
 
-const Page = async (props) => {
-  const params = await props.params;
+const Page = async ({ params }) => {
   const environmentId = params.environmentId;
   const t = await getTranslations();
   const [

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

@@ -77,12 +77,11 @@ export const ManageIntegration = ({
       {showReconnectButton && (
         <div className="mb-4 flex w-full items-center justify-between space-x-4">
           <p className="text-amber-700">
-            {t.rich("environments.integrations.slack.slack_reconnect_button_description", {
-              b: (chunks) => <b>{chunks}</b>,
-            })}
+            <strong>Note:</strong> We recently changed our Slack integration to also support private channels.
+            Please reconnect your Slack workspace.
           </p>
           <Button onClick={handleSlackAuthorization} variant="secondary">
-            {t("environments.integrations.slack.slack_reconnect_button")}
+            Reconnect
           </Button>
         </div>
       )}
@@ -91,7 +90,7 @@ export const ManageIntegration = ({
           <span className="mr-4 h-4 w-4 rounded-full bg-green-600"></span>
           <span className="text-slate-500">
             {t("environments.integrations.slack.connected_with_team", {
-              team: slackIntegration.config.key.team?.name,
+              team: slackIntegration.config.key.team.name,
             })}
           </span>
         </div>