chore: update remaining npm dependencies (#5685)

Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>

.env.example

@@ -93,10 +93,6 @@ EMAIL_VERIFICATION_DISABLED=1
 # Password Reset. If you enable Password Reset functionality you have to setup SMTP-Settings, too.
 PASSWORD_RESET_DISABLED=1
 
-# Signup. Disable the ability for new users to create an account.
-# Note: This variable is only available to the SaaS setup of Formbricks Cloud. Signup is disable by default for self-hosting.
-# SIGNUP_DISABLED=1
-
 # Email login. Disable the ability for users to login with email.
 # EMAIL_AUTH_DISABLED=1
 
@@ -158,10 +154,6 @@ NOTION_OAUTH_CLIENT_SECRET=
 STRIPE_SECRET_KEY=
 STRIPE_WEBHOOK_SECRET=
 
-# Configure Formbricks usage within Formbricks
-FORMBRICKS_API_HOST=
-FORMBRICKS_ENVIRONMENT_ID=
-
 # Oauth credentials for Google sheet integration
 GOOGLE_SHEETS_CLIENT_ID=
 GOOGLE_SHEETS_CLIENT_SECRET=
@@ -180,8 +172,9 @@ ENTERPRISE_LICENSE_KEY=
 # Automatically assign new users to a specific organization and role within that organization
 # Insert an existing organization id or generate a valid CUID for a new one at https://www.getuniqueid.com/cuid (e.g. cjld2cjxh0000qzrmn831i7rn)
 # (Role Management is an Enterprise feature)
-# DEFAULT_ORGANIZATION_ID=
 # DEFAULT_ORGANIZATION_ROLE=owner
+# AUTH_SSO_DEFAULT_TEAM_ID=
+# AUTH_SKIP_INVITE_FOR_SSO=
 
 # Send new users to Brevo
 # BREVO_API_KEY=
@@ -224,4 +217,4 @@ UNKEY_ROOT_KEY=
 # SENTRY_AUTH_TOKEN=
 
 # Disable the user management from UI 
-# DISABLE_USER_MANAGEMENT
+# DISABLE_USER_MANAGEMENT=1

.github/actions/cache-build-web/action.yml

@@ -49,7 +49,7 @@ runs:
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install dependencies

.github/copilot-instructions.md

@@ -14,7 +14,8 @@ When generating test files inside the "/app/web" path, follow these rules:
 - Add the original file path to the "test.coverage.include"array in the "apps/web/vite.config.mts" file. Do this only when the test file is created.
 - Don't mock functions that are already mocked in the "apps/web/vitestSetup.ts" file
 - When using "screen.getByText" check for the tolgee string if it is being used in the file.
-- When mocking data check if the properties added are part of the type of the object being mocked. Don't add properties that are not part of the type.
+- The types for mocked variables can be found in the "packages/types" path. Be sure that every imported type exists before using it. Don't create types that are not already in the codebase.
+- When mocking data check if the properties added are part of the type of the object being mocked. Only specify known properties, don't use properties that are not part of the type.
   
 If it's a test for a ".tsx" file, follow these extra instructions:
 

.github/workflows/apply-issue-labels-to-pr.yml

@@ -19,12 +19,12 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: Apply labels from linked issue to PR
-        uses: actions/github-script@211cb3fefb35a799baa5156f9321bb774fe56294 # v5.2.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/build-web.yml

@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/dangerous-git-checkout
 
       - name: Build & Cache Web Binaries

.github/workflows/chromatic.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
+        uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0

.github/workflows/deploy-formbricks-cloud.yml

@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
 
       - name: Tailscale
         uses: tailscale/github-action@v3

.github/workflows/docker-build-validation.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/e2e.yml

@@ -46,11 +46,11 @@ jobs:
           --health-retries=5
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/dangerous-git-checkout
 
       - name: Setup Node.js 20.x

.github/workflows/labeler.yml

@@ -1,27 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  - pull_request_target
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    name: Pull Request Labeler
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          # https://github.com/actions/labeler/issues/442#issuecomment-1297359481
-          sync-labels: ""

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -26,7 +26,7 @@ jobs:
           node-version: 20.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

.github/workflows/pr.yml

@@ -51,7 +51,7 @@ jobs:
       statuses: write
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0
         with:
           egress-policy: audit
       - name: fail if conditional jobs failed

.github/workflows/release-docker-github-experimental.yml

@@ -31,12 +31,12 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Depot CLI
         uses: depot/setup-action@b0b1ea4f69e92ebf5dea3f8713a1b0c37b2126a5 # v1.6.0
@@ -45,7 +45,7 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action

.github/workflows/release-docker-github.yml

@@ -38,12 +38,12 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Get Release Tag
         id: extract_release_tag
@@ -65,7 +65,7 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
+        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action

.github/workflows/release-helm-chart.yml

@@ -19,7 +19,7 @@ jobs:
       contents: read
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/scorecard.yml

@@ -35,12 +35,12 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

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

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/sonarqube.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
@@ -29,7 +29,7 @@ jobs:
           node-version: 22.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

.github/workflows/terraform-plan-and-apply.yml

@@ -26,7 +26,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/test.yml

@@ -14,11 +14,11 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/dangerous-git-checkout
 
       - name: Setup Node.js 20.x

.github/workflows/tolgee-missing-key-check.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/tolgee.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

.github/workflows/welcome-new-contributors.yml

@@ -18,7 +18,7 @@ jobs:
     if: github.event.action == 'opened'
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
           egress-policy: audit
 

apps/demo/.env.example

@@ -1,5 +0,0 @@
-NEXT_PUBLIC_FORMBRICKS_API_HOST=http://localhost:3000
-NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=YOUR_ENVIRONMENT_ID
-
-# Copy the environment ID for the URL of your Formbricks App and
-# paste it above to connect your Formbricks App with the Demo App.

apps/demo/.eslintrc.js

@@ -1,7 +0,0 @@
-module.exports = {
-  extends: ["@formbricks/eslint-config/next.js"],
-  parserOptions: {
-    project: "tsconfig.json",
-    tsconfigRootDir: __dirname,
-  },
-};

apps/demo/.gitignore

@@ -1,36 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.pnpm-debug.log*
-
-# local env files
-.env*.local
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts

apps/demo/components/layout-app.tsx

@@ -1,13 +0,0 @@
-import { Sidebar } from "./sidebar";
-
-export function LayoutApp({ children }: { children: React.ReactNode }): React.JSX.Element {
-  return (
-    <div className="min-h-full">
-      {/* Static sidebar for desktop */}
-      <div className="hidden lg:fixed lg:inset-y-0 lg:flex lg:w-64 lg:flex-col">
-        <Sidebar />
-      </div>
-      <div className="flex flex-1 flex-col lg:pl-64">{children}</div>
-    </div>
-  );
-}

apps/demo/components/sidebar.tsx

@@ -1,65 +0,0 @@
-import {
-  ClockIcon,
-  CogIcon,
-  CreditCardIcon,
-  FileBarChartIcon,
-  HelpCircleIcon,
-  HomeIcon,
-  ScaleIcon,
-  ShieldCheckIcon,
-  UsersIcon,
-} from "lucide-react";
-import { classNames } from "../lib/utils";
-
-const navigation = [
-  { name: "Home", href: "#", icon: HomeIcon, current: true },
-  { name: "History", href: "#", icon: ClockIcon, current: false },
-  { name: "Balances", href: "#", icon: ScaleIcon, current: false },
-  { name: "Cards", href: "#", icon: CreditCardIcon, current: false },
-  { name: "Recipients", href: "#", icon: UsersIcon, current: false },
-  { name: "Reports", href: "#", icon: FileBarChartIcon, current: false },
-];
-const secondaryNavigation = [
-  { name: "Settings", href: "#", icon: CogIcon },
-  { name: "Help", href: "#", icon: HelpCircleIcon },
-  { name: "Privacy", href: "#", icon: ShieldCheckIcon },
-];
-
-export function Sidebar(): React.JSX.Element {
-  return (
-    <div className="flex grow flex-col overflow-y-auto bg-cyan-700 pt-5 pb-4">
-      <nav
-        className="mt-5 flex flex-1 flex-col divide-y divide-cyan-800 overflow-y-auto"
-        aria-label="Sidebar">
-        <div className="space-y-1 px-2">
-          {navigation.map((item) => (
-            <a
-              key={item.name}
-              href={item.href}
-              className={classNames(
-                item.current ? "bg-cyan-800 text-white" : "text-cyan-100 hover:bg-cyan-600 hover:text-white",
-                "group flex items-center rounded-md px-2 py-2 text-sm leading-6 font-medium"
-              )}
-              aria-current={item.current ? "page" : undefined}>
-              <item.icon className="mr-4 h-6 w-6 shrink-0 text-cyan-200" aria-hidden="true" />
-              {item.name}
-            </a>
-          ))}
-        </div>
-        <div className="mt-6 pt-6">
-          <div className="space-y-1 px-2">
-            {secondaryNavigation.map((item) => (
-              <a
-                key={item.name}
-                href={item.href}
-                className="group flex items-center rounded-md px-2 py-2 text-sm leading-6 font-medium text-cyan-100 hover:bg-cyan-600 hover:text-white">
-                <item.icon className="mr-4 h-6 w-6 text-cyan-200" aria-hidden="true" />
-                {item.name}
-              </a>
-            ))}
-          </div>
-        </div>
-      </nav>
-    </div>
-  );
-}

apps/demo/globals.css

@@ -1,23 +0,0 @@
-@import 'tailwindcss';
-
-@plugin '@tailwindcss/forms';
-
-@custom-variant dark (&:is(.dark *));
-
-/*
-  The default border color has changed to `currentcolor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentcolor);
-  }
-}

apps/demo/lib/utils.ts

@@ -1,3 +0,0 @@
-export function classNames(...classes: string[]): string {
-  return classes.filter(Boolean).join(" ");
-}

apps/demo/next-env.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

apps/demo/next.config.mjs

@@ -1,17 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  images: {
-    remotePatterns: [
-      {
-        protocol: "https",
-        hostname: "tailwindui.com",
-      },
-      {
-        protocol: "https",
-        hostname: "images.unsplash.com",
-      },
-    ],
-  },
-};
-
-export default nextConfig;

apps/demo/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "@formbricks/demo",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "clean": "rimraf .turbo node_modules .next",
-    "dev": "next dev -p 3002 --turbopack",
-    "go": "next dev -p 3002 --turbopack",
-    "build": "next build",
-    "start": "next start",
-    "lint": "next lint"
-  },
-  "dependencies": {
-    "@formbricks/js": "workspace:*",
-    "@tailwindcss/forms": "0.5.9",
-    "@tailwindcss/postcss": "4.1.3",
-    "lucide-react": "0.486.0",
-    "next": "15.2.4",
-    "postcss": "8.5.3",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "tailwindcss": "4.1.3"
-  },
-  "devDependencies": {
-    "@formbricks/config-typescript": "workspace:*",
-    "@formbricks/eslint-config": "workspace:*"
-  }
-}

apps/demo/pages/_app.tsx

@@ -1,20 +0,0 @@
-import type { AppProps } from "next/app";
-import Head from "next/head";
-import "../globals.css";
-
-export default function App({ Component, pageProps }: AppProps): React.JSX.Element {
-  return (
-    <>
-      <Head>
-        <title>Demo App</title>
-      </Head>
-      {(!process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID ||
-        !process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) && (
-        <div className="w-full bg-red-500 p-3 text-center text-sm text-white">
-          Please set Formbricks environment variables in apps/demo/.env
-        </div>
-      )}
-      <Component {...pageProps} />
-    </>
-  );
-}

apps/demo/pages/_document.tsx

@@ -1,13 +0,0 @@
-import { Head, Html, Main, NextScript } from "next/document";
-
-export default function Document(): React.JSX.Element {
-  return (
-    <Html lang="en" className="h-full bg-slate-50">
-      <Head />
-      <body className="h-full">
-        <Main />
-        <NextScript />
-      </body>
-    </Html>
-  );
-}

apps/demo/pages/index.tsx

@@ -1,359 +0,0 @@
-import Image from "next/image";
-import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
-import formbricks from "@formbricks/js";
-import fbsetup from "../public/fb-setup.png";
-
-declare const window: Window;
-
-export default function AppPage(): React.JSX.Element {
-  const [darkMode, setDarkMode] = useState(false);
-  const router = useRouter();
-  const userId = "THIS-IS-A-VERY-LONG-USER-ID-FOR-TESTING";
-  const userAttributes = {
-    "Attribute 1": "one",
-    "Attribute 2": "two",
-    "Attribute 3": "three",
-  };
-
-  useEffect(() => {
-    if (darkMode) {
-      document.body.classList.add("dark");
-    } else {
-      document.body.classList.remove("dark");
-    }
-  }, [darkMode]);
-
-  useEffect(() => {
-    const initFormbricks = () => {
-      // enable Formbricks debug mode by adding formbricksDebug=true GET parameter
-      const addFormbricksDebugParam = (): void => {
-        const urlParams = new URLSearchParams(window.location.search);
-        if (!urlParams.has("formbricksDebug")) {
-          urlParams.set("formbricksDebug", "true");
-          const newUrl = `${window.location.pathname}?${urlParams.toString()}`;
-          window.history.replaceState({}, "", newUrl);
-        }
-      };
-
-      addFormbricksDebugParam();
-
-      if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-        void formbricks.setup({
-          environmentId: process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID,
-          appUrl: process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST,
-        });
-      }
-
-      // Connect next.js router to Formbricks
-      if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-        const handleRouteChange = formbricks.registerRouteChange;
-
-        router.events.on("routeChangeComplete", () => {
-          void handleRouteChange();
-        });
-
-        return () => {
-          router.events.off("routeChangeComplete", () => {
-            void handleRouteChange();
-          });
-        };
-      }
-    };
-
-    initFormbricks();
-  }, [router.events]);
-
-  return (
-    <div className="min-h-screen bg-white px-12 py-6 dark:bg-slate-800">
-      <div className="flex flex-col justify-between md:flex-row">
-        <div className="flex flex-col items-center gap-2 sm:flex-row">
-          <div>
-            <h1 className="text-2xl font-bold text-slate-900 dark:text-white">
-              Formbricks In-product Survey Demo App
-            </h1>
-            <p className="text-slate-700 dark:text-slate-300">
-              This app helps you test your app surveys. You can create and test user actions, create and
-              update user attributes, etc.
-            </p>
-          </div>
-        </div>
-
-        <button
-          type="button"
-          className="mt-2 rounded-lg bg-slate-200 px-6 py-1 dark:bg-slate-700 dark:text-slate-100"
-          onClick={() => {
-            setDarkMode(!darkMode);
-          }}>
-          {darkMode ? "Toggle Light Mode" : "Toggle Dark Mode"}
-        </button>
-      </div>
-
-      <div className="my-4 grid grid-cols-1 gap-6 md:grid-cols-2">
-        <div>
-          <div className="rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold text-slate-900 dark:text-white">1. Setup .env</h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              Copy the environment ID of your Formbricks app to the env variable in /apps/demo/.env
-            </p>
-            <Image src={fbsetup} alt="fb setup" className="mt-4 rounded-xs" priority />
-
-            <div className="mt-4 flex-col items-start text-sm text-slate-700 sm:flex sm:items-center sm:text-base dark:text-slate-300">
-              <p className="mb-1 sm:mr-2 sm:mb-0">You&apos;re connected with env:</p>
-              <div className="flex items-center">
-                <strong className="w-32 truncate sm:w-auto">
-                  {process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID}
-                </strong>
-                <span className="relative ml-2 flex h-3 w-3">
-                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500 opacity-75" />
-                  <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500" />
-                </span>
-              </div>
-            </div>
-          </div>
-          <div className="mt-4 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold text-slate-900 dark:text-white">2. Widget Logs</h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              Look at the logs to understand how the widget works.{" "}
-              <strong className="dark:text-white">Open your browser console</strong> to see the logs.
-            </p>
-          </div>
-        </div>
-
-        <div className="md:grid md:grid-cols-3">
-          <div className="col-span-3 self-start rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold dark:text-white">
-              Set a user ID / pull data from Formbricks app
-            </h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              On formbricks.setUserId() the user state will <strong>be fetched from Formbricks</strong> and
-              the local state gets <strong>updated with the user state</strong>.
-            </p>
-            <button
-              className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
-              type="button"
-              onClick={() => {
-                void formbricks.setUserId(userId);
-              }}>
-              Set user ID
-            </button>
-            <p className="text-xs text-slate-700 dark:text-slate-300">
-              If you made a change in Formbricks app and it does not seem to work, hit &apos;Reset&apos; and
-              try again.
-            </p>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
-                No-Code Action
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sends a{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/actions#setting-up-no-code-actions"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500"
-                  target="_blank">
-                  No Code Action
-                </a>{" "}
-                as long as you created it beforehand in the Formbricks App.{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/actions#setting-up-no-code-actions"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                  className="underline dark:text-blue-500">
-                  Here are instructions on how to do it.
-                </a>
-              </p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                onClick={() => {
-                  void formbricks.setAttribute("Plan", "Free");
-                }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
-                Set Plan to &apos;Free&apos;
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sets the{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/user-identification#setting-custom-user-attributes"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500">
-                  attribute
-                </a>{" "}
-                &apos;Plan&apos; to &apos;Free&apos;. If the attribute does not exist, it creates it.
-              </p>
-            </div>
-          </div>
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                onClick={() => {
-                  void formbricks.setAttribute("Plan", "Paid");
-                }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
-                Set Plan to &apos;Paid&apos;
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sets the{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/user-identification#setting-custom-user-attributes"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500">
-                  attribute
-                </a>{" "}
-                &apos;Plan&apos; to &apos;Paid&apos;. If the attribute does not exist, it creates it.
-              </p>
-            </div>
-          </div>
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                onClick={() => {
-                  void formbricks.setEmail("test@web.com");
-                }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
-                Set Email
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sets the{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/user-identification"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500">
-                  user email
-                </a>{" "}
-                &apos;test@web.com&apos;
-              </p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                onClick={() => {
-                  void formbricks.setAttributes(userAttributes);
-                }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
-                Set Multiple Attributes
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sets the{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/user-identification#setting-custom-user-attributes"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500">
-                  user attributes
-                </a>{" "}
-                to &apos;one&apos;, &apos;two&apos;, &apos;three&apos;.
-              </p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                onClick={() => {
-                  void formbricks.setLanguage("de");
-                }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
-                Set Language to &apos;de&apos;
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sets the{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/general-features/multi-language-surveys"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500">
-                  language
-                </a>{" "}
-                to &apos;de&apos;.
-              </p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
-                onClick={() => {
-                  void formbricks.track("code");
-                }}>
-                Code Action
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sends a{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/actions#setting-up-code-actions"
-                  rel="noopener noreferrer"
-                  className="underline dark:text-blue-500"
-                  target="_blank">
-                  Code Action
-                </a>{" "}
-                as long as you created it beforehand in the Formbricks App.{" "}
-                <a
-                  href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/actions#setting-up-code-actions"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                  className="underline dark:text-blue-500">
-                  Here are instructions on how to do it.
-                </a>
-              </p>
-            </div>
-          </div>
-
-          <div className="p-6">
-            <div>
-              <button
-                type="button"
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
-                onClick={() => {
-                  void formbricks.logout();
-                }}>
-                Logout
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button logs out the user and syncs the local state with Formbricks. (Only works if a
-                userId is set)
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/demo/postcss.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  plugins: {
-    "@tailwindcss/postcss": {},
-  },
-};

apps/demo/public/next.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

apps/demo/public/thirteen.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="31" fill="none"><g opacity=".9"><path fill="url(#a)" d="M13 .4v29.3H7V6.3h-.2L0 10.5V5L7.2.4H13Z"/><path fill="url(#b)" d="M28.8 30.1c-2.2 0-4-.3-5.7-1-1.7-.8-3-1.8-4-3.1a7.7 7.7 0 0 1-1.4-4.6h6.2c0 .8.3 1.4.7 2 .4.5 1 .9 1.7 1.2.7.3 1.6.4 2.5.4 1 0 1.7-.2 2.5-.5.7-.3 1.3-.8 1.7-1.4.4-.6.6-1.2.6-2s-.2-1.5-.7-2.1c-.4-.6-1-1-1.8-1.4-.8-.4-1.8-.5-2.9-.5h-2.7v-4.6h2.7a6 6 0 0 0 2.5-.5 4 4 0 0 0 1.7-1.3c.4-.6.6-1.3.6-2a3.5 3.5 0 0 0-2-3.3 5.6 5.6 0 0 0-4.5 0 4 4 0 0 0-1.7 1.2c-.4.6-.6 1.2-.6 2h-6c0-1.7.6-3.2 1.5-4.5 1-1.3 2.2-2.3 3.8-3C25 .4 26.8 0 28.8 0s3.8.4 5.3 1.1c1.5.7 2.7 1.7 3.6 3a7.2 7.2 0 0 1 1.2 4.2c0 1.6-.5 3-1.5 4a7 7 0 0 1-4 2.2v.2c2.2.3 3.8 1 5 2.2a6.4 6.4 0 0 1 1.6 4.6c0 1.7-.5 3.1-1.4 4.4a9.7 9.7 0 0 1-4 3.1c-1.7.8-3.7 1.1-5.8 1.1Z"/></g><defs><linearGradient id="a" x1="20" x2="20" y1="0" y2="30.1" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#3D3D3D"/></linearGradient><linearGradient id="b" x1="20" x2="20" y1="0" y2="30.1" gradientUnits="userSpaceOnUse"><stop/><stop offset="1" stop-color="#3D3D3D"/></linearGradient></defs></svg>

apps/demo/public/vercel.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

apps/demo/tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "exclude": ["node_modules"],
-  "extends": "@formbricks/config-typescript/nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
-}

apps/storybook/package.json

@@ -11,13 +11,12 @@
     "clean": "rimraf .turbo node_modules dist storybook-static"
   },
   "dependencies": {
-    "eslint-plugin-react-refresh": "0.4.19",
+    "eslint-plugin-react-refresh": "0.4.20",
     "react": "19.1.0",
     "react-dom": "19.1.0"
   },
   "devDependencies": {
     "@chromatic-com/storybook": "3.2.6",
-    "@formbricks/config-typescript": "workspace:*",
     "@storybook/addon-a11y": "8.6.12",
     "@storybook/addon-essentials": "8.6.12",
     "@storybook/addon-interactions": "8.6.12",
@@ -27,14 +26,13 @@
     "@storybook/react": "8.6.12",
     "@storybook/react-vite": "8.6.12",
     "@storybook/test": "8.6.12",
-    "@typescript-eslint/eslint-plugin": "8.29.1",
-    "@typescript-eslint/parser": "8.29.1",
-    "@vitejs/plugin-react": "4.3.4",
-    "esbuild": "0.25.2",
+    "@typescript-eslint/eslint-plugin": "8.32.0",
+    "@typescript-eslint/parser": "8.32.0",
+    "@vitejs/plugin-react": "4.4.1",
+    "esbuild": "0.25.4",
     "eslint-plugin-storybook": "0.12.0",
     "prop-types": "15.8.1",
     "storybook": "8.6.12",
-    "tsup": "8.4.0",
-    "vite": "6.2.5"
+    "vite": "6.3.5"
   }
 }

apps/web/Dockerfile

@@ -18,8 +18,9 @@ FROM node:22-alpine3.21 AS base
 FROM base AS installer
 
 # Enable corepack and prepare pnpm
-RUN npm install -g corepack@latest
+RUN npm install --ignore-scripts -g corepack@latest 
 RUN corepack enable
+RUN corepack prepare pnpm@9.15.9 --activate
 
 # Install necessary build tools and compilers
 RUN apk update && apk add --no-cache cmake g++ gcc jq make openssl-dev python3
@@ -59,7 +60,7 @@ COPY . .
 RUN touch apps/web/.env
 
 # Install the dependencies
-RUN pnpm install
+RUN pnpm install --ignore-scripts
 
 # Build the project using our secret reader script
 # This mounts the secrets only during this build step without storing them in layers
@@ -75,7 +76,7 @@ RUN jq -r '.devDependencies.prisma' packages/database/package.json > /prisma_ver
 #
 FROM base AS runner
 
-RUN npm install -g corepack@latest
+RUN npm install --ignore-scripts -g corepack@latest 
 RUN corepack enable
 
 RUN apk add --no-cache curl \
@@ -141,12 +142,13 @@ RUN chmod -R 755 ./node_modules/@noble/hashes
 COPY --from=installer /app/node_modules/zod ./node_modules/zod
 RUN chmod -R 755 ./node_modules/zod
 
-RUN npm install -g tsx typescript prisma pino-pretty
+RUN npm install --ignore-scripts -g tsx typescript pino-pretty 
+RUN npm install -g prisma
 
 EXPOSE 3000
 ENV HOSTNAME "0.0.0.0"
 ENV NODE_ENV="production"
-# USER nextjs
+USER nextjs
 
 # Prepare volume for uploads
 RUN mkdir -p /home/nextjs/apps/web/uploads/

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { formbricksLogout } from "@/app/lib/formbricks";
 import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
 import { capitalizeFirstLetter } from "@/lib/utils/strings";
@@ -125,7 +124,6 @@ export const LandingSidebar = ({
             <DropdownMenuItem
               onClick={async () => {
                 await signOut({ callbackUrl: "/auth/login" });
-                await formbricksLogout();
               }}
               icon={<LogOutIcon className="mr-2 h-4 w-4" strokeWidth={1.5} />}>
               {t("common.logout")}

apps/web/app/(app)/components/FormbricksClient.test.tsx

@@ -1,81 +0,0 @@
-import { render } from "@testing-library/react";
-import { describe, expect, test, vi } from "vitest";
-import formbricks from "@formbricks/js";
-import { FormbricksClient } from "./FormbricksClient";
-
-// Mock next/navigation hooks.
-vi.mock("next/navigation", () => ({
-  usePathname: () => "/test-path",
-  useSearchParams: () => new URLSearchParams("foo=bar"),
-}));
-
-// Mock the flag that enables Formbricks.
-vi.mock("@/app/lib/formbricks", () => ({
-  formbricksEnabled: true,
-}));
-
-// Mock the Formbricks SDK module.
-vi.mock("@formbricks/js", () => ({
-  __esModule: true,
-  default: {
-    setup: vi.fn(),
-    setUserId: vi.fn(),
-    setEmail: vi.fn(),
-    registerRouteChange: vi.fn(),
-  },
-}));
-
-describe("FormbricksClient", () => {
-  test("calls setup, setUserId, setEmail and registerRouteChange on mount when enabled", () => {
-    const mockSetup = vi.spyOn(formbricks, "setup");
-    const mockSetUserId = vi.spyOn(formbricks, "setUserId");
-    const mockSetEmail = vi.spyOn(formbricks, "setEmail");
-    const mockRegisterRouteChange = vi.spyOn(formbricks, "registerRouteChange");
-
-    render(
-      <FormbricksClient
-        userId="user-123"
-        email="test@example.com"
-        formbricksEnvironmentId="env-test"
-        formbricksApiHost="https://api.test.com"
-        formbricksEnabled={true}
-      />
-    );
-
-    // Expect the first effect to call setup and assign the provided user details.
-    expect(mockSetup).toHaveBeenCalledWith({
-      environmentId: "env-test",
-      appUrl: "https://api.test.com",
-    });
-    expect(mockSetUserId).toHaveBeenCalledWith("user-123");
-    expect(mockSetEmail).toHaveBeenCalledWith("test@example.com");
-
-    // And the second effect should always register the route change when Formbricks is enabled.
-    expect(mockRegisterRouteChange).toHaveBeenCalled();
-  });
-
-  test("does not call setup, setUserId, or setEmail if userId is not provided yet still calls registerRouteChange", () => {
-    const mockSetup = vi.spyOn(formbricks, "setup");
-    const mockSetUserId = vi.spyOn(formbricks, "setUserId");
-    const mockSetEmail = vi.spyOn(formbricks, "setEmail");
-    const mockRegisterRouteChange = vi.spyOn(formbricks, "registerRouteChange");
-
-    render(
-      <FormbricksClient
-        userId=""
-        email="test@example.com"
-        formbricksEnvironmentId="env-test"
-        formbricksApiHost="https://api.test.com"
-        formbricksEnabled={true}
-      />
-    );
-
-    // Since userId is falsy, the first effect should not call setup or assign user details.
-    expect(mockSetup).not.toHaveBeenCalled();
-    expect(mockSetUserId).not.toHaveBeenCalled();
-    expect(mockSetEmail).not.toHaveBeenCalled();
-
-    // The second effect only checks formbricksEnabled, so registerRouteChange should be called.
-    expect(mockRegisterRouteChange).toHaveBeenCalled();
-  });
-});

apps/web/app/(app)/components/FormbricksClient.tsx

@@ -1,44 +0,0 @@
-"use client";
-
-import { usePathname, useSearchParams } from "next/navigation";
-import { useEffect } from "react";
-import formbricks from "@formbricks/js";
-
-interface FormbricksClientProps {
-  userId: string;
-  email: string;
-  formbricksEnvironmentId?: string;
-  formbricksApiHost?: string;
-  formbricksEnabled?: boolean;
-}
-
-export const FormbricksClient = ({
-  userId,
-  email,
-  formbricksEnvironmentId,
-  formbricksApiHost,
-  formbricksEnabled,
-}: FormbricksClientProps) => {
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-
-  useEffect(() => {
-    if (formbricksEnabled && userId) {
-      formbricks.setup({
-        environmentId: formbricksEnvironmentId ?? "",
-        appUrl: formbricksApiHost ?? "",
-      });
-
-      formbricks.setUserId(userId);
-      formbricks.setEmail(email);
-    }
-  }, [userId, email, formbricksEnvironmentId, formbricksApiHost, formbricksEnabled]);
-
-  useEffect(() => {
-    if (formbricksEnabled) {
-      formbricks.registerRouteChange();
-    }
-  }, [pathname, searchParams, formbricksEnabled]);
-
-  return null;
-};

apps/web/app/(app)/environments/[environmentId]/(contacts)/contacts/[contactId]/page.test.tsx

@@ -0,0 +1,34 @@
+import { SingleContactPage } from "@/modules/ee/contacts/[contactId]/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+// mock constants
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  ENCRYPTION_KEY: "test",
+  ENTERPRISE_LICENSE_KEY: "test",
+  GITHUB_ID: "test",
+  GITHUB_SECRET: "test",
+  GOOGLE_CLIENT_ID: "test",
+  GOOGLE_CLIENT_SECRET: "test",
+  AZUREAD_CLIENT_ID: "mock-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
+  AZUREAD_TENANT_ID: "mock-azuread-tenant-id",
+  OIDC_CLIENT_ID: "mock-oidc-client-id",
+  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
+  OIDC_ISSUER: "mock-oidc-issuer",
+  OIDC_DISPLAY_NAME: "mock-oidc-display-name",
+  OIDC_SIGNING_ALGORITHM: "mock-oidc-signing-algorithm",
+  WEBAPP_URL: "mock-webapp-url",
+  IS_PRODUCTION: true,
+  FB_LOGO_URL: "https://example.com/mock-logo.png",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: "mock-smtp-port",
+  IS_POSTHOG_CONFIGURED: true,
+}));
+
+describe("Contact Page Re-export", () => {
+  test("should re-export SingleContactPage", () => {
+    expect(Page).toBe(SingleContactPage);
+  });
+});

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

@@ -0,0 +1,15 @@
+import { ContactsPage } from "@/modules/ee/contacts/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+// Mock the actual ContactsPage component
+vi.mock("@/modules/ee/contacts/page", () => ({
+  ContactsPage: () => <div data-testid="contacts-page">Mock Contacts Page</div>,
+}));
+
+describe("Contacts Page Re-export", () => {
+  test("should re-export ContactsPage from the EE module", () => {
+    // Assert that the default export 'Page' is the same as the mocked 'ContactsPage'
+    expect(Page).toBe(ContactsPage);
+  });
+});

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

@@ -0,0 +1,18 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import SegmentsPageWrapper from "./page";
+
+vi.mock("@/modules/ee/contacts/segments/page", () => ({
+  SegmentsPage: vi.fn(() => <div>SegmentsPageMock</div>),
+}));
+
+describe("SegmentsPageWrapper", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the SegmentsPage component", () => {
+    render(<SegmentsPageWrapper params={{ environmentId: "test-env" } as any} />);
+    expect(screen.getByText("SegmentsPageMock")).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,343 @@
+import { createActionClassAction } from "@/modules/survey/editor/actions";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TActionClass } from "@formbricks/types/action-classes";
+import { TEnvironment } from "@formbricks/types/environment";
+import { getActiveInactiveSurveysAction } from "../actions";
+import { ActionActivityTab } from "./ActionActivityTab";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/actions/utils", () => ({
+  ACTION_TYPE_ICON_LOOKUP: {
+    noCode: <div>NoCodeIcon</div>,
+    automatic: <div>AutomaticIcon</div>,
+    code: <div>CodeIcon</div>,
+  },
+}));
+
+vi.mock("@/lib/time", () => ({
+  convertDateTimeStringShort: (dateString: string) => `formatted-${dateString}`,
+}));
+
+vi.mock("@/lib/utils/helper", () => ({
+  getFormattedErrorMessage: (error: any) => `Formatted error: ${error?.message || "Unknown error"}`,
+}));
+
+vi.mock("@/lib/utils/strings", () => ({
+  capitalizeFirstLetter: (str: string) => str.charAt(0).toUpperCase() + str.slice(1),
+}));
+
+vi.mock("@/modules/survey/editor/actions", () => ({
+  createActionClassAction: vi.fn(),
+}));
+
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, variant, ...props }: any) => (
+    <button onClick={onClick} data-variant={variant} {...props}>
+      {children}
+    </button>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/error-component", () => ({
+  ErrorComponent: () => <div>ErrorComponent</div>,
+}));
+
+vi.mock("@/modules/ui/components/label", () => ({
+  Label: ({ children, ...props }: any) => <label {...props}>{children}</label>,
+}));
+
+vi.mock("@/modules/ui/components/loading-spinner", () => ({
+  LoadingSpinner: () => <div>LoadingSpinner</div>,
+}));
+
+vi.mock("../actions", () => ({
+  getActiveInactiveSurveysAction: vi.fn(),
+}));
+
+const mockActionClass = {
+  id: "action1",
+  createdAt: new Date("2023-01-01T10:00:00Z"),
+  updatedAt: new Date("2023-01-10T11:00:00Z"),
+  name: "Test Action",
+  description: "Test Description",
+  type: "noCode",
+  environmentId: "env1_dev",
+  noCodeConfig: {
+    /* ... */
+  } as any,
+} as unknown as TActionClass;
+
+const mockEnvironmentDev = {
+  id: "env1_dev",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+} as unknown as TEnvironment;
+
+const mockEnvironmentProd = {
+  id: "env1_prod",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+} as unknown as TEnvironment;
+
+const mockOtherEnvActionClasses: TActionClass[] = [
+  {
+    id: "action2",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Existing Action Prod",
+    type: "noCode",
+    environmentId: "env1_prod",
+  } as unknown as TActionClass,
+  {
+    id: "action3",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Existing Code Action Prod",
+    type: "code",
+    key: "existing-key",
+    environmentId: "env1_prod",
+  } as unknown as TActionClass,
+];
+
+describe("ActionActivityTab", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(getActiveInactiveSurveysAction).mockResolvedValue({
+      data: {
+        activeSurveys: ["Active Survey 1"],
+        inactiveSurveys: ["Inactive Survey 1", "Inactive Survey 2"],
+      },
+    });
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders loading state initially", () => {
+    // Don't resolve the promise immediately
+    vi.mocked(getActiveInactiveSurveysAction).mockReturnValue(new Promise(() => {}));
+    render(
+      <ActionActivityTab
+        actionClass={mockActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+    expect(screen.getByText("LoadingSpinner")).toBeInTheDocument();
+  });
+
+  test("renders error state if fetching surveys fails", async () => {
+    vi.mocked(getActiveInactiveSurveysAction).mockResolvedValue({
+      data: undefined,
+    });
+    render(
+      <ActionActivityTab
+        actionClass={mockActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+    // Wait for the component to update after the promise resolves
+    await screen.findByText("ErrorComponent");
+    expect(screen.getByText("ErrorComponent")).toBeInTheDocument();
+  });
+
+  test("renders survey lists and action details correctly", async () => {
+    render(
+      <ActionActivityTab
+        actionClass={mockActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+
+    // Wait for loading to finish
+    await screen.findByText("common.active_surveys");
+
+    // Check survey lists
+    expect(screen.getByText("Active Survey 1")).toBeInTheDocument();
+    expect(screen.getByText("Inactive Survey 1")).toBeInTheDocument();
+    expect(screen.getByText("Inactive Survey 2")).toBeInTheDocument();
+
+    // Check action details
+    // Use the actual Date.toString() output that the mock receives
+    expect(screen.getByText(`formatted-${mockActionClass.createdAt.toString()}`)).toBeInTheDocument(); // Created on
+    expect(screen.getByText(`formatted-${mockActionClass.updatedAt.toString()}`)).toBeInTheDocument(); // Last updated
+    expect(screen.getByText("NoCodeIcon")).toBeInTheDocument(); // Type icon
+    expect(screen.getByText("NoCode")).toBeInTheDocument(); // Type text
+    expect(screen.getByText("Development")).toBeInTheDocument(); // Environment
+    expect(screen.getByText("Copy to Production")).toBeInTheDocument(); // Copy button text
+  });
+
+  test("calls copyAction with correct data on button click", async () => {
+    vi.mocked(createActionClassAction).mockResolvedValue({ data: { id: "newAction" } as any });
+    render(
+      <ActionActivityTab
+        actionClass={mockActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+
+    await screen.findByText("Copy to Production");
+    const copyButton = screen.getByText("Copy to Production");
+    await userEvent.click(copyButton);
+
+    expect(createActionClassAction).toHaveBeenCalledTimes(1);
+    // Include the extra properties that the component sends due to spreading mockActionClass
+    const expectedActionInput = {
+      ...mockActionClass, // Spread the original object
+      name: "Test Action", // Keep the original name as it doesn't conflict
+      environmentId: "env1_prod", // Target environment ID
+    };
+    // Remove properties not expected by the action call itself, even if sent by component
+    delete (expectedActionInput as any).id;
+    delete (expectedActionInput as any).createdAt;
+    delete (expectedActionInput as any).updatedAt;
+
+    // The assertion now checks against the structure sent by the component
+    expect(createActionClassAction).toHaveBeenCalledWith({
+      action: {
+        ...mockActionClass, // Include id, createdAt, updatedAt etc.
+        name: "Test Action",
+        environmentId: "env1_prod",
+      },
+    });
+    expect(toast.success).toHaveBeenCalledWith("environments.actions.action_copied_successfully");
+  });
+
+  test("handles name conflict during copy", async () => {
+    vi.mocked(createActionClassAction).mockResolvedValue({ data: { id: "newAction" } as any });
+    const conflictingActionClass = { ...mockActionClass, name: "Existing Action Prod" };
+    render(
+      <ActionActivityTab
+        actionClass={conflictingActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+
+    await screen.findByText("Copy to Production");
+    const copyButton = screen.getByText("Copy to Production");
+    await userEvent.click(copyButton);
+
+    expect(createActionClassAction).toHaveBeenCalledTimes(1);
+
+    // The assertion now checks against the structure sent by the component
+    expect(createActionClassAction).toHaveBeenCalledWith({
+      action: {
+        ...conflictingActionClass, // Include id, createdAt, updatedAt etc.
+        name: "Existing Action Prod (copy)",
+        environmentId: "env1_prod",
+      },
+    });
+    expect(toast.success).toHaveBeenCalledWith("environments.actions.action_copied_successfully");
+  });
+
+  test("handles key conflict during copy for 'code' type", async () => {
+    const codeActionClass: TActionClass = {
+      ...mockActionClass,
+      id: "codeAction1",
+      type: "code",
+      key: "existing-key", // Conflicting key
+      noCodeConfig: {
+        /* ... */
+      } as any,
+    };
+    render(
+      <ActionActivityTab
+        actionClass={codeActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+
+    await screen.findByText("Copy to Production");
+    const copyButton = screen.getByText("Copy to Production");
+    await userEvent.click(copyButton);
+
+    expect(createActionClassAction).not.toHaveBeenCalled();
+    expect(toast.error).toHaveBeenCalledWith("environments.actions.action_with_key_already_exists");
+  });
+
+  test("shows error if copy action fails server-side", async () => {
+    vi.mocked(createActionClassAction).mockResolvedValue({ data: undefined });
+    render(
+      <ActionActivityTab
+        actionClass={mockActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={false}
+      />
+    );
+
+    await screen.findByText("Copy to Production");
+    const copyButton = screen.getByText("Copy to Production");
+    await userEvent.click(copyButton);
+
+    expect(createActionClassAction).toHaveBeenCalledTimes(1);
+    expect(toast.error).toHaveBeenCalledWith("environments.actions.action_copy_failed");
+  });
+
+  test("shows error and prevents copy if user is read-only", async () => {
+    render(
+      <ActionActivityTab
+        actionClass={mockActionClass}
+        environmentId="env1_dev"
+        environment={mockEnvironmentDev}
+        otherEnvActionClasses={mockOtherEnvActionClasses}
+        otherEnvironment={mockEnvironmentProd}
+        isReadOnly={true} // Set to read-only
+      />
+    );
+
+    await screen.findByText("Copy to Production");
+    const copyButton = screen.getByText("Copy to Production");
+    await userEvent.click(copyButton);
+
+    expect(createActionClassAction).not.toHaveBeenCalled();
+    expect(toast.error).toHaveBeenCalledWith("common.you_are_not_authorised_to_perform_this_action");
+  });
+
+  test("renders correct copy button text for production environment", async () => {
+    render(
+      <ActionActivityTab
+        actionClass={{ ...mockActionClass, environmentId: "env1_prod" }}
+        environmentId="env1_prod"
+        environment={mockEnvironmentProd} // Current env is Production
+        otherEnvActionClasses={[]} // Assume dev env has no actions for simplicity
+        otherEnvironment={mockEnvironmentDev} // Target env is Development
+        isReadOnly={false}
+      />
+    );
+    await screen.findByText("Copy to Development");
+    expect(screen.getByText("Copy to Development")).toBeInTheDocument();
+    expect(screen.getByText("Production")).toBeInTheDocument(); // Environment text
+  });
+});

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

@@ -0,0 +1,122 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TActionClass } from "@formbricks/types/action-classes";
+import { TEnvironment } from "@formbricks/types/environment";
+import { ActionClassesTable } from "./ActionClassesTable";
+
+// Mock the ActionDetailModal
+vi.mock("./ActionDetailModal", () => ({
+  ActionDetailModal: ({ open, actionClass, setOpen }: any) =>
+    open ? (
+      <div data-testid="action-detail-modal">
+        Modal for {actionClass.name}
+        <button onClick={() => setOpen(false)}>Close Modal</button>
+      </div>
+    ) : null,
+}));
+
+const mockActionClasses: TActionClass[] = [
+  { id: "1", name: "Action 1", type: "noCode", environmentId: "env1" } as TActionClass,
+  { id: "2", name: "Action 2", type: "code", environmentId: "env1" } as TActionClass,
+];
+
+const mockEnvironment: TEnvironment = {
+  id: "env1",
+  name: "Test Environment",
+  type: "development",
+} as unknown as TEnvironment;
+const mockOtherEnvironment: TEnvironment = {
+  id: "env2",
+  name: "Other Environment",
+  type: "production",
+} as unknown as TEnvironment;
+
+const mockTableHeading = <div data-testid="table-heading">Table Heading</div>;
+const mockActionRows = mockActionClasses.map((action) => (
+  <div key={action.id} data-testid={`action-row-${action.id}`}>
+    {action.name} Row
+  </div>
+));
+
+describe("ActionClassesTable", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders table heading and action rows when actions exist", () => {
+    render(
+      <ActionClassesTable
+        environmentId="env1"
+        actionClasses={mockActionClasses}
+        environment={mockEnvironment}
+        isReadOnly={false}
+        otherEnvActionClasses={[]}
+        otherEnvironment={mockOtherEnvironment}>
+        {[mockTableHeading, mockActionRows]}
+      </ActionClassesTable>
+    );
+
+    expect(screen.getByTestId("table-heading")).toBeInTheDocument();
+    expect(screen.getByTestId("action-row-1")).toBeInTheDocument();
+    expect(screen.getByTestId("action-row-2")).toBeInTheDocument();
+    expect(screen.queryByText("No actions found")).not.toBeInTheDocument();
+  });
+
+  test("renders 'No actions found' message when no actions exist", () => {
+    render(
+      <ActionClassesTable
+        environmentId="env1"
+        actionClasses={[]}
+        environment={mockEnvironment}
+        isReadOnly={false}
+        otherEnvActionClasses={[]}
+        otherEnvironment={mockOtherEnvironment}>
+        {[mockTableHeading, []]}
+      </ActionClassesTable>
+    );
+
+    expect(screen.getByTestId("table-heading")).toBeInTheDocument();
+    expect(screen.getByText("No actions found")).toBeInTheDocument();
+    expect(screen.queryByTestId("action-row-1")).not.toBeInTheDocument();
+  });
+
+  test("opens ActionDetailModal with correct action when a row is clicked", async () => {
+    render(
+      <ActionClassesTable
+        environmentId="env1"
+        actionClasses={mockActionClasses}
+        environment={mockEnvironment}
+        isReadOnly={false}
+        otherEnvActionClasses={[]}
+        otherEnvironment={mockOtherEnvironment}>
+        {[mockTableHeading, mockActionRows]}
+      </ActionClassesTable>
+    );
+
+    // Modal should not be open initially
+    expect(screen.queryByTestId("action-detail-modal")).not.toBeInTheDocument();
+
+    // Find the button wrapping the first action row
+    const actionButton1 = screen.getByTitle("Action 1");
+    await userEvent.click(actionButton1);
+
+    // Modal should now be open with the correct action name
+    const modal = screen.getByTestId("action-detail-modal");
+    expect(modal).toBeInTheDocument();
+    expect(modal).toHaveTextContent("Modal for Action 1");
+
+    // Close the modal
+    await userEvent.click(screen.getByText("Close Modal"));
+    expect(screen.queryByTestId("action-detail-modal")).not.toBeInTheDocument();
+
+    // Click the second action button
+    const actionButton2 = screen.getByTitle("Action 2");
+    await userEvent.click(actionButton2);
+
+    // Modal should open for the second action
+    const modal2 = screen.getByTestId("action-detail-modal");
+    expect(modal2).toBeInTheDocument();
+    expect(modal2).toHaveTextContent("Modal for Action 2");
+  });
+});

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

@@ -0,0 +1,180 @@
+import { ModalWithTabs } from "@/modules/ui/components/modal-with-tabs";
+import { cleanup, render } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TActionClass } from "@formbricks/types/action-classes";
+import { TEnvironment } from "@formbricks/types/environment";
+import { ActionActivityTab } from "./ActionActivityTab";
+import { ActionDetailModal } from "./ActionDetailModal";
+// Import mocked components
+import { ActionSettingsTab } from "./ActionSettingsTab";
+
+// Mock child components
+vi.mock("@/modules/ui/components/modal-with-tabs", () => ({
+  ModalWithTabs: vi.fn(({ tabs, icon, label, description, open, setOpen }) => (
+    <div data-testid="modal-with-tabs">
+      <span data-testid="modal-label">{label}</span>
+      <span data-testid="modal-description">{description}</span>
+      <span data-testid="modal-open">{open.toString()}</span>
+      <button onClick={() => setOpen(false)}>Close</button>
+      {icon}
+      {tabs.map((tab) => (
+        <div key={tab.title}>
+          <h2>{tab.title}</h2>
+          {tab.children}
+        </div>
+      ))}
+    </div>
+  )),
+}));
+
+vi.mock("./ActionActivityTab", () => ({
+  ActionActivityTab: vi.fn(() => <div data-testid="action-activity-tab">ActionActivityTab</div>),
+}));
+
+vi.mock("./ActionSettingsTab", () => ({
+  ActionSettingsTab: vi.fn(() => <div data-testid="action-settings-tab">ActionSettingsTab</div>),
+}));
+
+// Mock the utils file to control ACTION_TYPE_ICON_LOOKUP
+vi.mock("@/app/(app)/environments/[environmentId]/actions/utils", () => ({
+  ACTION_TYPE_ICON_LOOKUP: {
+    code: <div data-testid="code-icon">Code Icon Mock</div>,
+    noCode: <div data-testid="nocode-icon">No Code Icon Mock</div>,
+    // Add other types if needed by other tests or default props
+  },
+}));
+
+const mockEnvironmentId = "test-env-id";
+const mockSetOpen = vi.fn();
+
+const mockEnvironment = {
+  id: mockEnvironmentId,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production", // Use string literal as TEnvironmentType is not exported
+  appSetupCompleted: false,
+} as unknown as TEnvironment;
+
+const mockActionClass: TActionClass = {
+  id: "action-class-1",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  name: "Test Action",
+  description: "This is a test action",
+  type: "code", // Ensure this matches a key in the mocked ACTION_TYPE_ICON_LOOKUP
+  environmentId: mockEnvironmentId,
+  noCodeConfig: null,
+  key: "test-action-key",
+};
+
+const mockActionClasses: TActionClass[] = [mockActionClass];
+const mockOtherEnvActionClasses: TActionClass[] = [];
+const mockOtherEnvironment = { ...mockEnvironment, id: "other-env-id", name: "Other Environment" };
+
+const defaultProps = {
+  environmentId: mockEnvironmentId,
+  environment: mockEnvironment,
+  open: true,
+  setOpen: mockSetOpen,
+  actionClass: mockActionClass,
+  actionClasses: mockActionClasses,
+  isReadOnly: false,
+  otherEnvironment: mockOtherEnvironment,
+  otherEnvActionClasses: mockOtherEnvActionClasses,
+};
+
+describe("ActionDetailModal", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks(); // Clear mocks after each test
+  });
+
+  test("renders ModalWithTabs with correct props", () => {
+    render(<ActionDetailModal {...defaultProps} />);
+
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
+
+    expect(mockedModalWithTabs).toHaveBeenCalled();
+    const props = mockedModalWithTabs.mock.calls[0][0];
+
+    // Check basic props
+    expect(props.open).toBe(true);
+    expect(props.setOpen).toBe(mockSetOpen);
+    expect(props.label).toBe(mockActionClass.name);
+    expect(props.description).toBe(mockActionClass.description);
+
+    // Check icon data-testid based on the mock for the default 'code' type
+    expect(props.icon).toBeDefined();
+    if (!props.icon) {
+      throw new Error("Icon prop is not defined");
+    }
+    expect((props.icon as any).props["data-testid"]).toBe("code-icon");
+
+    // Check tabs structure
+    expect(props.tabs).toHaveLength(2);
+    expect(props.tabs[0].title).toBe("common.activity");
+    expect(props.tabs[1].title).toBe("common.settings");
+
+    // Check if the correct mocked components are used as children
+    // Access the mocked functions directly
+    const mockedActionActivityTab = vi.mocked(ActionActivityTab);
+    const mockedActionSettingsTab = vi.mocked(ActionSettingsTab);
+
+    if (!props.tabs[0].children || !props.tabs[1].children) {
+      throw new Error("Tabs children are not defined");
+    }
+
+    expect((props.tabs[0].children as any).type).toBe(mockedActionActivityTab);
+    expect((props.tabs[1].children as any).type).toBe(mockedActionSettingsTab);
+
+    // Check props passed to child components
+    const activityTabProps = (props.tabs[0].children as any).props;
+    expect(activityTabProps.otherEnvActionClasses).toBe(mockOtherEnvActionClasses);
+    expect(activityTabProps.otherEnvironment).toBe(mockOtherEnvironment);
+    expect(activityTabProps.isReadOnly).toBe(false);
+    expect(activityTabProps.environment).toBe(mockEnvironment);
+    expect(activityTabProps.actionClass).toBe(mockActionClass);
+    expect(activityTabProps.environmentId).toBe(mockEnvironmentId);
+
+    const settingsTabProps = (props.tabs[1].children as any).props;
+    expect(settingsTabProps.actionClass).toBe(mockActionClass);
+    expect(settingsTabProps.actionClasses).toBe(mockActionClasses);
+    expect(settingsTabProps.setOpen).toBe(mockSetOpen);
+    expect(settingsTabProps.isReadOnly).toBe(false);
+  });
+
+  test("renders correct icon based on action type", () => {
+    // Test with 'noCode' type
+    const noCodeAction: TActionClass = { ...mockActionClass, type: "noCode" } as TActionClass;
+    render(<ActionDetailModal {...defaultProps} actionClass={noCodeAction} />);
+
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
+    const props = mockedModalWithTabs.mock.calls[0][0];
+
+    // Expect the 'nocode-icon' based on the updated mock and action type
+    expect(props.icon).toBeDefined();
+
+    if (!props.icon) {
+      throw new Error("Icon prop is not defined");
+    }
+
+    expect((props.icon as any).props["data-testid"]).toBe("nocode-icon");
+  });
+
+  test("passes isReadOnly prop correctly", () => {
+    render(<ActionDetailModal {...defaultProps} isReadOnly={true} />);
+    // Access the mocked component directly
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
+    const props = mockedModalWithTabs.mock.calls[0][0];
+
+    if (!props.tabs[0].children || !props.tabs[1].children) {
+      throw new Error("Tabs children are not defined");
+    }
+
+    const activityTabProps = (props.tabs[0].children as any).props;
+    expect(activityTabProps.isReadOnly).toBe(true);
+
+    const settingsTabProps = (props.tabs[1].children as any).props;
+    expect(settingsTabProps.isReadOnly).toBe(true);
+  });
+});

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

@@ -0,0 +1,63 @@
+import { timeSince } from "@/lib/time";
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TActionClass } from "@formbricks/types/action-classes";
+import { ActionClassDataRow } from "./ActionRowData";
+
+vi.mock("@/lib/time", () => ({
+  timeSince: vi.fn(),
+}));
+
+const mockActionClass: TActionClass = {
+  id: "testId",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  name: "Test Action",
+  description: "This is a test action",
+  type: "code",
+  noCodeConfig: null,
+  environmentId: "envId",
+  key: null,
+};
+
+const locale = "en-US";
+const timeSinceOutput = "2 hours ago";
+
+describe("ActionClassDataRow", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders code action correctly", () => {
+    vi.mocked(timeSince).mockReturnValue(timeSinceOutput);
+    const actionClass = { ...mockActionClass, type: "code" } as TActionClass;
+    render(<ActionClassDataRow actionClass={actionClass} locale={locale} />);
+
+    expect(screen.getByText(actionClass.name)).toBeInTheDocument();
+    expect(screen.getByText(actionClass.description!)).toBeInTheDocument();
+    expect(screen.getByText(timeSinceOutput)).toBeInTheDocument();
+    expect(timeSince).toHaveBeenCalledWith(actionClass.createdAt.toString(), locale);
+  });
+
+  test("renders no-code action correctly", () => {
+    vi.mocked(timeSince).mockReturnValue(timeSinceOutput);
+    const actionClass = { ...mockActionClass, type: "noCode" } as TActionClass;
+    render(<ActionClassDataRow actionClass={actionClass} locale={locale} />);
+
+    expect(screen.getByText(actionClass.name)).toBeInTheDocument();
+    expect(screen.getByText(actionClass.description!)).toBeInTheDocument();
+    expect(screen.getByText(timeSinceOutput)).toBeInTheDocument();
+    expect(timeSince).toHaveBeenCalledWith(actionClass.createdAt.toString(), locale);
+  });
+
+  test("renders without description", () => {
+    vi.mocked(timeSince).mockReturnValue(timeSinceOutput);
+    const actionClass = { ...mockActionClass, description: undefined } as unknown as TActionClass;
+    render(<ActionClassDataRow actionClass={actionClass} locale={locale} />);
+
+    expect(screen.getByText(actionClass.name)).toBeInTheDocument();
+    expect(screen.queryByText("This is a test action")).not.toBeInTheDocument();
+    expect(screen.getByText(timeSinceOutput)).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,265 @@
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { toast } from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TActionClass, TActionClassNoCodeConfig, TActionClassType } from "@formbricks/types/action-classes";
+import { ActionSettingsTab } from "./ActionSettingsTab";
+
+// Mock actions
+vi.mock("@/app/(app)/environments/[environmentId]/actions/actions", () => ({
+  deleteActionClassAction: vi.fn(),
+  updateActionClassAction: vi.fn(),
+}));
+
+// Mock utils
+vi.mock("@/app/lib/actionClass/actionClass", () => ({
+  isValidCssSelector: vi.fn((selector) => selector !== "invalid-selector"),
+}));
+
+// Mock UI components
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, variant, loading, ...props }: any) => (
+    <button onClick={onClick} data-variant={variant} disabled={loading} {...props}>
+      {loading ? "Loading..." : children}
+    </button>
+  ),
+}));
+vi.mock("@/modules/ui/components/code-action-form", () => ({
+  CodeActionForm: ({ isReadOnly }: { isReadOnly: boolean }) => (
+    <div data-testid="code-action-form" data-readonly={isReadOnly}>
+      Code Action Form
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/delete-dialog", () => ({
+  DeleteDialog: ({ open, setOpen, isDeleting, onDelete }: any) =>
+    open ? (
+      <div data-testid="delete-dialog">
+        <span>Delete Dialog</span>
+        <button onClick={onDelete} disabled={isDeleting}>
+          {isDeleting ? "Deleting..." : "Confirm Delete"}
+        </button>
+        <button onClick={() => setOpen(false)}>Cancel</button>
+      </div>
+    ) : null,
+}));
+vi.mock("@/modules/ui/components/no-code-action-form", () => ({
+  NoCodeActionForm: ({ isReadOnly }: { isReadOnly: boolean }) => (
+    <div data-testid="no-code-action-form" data-readonly={isReadOnly}>
+      No Code Action Form
+    </div>
+  ),
+}));
+
+// Mock icons
+vi.mock("lucide-react", () => ({
+  TrashIcon: () => <div data-testid="trash-icon">Trash</div>,
+}));
+
+const mockSetOpen = vi.fn();
+const mockActionClasses: TActionClass[] = [
+  {
+    id: "action1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Existing Action",
+    description: "An existing action",
+    type: "noCode",
+    environmentId: "env1",
+    noCodeConfig: { type: "click" } as TActionClassNoCodeConfig,
+  } as unknown as TActionClass,
+];
+
+const createMockActionClass = (id: string, type: TActionClassType, name: string): TActionClass =>
+  ({
+    id,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name,
+    description: `${name} description`,
+    type,
+    environmentId: "env1",
+    ...(type === "code" && { key: `${name}-key` }),
+    ...(type === "noCode" && {
+      noCodeConfig: { type: "url", rule: "exactMatch", value: `http://${name}.com` },
+    }),
+  }) as unknown as TActionClass;
+
+describe("ActionSettingsTab", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders correctly for 'code' action type", () => {
+    const actionClass = createMockActionClass("code1", "code", "Code Action");
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={false}
+      />
+    );
+
+    // Use getByPlaceholderText or getByLabelText now that Input isn't mocked
+    expect(screen.getByPlaceholderText("environments.actions.eg_clicked_download")).toHaveValue(
+      actionClass.name
+    );
+    expect(screen.getByPlaceholderText("environments.actions.user_clicked_download_button")).toHaveValue(
+      actionClass.description
+    );
+    expect(screen.getByTestId("code-action-form")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.actions.this_is_a_code_action_please_make_changes_in_your_code_base")
+    ).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "common.save_changes" })).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: /common.delete/ })).toBeInTheDocument();
+  });
+
+  test("renders correctly for 'noCode' action type", () => {
+    const actionClass = createMockActionClass("noCode1", "noCode", "No Code Action");
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={false}
+      />
+    );
+
+    // Use getByPlaceholderText or getByLabelText now that Input isn't mocked
+    expect(screen.getByPlaceholderText("environments.actions.eg_clicked_download")).toHaveValue(
+      actionClass.name
+    );
+    expect(screen.getByPlaceholderText("environments.actions.user_clicked_download_button")).toHaveValue(
+      actionClass.description
+    );
+    expect(screen.getByTestId("no-code-action-form")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "common.save_changes" })).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: /common.delete/ })).toBeInTheDocument();
+  });
+
+  test("handles successful deletion", async () => {
+    const actionClass = createMockActionClass("noCode1", "noCode", "No Code Action");
+    const { deleteActionClassAction } = await import(
+      "@/app/(app)/environments/[environmentId]/actions/actions"
+    );
+    vi.mocked(deleteActionClassAction).mockResolvedValue({ data: actionClass } as any);
+
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={false}
+      />
+    );
+
+    const deleteButtonTrigger = screen.getByRole("button", { name: /common.delete/ });
+    await userEvent.click(deleteButtonTrigger);
+
+    expect(screen.getByTestId("delete-dialog")).toBeInTheDocument();
+
+    const confirmDeleteButton = screen.getByRole("button", { name: "Confirm Delete" });
+    await userEvent.click(confirmDeleteButton);
+
+    await waitFor(() => {
+      expect(deleteActionClassAction).toHaveBeenCalledWith({ actionClassId: actionClass.id });
+      expect(toast.success).toHaveBeenCalledWith("environments.actions.action_deleted_successfully");
+      expect(mockSetOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  test("handles deletion failure", async () => {
+    const actionClass = createMockActionClass("noCode1", "noCode", "No Code Action");
+    const { deleteActionClassAction } = await import(
+      "@/app/(app)/environments/[environmentId]/actions/actions"
+    );
+    vi.mocked(deleteActionClassAction).mockRejectedValue(new Error("Deletion failed"));
+
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={false}
+      />
+    );
+
+    const deleteButtonTrigger = screen.getByRole("button", { name: /common.delete/ });
+    await userEvent.click(deleteButtonTrigger);
+    const confirmDeleteButton = screen.getByRole("button", { name: "Confirm Delete" });
+    await userEvent.click(confirmDeleteButton);
+
+    await waitFor(() => {
+      expect(deleteActionClassAction).toHaveBeenCalled();
+      expect(toast.error).toHaveBeenCalledWith("common.something_went_wrong_please_try_again");
+    });
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("renders read-only state correctly", () => {
+    const actionClass = createMockActionClass("noCode1", "noCode", "No Code Action");
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={true} // Set to read-only
+      />
+    );
+
+    // Use getByPlaceholderText or getByLabelText now that Input isn't mocked
+    expect(screen.getByPlaceholderText("environments.actions.eg_clicked_download")).toBeDisabled();
+    expect(screen.getByPlaceholderText("environments.actions.user_clicked_download_button")).toBeDisabled();
+    expect(screen.getByTestId("no-code-action-form")).toHaveAttribute("data-readonly", "true");
+    expect(screen.queryByRole("button", { name: "common.save_changes" })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: /common.delete/ })).not.toBeInTheDocument();
+    expect(screen.getByRole("link", { name: "common.read_docs" })).toBeInTheDocument(); // Docs link still visible
+  });
+
+  test("prevents delete when read-only", async () => {
+    const actionClass = createMockActionClass("noCode1", "noCode", "No Code Action");
+    const { deleteActionClassAction } = await import(
+      "@/app/(app)/environments/[environmentId]/actions/actions"
+    );
+
+    // Render with isReadOnly=true, but simulate a delete attempt
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={true}
+      />
+    );
+
+    // Try to open and confirm delete dialog (buttons won't exist, so we simulate the flow)
+    // This test primarily checks the logic within handleDeleteAction if it were called.
+    // A better approach might be to export handleDeleteAction for direct testing,
+    // but for now, we assume the UI prevents calling it.
+
+    // We can assert that the delete button isn't there to prevent the flow
+    expect(screen.queryByRole("button", { name: /common.delete/ })).not.toBeInTheDocument();
+    expect(deleteActionClassAction).not.toHaveBeenCalled();
+  });
+
+  test("renders docs link correctly", () => {
+    const actionClass = createMockActionClass("noCode1", "noCode", "No Code Action");
+    render(
+      <ActionSettingsTab
+        actionClass={actionClass}
+        actionClasses={mockActionClasses}
+        setOpen={mockSetOpen}
+        isReadOnly={false}
+      />
+    );
+    const docsLink = screen.getByRole("link", { name: "common.read_docs" });
+    expect(docsLink).toHaveAttribute("href", "https://formbricks.com/docs/actions/no-code");
+    expect(docsLink).toHaveAttribute("target", "_blank");
+  });
+});

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

@@ -0,0 +1,26 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { ActionTableHeading } from "./ActionTableHeading";
+
+// Mock the server-side translation function
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+describe("ActionTableHeading", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the table heading with correct column names", async () => {
+    // Render the async component
+    const ResolvedComponent = await ActionTableHeading();
+    render(ResolvedComponent);
+
+    // Check if the translated column headers are present
+    expect(screen.getByText("environments.actions.user_actions")).toBeInTheDocument();
+    expect(screen.getByText("common.created")).toBeInTheDocument();
+    // Check for the screen reader only text
+    expect(screen.getByText("common.edit")).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,142 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TActionClass, TActionClassNoCodeConfig } from "@formbricks/types/action-classes";
+import { AddActionModal } from "./AddActionModal";
+
+// Mock child components and hooks
+vi.mock("@/modules/survey/editor/components/create-new-action-tab", () => ({
+  CreateNewActionTab: vi.fn(({ setOpen }) => (
+    <div data-testid="create-new-action-tab">
+      <span>CreateNewActionTab Content</span>
+      <button onClick={() => setOpen(false)}>Close from Tab</button>
+    </div>
+  )),
+}));
+
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, ...props }: any) => (
+    <button onClick={onClick} {...props}>
+      {children}
+    </button>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ children, open, setOpen, ...props }: any) =>
+    open ? (
+      <div data-testid="modal" {...props}>
+        {children}
+        <button onClick={() => setOpen(false)}>Close Modal</button>
+      </div>
+    ) : null,
+}));
+
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key: string) => key,
+  }),
+}));
+
+vi.mock("lucide-react", () => ({
+  MousePointerClickIcon: () => <div data-testid="mouse-pointer-icon" />,
+  PlusIcon: () => <div data-testid="plus-icon" />,
+}));
+
+const mockActionClasses: TActionClass[] = [
+  {
+    id: "action1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Action 1",
+    description: "Description 1",
+    type: "noCode",
+    environmentId: "env1",
+    noCodeConfig: { type: "click" } as unknown as TActionClassNoCodeConfig,
+  } as unknown as TActionClass,
+];
+
+const environmentId = "env1";
+
+describe("AddActionModal", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders the 'Add Action' button initially", () => {
+    render(
+      <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
+    );
+    expect(screen.getByRole("button", { name: "common.add_action" })).toBeInTheDocument();
+    expect(screen.getByTestId("plus-icon")).toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
+  });
+
+  test("opens the modal when the 'Add Action' button is clicked", async () => {
+    render(
+      <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
+    );
+    const addButton = screen.getByRole("button", { name: "common.add_action" });
+    await userEvent.click(addButton);
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(screen.getByTestId("mouse-pointer-icon")).toBeInTheDocument();
+    expect(screen.getByText("environments.actions.track_new_user_action")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.actions.track_user_action_to_display_surveys_or_create_user_segment")
+    ).toBeInTheDocument();
+    expect(screen.getByTestId("create-new-action-tab")).toBeInTheDocument();
+  });
+
+  test("passes correct props to CreateNewActionTab", async () => {
+    const { CreateNewActionTab } = await import("@/modules/survey/editor/components/create-new-action-tab");
+    const mockedCreateNewActionTab = vi.mocked(CreateNewActionTab);
+
+    render(
+      <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
+    );
+    const addButton = screen.getByRole("button", { name: "common.add_action" });
+    await userEvent.click(addButton);
+
+    expect(mockedCreateNewActionTab).toHaveBeenCalled();
+    const props = mockedCreateNewActionTab.mock.calls[0][0];
+    expect(props.environmentId).toBe(environmentId);
+    expect(props.actionClasses).toEqual(mockActionClasses); // Initial state check
+    expect(props.isReadOnly).toBe(false);
+    expect(props.setOpen).toBeInstanceOf(Function);
+    expect(props.setActionClasses).toBeInstanceOf(Function);
+  });
+
+  test("closes the modal when the close button (simulated) is clicked", async () => {
+    render(
+      <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
+    );
+    const addButton = screen.getByRole("button", { name: "common.add_action" });
+    await userEvent.click(addButton);
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+
+    // Simulate closing via the mocked Modal's close button
+    const closeModalButton = screen.getByText("Close Modal");
+    await userEvent.click(closeModalButton);
+
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
+  });
+
+  test("closes the modal when setOpen is called from CreateNewActionTab", async () => {
+    render(
+      <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
+    );
+    const addButton = screen.getByRole("button", { name: "common.add_action" });
+    await userEvent.click(addButton);
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+
+    // Simulate closing via the mocked CreateNewActionTab's button
+    const closeFromTabButton = screen.getByText("Close from Tab");
+    await userEvent.click(closeFromTabButton);
+
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,44 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+// Mock child components
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-content-wrapper">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle }: { pageTitle: string }) => <div data-testid="page-header">{pageTitle}</div>,
+}));
+
+describe("Loading", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders loading state correctly", () => {
+    render(<Loading />);
+
+    // Check if mocked components are rendered
+    expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("page-header")).toBeInTheDocument();
+    expect(screen.getByTestId("page-header")).toHaveTextContent("common.actions");
+
+    // Check for translated table headers
+    expect(screen.getByText("environments.actions.user_actions")).toBeInTheDocument();
+    expect(screen.getByText("common.created")).toBeInTheDocument();
+    expect(screen.getByText("common.edit")).toBeInTheDocument(); // Screen reader text
+
+    // Check for skeleton elements (presence of animate-pulse class)
+    const skeletonElements = document.querySelectorAll(".animate-pulse");
+    expect(skeletonElements.length).toBeGreaterThan(0); // Ensure some skeleton elements are rendered
+
+    // Check for the presence of multiple skeleton rows (3 rows * 4 pulse elements per row = 12)
+    const pulseDivs = screen.getAllByText((_, element) => {
+      return element?.tagName.toLowerCase() === "div" && element.classList.contains("animate-pulse");
+    });
+    expect(pulseDivs.length).toBe(3 * 4); // 3 rows, 4 pulsing divs per row (icon, name, desc, created)
+  });
+});

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

@@ -33,7 +33,7 @@ const Loading = () => {
                   </div>
                 </div>
               </div>
-              <div className="col-span-2 my-auto flex justify-center whitespace-nowrap text-center text-sm text-slate-500">
+              <div className="col-span-2 my-auto flex justify-center text-center text-sm whitespace-nowrap text-slate-500">
                 <div className="h-4 w-28 animate-pulse rounded-full bg-slate-200"></div>
               </div>
             </div>

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

@@ -0,0 +1,161 @@
+import { getActionClasses } from "@/lib/actionClass/service";
+import { getEnvironments } from "@/lib/environment/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TActionClass } from "@formbricks/types/action-classes";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TProject } from "@formbricks/types/project";
+// Import the component after mocks
+import Page from "./page";
+
+// Mock dependencies
+vi.mock("@/lib/actionClass/service", () => ({
+  getActionClasses: vi.fn(),
+}));
+vi.mock("@/lib/environment/service", () => ({
+  getEnvironments: vi.fn(),
+}));
+vi.mock("@/lib/utils/locale", () => ({
+  findMatchingLocale: vi.fn(),
+}));
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/actions/components/ActionClassesTable", () => ({
+  ActionClassesTable: ({ children }) => <div>ActionClassesTable Mock{children}</div>,
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/actions/components/ActionRowData", () => ({
+  ActionClassDataRow: ({ actionClass }) => <div>ActionClassDataRow Mock: {actionClass.name}</div>,
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/actions/components/ActionTableHeading", () => ({
+  ActionTableHeading: () => <div>ActionTableHeading Mock</div>,
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/actions/components/AddActionModal", () => ({
+  AddActionModal: () => <div>AddActionModal Mock</div>,
+}));
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }) => <div>PageContentWrapper Mock{children}</div>,
+}));
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle, cta }) => (
+    <div>
+      PageHeader Mock: {pageTitle} {cta && <div>CTA Mock</div>}
+    </div>
+  ),
+}));
+
+// Mock data
+const mockEnvironmentId = "test-env-id";
+const mockProjectId = "test-project-id";
+const mockEnvironment = {
+  id: mockEnvironmentId,
+  name: "Test Environment",
+  type: "development",
+} as unknown as TEnvironment;
+const mockOtherEnvironment = {
+  id: "other-env-id",
+  name: "Other Environment",
+  type: "production",
+} as unknown as TEnvironment;
+const mockProject = { id: mockProjectId, name: "Test Project" } as unknown as TProject;
+const mockActionClasses = [
+  { id: "action1", name: "Action 1", type: "code", environmentId: mockEnvironmentId } as TActionClass,
+  { id: "action2", name: "Action 2", type: "noCode", environmentId: mockEnvironmentId } as TActionClass,
+];
+const mockOtherEnvActionClasses = [
+  { id: "action3", name: "Action 3", type: "code", environmentId: mockOtherEnvironment.id } as TActionClass,
+];
+const mockLocale = "en-US";
+
+const mockParams = { environmentId: mockEnvironmentId };
+const mockProps = { params: mockParams };
+
+describe("Actions Page", () => {
+  beforeEach(() => {
+    vi.mocked(getActionClasses)
+      .mockResolvedValueOnce(mockActionClasses) // First call for current env
+      .mockResolvedValueOnce(mockOtherEnvActionClasses); // Second call for other env
+    vi.mocked(getEnvironments).mockResolvedValue([mockEnvironment, mockOtherEnvironment]);
+    vi.mocked(findMatchingLocale).mockResolvedValue(mockLocale);
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.resetAllMocks();
+  });
+
+  test("renders the page correctly with actions", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: false,
+      project: mockProject,
+      isBilling: false,
+      environment: mockEnvironment,
+    } as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("PageHeader Mock: common.actions")).toBeInTheDocument();
+    expect(screen.getByText("CTA Mock")).toBeInTheDocument(); // AddActionModal rendered via CTA
+    expect(screen.getByText("ActionClassesTable Mock")).toBeInTheDocument();
+    expect(screen.getByText("ActionTableHeading Mock")).toBeInTheDocument();
+    expect(screen.getByText("ActionClassDataRow Mock: Action 1")).toBeInTheDocument();
+    expect(screen.getByText("ActionClassDataRow Mock: Action 2")).toBeInTheDocument();
+    expect(vi.mocked(redirect)).not.toHaveBeenCalled();
+  });
+
+  test("redirects if isBilling is true", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: false,
+      project: mockProject,
+      isBilling: true,
+      environment: mockEnvironment,
+    } as TEnvironmentAuth);
+
+    await Page(mockProps);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/settings/billing`);
+  });
+
+  test("does not render AddActionModal CTA if isReadOnly is true", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: true,
+      project: mockProject,
+      isBilling: false,
+      environment: mockEnvironment,
+    } as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("PageHeader Mock: common.actions")).toBeInTheDocument();
+    expect(screen.queryByText("CTA Mock")).not.toBeInTheDocument(); // CTA should not be present
+    expect(screen.getByText("ActionClassesTable Mock")).toBeInTheDocument();
+  });
+
+  test("renders AddActionModal CTA if isReadOnly is false", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: false,
+      project: mockProject,
+      isBilling: false,
+      environment: mockEnvironment,
+    } as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("PageHeader Mock: common.actions")).toBeInTheDocument();
+    expect(screen.getByText("CTA Mock")).toBeInTheDocument(); // CTA should be present
+    expect(screen.getByText("ActionClassesTable Mock")).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,39 @@
+import { cleanup, render } from "@testing-library/react";
+import { Code2Icon, MousePointerClickIcon } from "lucide-react";
+import React from "react";
+import { afterEach, describe, expect, test } from "vitest";
+import { ACTION_TYPE_ICON_LOOKUP } from "./utils";
+
+describe("ACTION_TYPE_ICON_LOOKUP", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("should contain the correct icon for 'code'", () => {
+    expect(ACTION_TYPE_ICON_LOOKUP).toHaveProperty("code");
+    const IconComponent = ACTION_TYPE_ICON_LOOKUP.code;
+    expect(React.isValidElement(IconComponent)).toBe(true);
+
+    // Render the icon and check if it's the correct Lucide icon
+    const { container } = render(IconComponent);
+    const svgElement = container.querySelector("svg");
+    expect(svgElement).toBeInTheDocument();
+    // Check for a class or attribute specific to Code2Icon if possible,
+    // or compare the rendered output structure if necessary.
+    // For simplicity, we check the component type directly (though this is less robust)
+    expect(IconComponent.type).toBe(Code2Icon);
+  });
+
+  test("should contain the correct icon for 'noCode'", () => {
+    expect(ACTION_TYPE_ICON_LOOKUP).toHaveProperty("noCode");
+    const IconComponent = ACTION_TYPE_ICON_LOOKUP.noCode;
+    expect(React.isValidElement(IconComponent)).toBe(true);
+
+    // Render the icon and check if it's the correct Lucide icon
+    const { container } = render(IconComponent);
+    const svgElement = container.querySelector("svg");
+    expect(svgElement).toBeInTheDocument();
+    // Similar check as above for MousePointerClickIcon
+    expect(IconComponent.type).toBe(MousePointerClickIcon);
+  });
+});

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

@@ -0,0 +1,298 @@
+import { EnvironmentLayout } from "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout";
+import { getEnvironment, getEnvironments } from "@/lib/environment/service";
+import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
+import { getAccessFlags } from "@/lib/membership/utils";
+import {
+  getMonthlyActiveOrganizationPeopleCount,
+  getMonthlyOrganizationResponseCount,
+  getOrganizationByEnvironmentId,
+  getOrganizationsByUserId,
+} from "@/lib/organization/service";
+import { getUserProjects } from "@/lib/project/service";
+import { getUser } from "@/lib/user/service";
+import { getEnterpriseLicense, getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
+import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
+import { cleanup, render, screen } from "@testing-library/react";
+import type { Session } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TMembership } from "@formbricks/types/memberships";
+import {
+  TOrganization,
+  TOrganizationBilling,
+  TOrganizationBillingPlanLimits,
+} from "@formbricks/types/organizations";
+import { TProject } from "@formbricks/types/project";
+import { TUser } from "@formbricks/types/user";
+
+// Mock services and utils
+vi.mock("@/lib/environment/service", () => ({
+  getEnvironment: vi.fn(),
+  getEnvironments: vi.fn(),
+}));
+vi.mock("@/lib/organization/service", () => ({
+  getOrganizationByEnvironmentId: vi.fn(),
+  getOrganizationsByUserId: vi.fn(),
+  getMonthlyActiveOrganizationPeopleCount: vi.fn(),
+  getMonthlyOrganizationResponseCount: vi.fn(),
+}));
+vi.mock("@/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+vi.mock("@/lib/project/service", () => ({
+  getUserProjects: vi.fn(),
+}));
+vi.mock("@/lib/membership/service", () => ({
+  getMembershipByUserIdOrganizationId: vi.fn(),
+}));
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: vi.fn(() => ({ isMember: true })), // Default to member for simplicity
+}));
+vi.mock("@/modules/ee/license-check/lib/utils", () => ({
+  getEnterpriseLicense: vi.fn(),
+  getOrganizationProjectsLimit: vi.fn(),
+}));
+vi.mock("@/modules/ee/teams/lib/roles", () => ({
+  getProjectPermissionByUserId: vi.fn(),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+let mockIsFormbricksCloud = false;
+let mockIsDevelopment = false;
+
+vi.mock("@/lib/constants", () => ({
+  get IS_FORMBRICKS_CLOUD() {
+    return mockIsFormbricksCloud;
+  },
+  get IS_DEVELOPMENT() {
+    return mockIsDevelopment;
+  },
+}));
+
+// Mock components
+vi.mock("@/app/(app)/environments/[environmentId]/components/MainNavigation", () => ({
+  MainNavigation: () => <div data-testid="main-navigation">MainNavigation</div>,
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/components/TopControlBar", () => ({
+  TopControlBar: () => <div data-testid="top-control-bar">TopControlBar</div>,
+}));
+vi.mock("@/modules/ui/components/dev-environment-banner", () => ({
+  DevEnvironmentBanner: ({ environment }: { environment: TEnvironment }) =>
+    environment.type === "development" ? <div data-testid="dev-banner">DevEnvironmentBanner</div> : null,
+}));
+vi.mock("@/modules/ui/components/limits-reached-banner", () => ({
+  LimitsReachedBanner: () => <div data-testid="limits-banner">LimitsReachedBanner</div>,
+}));
+vi.mock("@/modules/ui/components/pending-downgrade-banner", () => ({
+  PendingDowngradeBanner: ({
+    isPendingDowngrade,
+    active,
+  }: {
+    isPendingDowngrade: boolean;
+    active: boolean;
+  }) =>
+    isPendingDowngrade && active ? <div data-testid="downgrade-banner">PendingDowngradeBanner</div> : null,
+}));
+
+const mockUser = {
+  id: "user-1",
+  name: "Test User",
+  email: "test@example.com",
+  emailVerified: new Date(),
+  imageUrl: "",
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  notificationSettings: { alert: {}, weeklySummary: {} },
+} as unknown as TUser;
+
+const mockOrganization = {
+  id: "org-1",
+  name: "Test Org",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  billing: {
+    stripeCustomerId: null,
+    limits: { monthly: { responses: null } } as unknown as TOrganizationBillingPlanLimits,
+  } as unknown as TOrganizationBilling,
+} as unknown as TOrganization;
+
+const mockEnvironment: TEnvironment = {
+  id: "env-1",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+  projectId: "proj-1",
+  appSetupCompleted: true,
+};
+
+const mockProject: TProject = {
+  id: "proj-1",
+  name: "Test Project",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  organizationId: "org-1",
+  environments: [mockEnvironment],
+} as unknown as TProject;
+
+const mockMembership: TMembership = {
+  organizationId: "org-1",
+  userId: "user-1",
+  accepted: true,
+  role: "owner",
+};
+
+const mockLicense = {
+  plan: "free",
+  active: false,
+  lastChecked: new Date(),
+  features: { isMultiOrgEnabled: false },
+} as any;
+
+const mockProjectPermission = {
+  userId: "user-1",
+  projectId: "proj-1",
+  role: "admin",
+} as any;
+
+const mockSession: Session = {
+  user: {
+    id: "user-1",
+  },
+  expires: new Date(Date.now() + 3600 * 1000).toISOString(),
+};
+
+describe("EnvironmentLayout", () => {
+  beforeEach(() => {
+    vi.mocked(getUser).mockResolvedValue(mockUser);
+    vi.mocked(getEnvironment).mockResolvedValue(mockEnvironment);
+    vi.mocked(getOrganizationsByUserId).mockResolvedValue([mockOrganization]);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrganization);
+    vi.mocked(getUserProjects).mockResolvedValue([mockProject]);
+    vi.mocked(getEnvironments).mockResolvedValue([mockEnvironment]);
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getMonthlyActiveOrganizationPeopleCount).mockResolvedValue(100);
+    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(500);
+    vi.mocked(getEnterpriseLicense).mockResolvedValue(mockLicense);
+    vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(null as any);
+    vi.mocked(getProjectPermissionByUserId).mockResolvedValue(mockProjectPermission);
+    mockIsDevelopment = false;
+    mockIsFormbricksCloud = false;
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.resetAllMocks();
+  });
+
+  test("renders correctly with default props", async () => {
+    // Ensure the default mockLicense has isPendingDowngrade: false and active: false
+    vi.mocked(getEnterpriseLicense).mockResolvedValue({
+      ...mockLicense,
+      isPendingDowngrade: false,
+      active: false,
+    });
+
+    render(
+      await EnvironmentLayout({
+        environmentId: "env-1",
+        session: mockSession,
+        children: <div>Child Content</div>,
+      })
+    );
+
+    expect(screen.getByTestId("main-navigation")).toBeInTheDocument();
+    expect(screen.getByTestId("top-control-bar")).toBeInTheDocument();
+    expect(screen.getByText("Child Content")).toBeInTheDocument();
+    expect(screen.queryByTestId("dev-banner")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("limits-banner")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("downgrade-banner")).not.toBeInTheDocument(); // This should now pass
+  });
+
+  test("renders DevEnvironmentBanner in development environment", async () => {
+    const devEnvironment = { ...mockEnvironment, type: "development" as const };
+    vi.mocked(getEnvironment).mockResolvedValue(devEnvironment);
+    mockIsDevelopment = true;
+
+    render(
+      await EnvironmentLayout({
+        environmentId: "env-1",
+        session: mockSession,
+        children: <div>Child Content</div>,
+      })
+    );
+
+    expect(screen.getByTestId("dev-banner")).toBeInTheDocument();
+  });
+
+  test("renders LimitsReachedBanner in Formbricks Cloud", async () => {
+    mockIsFormbricksCloud = true;
+
+    render(
+      await EnvironmentLayout({
+        environmentId: "env-1",
+        session: mockSession,
+        children: <div>Child Content</div>,
+      })
+    );
+
+    expect(screen.getByTestId("limits-banner")).toBeInTheDocument();
+    expect(vi.mocked(getMonthlyActiveOrganizationPeopleCount)).toHaveBeenCalledWith(mockOrganization.id);
+    expect(vi.mocked(getMonthlyOrganizationResponseCount)).toHaveBeenCalledWith(mockOrganization.id);
+  });
+
+  test("renders PendingDowngradeBanner when pending downgrade", async () => {
+    // Ensure the license mock reflects the condition needed for the banner
+    const pendingLicense = { ...mockLicense, isPendingDowngrade: true, active: true };
+    vi.mocked(getEnterpriseLicense).mockResolvedValue(pendingLicense);
+
+    render(
+      await EnvironmentLayout({
+        environmentId: "env-1",
+        session: mockSession,
+        children: <div>Child Content</div>,
+      })
+    );
+
+    expect(screen.getByTestId("downgrade-banner")).toBeInTheDocument();
+  });
+
+  test("throws error if user not found", async () => {
+    vi.mocked(getUser).mockResolvedValue(null);
+    await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
+      "common.user_not_found"
+    );
+  });
+
+  test("throws error if organization not found", async () => {
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(null);
+    await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
+      "common.organization_not_found"
+    );
+  });
+
+  test("throws error if environment not found", async () => {
+    vi.mocked(getEnvironment).mockResolvedValue(null);
+    await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
+      "common.environment_not_found"
+    );
+  });
+
+  test("throws error if projects, environments or organizations not found", async () => {
+    vi.mocked(getUserProjects).mockResolvedValue(null as any); // Simulate one of the promises failing
+    await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
+      "environments.projects_environments_organizations_not_found"
+    );
+  });
+
+  test("throws error if member has no project permission", async () => {
+    vi.mocked(getAccessFlags).mockReturnValue({ isMember: true } as any);
+    vi.mocked(getProjectPermissionByUserId).mockResolvedValue(null);
+    await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
+      "common.project_permission_not_found"
+    );
+  });
+});

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

@@ -0,0 +1,33 @@
+import { FORMBRICKS_ENVIRONMENT_ID_LS } from "@/lib/localStorage";
+import { render } from "@testing-library/react";
+import { describe, expect, test, vi } from "vitest";
+import EnvironmentStorageHandler from "./EnvironmentStorageHandler";
+
+describe("EnvironmentStorageHandler", () => {
+  test("sets environmentId in localStorage on mount", () => {
+    const setItemSpy = vi.spyOn(Storage.prototype, "setItem");
+    const testEnvironmentId = "test-env-123";
+
+    render(<EnvironmentStorageHandler environmentId={testEnvironmentId} />);
+
+    expect(setItemSpy).toHaveBeenCalledWith(FORMBRICKS_ENVIRONMENT_ID_LS, testEnvironmentId);
+    setItemSpy.mockRestore();
+  });
+
+  test("updates environmentId in localStorage when prop changes", () => {
+    const setItemSpy = vi.spyOn(Storage.prototype, "setItem");
+    const initialEnvironmentId = "test-env-initial";
+    const updatedEnvironmentId = "test-env-updated";
+
+    const { rerender } = render(<EnvironmentStorageHandler environmentId={initialEnvironmentId} />);
+
+    expect(setItemSpy).toHaveBeenCalledWith(FORMBRICKS_ENVIRONMENT_ID_LS, initialEnvironmentId);
+
+    rerender(<EnvironmentStorageHandler environmentId={updatedEnvironmentId} />);
+
+    expect(setItemSpy).toHaveBeenCalledWith(FORMBRICKS_ENVIRONMENT_ID_LS, updatedEnvironmentId);
+    expect(setItemSpy).toHaveBeenCalledTimes(2); // Called on mount and on rerender with new prop
+
+    setItemSpy.mockRestore();
+  });
+});

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

@@ -0,0 +1,149 @@
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { EnvironmentSwitch } from "./EnvironmentSwitch";
+
+// Mock next/navigation
+const mockPush = vi.fn();
+vi.mock("next/navigation", () => ({
+  useRouter: vi.fn(() => ({
+    push: mockPush,
+  })),
+}));
+
+// Mock @tolgee/react
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key: string) => key,
+  }),
+}));
+
+const mockEnvironmentDev: TEnvironment = {
+  id: "dev-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+  projectId: "project-id",
+  appSetupCompleted: true,
+};
+
+const mockEnvironmentProd: TEnvironment = {
+  id: "prod-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+  projectId: "project-id",
+  appSetupCompleted: true,
+};
+
+const mockEnvironments = [mockEnvironmentDev, mockEnvironmentProd];
+
+describe("EnvironmentSwitch", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders checked when environment is development", () => {
+    render(<EnvironmentSwitch environment={mockEnvironmentDev} environments={mockEnvironments} />);
+    const switchElement = screen.getByRole("switch");
+    expect(switchElement).toBeChecked();
+    expect(screen.getByText("common.dev_env")).toHaveClass("text-orange-800");
+  });
+
+  test("renders unchecked when environment is production", () => {
+    render(<EnvironmentSwitch environment={mockEnvironmentProd} environments={mockEnvironments} />);
+    const switchElement = screen.getByRole("switch");
+    expect(switchElement).not.toBeChecked();
+    expect(screen.getByText("common.dev_env")).not.toHaveClass("text-orange-800");
+  });
+
+  test("calls router.push with development environment ID when toggled from production", async () => {
+    render(<EnvironmentSwitch environment={mockEnvironmentProd} environments={mockEnvironments} />);
+    const switchElement = screen.getByRole("switch");
+
+    expect(switchElement).not.toBeChecked();
+    await userEvent.click(switchElement);
+
+    // Check loading state (switch disabled)
+    expect(switchElement).toBeDisabled();
+
+    // Check router push call
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith(`/environments/${mockEnvironmentDev.id}/`);
+    });
+
+    // Check visual state change (though state update happens before navigation)
+    // In a real scenario, the component would re-render with the new environment prop after navigation.
+    // Here, we simulate the state change directly for testing the toggle logic.
+    await waitFor(() => {
+      // Re-render or check internal state if possible, otherwise check mock calls
+      // Since the component manages its own state, we can check the visual state after click
+      expect(switchElement).toBeChecked(); // State updates immediately
+    });
+  });
+
+  test("calls router.push with production environment ID when toggled from development", async () => {
+    render(<EnvironmentSwitch environment={mockEnvironmentDev} environments={mockEnvironments} />);
+    const switchElement = screen.getByRole("switch");
+
+    expect(switchElement).toBeChecked();
+    await userEvent.click(switchElement);
+
+    // Check loading state (switch disabled)
+    expect(switchElement).toBeDisabled();
+
+    // Check router push call
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith(`/environments/${mockEnvironmentProd.id}/`);
+    });
+
+    // Check visual state change
+    await waitFor(() => {
+      expect(switchElement).not.toBeChecked(); // State updates immediately
+    });
+  });
+
+  test("does not call router.push if target environment is not found", async () => {
+    const incompleteEnvironments = [mockEnvironmentProd]; // Only production exists
+    render(<EnvironmentSwitch environment={mockEnvironmentProd} environments={incompleteEnvironments} />);
+    const switchElement = screen.getByRole("switch");
+
+    await userEvent.click(switchElement); // Try to toggle to development
+
+    await waitFor(() => {
+      expect(switchElement).toBeDisabled(); // Loading state still set
+    });
+
+    // router.push should not be called because dev env is missing
+    expect(mockPush).not.toHaveBeenCalled();
+
+    // State still updates visually
+    await waitFor(() => {
+      expect(switchElement).toBeChecked();
+    });
+  });
+
+  test("toggles using the label click", async () => {
+    render(<EnvironmentSwitch environment={mockEnvironmentProd} environments={mockEnvironments} />);
+    const labelElement = screen.getByText("common.dev_env");
+    const switchElement = screen.getByRole("switch");
+
+    expect(switchElement).not.toBeChecked();
+    await userEvent.click(labelElement); // Click the label
+
+    // Check loading state (switch disabled)
+    expect(switchElement).toBeDisabled();
+
+    // Check router push call
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith(`/environments/${mockEnvironmentDev.id}/`);
+    });
+
+    // Check visual state change
+    await waitFor(() => {
+      expect(switchElement).toBeChecked();
+    });
+  });
+});

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

@@ -0,0 +1,311 @@
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { signOut } from "next-auth/react";
+import { usePathname, useRouter } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TProject } from "@formbricks/types/project";
+import { TUser } from "@formbricks/types/user";
+import { getLatestStableFbReleaseAction } from "../actions/actions";
+import { MainNavigation } from "./MainNavigation";
+
+// Mock dependencies
+vi.mock("next/navigation", () => ({
+  useRouter: vi.fn(() => ({ push: vi.fn() })),
+  usePathname: vi.fn(() => "/environments/env1/surveys"),
+}));
+vi.mock("next-auth/react", () => ({
+  signOut: vi.fn(),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/actions/actions", () => ({
+  getLatestStableFbReleaseAction: vi.fn(),
+}));
+vi.mock("@/app/lib/formbricks", () => ({
+  formbricksLogout: vi.fn(),
+}));
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: (role?: string) => ({
+    isAdmin: role === "admin",
+    isOwner: role === "owner",
+    isManager: role === "manager",
+    isMember: role === "member",
+    isBilling: role === "billing",
+  }),
+}));
+vi.mock("@/modules/organization/components/CreateOrganizationModal", () => ({
+  CreateOrganizationModal: ({ open }: { open: boolean }) =>
+    open ? <div data-testid="create-org-modal">Create Org Modal</div> : null,
+}));
+vi.mock("@/modules/projects/components/project-switcher", () => ({
+  ProjectSwitcher: ({ isCollapsed }: { isCollapsed: boolean }) => (
+    <div data-testid="project-switcher" data-collapsed={isCollapsed}>
+      Project Switcher
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/avatars", () => ({
+  ProfileAvatar: () => <div data-testid="profile-avatar">Avatar</div>,
+}));
+vi.mock("next/image", () => ({
+  // eslint-disable-next-line @next/next/no-img-element
+  default: (props: any) => <img alt="test" {...props} />,
+}));
+vi.mock("../../../../../package.json", () => ({
+  version: "1.0.0",
+}));
+
+// Mock localStorage
+const localStorageMock = (() => {
+  let store: Record<string, string> = {};
+  return {
+    getItem: (key: string) => store[key] || null,
+    setItem: (key: string, value: string) => {
+      store[key] = value.toString();
+    },
+    removeItem: (key: string) => {
+      delete store[key];
+    },
+    clear: () => {
+      store = {};
+    },
+  };
+})();
+Object.defineProperty(window, "localStorage", { value: localStorageMock });
+
+// Mock data
+const mockEnvironment: TEnvironment = {
+  id: "env1",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+  projectId: "proj1",
+  appSetupCompleted: true,
+};
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  imageUrl: "http://example.com/avatar.png",
+  emailVerified: new Date(),
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  notificationSettings: { alert: {}, weeklySummary: {} },
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+const mockOrganization = {
+  id: "org1",
+  name: "Test Org",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  billing: { stripeCustomerId: null, plan: "free", limits: { monthly: { responses: null } } } as any,
+} as unknown as TOrganization;
+
+const mockOrganizations: TOrganization[] = [
+  mockOrganization,
+  { ...mockOrganization, id: "org2", name: "Another Org" },
+];
+const mockProject: TProject = {
+  id: "proj1",
+  name: "Test Project",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  organizationId: "org1",
+  environments: [mockEnvironment],
+  config: { channel: "website" },
+} as unknown as TProject;
+const mockProjects: TProject[] = [mockProject];
+
+const defaultProps = {
+  environment: mockEnvironment,
+  organizations: mockOrganizations,
+  user: mockUser,
+  organization: mockOrganization,
+  projects: mockProjects,
+  isMultiOrgEnabled: true,
+  isFormbricksCloud: false,
+  isDevelopment: false,
+  membershipRole: "owner" as const,
+  organizationProjectsLimit: 5,
+  isLicenseActive: true,
+};
+
+describe("MainNavigation", () => {
+  let mockRouterPush: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    mockRouterPush = vi.fn();
+    vi.mocked(useRouter).mockReturnValue({ push: mockRouterPush } as any);
+    vi.mocked(usePathname).mockReturnValue("/environments/env1/surveys");
+    vi.mocked(getLatestStableFbReleaseAction).mockResolvedValue({ data: null }); // Default: no new version
+    localStorage.clear();
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders expanded by default and collapses on toggle", async () => {
+    render(<MainNavigation {...defaultProps} />);
+    const projectSwitcher = screen.getByTestId("project-switcher");
+    // Assuming the toggle button is the only one initially without an accessible name
+    // A more specific selector like data-testid would be better if available.
+    const toggleButton = screen.getByRole("button", { name: "" });
+
+    // Check initial state (expanded)
+    expect(projectSwitcher).toHaveAttribute("data-collapsed", "false");
+    expect(screen.getByAltText("environments.formbricks_logo")).toBeInTheDocument();
+    // Check localStorage is not set initially after clear()
+    expect(localStorage.getItem("isMainNavCollapsed")).toBeNull();
+
+    // Click to collapse
+    await userEvent.click(toggleButton);
+
+    // Check state after first toggle (collapsed)
+    await waitFor(() => {
+      // Check that the attribute eventually becomes true
+      expect(projectSwitcher).toHaveAttribute("data-collapsed", "true");
+      // Check that localStorage is updated
+      expect(localStorage.getItem("isMainNavCollapsed")).toBe("true");
+    });
+    // Check that the logo is eventually hidden
+    await waitFor(() => {
+      expect(screen.queryByAltText("environments.formbricks_logo")).not.toBeInTheDocument();
+    });
+
+    // Click to expand
+    await userEvent.click(toggleButton);
+
+    // Check state after second toggle (expanded)
+    await waitFor(() => {
+      // Check that the attribute eventually becomes false
+      expect(projectSwitcher).toHaveAttribute("data-collapsed", "false");
+      // Check that localStorage is updated
+      expect(localStorage.getItem("isMainNavCollapsed")).toBe("false");
+    });
+    // Check that the logo is eventually visible
+    await waitFor(() => {
+      expect(screen.getByAltText("environments.formbricks_logo")).toBeInTheDocument();
+    });
+  });
+
+  test("renders correct active navigation link", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/env1/actions");
+    render(<MainNavigation {...defaultProps} />);
+    const actionsLink = screen.getByRole("link", { name: /common.actions/ });
+    // Check if the parent li has the active class styling
+    expect(actionsLink.closest("li")).toHaveClass("border-brand-dark");
+  });
+
+  test("renders user dropdown and handles logout", async () => {
+    vi.mocked(signOut).mockResolvedValue({ url: "/auth/login" });
+    render(<MainNavigation {...defaultProps} />);
+
+    // Find the avatar and get its parent div which acts as the trigger
+    const userTrigger = screen.getByTestId("profile-avatar").parentElement!;
+    expect(userTrigger).toBeInTheDocument(); // Ensure the trigger element is found
+    await userEvent.click(userTrigger);
+
+    // Wait for the dropdown content to appear
+    await waitFor(() => {
+      expect(screen.getByText("common.account")).toBeInTheDocument();
+    });
+
+    expect(screen.getByText("common.organization")).toBeInTheDocument();
+    expect(screen.getByText("common.license")).toBeInTheDocument(); // Not cloud, not member
+    expect(screen.getByText("common.documentation")).toBeInTheDocument();
+    expect(screen.getByText("common.logout")).toBeInTheDocument();
+
+    const logoutButton = screen.getByText("common.logout");
+    await userEvent.click(logoutButton);
+
+    expect(signOut).toHaveBeenCalledWith({ redirect: false, callbackUrl: "/auth/login" });
+    await waitFor(() => {
+      expect(mockRouterPush).toHaveBeenCalledWith("/auth/login");
+    });
+  });
+
+  test("handles organization switching", async () => {
+    render(<MainNavigation {...defaultProps} />);
+
+    const userTrigger = screen.getByTestId("profile-avatar").parentElement!;
+    await userEvent.click(userTrigger);
+
+    // Wait for the initial dropdown items
+    await waitFor(() => {
+      expect(screen.getByText("common.switch_organization")).toBeInTheDocument();
+    });
+
+    const switchOrgTrigger = screen.getByText("common.switch_organization").closest("div[role='menuitem']")!;
+    await userEvent.hover(switchOrgTrigger); // Hover to open sub-menu
+
+    const org2Item = await screen.findByText("Another Org"); // findByText includes waitFor
+    await userEvent.click(org2Item);
+
+    expect(mockRouterPush).toHaveBeenCalledWith("/organizations/org2/");
+  });
+
+  test("opens create organization modal", async () => {
+    render(<MainNavigation {...defaultProps} />);
+
+    const userTrigger = screen.getByTestId("profile-avatar").parentElement!;
+    await userEvent.click(userTrigger);
+
+    // Wait for the initial dropdown items
+    await waitFor(() => {
+      expect(screen.getByText("common.switch_organization")).toBeInTheDocument();
+    });
+
+    const switchOrgTrigger = screen.getByText("common.switch_organization").closest("div[role='menuitem']")!;
+    await userEvent.hover(switchOrgTrigger); // Hover to open sub-menu
+
+    const createOrgButton = await screen.findByText("common.create_new_organization"); // findByText includes waitFor
+    await userEvent.click(createOrgButton);
+
+    expect(screen.getByTestId("create-org-modal")).toBeInTheDocument();
+  });
+
+  test("hides new version banner for members or if no new version", async () => {
+    // Test for member
+    vi.mocked(getLatestStableFbReleaseAction).mockResolvedValue({ data: "v1.1.0" });
+    render(<MainNavigation {...defaultProps} membershipRole="member" />);
+    let toggleButton = screen.getByRole("button", { name: "" });
+    await userEvent.click(toggleButton);
+    await waitFor(() => {
+      expect(screen.queryByText("common.new_version_available", { exact: false })).not.toBeInTheDocument();
+    });
+    cleanup(); // Clean up before next render
+
+    // Test for no new version
+    vi.mocked(getLatestStableFbReleaseAction).mockResolvedValue({ data: null });
+    render(<MainNavigation {...defaultProps} membershipRole="owner" />);
+    toggleButton = screen.getByRole("button", { name: "" });
+    await userEvent.click(toggleButton);
+    await waitFor(() => {
+      expect(screen.queryByText("common.new_version_available", { exact: false })).not.toBeInTheDocument();
+    });
+  });
+
+  test("hides main nav and project switcher if user role is billing", () => {
+    render(<MainNavigation {...defaultProps} membershipRole="billing" />);
+    expect(screen.queryByRole("link", { name: /common.surveys/ })).not.toBeInTheDocument();
+    expect(screen.queryByTestId("project-switcher")).not.toBeInTheDocument();
+  });
+
+  test("shows billing link and hides license link in cloud", async () => {
+    render(<MainNavigation {...defaultProps} isFormbricksCloud={true} />);
+    const userTrigger = screen.getByTestId("profile-avatar").parentElement!;
+    await userEvent.click(userTrigger);
+
+    // Wait for dropdown items
+    await waitFor(() => {
+      expect(screen.getByText("common.billing")).toBeInTheDocument();
+    });
+    expect(screen.queryByText("common.license")).not.toBeInTheDocument();
+  });
+});

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

@@ -2,7 +2,6 @@
 
 import { getLatestStableFbReleaseAction } from "@/app/(app)/environments/[environmentId]/actions/actions";
 import { NavigationLink } from "@/app/(app)/environments/[environmentId]/components/NavigationLink";
-import { formbricksLogout } from "@/app/lib/formbricks";
 import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
 import { getAccessFlags } from "@/lib/membership/utils";
@@ -392,7 +391,6 @@ export const MainNavigation = ({
                     onClick={async () => {
                       const route = await signOut({ redirect: false, callbackUrl: "/auth/login" });
                       router.push(route.url);
-                      await formbricksLogout();
                     }}
                     icon={<LogOutIcon className="mr-2 h-4 w-4" strokeWidth={1.5} />}>
                     {t("common.logout")}

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

@@ -0,0 +1,21 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test } from "vitest";
+import { NavbarLoading } from "./NavbarLoading";
+
+describe("NavbarLoading", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the correct number of skeleton elements", () => {
+    render(<NavbarLoading />);
+
+    // Find all divs with the animate-pulse class
+    const skeletonElements = screen.getAllByText((content, element) => {
+      return element?.tagName.toLowerCase() === "div" && element.classList.contains("animate-pulse");
+    });
+
+    // There are 8 skeleton divs in the component
+    expect(skeletonElements).toHaveLength(8);
+  });
+});

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

@@ -0,0 +1,105 @@
+import { cleanup, render, screen, within } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { NavigationLink } from "./NavigationLink";
+
+// Mock next/link
+vi.mock("next/link", () => ({
+  default: ({ children, href }: { children: React.ReactNode; href: string }) => <a href={href}>{children}</a>,
+}));
+
+// Mock tooltip components
+vi.mock("@/modules/ui/components/tooltip", () => ({
+  Tooltip: ({ children }: { children: React.ReactNode }) => <div data-testid="tooltip">{children}</div>,
+  TooltipContent: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-content">{children}</div>
+  ),
+  TooltipProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-provider">{children}</div>
+  ),
+  TooltipTrigger: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-trigger">{children}</div>
+  ),
+}));
+
+const defaultProps = {
+  href: "/test-link",
+  isActive: false,
+  isCollapsed: false,
+  children: <svg data-testid="icon" />,
+  linkText: "Test Link Text",
+  isTextVisible: true,
+};
+
+describe("NavigationLink", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders expanded link correctly (inactive, text visible)", () => {
+    render(<NavigationLink {...defaultProps} />);
+    const linkElement = screen.getByRole("link");
+    const listItem = linkElement.closest("li");
+    const textSpan = screen.getByText(defaultProps.linkText);
+
+    expect(linkElement).toHaveAttribute("href", defaultProps.href);
+    expect(screen.getByTestId("icon")).toBeInTheDocument();
+    expect(textSpan).toBeInTheDocument();
+    expect(textSpan).toHaveClass("opacity-0");
+    expect(listItem).not.toHaveClass("bg-slate-50"); // inactiveClass check
+    expect(listItem).toHaveClass("hover:bg-slate-50"); // inactiveClass check
+    expect(screen.queryByTestId("tooltip-provider")).not.toBeInTheDocument();
+  });
+
+  test("renders expanded link correctly (active, text hidden)", () => {
+    render(<NavigationLink {...defaultProps} isActive={true} isTextVisible={false} />);
+    const linkElement = screen.getByRole("link");
+    const listItem = linkElement.closest("li");
+    const textSpan = screen.getByText(defaultProps.linkText);
+
+    expect(linkElement).toHaveAttribute("href", defaultProps.href);
+    expect(screen.getByTestId("icon")).toBeInTheDocument();
+    expect(textSpan).toBeInTheDocument();
+    expect(textSpan).toHaveClass("opacity-100");
+    expect(listItem).toHaveClass("bg-slate-50"); // activeClass check
+    expect(listItem).toHaveClass("border-brand-dark"); // activeClass check
+    expect(screen.queryByTestId("tooltip-provider")).not.toBeInTheDocument();
+  });
+
+  test("renders collapsed link correctly (inactive)", () => {
+    render(<NavigationLink {...defaultProps} isCollapsed={true} />);
+    const linkElement = screen.getByRole("link");
+    const listItem = linkElement.closest("li");
+
+    expect(linkElement).toHaveAttribute("href", defaultProps.href);
+    expect(screen.getByTestId("icon")).toBeInTheDocument();
+    // Check text is NOT directly within the list item
+    expect(within(listItem!).queryByText(defaultProps.linkText)).not.toBeInTheDocument();
+    expect(listItem).not.toHaveClass("bg-slate-50"); // inactiveClass check
+    expect(listItem).toHaveClass("hover:bg-slate-50"); // inactiveClass check
+
+    // Check tooltip elements
+    expect(screen.getByTestId("tooltip-provider")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-trigger")).toBeInTheDocument();
+    // Check text IS within the tooltip content mock
+    expect(screen.getByTestId("tooltip-content")).toHaveTextContent(defaultProps.linkText);
+  });
+
+  test("renders collapsed link correctly (active)", () => {
+    render(<NavigationLink {...defaultProps} isCollapsed={true} isActive={true} />);
+    const linkElement = screen.getByRole("link");
+    const listItem = linkElement.closest("li");
+
+    expect(linkElement).toHaveAttribute("href", defaultProps.href);
+    expect(screen.getByTestId("icon")).toBeInTheDocument();
+    // Check text is NOT directly within the list item
+    expect(within(listItem!).queryByText(defaultProps.linkText)).not.toBeInTheDocument();
+    expect(listItem).toHaveClass("bg-slate-50"); // activeClass check
+    expect(listItem).toHaveClass("border-brand-dark"); // activeClass check
+
+    // Check tooltip elements
+    expect(screen.getByTestId("tooltip-provider")).toBeInTheDocument();
+    // Check text IS within the tooltip content mock
+    expect(screen.getByTestId("tooltip-content")).toHaveTextContent(defaultProps.linkText);
+  });
+});

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

@@ -0,0 +1,40 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { ProjectNavItem } from "./ProjectNavItem";
+
+describe("ProjectNavItem", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  const defaultProps = {
+    href: "/test-path",
+    children: <span>Test Child</span>,
+  };
+
+  test("renders correctly when active", () => {
+    render(<ProjectNavItem {...defaultProps} isActive={true} />);
+
+    const linkElement = screen.getByRole("link");
+    const listItem = linkElement.closest("li");
+
+    expect(linkElement).toHaveAttribute("href", "/test-path");
+    expect(screen.getByText("Test Child")).toBeInTheDocument();
+    expect(listItem).toHaveClass("bg-slate-50");
+    expect(listItem).toHaveClass("font-semibold");
+    expect(listItem).not.toHaveClass("hover:bg-slate-50");
+  });
+
+  test("renders correctly when inactive", () => {
+    render(<ProjectNavItem {...defaultProps} isActive={false} />);
+
+    const linkElement = screen.getByRole("link");
+    const listItem = linkElement.closest("li");
+
+    expect(linkElement).toHaveAttribute("href", "/test-path");
+    expect(screen.getByText("Test Child")).toBeInTheDocument();
+    expect(listItem).not.toHaveClass("bg-slate-50");
+    expect(listItem).not.toHaveClass("font-semibold");
+    expect(listItem).toHaveClass("hover:bg-slate-50");
+  });
+});

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

@@ -0,0 +1,140 @@
+import { QuestionOptions } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox";
+import { QuestionFilterOptions } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter";
+import { getTodayDate } from "@/app/lib/surveys/surveys";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { ResponseFilterProvider, useResponseFilter } from "./ResponseFilterContext";
+
+// Mock the getTodayDate function
+vi.mock("@/app/lib/surveys/surveys", () => ({
+  getTodayDate: vi.fn(),
+}));
+
+const mockToday = new Date("2024-01-15T00:00:00.000Z");
+const mockFromDate = new Date("2024-01-01T00:00:00.000Z");
+
+// Test component to use the hook
+const TestComponent = () => {
+  const {
+    selectedFilter,
+    setSelectedFilter,
+    selectedOptions,
+    setSelectedOptions,
+    dateRange,
+    setDateRange,
+    resetState,
+  } = useResponseFilter();
+
+  return (
+    <div>
+      <div data-testid="onlyComplete">{selectedFilter.onlyComplete.toString()}</div>
+      <div data-testid="filterLength">{selectedFilter.filter.length}</div>
+      <div data-testid="questionOptionsLength">{selectedOptions.questionOptions.length}</div>
+      <div data-testid="questionFilterOptionsLength">{selectedOptions.questionFilterOptions.length}</div>
+      <div data-testid="dateFrom">{dateRange.from?.toISOString()}</div>
+      <div data-testid="dateTo">{dateRange.to?.toISOString()}</div>
+
+      <button
+        onClick={() =>
+          setSelectedFilter({
+            filter: [
+              {
+                questionType: { id: "q1", label: "Question 1" },
+                filterType: { filterValue: "value1", filterComboBoxValue: "option1" },
+              },
+            ],
+            onlyComplete: true,
+          })
+        }>
+        Update Filter
+      </button>
+      <button
+        onClick={() =>
+          setSelectedOptions({
+            questionOptions: [{ header: "q1" } as unknown as QuestionOptions],
+            questionFilterOptions: [{ id: "qFilterOpt1" } as unknown as QuestionFilterOptions],
+          })
+        }>
+        Update Options
+      </button>
+      <button onClick={() => setDateRange({ from: mockFromDate, to: mockToday })}>Update Date Range</button>
+      <button onClick={resetState}>Reset State</button>
+    </div>
+  );
+};
+
+describe("ResponseFilterContext", () => {
+  beforeEach(() => {
+    vi.mocked(getTodayDate).mockReturnValue(mockToday);
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.resetAllMocks();
+  });
+
+  test("should provide initial state values", () => {
+    render(
+      <ResponseFilterProvider>
+        <TestComponent />
+      </ResponseFilterProvider>
+    );
+
+    expect(screen.getByTestId("onlyComplete").textContent).toBe("false");
+    expect(screen.getByTestId("filterLength").textContent).toBe("0");
+    expect(screen.getByTestId("questionOptionsLength").textContent).toBe("0");
+    expect(screen.getByTestId("questionFilterOptionsLength").textContent).toBe("0");
+    expect(screen.getByTestId("dateFrom").textContent).toBe("");
+    expect(screen.getByTestId("dateTo").textContent).toBe(mockToday.toISOString());
+  });
+
+  test("should update selectedFilter state", async () => {
+    render(
+      <ResponseFilterProvider>
+        <TestComponent />
+      </ResponseFilterProvider>
+    );
+
+    const updateButton = screen.getByText("Update Filter");
+    await userEvent.click(updateButton);
+
+    expect(screen.getByTestId("onlyComplete").textContent).toBe("true");
+    expect(screen.getByTestId("filterLength").textContent).toBe("1");
+  });
+
+  test("should update selectedOptions state", async () => {
+    render(
+      <ResponseFilterProvider>
+        <TestComponent />
+      </ResponseFilterProvider>
+    );
+
+    const updateButton = screen.getByText("Update Options");
+    await userEvent.click(updateButton);
+
+    expect(screen.getByTestId("questionOptionsLength").textContent).toBe("1");
+    expect(screen.getByTestId("questionFilterOptionsLength").textContent).toBe("1");
+  });
+
+  test("should update dateRange state", async () => {
+    render(
+      <ResponseFilterProvider>
+        <TestComponent />
+      </ResponseFilterProvider>
+    );
+
+    const updateButton = screen.getByText("Update Date Range");
+    await userEvent.click(updateButton);
+
+    expect(screen.getByTestId("dateFrom").textContent).toBe(mockFromDate.toISOString());
+    expect(screen.getByTestId("dateTo").textContent).toBe(mockToday.toISOString());
+  });
+
+  test("should throw error when useResponseFilter is used outside of Provider", () => {
+    // Hide console error temporarily
+    const consoleErrorMock = vi.spyOn(console, "error").mockImplementation(() => {});
+    expect(() => render(<TestComponent />)).toThrow("useFilterDate must be used within a FilterDateProvider");
+    consoleErrorMock.mockRestore();
+  });
+});

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

@@ -0,0 +1,66 @@
+import { TopControlButtons } from "@/app/(app)/environments/[environmentId]/components/TopControlButtons";
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TOrganizationRole } from "@formbricks/types/memberships";
+import { TopControlBar } from "./TopControlBar";
+
+// Mock the child component
+vi.mock("@/app/(app)/environments/[environmentId]/components/TopControlButtons", () => ({
+  TopControlButtons: vi.fn(() => <div data-testid="top-control-buttons">Mocked TopControlButtons</div>),
+}));
+
+const mockEnvironment: TEnvironment = {
+  id: "env1",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+  projectId: "proj1",
+  appSetupCompleted: true,
+};
+
+const mockEnvironments: TEnvironment[] = [
+  mockEnvironment,
+  { ...mockEnvironment, id: "env2", type: "development" },
+];
+
+const mockMembershipRole: TOrganizationRole = "owner";
+const mockProjectPermission = "manage";
+
+describe("TopControlBar", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly and passes props to TopControlButtons", () => {
+    render(
+      <TopControlBar
+        environment={mockEnvironment}
+        environments={mockEnvironments}
+        membershipRole={mockMembershipRole}
+        projectPermission={mockProjectPermission}
+      />
+    );
+
+    // Check if the main div is rendered
+    const mainDiv = screen.getByTestId("top-control-buttons").parentElement?.parentElement?.parentElement;
+    expect(mainDiv).toHaveClass(
+      "fixed inset-0 top-0 z-30 flex h-14 w-full items-center justify-end bg-slate-50 px-6"
+    );
+
+    // Check if the mocked child component is rendered
+    expect(screen.getByTestId("top-control-buttons")).toBeInTheDocument();
+
+    // Check if the child component received the correct props
+    expect(TopControlButtons).toHaveBeenCalledWith(
+      {
+        environment: mockEnvironment,
+        environments: mockEnvironments,
+        membershipRole: mockMembershipRole,
+        projectPermission: mockProjectPermission,
+      },
+      undefined // Updated from {} to undefined
+    );
+  });
+});

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

@@ -0,0 +1,182 @@
+import { getAccessFlags } from "@/lib/membership/utils";
+import { getTeamPermissionFlags } from "@/modules/ee/teams/utils/teams";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TOrganizationRole } from "@formbricks/types/memberships";
+import { TopControlButtons } from "./TopControlButtons";
+
+// Mock dependencies
+const mockPush = vi.fn();
+vi.mock("next/navigation", () => ({
+  useRouter: vi.fn(() => ({ push: mockPush })),
+}));
+
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: vi.fn(),
+}));
+
+vi.mock("@/modules/ee/teams/utils/teams", () => ({
+  getTeamPermissionFlags: vi.fn(),
+}));
+
+vi.mock("@/app/(app)/environments/[environmentId]/components/EnvironmentSwitch", () => ({
+  EnvironmentSwitch: vi.fn(() => <div data-testid="environment-switch">EnvironmentSwitch</div>),
+}));
+
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, variant, size, className, asChild, ...props }: any) => {
+    const Tag = asChild ? "div" : "button"; // Use div if asChild is true for Link mock
+    return (
+      <Tag onClick={onClick} data-testid={`button-${className}`} {...props}>
+        {children}
+      </Tag>
+    );
+  },
+}));
+
+vi.mock("@/modules/ui/components/tooltip", () => ({
+  TooltipRenderer: ({ children, tooltipContent }: { children: React.ReactNode; tooltipContent: string }) => (
+    <div data-testid={`tooltip-${tooltipContent.split(".").pop()}`}>{children}</div>
+  ),
+}));
+
+vi.mock("lucide-react", () => ({
+  BugIcon: () => <div data-testid="bug-icon" />,
+  CircleUserIcon: () => <div data-testid="circle-user-icon" />,
+  PlusIcon: () => <div data-testid="plus-icon" />,
+}));
+
+vi.mock("next/link", () => ({
+  default: ({ children, href, target }: { children: React.ReactNode; href: string; target?: string }) => (
+    <a href={href} target={target} data-testid="link-mock">
+      {children}
+    </a>
+  ),
+}));
+
+// Mock data
+const mockEnvironmentDev: TEnvironment = {
+  id: "dev-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+  projectId: "project-id",
+  appSetupCompleted: true,
+};
+
+const mockEnvironmentProd: TEnvironment = {
+  id: "prod-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+  projectId: "project-id",
+  appSetupCompleted: true,
+};
+
+const mockEnvironments = [mockEnvironmentDev, mockEnvironmentProd];
+
+describe("TopControlButtons", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // Default mocks for access flags
+    vi.mocked(getAccessFlags).mockReturnValue({
+      isOwner: false,
+      isMember: false,
+      isBilling: false,
+    } as any);
+    vi.mocked(getTeamPermissionFlags).mockReturnValue({
+      hasReadAccess: false,
+    } as any);
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  const renderComponent = (
+    membershipRole?: TOrganizationRole,
+    projectPermission: any = null,
+    isBilling = false,
+    hasReadAccess = false
+  ) => {
+    vi.mocked(getAccessFlags).mockReturnValue({
+      isMember: membershipRole === "member",
+      isBilling: isBilling,
+      isOwner: membershipRole === "owner",
+    } as any);
+    vi.mocked(getTeamPermissionFlags).mockReturnValue({
+      hasReadAccess: hasReadAccess,
+    } as any);
+
+    return render(
+      <TopControlButtons
+        environment={mockEnvironmentDev}
+        environments={mockEnvironments}
+        membershipRole={membershipRole}
+        projectPermission={projectPermission}
+      />
+    );
+  };
+
+  test("renders correctly for Owner role", async () => {
+    renderComponent("owner");
+
+    expect(screen.getByTestId("environment-switch")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-share_feedback")).toBeInTheDocument();
+    expect(screen.getByTestId("bug-icon")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-account")).toBeInTheDocument();
+    expect(screen.getByTestId("circle-user-icon")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-new_survey")).toBeInTheDocument();
+    expect(screen.getByTestId("plus-icon")).toBeInTheDocument();
+
+    // Check link
+    const link = screen.getByTestId("link-mock");
+    expect(link).toHaveAttribute("href", "https://github.com/formbricks/formbricks/issues");
+    expect(link).toHaveAttribute("target", "_blank");
+
+    // Click account button
+    const accountButton = screen.getByTestId("circle-user-icon").closest("button");
+    await userEvent.click(accountButton!);
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith(`/environments/${mockEnvironmentDev.id}/settings/profile`);
+    });
+
+    // Click new survey button
+    const newSurveyButton = screen.getByTestId("plus-icon").closest("button");
+    await userEvent.click(newSurveyButton!);
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalledWith(`/environments/${mockEnvironmentDev.id}/surveys/templates`);
+    });
+  });
+
+  test("hides EnvironmentSwitch for Billing role", () => {
+    renderComponent(undefined, null, true); // isBilling = true
+    expect(screen.queryByTestId("environment-switch")).not.toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-share_feedback")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-account")).toBeInTheDocument();
+    expect(screen.queryByTestId("tooltip-new_survey")).not.toBeInTheDocument(); // Hidden for billing
+  });
+
+  test("hides New Survey button for Billing role", () => {
+    renderComponent(undefined, null, true); // isBilling = true
+    expect(screen.queryByTestId("tooltip-new_survey")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("plus-icon")).not.toBeInTheDocument();
+  });
+
+  test("hides New Survey button for read-only Member", () => {
+    renderComponent("member", null, false, true); // isMember = true, hasReadAccess = true
+    expect(screen.getByTestId("environment-switch")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-share_feedback")).toBeInTheDocument();
+    expect(screen.getByTestId("tooltip-account")).toBeInTheDocument();
+    expect(screen.queryByTestId("tooltip-new_survey")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("plus-icon")).not.toBeInTheDocument();
+  });
+
+  test("shows New Survey button for Member with write access", () => {
+    renderComponent("member", null, false, false); // isMember = true, hasReadAccess = false
+    expect(screen.getByTestId("tooltip-new_survey")).toBeInTheDocument();
+    expect(screen.getByTestId("plus-icon")).toBeInTheDocument();
+  });
+});

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

@@ -0,0 +1,104 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { WidgetStatusIndicator } from "./WidgetStatusIndicator";
+
+// Mock next/navigation
+const mockRefresh = vi.fn();
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({
+    refresh: mockRefresh,
+  }),
+}));
+
+// Mock lucide-react icons
+vi.mock("lucide-react", () => ({
+  AlertTriangleIcon: () => <div data-testid="alert-icon">AlertTriangleIcon</div>,
+  CheckIcon: () => <div data-testid="check-icon">CheckIcon</div>,
+  RotateCcwIcon: () => <div data-testid="refresh-icon">RotateCcwIcon</div>,
+}));
+
+// Mock Button component
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, ...props }: any) => (
+    <button onClick={onClick} {...props}>
+      {children}
+    </button>
+  ),
+}));
+
+const mockEnvironmentNotImplemented: TEnvironment = {
+  id: "env-not-implemented",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+  projectId: "proj1",
+  appSetupCompleted: false, // Not implemented state
+};
+
+const mockEnvironmentRunning: TEnvironment = {
+  id: "env-running",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "production",
+  projectId: "proj1",
+  appSetupCompleted: true, // Running state
+};
+
+describe("WidgetStatusIndicator", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly for 'notImplemented' state", () => {
+    render(<WidgetStatusIndicator environment={mockEnvironmentNotImplemented} />);
+
+    // Check icon
+    expect(screen.getByTestId("alert-icon")).toBeInTheDocument();
+    expect(screen.queryByTestId("check-icon")).not.toBeInTheDocument();
+
+    // Check texts
+    expect(
+      screen.getByText("environments.project.app-connection.formbricks_sdk_not_connected")
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.project.app-connection.formbricks_sdk_not_connected_description")
+    ).toBeInTheDocument();
+
+    // Check button
+    const recheckButton = screen.getByRole("button", { name: /environments.project.app-connection.recheck/ });
+    expect(recheckButton).toBeInTheDocument();
+    expect(screen.getByTestId("refresh-icon")).toBeInTheDocument();
+  });
+
+  test("renders correctly for 'running' state", () => {
+    render(<WidgetStatusIndicator environment={mockEnvironmentRunning} />);
+
+    // Check icon
+    expect(screen.getByTestId("check-icon")).toBeInTheDocument();
+    expect(screen.queryByTestId("alert-icon")).not.toBeInTheDocument();
+
+    // Check texts
+    expect(screen.getByText("environments.project.app-connection.receiving_data")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.project.app-connection.formbricks_sdk_connected")
+    ).toBeInTheDocument();
+
+    // Check button absence
+    expect(
+      screen.queryByRole("button", { name: /environments.project.app-connection.recheck/ })
+    ).not.toBeInTheDocument();
+    expect(screen.queryByTestId("refresh-icon")).not.toBeInTheDocument();
+  });
+
+  test("calls router.refresh when 'Recheck' button is clicked", async () => {
+    render(<WidgetStatusIndicator environment={mockEnvironmentNotImplemented} />);
+
+    const recheckButton = screen.getByRole("button", { name: /environments.project.app-connection.recheck/ });
+    await userEvent.click(recheckButton);
+
+    expect(mockRefresh).toHaveBeenCalledTimes(1);
+  });
+});

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

@@ -26,13 +26,6 @@ vi.mock("@/modules/ui/components/environmentId-base-layout", () => ({
 vi.mock("@/modules/ui/components/toaster-client", () => ({
   ToasterClient: () => <div data-testid="ToasterClient" />,
 }));
-vi.mock("../../components/FormbricksClient", () => ({
-  FormbricksClient: ({ userId, email }: any) => (
-    <div data-testid="FormbricksClient">
-      {userId}-{email}
-    </div>
-  ),
-}));
 vi.mock("./components/EnvironmentStorageHandler", () => ({
   default: ({ environmentId }: any) => <div data-testid="EnvironmentStorageHandler">{environmentId}</div>,
 }));

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

@@ -0,0 +1,138 @@
+import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
+import { getAccessFlags } from "@/lib/membership/utils";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TMembership } from "@formbricks/types/memberships";
+import { TOrganization, TOrganizationBilling } from "@formbricks/types/organizations";
+import EnvironmentPage from "./page";
+
+vi.mock("@/lib/membership/service", () => ({
+  getMembershipByUserIdOrganizationId: vi.fn(),
+}));
+
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: vi.fn(),
+}));
+
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+describe("EnvironmentPage", () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  const mockEnvironmentId = "test-environment-id";
+  const mockUserId = "test-user-id";
+  const mockOrganizationId = "test-organization-id";
+
+  const mockSession = {
+    user: {
+      id: mockUserId,
+      name: "Test User",
+      email: "test@example.com",
+      imageUrl: "",
+      twoFactorEnabled: false,
+      identityProvider: "email",
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      emailVerified: new Date(),
+      role: "user",
+      objective: "other",
+    },
+    expires: new Date(Date.now() + 3600 * 1000).toISOString(), // 1 hour from now
+  } as any;
+
+  const mockOrganization: TOrganization = {
+    id: mockOrganizationId,
+    name: "Test Organization",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    billing: {
+      stripeCustomerId: "cus_123",
+    } as unknown as TOrganizationBilling,
+  } as unknown as TOrganization;
+
+  test("should redirect to billing settings if isBilling is true", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any); // Using 'any' for brevity as environment type is complex and not core to this test
+
+    const mockMembership: TMembership = {
+      userId: mockUserId,
+      organizationId: mockOrganizationId,
+      role: "owner" as any,
+      accepted: true,
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: true, isOwner: true } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/settings/billing`);
+  });
+
+  test("should redirect to surveys if isBilling is false", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any);
+
+    const mockMembership: TMembership = {
+      userId: mockUserId,
+      organizationId: mockOrganizationId,
+      role: "developer" as any, // Role that would result in isBilling: false
+      accepted: true,
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: false, isOwner: false } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/surveys`);
+  });
+
+  test("should handle session being null", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: null, // Simulate no active session
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any);
+
+    // Membership fetch might return null or throw, depending on implementation when userId is undefined
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(null);
+    // Access flags would likely be all false if membership is null
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: false, isOwner: false } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    // Expect redirect to surveys as default when isBilling is false
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/surveys`);
+  });
+
+  test("should handle currentUserMembership being null", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any);
+
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(null); // Simulate no membership found
+    // Access flags would likely be all false if membership is null
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: false, isOwner: false } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    // Expect redirect to surveys as default when isBilling is false
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/surveys`);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/(setup)/app-connection/loading.test.tsx

@@ -0,0 +1,15 @@
+import { AppConnectionLoading as OriginalAppConnectionLoading } from "@/modules/projects/settings/(setup)/app-connection/loading";
+import { describe, expect, test, vi } from "vitest";
+import AppConnectionLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/(setup)/app-connection/loading", () => ({
+  AppConnectionLoading: () => <div data-testid="mock-app-connection-loading">Mock AppConnectionLoading</div>,
+}));
+
+describe("AppConnectionLoading Re-export", () => {
+  test("should re-export AppConnectionLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(AppConnectionLoading).toBe(OriginalAppConnectionLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/(setup)/app-connection/page.test.tsx

@@ -0,0 +1,33 @@
+import { AppConnectionPage as OriginalAppConnectionPage } from "@/modules/projects/settings/(setup)/app-connection/page";
+import { describe, expect, test, vi } from "vitest";
+import AppConnectionPage from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("AppConnectionPage Re-export", () => {
+  test("should re-export AppConnectionPage correctly", () => {
+    expect(AppConnectionPage).toBe(OriginalAppConnectionPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/general/loading.test.tsx

@@ -0,0 +1,17 @@
+import { GeneralSettingsLoading as OriginalGeneralSettingsLoading } from "@/modules/projects/settings/general/loading";
+import { describe, expect, test, vi } from "vitest";
+import GeneralSettingsLoadingPage from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/general/loading", () => ({
+  GeneralSettingsLoading: () => (
+    <div data-testid="mock-general-settings-loading">Mock GeneralSettingsLoading</div>
+  ),
+}));
+
+describe("GeneralSettingsLoadingPage Re-export", () => {
+  test("should re-export GeneralSettingsLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(GeneralSettingsLoadingPage).toBe(OriginalGeneralSettingsLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/general/page.test.tsx

@@ -0,0 +1,33 @@
+import { GeneralSettingsPage } from "@/modules/projects/settings/general/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("GeneralSettingsPage re-export", () => {
+  test("should re-export GeneralSettingsPage component", () => {
+    expect(Page).toBe(GeneralSettingsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/languages/loading.test.tsx

@@ -0,0 +1,15 @@
+import { LanguagesLoading as OriginalLanguagesLoading } from "@/modules/ee/languages/loading";
+import { describe, expect, test, vi } from "vitest";
+import LanguagesLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/ee/languages/loading", () => ({
+  LanguagesLoading: () => <div data-testid="mock-languages-loading">Mock LanguagesLoading</div>,
+}));
+
+describe("LanguagesLoadingPage Re-export", () => {
+  test("should re-export LanguagesLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(LanguagesLoading).toBe(OriginalLanguagesLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/languages/page.test.tsx

@@ -0,0 +1,33 @@
+import { LanguagesPage } from "@/modules/ee/languages/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("LanguagesPage re-export", () => {
+  test("should re-export LanguagesPage component", () => {
+    expect(Page).toBe(LanguagesPage);
+  });
+});

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

@@ -0,0 +1,24 @@
+import { cleanup, render } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import ProjectLayout, { metadata as layoutMetadata } from "./layout";
+
+vi.mock("@/modules/projects/settings/layout", () => ({
+  ProjectSettingsLayout: ({ children }) => <div data-testid="project-settings-layout">{children}</div>,
+  metadata: { title: "Mocked Project Settings" },
+}));
+
+describe("ProjectLayout", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders ProjectSettingsLayout", () => {
+    const { getByTestId } = render(<ProjectLayout>Child Content</ProjectLayout>);
+    expect(getByTestId("project-settings-layout")).toBeInTheDocument();
+    expect(getByTestId("project-settings-layout")).toHaveTextContent("Child Content");
+  });
+
+  test("exports metadata from @/modules/projects/settings/layout", () => {
+    expect(layoutMetadata).toEqual({ title: "Mocked Project Settings" });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/look/loading.test.tsx

@@ -0,0 +1,17 @@
+import { ProjectLookSettingsLoading as OriginalProjectLookSettingsLoading } from "@/modules/projects/settings/look/loading";
+import { describe, expect, test, vi } from "vitest";
+import ProjectLookSettingsLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/look/loading", () => ({
+  ProjectLookSettingsLoading: () => (
+    <div data-testid="mock-project-look-settings-loading">Mock ProjectLookSettingsLoading</div>
+  ),
+}));
+
+describe("ProjectLookSettingsLoadingPage Re-export", () => {
+  test("should re-export ProjectLookSettingsLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(ProjectLookSettingsLoading).toBe(OriginalProjectLookSettingsLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/look/page.test.tsx

@@ -0,0 +1,33 @@
+import { ProjectLookSettingsPage } from "@/modules/projects/settings/look/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("ProjectLookSettingsPage re-export", () => {
+  test("should re-export ProjectLookSettingsPage component", () => {
+    expect(Page).toBe(ProjectLookSettingsPage);
+  });
+});

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

@@ -0,0 +1,33 @@
+import { ProjectSettingsPage } from "@/modules/projects/settings/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("ProjectSettingsPage re-export", () => {
+  test("should re-export ProjectSettingsPage component", () => {
+    expect(Page).toBe(ProjectSettingsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/tags/loading.test.tsx

@@ -0,0 +1,15 @@
+import { TagsLoading as OriginalTagsLoading } from "@/modules/projects/settings/tags/loading";
+import { describe, expect, test, vi } from "vitest";
+import TagsLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/tags/loading", () => ({
+  TagsLoading: () => <div data-testid="mock-tags-loading">Mock TagsLoading</div>,
+}));
+
+describe("TagsLoadingPage Re-export", () => {
+  test("should re-export TagsLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(TagsLoading).toBe(OriginalTagsLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/tags/page.test.tsx

@@ -0,0 +1,33 @@
+import { TagsPage } from "@/modules/projects/settings/tags/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("TagsPage re-export", () => {
+  test("should re-export TagsPage component", () => {
+    expect(Page).toBe(TagsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/teams/page.test.tsx

@@ -0,0 +1,33 @@
+import { ProjectTeams } from "@/modules/ee/teams/project-teams/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("ProjectTeams re-export", () => {
+  test("should re-export ProjectTeams component", () => {
+    expect(Page).toBe(ProjectTeams);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar.test.tsx

@@ -0,0 +1,148 @@
+import { SecondaryNavigation } from "@/modules/ui/components/secondary-navigation";
+import { cleanup, render } from "@testing-library/react";
+import { usePathname } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { AccountSettingsNavbar } from "./AccountSettingsNavbar";
+
+vi.mock("next/navigation", () => ({
+  usePathname: vi.fn(),
+}));
+
+vi.mock("@/modules/ui/components/secondary-navigation", () => ({
+  SecondaryNavigation: vi.fn(() => <div>SecondaryNavigationMock</div>),
+}));
+
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key: string) => {
+      if (key === "common.profile") return "Profile";
+      if (key === "common.notifications") return "Notifications";
+      return key;
+    },
+  }),
+}));
+
+describe("AccountSettingsNavbar", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly and sets profile as current when pathname includes /profile", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/testEnvId/settings/profile");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="profile" />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      {
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/testEnvId/settings/profile",
+            current: true,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/testEnvId/settings/notifications",
+            current: false,
+          },
+        ],
+        activeId: "profile",
+        loading: undefined,
+      },
+      undefined
+    );
+  });
+
+  test("sets notifications as current when pathname includes /notifications", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/testEnvId/settings/notifications");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="notifications" />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/testEnvId/settings/profile",
+            current: false,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/testEnvId/settings/notifications",
+            current: true,
+          },
+        ],
+        activeId: "notifications",
+      }),
+      undefined
+    );
+  });
+
+  test("passes loading prop to SecondaryNavigation", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/testEnvId/settings/profile");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="profile" loading={true} />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        loading: true,
+      }),
+      undefined
+    );
+  });
+
+  test("handles undefined environmentId gracefully in hrefs", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/undefined/settings/profile");
+    render(<AccountSettingsNavbar activeId="profile" />); // environmentId is undefined
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/undefined/settings/profile",
+            current: true,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/undefined/settings/notifications",
+            current: false,
+          },
+        ],
+      }),
+      undefined
+    );
+  });
+
+  test("handles null pathname gracefully", () => {
+    vi.mocked(usePathname).mockReturnValue("");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="profile" />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/testEnvId/settings/profile",
+            current: false,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/testEnvId/settings/notifications",
+            current: false,
+          },
+        ],
+      }),
+      undefined
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/layout.test.tsx

@@ -0,0 +1,95 @@
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
+import { getProjectByEnvironmentId } from "@/lib/project/service";
+import { cleanup, render, screen } from "@testing-library/react";
+import { Session, getServerSession } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TProject } from "@formbricks/types/project";
+import AccountSettingsLayout from "./layout";
+
+// Mock dependencies
+vi.mock("@/lib/organization/service");
+vi.mock("@/lib/project/service");
+vi.mock("next-auth", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("next-auth")>();
+  return {
+    ...actual,
+    getServerSession: vi.fn(),
+  };
+});
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+const mockGetOrganizationByEnvironmentId = vi.mocked(getOrganizationByEnvironmentId);
+const mockGetProjectByEnvironmentId = vi.mocked(getProjectByEnvironmentId);
+const mockGetServerSession = vi.mocked(getServerSession);
+
+const mockOrganization = { id: "org_test_id" } as unknown as TOrganization;
+const mockProject = { id: "project_test_id" } as unknown as TProject;
+const mockSession = { user: { id: "user_test_id" } } as unknown as Session;
+
+const t = (key: any) => key;
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => t,
+}));
+
+const mockProps = {
+  params: { environmentId: "env_test_id" },
+  children: <div>Child Content</div>,
+};
+
+describe("AccountSettingsLayout", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+
+    mockGetOrganizationByEnvironmentId.mockResolvedValue(mockOrganization);
+    mockGetProjectByEnvironmentId.mockResolvedValue(mockProject);
+    mockGetServerSession.mockResolvedValue(mockSession);
+  });
+
+  test("should render children when all data is fetched successfully", async () => {
+    render(await AccountSettingsLayout(mockProps));
+    expect(screen.getByText("Child Content")).toBeInTheDocument();
+  });
+
+  test("should throw error if organization is not found", async () => {
+    mockGetOrganizationByEnvironmentId.mockResolvedValue(null);
+    await expect(AccountSettingsLayout(mockProps)).rejects.toThrowError("common.organization_not_found");
+  });
+
+  test("should throw error if project is not found", async () => {
+    mockGetProjectByEnvironmentId.mockResolvedValue(null);
+    await expect(AccountSettingsLayout(mockProps)).rejects.toThrowError("common.project_not_found");
+  });
+
+  test("should throw error if session is not found", async () => {
+    mockGetServerSession.mockResolvedValue(null);
+    await expect(AccountSettingsLayout(mockProps)).rejects.toThrowError("common.session_not_found");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/EditAlerts.test.tsx

@@ -0,0 +1,268 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { Membership } from "../types";
+import { EditAlerts } from "./EditAlerts";
+
+// Mock dependencies
+vi.mock("@/modules/ui/components/tooltip", () => ({
+  Tooltip: ({ children }: { children: React.ReactNode }) => <div data-testid="tooltip">{children}</div>,
+  TooltipContent: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-content">{children}</div>
+  ),
+  TooltipProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-provider">{children}</div>
+  ),
+  TooltipTrigger: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-trigger">{children}</div>
+  ),
+}));
+
+vi.mock("lucide-react", () => ({
+  HelpCircleIcon: () => <div data-testid="help-circle-icon" />,
+  UsersIcon: () => <div data-testid="users-icon" />,
+}));
+
+vi.mock("next/link", () => ({
+  default: ({ children, href }: { children: React.ReactNode; href: string }) => (
+    <a href={href} data-testid="link">
+      {children}
+    </a>
+  ),
+}));
+
+const mockNotificationSwitch = vi.fn();
+vi.mock("./NotificationSwitch", () => ({
+  NotificationSwitch: (props: any) => {
+    mockNotificationSwitch(props);
+    return (
+      <div data-testid={`notification-switch-${props.surveyOrProjectOrOrganizationId}`}>
+        NotificationSwitch
+      </div>
+    );
+  },
+}));
+
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {},
+    unsubscribedOrganizationIds: [],
+  },
+  role: "project_manager",
+  objective: "other",
+  emailVerified: new Date(),
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  identityProvider: "email",
+  twoFactorEnabled: false,
+} as unknown as TUser;
+
+const mockMemberships: Membership[] = [
+  {
+    organization: {
+      id: "org1",
+      name: "Organization 1",
+      projects: [
+        {
+          id: "proj1",
+          name: "Project 1",
+          environments: [
+            {
+              id: "env1",
+              surveys: [
+                { id: "survey1", name: "Survey 1 Org 1 Proj 1" },
+                { id: "survey2", name: "Survey 2 Org 1 Proj 1" },
+              ],
+            },
+          ],
+        },
+        {
+          id: "proj2",
+          name: "Project 2",
+          environments: [
+            {
+              id: "env2",
+              surveys: [{ id: "survey3", name: "Survey 3 Org 1 Proj 2" }],
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    organization: {
+      id: "org2",
+      name: "Organization 2",
+      projects: [
+        {
+          id: "proj3",
+          name: "Project 3",
+          environments: [
+            {
+              id: "env3",
+              surveys: [{ id: "survey4", name: "Survey 4 Org 2 Proj 3" }],
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    organization: {
+      id: "org3",
+      name: "Organization 3 No Surveys",
+      projects: [
+        {
+          id: "proj4",
+          name: "Project 4",
+          environments: [
+            {
+              id: "env4",
+              surveys: [], // No surveys in this environment
+            },
+          ],
+        },
+      ],
+    },
+  },
+];
+
+const environmentId = "test-env-id";
+const autoDisableNotificationType = "someType";
+const autoDisableNotificationElementId = "someElementId";
+
+describe("EditAlerts", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly with multiple memberships and surveys", () => {
+    render(
+      <EditAlerts
+        memberships={mockMemberships}
+        user={mockUser}
+        environmentId={environmentId}
+        autoDisableNotificationType={autoDisableNotificationType}
+        autoDisableNotificationElementId={autoDisableNotificationElementId}
+      />
+    );
+
+    // Check organization names
+    expect(screen.getByText("Organization 1")).toBeInTheDocument();
+    expect(screen.getByText("Organization 2")).toBeInTheDocument();
+    expect(screen.getByText("Organization 3 No Surveys")).toBeInTheDocument();
+
+    // Check survey names and project names as subtext
+    expect(screen.getByText("Survey 1 Org 1 Proj 1")).toBeInTheDocument();
+    expect(screen.getAllByText("Project 1")[0]).toBeInTheDocument(); // Project name under survey
+    expect(screen.getByText("Survey 2 Org 1 Proj 1")).toBeInTheDocument();
+    expect(screen.getByText("Survey 3 Org 1 Proj 2")).toBeInTheDocument();
+    expect(screen.getAllByText("Project 2")[0]).toBeInTheDocument();
+    expect(screen.getByText("Survey 4 Org 2 Proj 3")).toBeInTheDocument();
+    expect(screen.getAllByText("Project 3")[0]).toBeInTheDocument();
+
+    // Check "No surveys found" message for org3
+    const org3Heading = screen.getByText("Organization 3 No Surveys");
+    expect(org3Heading.parentElement?.parentElement?.parentElement).toHaveTextContent(
+      "common.no_surveys_found"
+    );
+
+    // Check NotificationSwitch calls
+    // Org 1 auto-subscribe
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "org1",
+        notificationType: "unsubscribedOrganizationIds",
+        autoDisableNotificationType,
+        autoDisableNotificationElementId,
+      })
+    );
+    // Survey 1
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "survey1",
+        notificationType: "alert",
+        autoDisableNotificationType,
+        autoDisableNotificationElementId,
+      })
+    );
+    // Survey 4
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "survey4",
+        notificationType: "alert",
+        autoDisableNotificationType,
+        autoDisableNotificationElementId,
+      })
+    );
+
+    // Check tooltip
+    expect(screen.getAllByTestId("tooltip-provider").length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId("tooltip").length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId("tooltip-trigger").length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId("tooltip-content")[0]).toHaveTextContent(
+      "environments.settings.notifications.every_response_tooltip"
+    );
+    expect(screen.getAllByTestId("help-circle-icon").length).toBeGreaterThan(0);
+
+    // Check invite link
+    const inviteLinks = screen.getAllByTestId("link");
+    const specificInviteLink = inviteLinks.find(
+      (link) => link.getAttribute("href") === `/environments/${environmentId}/settings/general`
+    );
+    expect(specificInviteLink).toBeInTheDocument();
+    expect(specificInviteLink).toHaveTextContent("common.invite_them");
+
+    // Check UsersIcon
+    expect(screen.getAllByTestId("users-icon").length).toBe(mockMemberships.length);
+  });
+
+  test("renders correctly when a membership has no surveys", () => {
+    const singleMembershipNoSurveys: Membership[] = [
+      {
+        organization: {
+          id: "org-no-survey",
+          name: "Org Without Surveys",
+          projects: [
+            {
+              id: "proj-no-survey",
+              name: "Project Without Surveys",
+              environments: [
+                {
+                  id: "env-no-survey",
+                  surveys: [],
+                },
+              ],
+            },
+          ],
+        },
+      },
+    ];
+    render(
+      <EditAlerts
+        memberships={singleMembershipNoSurveys}
+        user={mockUser}
+        environmentId={environmentId}
+        autoDisableNotificationType={autoDisableNotificationType}
+        autoDisableNotificationElementId={autoDisableNotificationElementId}
+      />
+    );
+
+    expect(screen.getByText("Org Without Surveys")).toBeInTheDocument();
+    expect(screen.getByText("common.no_surveys_found")).toBeInTheDocument();
+    expect(screen.queryByText("Survey 1 Org 1 Proj 1")).not.toBeInTheDocument(); // Ensure other surveys aren't rendered
+
+    // Check NotificationSwitch for organization auto-subscribe
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "org-no-survey",
+        notificationType: "unsubscribedOrganizationIds",
+      })
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/EditWeeklySummary.test.tsx

@@ -0,0 +1,166 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { Membership } from "../types";
+import { EditWeeklySummary } from "./EditWeeklySummary";
+
+vi.mock("lucide-react", () => ({
+  UsersIcon: () => <div data-testid="users-icon" />,
+}));
+
+vi.mock("next/link", () => ({
+  default: ({ children, href }: { children: React.ReactNode; href: string }) => (
+    <a href={href} data-testid="link">
+      {children}
+    </a>
+  ),
+}));
+
+const mockNotificationSwitch = vi.fn();
+vi.mock("./NotificationSwitch", () => ({
+  NotificationSwitch: (props: any) => {
+    mockNotificationSwitch(props);
+    return (
+      <div data-testid={`notification-switch-${props.surveyOrProjectOrOrganizationId}`}>
+        NotificationSwitch
+      </div>
+    );
+  },
+}));
+
+const mockT = vi.fn((key) => key);
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: mockT,
+  }),
+}));
+
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {
+      proj1: true,
+      proj3: false,
+    },
+    unsubscribedOrganizationIds: [],
+  },
+  role: "project_manager",
+  objective: "other",
+  emailVerified: new Date(),
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  identityProvider: "email",
+  twoFactorEnabled: false,
+} as unknown as TUser;
+
+const mockMemberships: Membership[] = [
+  {
+    organization: {
+      id: "org1",
+      name: "Organization 1",
+      projects: [
+        { id: "proj1", name: "Project 1", environments: [] },
+        { id: "proj2", name: "Project 2", environments: [] },
+      ],
+    },
+  },
+  {
+    organization: {
+      id: "org2",
+      name: "Organization 2",
+      projects: [{ id: "proj3", name: "Project 3", environments: [] }],
+    },
+  },
+];
+
+const environmentId = "test-env-id";
+
+describe("EditWeeklySummary", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly with multiple memberships and projects", () => {
+    render(<EditWeeklySummary memberships={mockMemberships} user={mockUser} environmentId={environmentId} />);
+
+    expect(screen.getByText("Organization 1")).toBeInTheDocument();
+    expect(screen.getByText("Project 1")).toBeInTheDocument();
+    expect(screen.getByText("Project 2")).toBeInTheDocument();
+    expect(screen.getByText("Organization 2")).toBeInTheDocument();
+    expect(screen.getByText("Project 3")).toBeInTheDocument();
+
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "proj1",
+        notificationSettings: mockUser.notificationSettings,
+        notificationType: "weeklySummary",
+      })
+    );
+    expect(screen.getByTestId("notification-switch-proj1")).toBeInTheDocument();
+
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "proj2",
+        notificationSettings: mockUser.notificationSettings,
+        notificationType: "weeklySummary",
+      })
+    );
+    expect(screen.getByTestId("notification-switch-proj2")).toBeInTheDocument();
+
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "proj3",
+        notificationSettings: mockUser.notificationSettings,
+        notificationType: "weeklySummary",
+      })
+    );
+    expect(screen.getByTestId("notification-switch-proj3")).toBeInTheDocument();
+
+    const inviteLinks = screen.getAllByTestId("link");
+    expect(inviteLinks.length).toBe(mockMemberships.length);
+    inviteLinks.forEach((link) => {
+      expect(link).toHaveAttribute("href", `/environments/${environmentId}/settings/general`);
+      expect(link).toHaveTextContent("common.invite_them");
+    });
+
+    expect(screen.getAllByTestId("users-icon").length).toBe(mockMemberships.length);
+
+    expect(screen.getAllByText("common.project")[0]).toBeInTheDocument();
+    expect(screen.getAllByText("common.weekly_summary")[0]).toBeInTheDocument();
+    expect(
+      screen.getAllByText("environments.settings.notifications.want_to_loop_in_organization_mates?").length
+    ).toBe(mockMemberships.length);
+  });
+
+  test("renders correctly with no memberships", () => {
+    render(<EditWeeklySummary memberships={[]} user={mockUser} environmentId={environmentId} />);
+    expect(screen.queryByText("Organization 1")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("users-icon")).not.toBeInTheDocument();
+  });
+
+  test("renders correctly when an organization has no projects", () => {
+    const membershipsWithNoProjects: Membership[] = [
+      {
+        organization: {
+          id: "org3",
+          name: "Organization No Projects",
+          projects: [],
+        },
+      },
+    ];
+    render(
+      <EditWeeklySummary
+        memberships={membershipsWithNoProjects}
+        user={mockUser}
+        environmentId={environmentId}
+      />
+    );
+    expect(screen.getByText("Organization No Projects")).toBeInTheDocument();
+    expect(screen.queryByText("Project 1")).not.toBeInTheDocument(); // Check that no projects are listed under it
+    expect(mockNotificationSwitch).not.toHaveBeenCalled(); // No projects, so no switches for projects
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/IntegrationsTip.test.tsx

@@ -0,0 +1,36 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { IntegrationsTip } from "./IntegrationsTip";
+
+vi.mock("@/modules/ui/components/icons", () => ({
+  SlackIcon: () => <div data-testid="slack-icon" />,
+}));
+
+const mockT = vi.fn((key) => key);
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: mockT,
+  }),
+}));
+
+const environmentId = "test-env-id";
+
+describe("IntegrationsTip", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders the component with correct text and link", () => {
+    render(<IntegrationsTip environmentId={environmentId} />);
+
+    expect(screen.getByTestId("slack-icon")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.need_slack_or_discord_notifications?")
+    ).toBeInTheDocument();
+
+    const linkElement = screen.getByText("environments.settings.notifications.use_the_integration");
+    expect(linkElement).toBeInTheDocument();
+    expect(linkElement).toHaveAttribute("href", `/environments/${environmentId}/integrations`);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/NotificationSwitch.test.tsx

@@ -0,0 +1,249 @@
+import { act, cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TUserNotificationSettings } from "@formbricks/types/user";
+import { updateNotificationSettingsAction } from "../actions";
+import { NotificationSwitch } from "./NotificationSwitch";
+
+vi.mock("@/modules/ui/components/switch", () => ({
+  Switch: vi.fn(({ checked, disabled, onCheckedChange, id, "aria-label": ariaLabel }) => (
+    <input
+      type="checkbox"
+      data-testid={id}
+      aria-label={ariaLabel}
+      checked={checked}
+      disabled={disabled}
+      onChange={onCheckedChange}
+    />
+  )),
+}));
+
+vi.mock("../actions", () => ({
+  updateNotificationSettingsAction: vi.fn(() => Promise.resolve()),
+}));
+
+const surveyId = "survey1";
+const projectId = "project1";
+const organizationId = "org1";
+
+const baseNotificationSettings: TUserNotificationSettings = {
+  alert: {},
+  weeklySummary: {},
+  unsubscribedOrganizationIds: [],
+};
+
+describe("NotificationSwitch", () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    user = userEvent.setup();
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  const renderSwitch = (props: Partial<React.ComponentProps<typeof NotificationSwitch>>) => {
+    const defaultProps: React.ComponentProps<typeof NotificationSwitch> = {
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: JSON.parse(JSON.stringify(baseNotificationSettings)),
+      notificationType: "alert",
+    };
+    return render(<NotificationSwitch {...defaultProps} {...props} />);
+  };
+
+  test("renders with initial checked state for 'alert' (true)", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: true } };
+    renderSwitch({ notificationSettings: settings, notificationType: "alert" });
+    const switchInput = screen.getByLabelText("toggle notification settings for alert") as HTMLInputElement;
+    expect(switchInput.checked).toBe(true);
+  });
+
+  test("renders with initial checked state for 'alert' (false)", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: false } };
+    renderSwitch({ notificationSettings: settings, notificationType: "alert" });
+    const switchInput = screen.getByLabelText("toggle notification settings for alert") as HTMLInputElement;
+    expect(switchInput.checked).toBe(false);
+  });
+
+  test("renders with initial checked state for 'weeklySummary' (true)", () => {
+    const settings = { ...baseNotificationSettings, weeklySummary: { [projectId]: true } };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: projectId,
+      notificationSettings: settings,
+      notificationType: "weeklySummary",
+    });
+    const switchInput = screen.getByLabelText(
+      "toggle notification settings for weeklySummary"
+    ) as HTMLInputElement;
+    expect(switchInput.checked).toBe(true);
+  });
+
+  test("renders with initial checked state for 'unsubscribedOrganizationIds' (subscribed initially, so checked is true)", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText(
+      "toggle notification settings for unsubscribedOrganizationIds"
+    ) as HTMLInputElement;
+    expect(switchInput.checked).toBe(true); // Not in unsubscribed list means subscribed
+  });
+
+  test("renders with initial checked state for 'unsubscribedOrganizationIds' (unsubscribed initially, so checked is false)", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [organizationId] };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText(
+      "toggle notification settings for unsubscribedOrganizationIds"
+    ) as HTMLInputElement;
+    expect(switchInput.checked).toBe(false); // In unsubscribed list means unsubscribed
+  });
+
+  test("handles switch change for 'alert' type", async () => {
+    const initialSettings = { ...baseNotificationSettings, alert: { [surveyId]: false } };
+    renderSwitch({ notificationSettings: initialSettings, notificationType: "alert" });
+    const switchInput = screen.getByLabelText("toggle notification settings for alert");
+
+    await act(async () => {
+      await user.click(switchInput);
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...initialSettings, alert: { [surveyId]: true } },
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.notification_settings_updated",
+      { id: "notification-switch" }
+    );
+    expect(switchInput).toBeEnabled(); // Check if not disabled after action
+  });
+
+  test("handles switch change for 'unsubscribedOrganizationIds' (subscribe)", async () => {
+    const initialSettings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [organizationId] }; // initially unsubscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: initialSettings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText("toggle notification settings for unsubscribedOrganizationIds");
+
+    await act(async () => {
+      await user.click(switchInput);
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...initialSettings, unsubscribedOrganizationIds: [] }, // should be removed from list
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.notification_settings_updated",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("handles switch change for 'unsubscribedOrganizationIds' (unsubscribe)", async () => {
+    const initialSettings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] }; // initially subscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: initialSettings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText("toggle notification settings for unsubscribedOrganizationIds");
+
+    await act(async () => {
+      await user.click(switchInput);
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...initialSettings, unsubscribedOrganizationIds: [organizationId] }, // should be added to list
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.notification_settings_updated",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("useEffect: auto-disables 'alert' notification if conditions met", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: true } }; // Initially true
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: settings,
+      notificationType: "alert",
+      autoDisableNotificationType: "alert",
+      autoDisableNotificationElementId: surveyId,
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...settings, alert: { [surveyId]: false } },
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.you_will_not_receive_any_more_emails_for_responses_on_this_survey",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("useEffect: auto-disables 'unsubscribedOrganizationIds' (auto-unsubscribes) if conditions met", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] }; // Initially subscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+      autoDisableNotificationType: "someOtherType", // This prop is used to trigger the effect, not directly for type matching in this case
+      autoDisableNotificationElementId: organizationId,
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...settings, unsubscribedOrganizationIds: [organizationId] },
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.you_will_not_be_auto_subscribed_to_this_organizations_surveys_anymore",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("useEffect: does not auto-disable if 'autoDisableNotificationElementId' does not match", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: true } };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: settings,
+      notificationType: "alert",
+      autoDisableNotificationType: "alert",
+      autoDisableNotificationElementId: "otherId", // Mismatch
+    });
+    expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
+    expect(toast.success).not.toHaveBeenCalledWith(
+      "environments.settings.notifications.you_will_not_receive_any_more_emails_for_responses_on_this_survey"
+    );
+  });
+
+  test("useEffect: does not auto-disable if not checked initially for 'alert'", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: false } }; // Initially false
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: settings,
+      notificationType: "alert",
+      autoDisableNotificationType: "alert",
+      autoDisableNotificationElementId: surveyId,
+    });
+    expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
+  });
+
+  test("useEffect: does not auto-disable if not checked initially for 'unsubscribedOrganizationIds' (already unsubscribed)", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [organizationId] }; // Initially unsubscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+      autoDisableNotificationType: "someType",
+      autoDisableNotificationElementId: organizationId,
+    });
+    expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/loading.test.tsx

@@ -0,0 +1,50 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-content-wrapper">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle }: { pageTitle: string }) => <div data-testid="page-header">{pageTitle}</div>,
+}));
+
+describe("Loading Notifications Settings", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders loading state correctly", () => {
+    render(<Loading />);
+
+    expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
+    const pageHeader = screen.getByTestId("page-header");
+    expect(pageHeader).toBeInTheDocument();
+    expect(pageHeader).toHaveTextContent("common.account_settings");
+
+    // Check for Alerts LoadingCard
+    expect(screen.getByText("environments.settings.notifications.email_alerts_surveys")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.set_up_an_alert_to_get_an_email_on_new_responses")
+    ).toBeInTheDocument();
+    const alertsCard = screen
+      .getByText("environments.settings.notifications.email_alerts_surveys")
+      .closest("div[class*='rounded-xl']"); // Find parent card
+    expect(alertsCard).toBeInTheDocument();
+
+    // Check for Weekly Summary LoadingCard
+    expect(
+      screen.getByText("environments.settings.notifications.weekly_summary_projects")
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.stay_up_to_date_with_a_Weekly_every_Monday")
+    ).toBeInTheDocument();
+    const weeklySummaryCard = screen
+      .getByText("environments.settings.notifications.weekly_summary_projects")
+      .closest("div[class*='rounded-xl']"); // Find parent card
+    expect(weeklySummaryCard).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/page.test.tsx

@@ -0,0 +1,258 @@
+import { getUser } from "@/lib/user/service";
+import { cleanup, render, screen } from "@testing-library/react";
+import { getServerSession } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { TUser } from "@formbricks/types/user";
+import { EditAlerts } from "./components/EditAlerts";
+import { EditWeeklySummary } from "./components/EditWeeklySummary";
+import Page from "./page";
+import { Membership } from "./types";
+
+// Mock external dependencies
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar",
+  () => ({
+    AccountSettingsNavbar: ({ activeId }) => <div>AccountSettingsNavbar activeId={activeId}</div>,
+  })
+);
+vi.mock("@/app/(app)/environments/[environmentId]/settings/components/SettingsCard", () => ({
+  SettingsCard: ({ title, description, children }) => (
+    <div>
+      <h1>{title}</h1>
+      <p>{description}</p>
+      {children}
+    </div>
+  ),
+}));
+vi.mock("@/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+vi.mock("@/modules/auth/lib/authOptions", () => ({
+  authOptions: {},
+}));
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }) => <div>{children}</div>,
+}));
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle, children }) => (
+    <div>
+      <h1>{pageTitle}</h1>
+      {children}
+    </div>
+  ),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    membership: {
+      findMany: vi.fn(),
+    },
+  },
+}));
+vi.mock("./components/EditAlerts", () => ({
+  EditAlerts: vi.fn(() => <div>EditAlertsComponent</div>),
+}));
+vi.mock("./components/EditWeeklySummary", () => ({
+  EditWeeklySummary: vi.fn(() => <div>EditWeeklySummaryComponent</div>),
+}));
+vi.mock("./components/IntegrationsTip", () => ({
+  IntegrationsTip: () => <div>IntegrationsTipComponent</div>,
+}));
+
+const mockUser: Partial<TUser> = {
+  id: "user-1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: { "survey-old": true },
+    weeklySummary: { "project-old": true },
+    unsubscribedOrganizationIds: ["org-unsubscribed"],
+  },
+};
+
+const mockMemberships: Membership[] = [
+  {
+    organization: {
+      id: "org-1",
+      name: "Org 1",
+      projects: [
+        {
+          id: "project-1",
+          name: "Project 1",
+          environments: [
+            {
+              id: "env-prod-1",
+              surveys: [
+                { id: "survey-1", name: "Survey 1" },
+                { id: "survey-2", name: "Survey 2" },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  },
+];
+
+const mockSession = {
+  user: {
+    id: "user-1",
+  },
+} as any;
+
+const mockParams = { environmentId: "env-1" };
+const mockSearchParams = {
+  type: "alertTest",
+  elementId: "elementTestId",
+};
+
+describe("NotificationsPage", () => {
+  afterEach(() => {
+    cleanup();
+    vi.resetAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(getServerSession).mockResolvedValue(mockSession);
+    vi.mocked(getUser).mockResolvedValue(mockUser as TUser);
+    vi.mocked(prisma.membership.findMany).mockResolvedValue(mockMemberships as any); // Prisma types can be complex
+  });
+
+  test("renders correctly with user and memberships, and processes notification settings", async () => {
+    const props = { params: mockParams, searchParams: mockSearchParams };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(screen.getByText("common.account_settings")).toBeInTheDocument();
+    expect(screen.getByText("AccountSettingsNavbar activeId=notifications")).toBeInTheDocument();
+    expect(screen.getByText("environments.settings.notifications.email_alerts_surveys")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.set_up_an_alert_to_get_an_email_on_new_responses")
+    ).toBeInTheDocument();
+    expect(screen.getByText("EditAlertsComponent")).toBeInTheDocument();
+    expect(screen.getByText("IntegrationsTipComponent")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.weekly_summary_projects")
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.stay_up_to_date_with_a_Weekly_every_Monday")
+    ).toBeInTheDocument();
+    expect(screen.getByText("EditWeeklySummaryComponent")).toBeInTheDocument();
+
+    // The actual `user.notificationSettings` passed to EditAlerts will be a new object
+    // after `setCompleteNotificationSettings` processes it.
+    // We verify the structure and defaults.
+    const editAlertsCall = vi.mocked(EditAlerts).mock.calls[0][0];
+    expect(editAlertsCall.user.notificationSettings.alert["survey-1"]).toBe(false);
+    expect(editAlertsCall.user.notificationSettings.alert["survey-2"]).toBe(false);
+    // If "survey-old" was not part of any membership survey, it might be removed or kept depending on exact logic.
+    // The current logic only adds keys from memberships. So "survey-old" would be gone from .alert
+    // Let's adjust expectation based on `setCompleteNotificationSettings`
+    // It iterates memberships, then projects, then environments, then surveys.
+    // `newNotificationSettings.alert[survey.id] = notificationSettings[survey.id]?.responseFinished || (notificationSettings.alert && notificationSettings.alert[survey.id]) || false;`
+    // This means only survey IDs found in memberships will be in the new `alert` object.
+    // `newNotificationSettings.weeklySummary[project.id]` also only adds project IDs from memberships.
+
+    const finalExpectedSettings = {
+      alert: {
+        "survey-1": false,
+        "survey-2": false,
+      },
+      weeklySummary: {
+        "project-1": false,
+      },
+      unsubscribedOrganizationIds: ["org-unsubscribed"],
+    };
+
+    expect(editAlertsCall.user.notificationSettings).toEqual(finalExpectedSettings);
+    expect(editAlertsCall.memberships).toEqual(mockMemberships);
+    expect(editAlertsCall.environmentId).toBe(mockParams.environmentId);
+    expect(editAlertsCall.autoDisableNotificationType).toBe(mockSearchParams.type);
+    expect(editAlertsCall.autoDisableNotificationElementId).toBe(mockSearchParams.elementId);
+
+    const editWeeklySummaryCall = vi.mocked(EditWeeklySummary).mock.calls[0][0];
+    expect(editWeeklySummaryCall.user.notificationSettings).toEqual(finalExpectedSettings);
+    expect(editWeeklySummaryCall.memberships).toEqual(mockMemberships);
+    expect(editWeeklySummaryCall.environmentId).toBe(mockParams.environmentId);
+  });
+
+  test("throws error if session is not found", async () => {
+    vi.mocked(getServerSession).mockResolvedValue(null);
+    const props = { params: mockParams, searchParams: {} };
+    await expect(Page(props)).rejects.toThrow("common.session_not_found");
+  });
+
+  test("throws error if user is not found", async () => {
+    vi.mocked(getUser).mockResolvedValue(null);
+    const props = { params: mockParams, searchParams: {} };
+    await expect(Page(props)).rejects.toThrow("common.user_not_found");
+  });
+
+  test("renders with empty memberships and default notification settings", async () => {
+    vi.mocked(prisma.membership.findMany).mockResolvedValue([]);
+    const userWithNoSpecificSettings = {
+      ...mockUser,
+      notificationSettings: { unsubscribedOrganizationIds: [] }, // Start fresh
+    };
+    vi.mocked(getUser).mockResolvedValue(userWithNoSpecificSettings as unknown as TUser);
+
+    const props = { params: mockParams, searchParams: {} };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(screen.getByText("EditAlertsComponent")).toBeInTheDocument();
+    expect(screen.getByText("EditWeeklySummaryComponent")).toBeInTheDocument();
+
+    const expectedEmptySettings = {
+      alert: {},
+      weeklySummary: {},
+      unsubscribedOrganizationIds: [],
+    };
+
+    const editAlertsCall = vi.mocked(EditAlerts).mock.calls[0][0];
+    expect(editAlertsCall.user.notificationSettings).toEqual(expectedEmptySettings);
+    expect(editAlertsCall.memberships).toEqual([]);
+
+    const editWeeklySummaryCall = vi.mocked(EditWeeklySummary).mock.calls[0][0];
+    expect(editWeeklySummaryCall.user.notificationSettings).toEqual(expectedEmptySettings);
+    expect(editWeeklySummaryCall.memberships).toEqual([]);
+  });
+
+  test("handles legacy notification settings correctly", async () => {
+    const userWithLegacySettings: Partial<TUser> = {
+      id: "user-legacy",
+      notificationSettings: {
+        "survey-1": { responseFinished: true }, // Legacy alert for survey-1
+        weeklySummary: { "project-1": true },
+        unsubscribedOrganizationIds: [],
+      } as any, // To allow legacy structure
+    };
+    vi.mocked(getUser).mockResolvedValue(userWithLegacySettings as TUser);
+    // Memberships define survey-1 and project-1
+    vi.mocked(prisma.membership.findMany).mockResolvedValue(mockMemberships as any);
+
+    const props = { params: mockParams, searchParams: {} };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    const expectedProcessedSettings = {
+      alert: {
+        "survey-1": true, // Should be true due to legacy setting
+        "survey-2": false, // Default for other surveys in membership
+      },
+      weeklySummary: {
+        "project-1": true, // From user's weeklySummary
+      },
+      unsubscribedOrganizationIds: [],
+    };
+
+    const editAlertsCall = vi.mocked(EditAlerts).mock.calls[0][0];
+    expect(editAlertsCall.user.notificationSettings).toEqual(expectedProcessedSettings);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity.test.tsx

@@ -0,0 +1,70 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { AccountSecurity } from "./AccountSecurity";
+
+vi.mock("@/modules/ee/two-factor-auth/components/enable-two-factor-modal", () => ({
+  EnableTwoFactorModal: ({ open }) =>
+    open ? <div data-testid="enable-2fa-modal">EnableTwoFactorModal</div> : null,
+}));
+
+vi.mock("@/modules/ee/two-factor-auth/components/disable-two-factor-modal", () => ({
+  DisableTwoFactorModal: ({ open }) =>
+    open ? <div data-testid="disable-2fa-modal">DisableTwoFactorModal</div> : null,
+}));
+
+const mockUser = {
+  id: "test-user-id",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {},
+    unsubscribedOrganizationIds: [],
+  },
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+describe("AccountSecurity", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  test("renders correctly with 2FA disabled", () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: false }} />);
+    expect(screen.getByText("environments.settings.profile.two_factor_authentication")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.profile.two_factor_authentication_description")
+    ).toBeInTheDocument();
+    expect(screen.getByRole("switch")).not.toBeChecked();
+  });
+
+  test("renders correctly with 2FA enabled", () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: true }} />);
+    expect(screen.getByRole("switch")).toBeChecked();
+  });
+
+  test("opens EnableTwoFactorModal when switch is turned on", async () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: false }} />);
+    const switchControl = screen.getByRole("switch");
+    await userEvent.click(switchControl);
+    expect(screen.getByTestId("enable-2fa-modal")).toBeInTheDocument();
+  });
+
+  test("opens DisableTwoFactorModal when switch is turned off", async () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: true }} />);
+    const switchControl = screen.getByRole("switch");
+    await userEvent.click(switchControl);
+    expect(screen.getByTestId("disable-2fa-modal")).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/DeleteAccount.test.tsx

@@ -0,0 +1,97 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Session } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TUser } from "@formbricks/types/user";
+import { DeleteAccount } from "./DeleteAccount";
+
+vi.mock("@/modules/account/components/DeleteAccountModal", () => ({
+  DeleteAccountModal: ({ open }) =>
+    open ? <div data-testid="delete-account-modal">DeleteAccountModal</div> : null,
+}));
+
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: { alert: {}, weeklySummary: {}, unsubscribedOrganizationIds: [] },
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+const mockSession: Session = {
+  user: mockUser,
+  expires: new Date(Date.now() + 2 * 86400).toISOString(),
+};
+
+const mockOrganizations: TOrganization[] = [
+  {
+    id: "org1",
+    name: "Org 1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    billing: {
+      stripeCustomerId: "cus_123",
+    } as unknown as TOrganization["billing"],
+  } as unknown as TOrganization,
+];
+
+describe("DeleteAccount", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  test("renders correctly and opens modal on click", async () => {
+    render(
+      <DeleteAccount
+        session={mockSession}
+        IS_FORMBRICKS_CLOUD={true}
+        user={mockUser}
+        organizationsWithSingleOwner={[]}
+        isMultiOrgEnabled={true}
+      />
+    );
+
+    expect(screen.getByText("environments.settings.profile.warning_cannot_undo")).toBeInTheDocument();
+    const deleteButton = screen.getByText("environments.settings.profile.confirm_delete_my_account");
+    expect(deleteButton).toBeEnabled();
+    await userEvent.click(deleteButton);
+    expect(screen.getByTestId("delete-account-modal")).toBeInTheDocument();
+  });
+
+  test("renders null if session is not provided", () => {
+    const { container } = render(
+      <DeleteAccount
+        session={null}
+        IS_FORMBRICKS_CLOUD={true}
+        user={mockUser}
+        organizationsWithSingleOwner={[]}
+        isMultiOrgEnabled={true}
+      />
+    );
+    expect(container.firstChild).toBeNull();
+  });
+
+  test("enables delete button if multi-org enabled even if user is single owner", () => {
+    render(
+      <DeleteAccount
+        session={mockSession}
+        IS_FORMBRICKS_CLOUD={false}
+        user={mockUser}
+        organizationsWithSingleOwner={mockOrganizations}
+        isMultiOrgEnabled={true}
+      />
+    );
+    const deleteButton = screen.getByText("environments.settings.profile.confirm_delete_my_account");
+    expect(deleteButton).toBeEnabled();
+  });
+});