made minor changes to structure. Included inclusion criteria in setup flow

.cursor/rules/component-migration.mdc

@@ -1,216 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
-# Component Migration Automation Rule
-
-## Overview
-This rule automates the migration of deprecated components to new component systems in React/TypeScript codebases.
-
-## Trigger
-When the user requests component migration (e.g., "migrate [DeprecatedComponent] to [NewComponent]" or "component migration").
-
-## Process
-
-### Step 1: Discovery and Planning
-1. **Identify migration parameters:**
-   - Ask user for deprecated component name (e.g., "Modal")
-   - Ask user for new component name(s) (e.g., "Dialog")
-   - Ask for any components to exclude (e.g., "ModalWithTabs")
-   - Ask for specific import paths if needed
-
-2. **Scan codebase** for deprecated components:
-   - Search for `import.*[DeprecatedComponent]` patterns
-   - Exclude specified components that should not be migrated
-   - List all found components with file paths
-   - Present numbered list to user for confirmation
-
-### Step 2: Component-by-Component Migration
-For each component, follow this exact sequence:
-
-#### 2.1 Component Migration
-- **Import changes:**
-  - Ask user to provide the new import structure
-  - Example transformation pattern:
-  ```typescript
-  // FROM:
-  import { [DeprecatedComponent] } from "@/components/ui/[DeprecatedComponent]"
-  
-  // TO:
-  import {
-    [NewComponent],
-    [NewComponentPart1],
-    [NewComponentPart2],
-    // ... other parts
-  } from "@/components/ui/[NewComponent]"
-  ```
-
-- **Props transformation:**
-  - Ask user for prop mapping rules (e.g., `open` → `open`, `setOpen` → `onOpenChange`)
-  - Ask for props to remove (e.g., `noPadding`, `closeOnOutsideClick`, `size`)
-  - Apply transformations based on user specifications
-
-- **Structure transformation:**
-  - Ask user for the new component structure pattern
-  - Apply the transformation maintaining all functionality
-  - Preserve all existing logic, state management, and event handlers
-
-#### 2.2 Wait for User Approval
-- Present the migration changes
-- Wait for explicit user approval before proceeding
-- If rejected, ask for specific feedback and iterate
-#### 2.3 Re-read and Apply Additional Changes
-- Re-read the component file to capture any user modifications
-- Apply any additional improvements the user made
-- Ensure all changes are incorporated
-
-#### 2.4 Test File Updates
-- **Find corresponding test file** (same name with `.test.tsx` or `.test.ts`)
-- **Update test mocks:**
-  - Ask user for new component mock structure
-  - Replace old component mocks with new ones
-  - Example pattern:
-  ```typescript
-  // Add to test setup:
-  jest.mock("@/components/ui/[NewComponent]", () => ({
-    [NewComponent]: ({ children, [props] }: any) => ([mock implementation]),
-    [NewComponentPart1]: ({ children }: any) => <div data-testid="[new-component-part1]">{children}</div>,
-    [NewComponentPart2]: ({ children }: any) => <div data-testid="[new-component-part2]">{children}</div>,
-    // ... other parts
-  }));
-  ```
-- **Update test expectations:**
-  - Change test IDs from old component to new component
-  - Update any component-specific assertions
-  - Ensure all new component parts used in the component are mocked
-
-#### 2.5 Run Tests and Optimize
-- Execute `Node package manager test -- ComponentName.test.tsx`
-- Fix any failing tests
-- Optimize code quality (imports, formatting, etc.)
-- Re-run tests until all pass
-- **Maximum 3 iterations** - if still failing, ask user for guidance
-
-#### 2.6 Wait for Final Approval
-- Present test results and any optimizations made
-- Wait for user approval of the complete migration
-- If rejected, iterate based on feedback
-
-#### 2.7 Git Commit
-- Run: `git add .`
-- Run: `git commit -m "migrate [ComponentName] from [DeprecatedComponent] to [NewComponent]"`
-- Confirm commit was successful
-
-### Step 3: Final Report Generation
-After all components are migrated, generate a comprehensive GitHub PR report:
-
-#### PR Title
-```
-feat: migrate [DeprecatedComponent] components to [NewComponent] system
-```
-
-#### PR Description Template
-```markdown
-## 🔄 [DeprecatedComponent] to [NewComponent] Migration
-
-### Overview
-Migrated [X] [DeprecatedComponent] components to the new [NewComponent] component system to modernize the UI architecture and improve consistency.
-
-### Components Migrated
-[List each component with file path]
-
-### Technical Changes
-- **Imports:** Replaced `[DeprecatedComponent]` with `[NewComponent], [NewComponentParts...]`
-- **Props:** [List prop transformations]
-- **Structure:** Implemented proper [NewComponent] component hierarchy
-- **Styling:** [Describe styling changes]
-- **Tests:** Updated all test mocks and expectations
-
-### Migration Pattern
-```typescript
-// Before
-<[DeprecatedComponent] [oldProps]>
-  [oldStructure]
-</[DeprecatedComponent]>
-
-// After
-<[NewComponent] [newProps]>
-  [newStructure]
-</[NewComponent]>
-```
-
-### Testing
-- ✅ All existing tests updated and passing
-- ✅ Component functionality preserved
-- ✅ UI/UX behavior maintained
-
-### How to Test This PR
-1. **Functional Testing:**
-   - Navigate to each migrated component's usage
-   - Verify [component] opens and closes correctly
-   - Test all interactive elements within [components]
-   - Confirm styling and layout are preserved
-
-2. **Automated Testing:**
-   ```bash
-   Node package manager test
-   ```
-
-3. **Visual Testing:**
-   - Check that all [components] maintain proper styling
-   - Verify responsive behavior
-   - Test keyboard navigation and accessibility
-
-### Breaking Changes
-[List any breaking changes or state "None - this is a drop-in replacement maintaining all existing functionality."]
-
-### Notes
-- [Any excluded components] were preserved as they already use [NewComponent] internally
-- All form validation and complex state management preserved
-- Enhanced code quality with better imports and formatting
-```
-
-## Special Considerations
-
-### Excluded Components
-- **DO NOT MIGRATE** components specified by user as exclusions
-- They may already use the new component internally or have other reasons
-- Inform user these are skipped and why
-
-### Complex Components
-- Preserve all existing functionality (forms, validation, state management)
-- Maintain prop interfaces
-- Keep all event handlers and callbacks
-- Preserve accessibility features
-
-### Test Coverage
-- Ensure all new component parts are mocked when used
-- Mock all new component parts that appear in the component
-- Update test IDs from old component to new component
-- Maintain all existing test scenarios
-
-### Error Handling
-- If tests fail after 3 iterations, stop and ask user for guidance
-- If component is too complex, ask user for specific guidance
-- If unsure about functionality preservation, ask for clarification
-
-### Migration Patterns
-- Always ask user for specific migration patterns before starting
-- Confirm import structures, prop mappings, and component hierarchies
-- Adapt to different component architectures (simple replacements, complex restructuring, etc.)
-
-## Success Criteria
-- All deprecated components successfully migrated to new components
-- All tests passing
-- No functionality lost
-- Code quality maintained or improved
-- User approval on each component
-- Successful git commits for each migration
-- Comprehensive PR report generated
-
-## Usage Examples
-- "migrate Modal to Dialog"
-- "migrate Button to NewButton" 
-- "migrate Card to ModernCard"
-- "component migration" (will prompt for details) 

.cursor/rules/documentations.mdc

@@ -15,9 +15,10 @@ icon: "link"
 
 - Description: 1 concise sentence to describe WHEN the feature is being used and FOR WHAT BENEFIT.
 - Make ample use of the Mintlify components you can find here https://mintlify.com/docs/llms.txt
-- In all Headlines, only capitalize the current feature and nothing else, to Camel Case
+- In all headlines, only capitalize the current feature and nothing else, NO Camel Case
+- Update the mint.json file and add the nav item at the correct position corresponding to where the MDX file is located
 - If a feature is part of the Enterprise Edition, use this note:
 
 <Note>
-  FEATURE NAME is part of the @Enterprise Edition. 
+  FEATURE NAME is part of the [Enterprise Edition](/self-hosting/advanced/license).
 </Note>

.env.example

@@ -210,8 +210,6 @@ UNKEY_ROOT_KEY=
 # The SENTRY_AUTH_TOKEN variable is picked up by the Sentry Build Plugin.
 # It's used automatically by Sentry during the build for authentication when uploading source maps.
 # SENTRY_AUTH_TOKEN=
-# The SENTRY_ENVIRONMENT is the environment which the error will belong to in the Sentry dashboard
-# SENTRY_ENVIRONMENT=
 
 # Configure the minimum role for user management from UI(owner, manager, disabled)
 # USER_MANAGEMENT_MINIMUM_ROLE="manager"
@@ -219,7 +217,7 @@ UNKEY_ROOT_KEY=
 # Configure the maximum age for the session in seconds. Default is 86400 (24 hours)
 # SESSION_MAX_AGE=86400
 
-# Audit logs options. Default 0.
+# Audit logs options. Requires REDIS_URL env varibale. Default 0.
 # AUDIT_LOG_ENABLED=0
 # If the ip should be added in the log or not. Default 0
 # AUDIT_LOG_GET_USER_IP=0

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,6 @@
 name: Feature request
 description: "Suggest an idea for this project \U0001F680"
 type: feature
-projects: "formbricks/21"
 body:
   - type: textarea
     id: problem-description

.github/ISSUE_TEMPLATE/task.yml

@@ -0,0 +1,11 @@
+name: Task (internal)
+description: "Template for creating a task. Used by the Formbricks Team only \U0001f4e5"
+type: task
+body:
+  - type: textarea
+    id: task-summary
+    attributes:
+      label: Task description
+      description: A clear detailed-rich description of the task.
+    validations:
+      required: true

.github/actions/upload-sentry-sourcemaps/action.yml

@@ -1,121 +0,0 @@
-name: 'Upload Sentry Sourcemaps'
-description: 'Extract sourcemaps from Docker image and upload to Sentry'
-
-inputs:
-  docker_image:
-    description: 'Docker image to extract sourcemaps from'
-    required: true
-  release_version:
-    description: 'Sentry release version (e.g., v1.2.3)'
-    required: true
-  sentry_auth_token:
-    description: 'Sentry authentication token'
-    required: true
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Validate Sentry auth token
-      shell: bash
-      run: |
-        set -euo pipefail
-        echo "🔐 Validating Sentry authentication token..."
-
-        # Assign token to local variable for secure handling
-        SENTRY_TOKEN="${{ inputs.sentry_auth_token }}"
-
-        # Test the token by making a simple API call to Sentry
-        response=$(curl -s -w "%{http_code}" -o /tmp/sentry_response.json \
-          -H "Authorization: Bearer $SENTRY_TOKEN" \
-          "https://sentry.io/api/0/organizations/formbricks/")
-
-        http_code=$(echo "$response" | tail -n1)
-
-        if [ "$http_code" != "200" ]; then
-          echo "❌ Error: Invalid Sentry auth token (HTTP $http_code)"
-          echo "Please check your SENTRY_AUTH_TOKEN is correct and has the necessary permissions."
-          if [ -f /tmp/sentry_response.json ]; then
-            echo "Response body:"
-            cat /tmp/sentry_response.json
-          fi
-          exit 1
-        fi
-
-        echo "✅ Sentry auth token validated successfully"
-
-        # Clean up temp file
-        rm -f /tmp/sentry_response.json
-
-    - name: Extract sourcemaps from Docker image
-      shell: bash
-      run: |
-        set -euo pipefail
-        echo "📦 Extracting sourcemaps from Docker image: ${{ inputs.docker_image }}"
-
-        # Create temporary container from the image and capture its ID
-        echo "Creating temporary container..."
-        CONTAINER_ID=$(docker create "${{ inputs.docker_image }}")
-        echo "Container created with ID: $CONTAINER_ID"
-
-        # Set up cleanup function to ensure container is removed on script exit
-        cleanup_container() {
-          # Capture the current exit code to preserve it
-          local original_exit_code=$?
-          
-          echo "🧹 Cleaning up Docker container..."
-          
-          # Remove the container if it exists (ignore errors if already removed)
-          if [ -n "$CONTAINER_ID" ]; then
-            docker rm -f "$CONTAINER_ID" 2>/dev/null || true
-            echo "Container $CONTAINER_ID removed"
-          fi
-          
-          # Exit with the original exit code to preserve script success/failure status
-          exit $original_exit_code
-        }
-        
-        # Register cleanup function to run on script exit (success or failure)
-        trap cleanup_container EXIT
-
-        # Extract .next directory containing sourcemaps
-        docker cp "$CONTAINER_ID:/home/nextjs/apps/web/.next" ./extracted-next
-
-        # Verify sourcemaps exist
-        if [ ! -d "./extracted-next/static/chunks" ]; then
-          echo "❌ Error: .next/static/chunks directory not found in Docker image"
-          echo "Expected structure: /home/nextjs/apps/web/.next/static/chunks/"
-          exit 1
-        fi
-
-        sourcemap_count=$(find ./extracted-next/static/chunks -name "*.map" | wc -l)
-        echo "✅ Found $sourcemap_count sourcemap files"
-
-        if [ "$sourcemap_count" -eq 0 ]; then
-          echo "❌ Error: No sourcemap files found. Check that productionBrowserSourceMaps is enabled."
-          exit 1
-        fi
-
-    - name: Create Sentry release and upload sourcemaps
-      uses: getsentry/action-release@v3
-      env:
-        SENTRY_AUTH_TOKEN: ${{ inputs.sentry_auth_token }}
-        SENTRY_ORG: formbricks
-        SENTRY_PROJECT: formbricks-cloud
-      with:
-        environment: production
-        version: ${{ inputs.release_version }}
-        sourcemaps: './extracted-next/'
-
-    - name: Clean up extracted files
-      shell: bash
-      if: always()
-      run: |
-        set -euo pipefail
-        # Clean up extracted files
-        rm -rf ./extracted-next
-        echo "🧹 Cleaned up extracted files"

.github/workflows/formbricks-release.yml

@@ -32,25 +32,3 @@ jobs:
     with:
       VERSION: v${{ needs.docker-build.outputs.VERSION }}
       ENVIRONMENT: "prod"
-
-  upload-sentry-sourcemaps:
-    name: Upload Sentry Sourcemaps
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    needs:
-      - docker-build
-      - deploy-formbricks-cloud
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Upload Sentry Sourcemaps
-        uses: ./.github/actions/upload-sentry-sourcemaps
-        continue-on-error: true
-        with:
-          docker_image: ghcr.io/formbricks/formbricks:v${{ needs.docker-build.outputs.VERSION }}
-          release_version: v${{ needs.docker-build.outputs.VERSION }}
-          sentry_auth_token: ${{ secrets.SENTRY_AUTH_TOKEN }}

.github/workflows/pr.yml

@@ -10,6 +10,8 @@ permissions:
 
 on:
   pull_request:
+    branches:
+      - main
   merge_group:
   workflow_dispatch:
 

.github/workflows/upload-sentry-sourcemaps.yml

@@ -1,46 +0,0 @@
-name: Upload Sentry Sourcemaps (Manual)
-
-on:
-  workflow_dispatch:
-    inputs:
-      docker_image:
-        description: "Docker image to extract sourcemaps from"
-        required: true
-        type: string
-      release_version:
-        description: "Release version (e.g., v1.2.3)"
-        required: true
-        type: string
-      tag_version:
-        description: "Docker image tag (leave empty to use release_version)"
-        required: false
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  upload-sourcemaps:
-    name: Upload Sourcemaps to Sentry
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Set Docker Image
-        run: |
-          if [ -n "${{ inputs.tag_version }}" ]; then
-            echo "DOCKER_IMAGE=${{ inputs.docker_image }}:${{ inputs.tag_version }}" >> $GITHUB_ENV
-          else
-            echo "DOCKER_IMAGE=${{ inputs.docker_image }}:${{ inputs.release_version }}" >> $GITHUB_ENV
-          fi
-
-      - name: Upload Sourcemaps to Sentry
-        uses: ./.github/actions/upload-sentry-sourcemaps
-        with:
-          docker_image: ${{ env.DOCKER_IMAGE }}
-          release_version: ${{ inputs.release_version }}
-          sentry_auth_token: ${{ secrets.SENTRY_AUTH_TOKEN }} 

CONTRIBUTING.md

@@ -14,7 +14,17 @@ Are you brimming with brilliant ideas? For new features that can elevate Formbri
 
 ## 🛠 Crafting Pull Requests
 
-For the time being, we don't have the capacity to properly facilitate community contributions. It's a lot of engineering attention often spent on issues which don't follow our prioritization, so we've decided to only facilitate community code contributions in rare exceptions in the coming months.
+Ready to dive into the code and make a real impact? Here's your path:
+
+1. **Read our Best Practices**: [It takes 5 minutes](https://formbricks.com/docs/developer-docs/contributing/get-started) but will help you save hours 🤓
+
+1. **Fork the Repository:** Fork our repository or use [Gitpod](https://gitpod.io) or use [Github Codespaces](https://github.com/features/codespaces) to get started instantly.
+
+1. **Tweak and Transform:** Work your coding magic and apply your changes.
+
+1. **Pull Request Act:** If you're ready to go, craft a new pull request closely following our PR template 🙏
+
+Would you prefer a chat before you dive into a lot of work? [Github Discussions](https://github.com/formbricks/formbricks/discussions) is your harbor. Share your thoughts, and we'll meet you there with open arms. We're responsive and friendly, promise!
 
 ## 🚀 Aspiring Features
 

README.md

@@ -192,7 +192,7 @@ Here are a few options:
 
 - Upvote issues with 👍 reaction so we know what the demand for a particular issue is to prioritize it within the roadmap.
 
-- Note: For the time being, we can only facilitate code contributions as an exception.
+Please check out [our contribution guide](https://formbricks.com/docs/developer-docs/contributing/get-started) and our [list of open issues](https://github.com/formbricks/formbricks/issues) for more information.
 
 ## All Thanks To Our Contributors
 

apps/storybook/.storybook/main.ts

@@ -14,9 +14,10 @@ const config: StorybookConfig = {
   addons: [
     getAbsolutePath("@storybook/addon-onboarding"),
     getAbsolutePath("@storybook/addon-links"),
+    getAbsolutePath("@storybook/addon-essentials"),
     getAbsolutePath("@chromatic-com/storybook"),
+    getAbsolutePath("@storybook/addon-interactions"),
     getAbsolutePath("@storybook/addon-a11y"),
-    getAbsolutePath("@storybook/addon-docs"),
   ],
   framework: {
     name: getAbsolutePath("@storybook/react-vite"),

apps/storybook/.storybook/preview.ts

@@ -1,21 +1,5 @@
-import type { Preview } from "@storybook/react-vite";
-import { TolgeeProvider } from "@tolgee/react";
-import React from "react";
+import type { Preview } from "@storybook/react";
 import "../../web/modules/ui/globals.css";
-import { TolgeeBase } from "../../web/tolgee/shared";
-
-// Create a Storybook-specific Tolgee decorator
-const withTolgee = (Story: any) => {
-  const tolgee = TolgeeBase().init({
-    tagNewKeys: [], // No branch tagging in Storybook
-  });
-
-  return React.createElement(
-    TolgeeProvider,
-    { tolgee, fallback: "Loading", ssr: { language: "en", staticData: {} } },
-    React.createElement(Story)
-  );
-};
 
 const preview: Preview = {
   parameters: {
@@ -26,7 +10,6 @@ const preview: Preview = {
       },
     },
   },
-  decorators: [withTolgee],
 };
 
 export default preview;

apps/storybook/package.json

@@ -14,19 +14,23 @@
     "eslint-plugin-react-refresh": "0.4.20"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^4.0.1",
-    "@storybook/addon-a11y": "9.0.15",
-    "@storybook/addon-links": "9.0.15",
-    "@storybook/addon-onboarding": "9.0.15",
-    "@storybook/react-vite": "9.0.15",
+    "@chromatic-com/storybook": "3.2.6",
+    "@storybook/addon-a11y": "8.6.12",
+    "@storybook/addon-essentials": "8.6.12",
+    "@storybook/addon-interactions": "8.6.12",
+    "@storybook/addon-links": "8.6.12",
+    "@storybook/addon-onboarding": "8.6.12",
+    "@storybook/blocks": "8.6.12",
+    "@storybook/react": "8.6.12",
+    "@storybook/react-vite": "8.6.12",
+    "@storybook/test": "8.6.12",
     "@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": "9.0.15",
+    "eslint-plugin-storybook": "0.12.0",
     "prop-types": "15.8.1",
-    "storybook": "9.0.15",
-    "vite": "6.3.5",
-    "@storybook/addon-docs": "9.0.15"
+    "storybook": "8.6.12",
+    "vite": "6.3.5"
   }
 }

apps/storybook/src/stories/Configure.mdx

@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/addon-docs/blocks";
+import { Meta } from "@storybook/blocks";
 
 import Accessibility from "./assets/accessibility.png";
 import AddonLibrary from "./assets/addon-library.png";

apps/web/Dockerfile

@@ -25,9 +25,21 @@ 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
 
-# Copy the secrets handling script
-COPY apps/web/scripts/docker/read-secrets.sh /tmp/read-secrets.sh
-RUN chmod +x /tmp/read-secrets.sh
+# BuildKit secret handling without hardcoded fallback values
+# This approach relies entirely on secrets passed from GitHub Actions
+RUN echo '#!/bin/sh' > /tmp/read-secrets.sh && \
+    echo 'if [ -f "/run/secrets/database_url" ]; then' >> /tmp/read-secrets.sh && \
+    echo '  export DATABASE_URL=$(cat /run/secrets/database_url)' >> /tmp/read-secrets.sh && \
+    echo 'else' >> /tmp/read-secrets.sh && \
+    echo '  echo "DATABASE_URL secret not found. Build may fail if this is required."' >> /tmp/read-secrets.sh && \
+    echo 'fi' >> /tmp/read-secrets.sh && \
+    echo 'if [ -f "/run/secrets/encryption_key" ]; then' >> /tmp/read-secrets.sh && \
+    echo '  export ENCRYPTION_KEY=$(cat /run/secrets/encryption_key)' >> /tmp/read-secrets.sh && \
+    echo 'else' >> /tmp/read-secrets.sh && \
+    echo '  echo "ENCRYPTION_KEY secret not found. Build may fail if this is required."' >> /tmp/read-secrets.sh && \
+    echo 'fi' >> /tmp/read-secrets.sh && \
+    echo 'exec "$@"' >> /tmp/read-secrets.sh && \
+    chmod +x /tmp/read-secrets.sh
 
 # Increase Node.js memory limit as a regular build argument
 ARG NODE_OPTIONS="--max_old_space_size=4096"
@@ -50,9 +62,6 @@ RUN touch apps/web/.env
 # Install the dependencies
 RUN pnpm install --ignore-scripts
 
-# Build the database package first
-RUN pnpm build --filter=@formbricks/database
-
 # Build the project using our secret reader script
 # This mounts the secrets only during this build step without storing them in layers
 RUN --mount=type=secret,id=database_url \
@@ -97,8 +106,20 @@ RUN chown -R nextjs:nextjs ./apps/web/public && chmod -R 755 ./apps/web/public
 COPY --from=installer /app/packages/database/schema.prisma ./packages/database/schema.prisma
 RUN chown nextjs:nextjs ./packages/database/schema.prisma && chmod 644 ./packages/database/schema.prisma
 
-COPY --from=installer /app/packages/database/dist ./packages/database/dist
-RUN chown -R nextjs:nextjs ./packages/database/dist && chmod -R 755 ./packages/database/dist
+COPY --from=installer /app/packages/database/package.json ./packages/database/package.json
+RUN chown nextjs:nextjs ./packages/database/package.json && chmod 644 ./packages/database/package.json
+
+COPY --from=installer /app/packages/database/migration ./packages/database/migration
+RUN chown -R nextjs:nextjs ./packages/database/migration && chmod -R 755 ./packages/database/migration
+
+COPY --from=installer /app/packages/database/src ./packages/database/src
+RUN chown -R nextjs:nextjs ./packages/database/src && chmod -R 755 ./packages/database/src
+
+COPY --from=installer /app/packages/database/node_modules ./packages/database/node_modules
+RUN chown -R nextjs:nextjs ./packages/database/node_modules && chmod -R 755 ./packages/database/node_modules
+
+COPY --from=installer /app/packages/logger/dist ./packages/database/node_modules/@formbricks/logger/dist
+RUN chown -R nextjs:nextjs ./packages/database/node_modules/@formbricks/logger/dist && chmod -R 755 ./packages/database/node_modules/@formbricks/logger/dist
 
 COPY --from=installer /app/node_modules/@prisma/client ./node_modules/@prisma/client
 RUN chown -R nextjs:nextjs ./node_modules/@prisma/client && chmod -R 755 ./node_modules/@prisma/client
@@ -121,14 +142,12 @@ 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 --ignore-scripts -g tsx typescript pino-pretty 
 RUN npm install -g prisma
 
-# Create a startup script to handle the conditional logic
-COPY --from=installer /app/apps/web/scripts/docker/next-start.sh /home/nextjs/start.sh
-RUN chown nextjs:nextjs /home/nextjs/start.sh && chmod +x /home/nextjs/start.sh
-
 EXPOSE 3000
-ENV HOSTNAME="0.0.0.0"
+ENV HOSTNAME "0.0.0.0"
+ENV NODE_ENV="production"
 USER nextjs
 
 # Prepare volume for uploads
@@ -139,4 +158,12 @@ VOLUME /home/nextjs/apps/web/uploads/
 RUN mkdir -p /home/nextjs/apps/web/saml-connection
 VOLUME /home/nextjs/apps/web/saml-connection
 
-CMD ["/home/nextjs/start.sh"]
+CMD if [ "${DOCKER_CRON_ENABLED:-1}" = "1" ]; then \
+      echo "Starting cron jobs..."; \
+      supercronic -quiet /app/docker/cronjobs & \
+    else \
+      echo "Docker cron jobs are disabled via DOCKER_CRON_ENABLED=0"; \
+    fi; \
+    (cd packages/database && npm run db:migrate:deploy) && \
+    (cd packages/database && npm run db:create-saml-database:deploy) && \
+    exec node apps/web/server.js

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

@@ -94,7 +94,6 @@ describe("LandingSidebar component", () => {
       organizationId: "o1",
       redirect: true,
       callbackUrl: "/auth/login",
-      clearEnvironmentId: true,
     });
   });
 });

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

@@ -130,7 +130,6 @@ export const LandingSidebar = ({
                   organizationId: organization.id,
                   redirect: true,
                   callbackUrl: "/auth/login",
-                  clearEnvironmentId: true,
                 });
               }}
               icon={<LogOutIcon className="mr-2 h-4 w-4" strokeWidth={1.5} />}>

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

@@ -1,5 +1,5 @@
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+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";
@@ -8,40 +8,23 @@ import { ActionDetailModal } from "./ActionDetailModal";
 // Import mocked components
 import { ActionSettingsTab } from "./ActionSettingsTab";
 
-// Mock the Dialog components
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({
-    open,
-    onOpenChange,
-    children,
-  }: {
-    open: boolean;
-    onOpenChange: (open: boolean) => void;
-    children: React.ReactNode;
-  }) =>
-    open ? (
-      <div data-testid="dialog">
-        {children}
-        <button data-testid="dialog-close" onClick={() => onOpenChange(false)}>
-          Close
-        </button>
-      </div>
-    ) : null,
-  DialogContent: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-content">{children}</div>
-  ),
-  DialogHeader: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-header">{children}</div>
-  ),
-  DialogTitle: ({ children }: { children: React.ReactNode }) => (
-    <h2 data-testid="dialog-title">{children}</h2>
-  ),
-  DialogDescription: ({ children }: { children: React.ReactNode }) => (
-    <p data-testid="dialog-description">{children}</p>
-  ),
-  DialogBody: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-body">{children}</div>
-  ),
+// 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", () => ({
@@ -61,22 +44,6 @@ vi.mock("@/app/(app)/environments/[environmentId]/actions/utils", () => ({
   },
 }));
 
-// Mock useTranslate
-vi.mock("@tolgee/react", () => ({
-  useTranslate: () => ({
-    t: (key: string) => {
-      const translations = {
-        "common.activity": "Activity",
-        "common.settings": "Settings",
-        "common.no_code": "No Code",
-        "common.action": "Action",
-        "common.code": "Code",
-      };
-      return translations[key] || key;
-    },
-  }),
-}));
-
 const mockEnvironmentId = "test-env-id";
 const mockSetOpen = vi.fn();
 
@@ -122,68 +89,58 @@ describe("ActionDetailModal", () => {
     vi.clearAllMocks(); // Clear mocks after each test
   });
 
-  test("renders correctly when open", () => {
+  test("renders ModalWithTabs with correct props", () => {
     render(<ActionDetailModal {...defaultProps} />);
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Test Action");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("This is a test action");
-    expect(screen.getByTestId("code-icon")).toBeInTheDocument();
-    expect(screen.getByText("Activity")).toBeInTheDocument();
-    expect(screen.getByText("Settings")).toBeInTheDocument();
-    // Only the first tab (Activity) should be active initially
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
-  });
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
 
-  test("does not render when open is false", () => {
-    render(<ActionDetailModal {...defaultProps} open={false} />);
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
-  });
+    expect(mockedModalWithTabs).toHaveBeenCalled();
+    const props = mockedModalWithTabs.mock.calls[0][0];
 
-  test("switches tabs correctly", async () => {
-    const user = userEvent.setup();
-    render(<ActionDetailModal {...defaultProps} />);
+    // 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);
 
-    // Initially shows activity tab (first tab is active)
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
+    // 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");
 
-    // Click settings tab
-    const settingsTab = screen.getByText("Settings");
-    await user.click(settingsTab);
+    // Check tabs structure
+    expect(props.tabs).toHaveLength(2);
+    expect(props.tabs[0].title).toBe("common.activity");
+    expect(props.tabs[1].title).toBe("common.settings");
 
-    // Now shows settings tab content
-    expect(screen.queryByTestId("action-activity-tab")).not.toBeInTheDocument();
-    expect(screen.getByTestId("action-settings-tab")).toBeInTheDocument();
+    // 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);
 
-    // Click activity tab again
-    const activityTab = screen.getByText("Activity");
-    await user.click(activityTab);
+    if (!props.tabs[0].children || !props.tabs[1].children) {
+      throw new Error("Tabs children are not defined");
+    }
 
-    // Back to activity tab content
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
-  });
+    expect((props.tabs[0].children as any).type).toBe(mockedActionActivityTab);
+    expect((props.tabs[1].children as any).type).toBe(mockedActionSettingsTab);
 
-  test("resets to first tab when modal is reopened", async () => {
-    const user = userEvent.setup();
-    const { rerender } = render(<ActionDetailModal {...defaultProps} />);
+    // 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);
 
-    // Switch to settings tab
-    const settingsTab = screen.getByText("Settings");
-    await user.click(settingsTab);
-    expect(screen.getByTestId("action-settings-tab")).toBeInTheDocument();
-
-    // Close modal
-    rerender(<ActionDetailModal {...defaultProps} open={false} />);
-
-    // Reopen modal
-    rerender(<ActionDetailModal {...defaultProps} open={true} />);
-
-    // Should be back to activity tab (first tab)
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
+    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", () => {
@@ -191,68 +148,33 @@ describe("ActionDetailModal", () => {
     const noCodeAction: TActionClass = { ...mockActionClass, type: "noCode" } as TActionClass;
     render(<ActionDetailModal {...defaultProps} actionClass={noCodeAction} />);
 
-    expect(screen.getByTestId("nocode-icon")).toBeInTheDocument();
-    expect(screen.queryByTestId("code-icon")).not.toBeInTheDocument();
-  });
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
+    const props = mockedModalWithTabs.mock.calls[0][0];
 
-  test("handles action without description", () => {
-    const actionWithoutDescription = { ...mockActionClass, description: "" };
-    render(<ActionDetailModal {...defaultProps} actionClass={actionWithoutDescription} />);
+    // Expect the 'nocode-icon' based on the updated mock and action type
+    expect(props.icon).toBeDefined();
 
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Test Action");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("Code action");
-  });
+    if (!props.icon) {
+      throw new Error("Icon prop is not defined");
+    }
 
-  test("passes correct props to ActionActivityTab", () => {
-    render(<ActionDetailModal {...defaultProps} />);
-
-    const mockedActionActivityTab = vi.mocked(ActionActivityTab);
-    expect(mockedActionActivityTab).toHaveBeenCalledWith(
-      {
-        otherEnvActionClasses: mockOtherEnvActionClasses,
-        otherEnvironment: mockOtherEnvironment,
-        isReadOnly: false,
-        environment: mockEnvironment,
-        actionClass: mockActionClass,
-        environmentId: mockEnvironmentId,
-      },
-      undefined
-    );
-  });
-
-  test("passes correct props to ActionSettingsTab when tab is active", async () => {
-    const user = userEvent.setup();
-    render(<ActionDetailModal {...defaultProps} />);
-
-    // ActionSettingsTab should not be called initially since first tab is active
-    const mockedActionSettingsTab = vi.mocked(ActionSettingsTab);
-    expect(mockedActionSettingsTab).not.toHaveBeenCalled();
-
-    // Click the settings tab to activate ActionSettingsTab
-    const settingsTab = screen.getByText("Settings");
-    await user.click(settingsTab);
-
-    // Now ActionSettingsTab should be called with correct props
-    expect(mockedActionSettingsTab).toHaveBeenCalledWith(
-      {
-        actionClass: mockActionClass,
-        actionClasses: mockActionClasses,
-        setOpen: mockSetOpen,
-        isReadOnly: false,
-      },
-      undefined
-    );
+    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];
 
-    const mockedActionActivityTab = vi.mocked(ActionActivityTab);
-    expect(mockedActionActivityTab).toHaveBeenCalledWith(
-      expect.objectContaining({
-        isReadOnly: true,
-      }),
-      undefined
-    );
+    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/ActionDetailModal.tsx

@@ -59,16 +59,6 @@ export const ActionDetailModal = ({
     },
   ];
 
-  const typeDescription = () => {
-    if (actionClass.description) return actionClass.description;
-    else
-      return (
-        (actionClass.type && actionClass.type === "noCode" ? t("common.no_code") : t("common.code")) +
-        " " +
-        t("common.action").toLowerCase()
-      );
-  };
-
   return (
     <>
       <ModalWithTabs
@@ -77,7 +67,7 @@ export const ActionDetailModal = ({
         tabs={tabs}
         icon={ACTION_TYPE_ICON_LOOKUP[actionClass.type]}
         label={actionClass.name}
-        description={typeDescription()}
+        description={actionClass.description || ""}
       />
     </>
   );

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

@@ -11,21 +11,22 @@ export const ActionClassDataRow = ({
   locale: TUserLocale;
 }) => {
   return (
-    <div className="m-2 grid grid-cols-6 content-center rounded-lg transition-colors ease-in-out hover:bg-slate-100">
-      <div className="col-span-4 flex items-start py-3 pl-6 text-sm">
-        <div className="flex w-full items-center gap-4">
-          <div className="mt-1 h-5 w-5 flex-shrink-0 text-slate-500">
+    <div className="m-2 grid h-16 grid-cols-6 content-center rounded-lg transition-colors ease-in-out hover:bg-slate-100">
+      <div className="col-span-4 flex items-center pl-6 text-sm">
+        <div className="flex items-center">
+          <div className="h-5 w-5 flex-shrink-0 text-slate-500">
             {ACTION_TYPE_ICON_LOOKUP[actionClass.type]}
           </div>
-          <div className="text-left">
-            <div className="break-words font-medium text-slate-900">{actionClass.name}</div>
-            <div className="break-words text-xs text-slate-400">{actionClass.description}</div>
+          <div className="ml-4 text-left">
+            <div className="font-medium text-slate-900">{actionClass.name}</div>
+            <div className="text-xs text-slate-400">{actionClass.description}</div>
           </div>
         </div>
       </div>
       <div className="col-span-2 my-auto whitespace-nowrap text-center text-sm text-slate-500">
         {timeSince(actionClass.createdAt.toString(), locale)}
       </div>
+      <div className="text-center"></div>
     </div>
   );
 };

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

@@ -210,13 +210,14 @@ export const ActionSettingsTab = ({
             )}
           </div>
 
-          <div className="flex justify-between gap-x-2 border-slate-200 pt-4">
-            <div className="flex items-center gap-x-2">
+          <div className="flex justify-between border-t border-slate-200 py-6">
+            <div>
               {!isReadOnly ? (
                 <Button
                   type="button"
                   variant="destructive"
                   onClick={() => setOpenDeleteDialog(true)}
+                  className="mr-3"
                   id="deleteActionModalTrigger">
                   <TrashIcon />
                   {t("common.delete")}

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

@@ -22,29 +22,14 @@ vi.mock("@/modules/ui/components/button", () => ({
   ),
 }));
 
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ children, open, setOpen, ...props }: any) =>
     open ? (
-      <div data-testid="dialog" role="dialog">
+      <div data-testid="modal" {...props}>
         {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
+        <button onClick={() => setOpen(false)}>Close Modal</button>
       </div>
     ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children, className }: any) => (
-    <h2 data-testid="dialog-title" className={className}>
-      {children}
-    </h2>
-  ),
-  DialogDescription: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-description">{children}</div>
-  ),
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
 }));
 
 vi.mock("@tolgee/react", () => ({
@@ -85,21 +70,17 @@ describe("AddActionModal", () => {
     );
     expect(screen.getByRole("button", { name: "common.add_action" })).toBeInTheDocument();
     expect(screen.getByTestId("plus-icon")).toBeInTheDocument();
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 
-  test("opens the dialog when the 'Add Action' button is clicked", async () => {
+  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("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-content")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-header")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-body")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
     expect(screen.getByTestId("mouse-pointer-icon")).toBeInTheDocument();
     expect(screen.getByText("environments.actions.track_new_user_action")).toBeInTheDocument();
     expect(
@@ -127,35 +108,35 @@ describe("AddActionModal", () => {
     expect(props.setActionClasses).toBeInstanceOf(Function);
   });
 
-  test("closes the dialog when the close button (simulated) is clicked", async () => {
+  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("dialog")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
 
-    // Simulate closing via the mocked Dialog's close button
-    const closeDialogButton = screen.getByText("Close Dialog");
-    await userEvent.click(closeDialogButton);
+    // Simulate closing via the mocked Modal's close button
+    const closeModalButton = screen.getByText("Close Modal");
+    await userEvent.click(closeModalButton);
 
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 
-  test("closes the dialog when setOpen is called from CreateNewActionTab", async () => {
+  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("dialog")).toBeInTheDocument();
+    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("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 });

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

@@ -2,14 +2,7 @@
 
 import { CreateNewActionTab } from "@/modules/survey/editor/components/create-new-action-tab";
 import { Button } from "@/modules/ui/components/button";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
+import { Modal } from "@/modules/ui/components/modal";
 import { useTranslate } from "@tolgee/react";
 import { MousePointerClickIcon, PlusIcon } from "lucide-react";
 import { useState } from "react";
@@ -33,26 +26,36 @@ export const AddActionModal = ({ environmentId, actionClasses, isReadOnly }: Add
         {t("common.add_action")}
         <PlusIcon />
       </Button>
-      <Dialog open={open} onOpenChange={setOpen}>
-        <DialogContent disableCloseOnOutsideClick>
-          <DialogHeader>
-            <MousePointerClickIcon />
-            <DialogTitle>{t("environments.actions.track_new_user_action")}</DialogTitle>
-            <DialogDescription>
-              {t("environments.actions.track_user_action_to_display_surveys_or_create_user_segment")}
-            </DialogDescription>
-          </DialogHeader>
-          <DialogBody>
-            <CreateNewActionTab
-              actionClasses={newActionClasses}
-              environmentId={environmentId}
-              isReadOnly={isReadOnly}
-              setActionClasses={setNewActionClasses}
-              setOpen={setOpen}
-            />
-          </DialogBody>
-        </DialogContent>
-      </Dialog>
+      <Modal open={open} setOpen={setOpen} noPadding closeOnOutsideClick={false} restrictOverflow>
+        <div className="flex h-full flex-col rounded-lg">
+          <div className="rounded-t-lg bg-slate-100">
+            <div className="flex w-full items-center justify-between p-6">
+              <div className="flex items-center space-x-2">
+                <div className="mr-1.5 h-6 w-6 text-slate-500">
+                  <MousePointerClickIcon className="h-5 w-5" />
+                </div>
+                <div>
+                  <div className="text-xl font-medium text-slate-700">
+                    {t("environments.actions.track_new_user_action")}
+                  </div>
+                  <div className="text-sm text-slate-500">
+                    {t("environments.actions.track_user_action_to_display_surveys_or_create_user_segment")}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="px-6 py-4">
+          <CreateNewActionTab
+            actionClasses={newActionClasses}
+            environmentId={environmentId}
+            isReadOnly={isReadOnly}
+            setActionClasses={setNewActionClasses}
+            setOpen={setOpen}
+          />
+        </div>
+      </Modal>
     </>
   );
 };

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

@@ -101,7 +101,6 @@ export const EnvironmentLayout = async ({ environmentId, session, children }: En
         isPendingDowngrade={isPendingDowngrade ?? false}
         active={active}
         environmentId={environment.id}
-        locale={user.locale}
       />
 
       <div className="flex h-full">

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

@@ -221,6 +221,7 @@ describe("MainNavigation", () => {
     vi.mocked(useSignOut).mockReturnValue({ signOut: mockSignOut });
 
     // Set up localStorage spy on the mocked localStorage
+    const removeItemSpy = vi.spyOn(window.localStorage, "removeItem");
 
     render(<MainNavigation {...defaultProps} />);
 
@@ -242,18 +243,23 @@ describe("MainNavigation", () => {
     const logoutButton = screen.getByText("common.logout");
     await userEvent.click(logoutButton);
 
+    // Verify localStorage.removeItem is called with the correct key
+    expect(removeItemSpy).toHaveBeenCalledWith("formbricks-environment-id");
+
     expect(mockSignOut).toHaveBeenCalledWith({
       reason: "user_initiated",
       redirectUrl: "/auth/login",
       organizationId: "org1",
       redirect: false,
       callbackUrl: "/auth/login",
-      clearEnvironmentId: true,
     });
 
     await waitFor(() => {
       expect(mockRouterPush).toHaveBeenCalledWith("/auth/login");
     });
+
+    // Clean up spy
+    removeItemSpy.mockRestore();
   });
 
   test("handles organization switching", async () => {

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

@@ -4,6 +4,7 @@ import { getLatestStableFbReleaseAction } from "@/app/(app)/environments/[enviro
 import { NavigationLink } from "@/app/(app)/environments/[environmentId]/components/NavigationLink";
 import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
+import { FORMBRICKS_ENVIRONMENT_ID_LS } from "@/lib/localStorage";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { capitalizeFirstLetter } from "@/lib/utils/strings";
 import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
@@ -390,13 +391,14 @@ export const MainNavigation = ({
 
                   <DropdownMenuItem
                     onClick={async () => {
+                      localStorage.removeItem(FORMBRICKS_ENVIRONMENT_ID_LS);
+
                       const route = await signOutWithAudit({
                         reason: "user_initiated",
                         redirectUrl: "/auth/login",
                         organizationId: organization.id,
                         redirect: false,
                         callbackUrl: "/auth/login",
-                        clearEnvironmentId: true,
                       });
                       router.push(route?.url || "/auth/login"); // NOSONAR // We want to check for empty strings
                     }}

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

@@ -92,24 +92,14 @@ vi.mock("@/modules/ui/components/additional-integration-settings", () => ({
     </div>
   ),
 }));
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ children, open, setOpen }) =>
     open ? (
-      <div data-testid="dialog" role="dialog">
+      <div data-testid="modal">
         {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
+        <button onClick={() => setOpen(false)}>Close Modal</button>
       </div>
     ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children }: any) => <h2 data-testid="dialog-title">{children}</h2>,
-  DialogDescription: ({ children }: any) => <p data-testid="dialog-description">{children}</p>,
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
-  DialogFooter: ({ children }: any) => <div data-testid="dialog-footer">{children}</div>,
 }));
 vi.mock("@/modules/ui/components/alert", () => ({
   Alert: ({ children }) => <div data-testid="alert">{children}</div>,

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

@@ -10,16 +10,8 @@ import { AdditionalIntegrationSettings } from "@/modules/ui/components/additiona
 import { Alert, AlertDescription, AlertTitle } from "@/modules/ui/components/alert";
 import { Button } from "@/modules/ui/components/button";
 import { Checkbox } from "@/modules/ui/components/checkbox";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
 import { Label } from "@/modules/ui/components/label";
+import { Modal } from "@/modules/ui/components/modal";
 import {
   Select,
   SelectContent,
@@ -27,11 +19,11 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/modules/ui/components/select";
-import { TFnType, useTranslate } from "@tolgee/react";
+import { useTranslate } from "@tolgee/react";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
-import { Control, Controller, useForm } from "react-hook-form";
+import { Controller, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { TIntegrationItem } from "@formbricks/types/integration";
 import {
@@ -76,80 +68,6 @@ const NoBaseFoundError = () => {
   );
 };
 
-const renderQuestionSelection = ({
-  t,
-  selectedSurvey,
-  control,
-  includeVariables,
-  setIncludeVariables,
-  includeHiddenFields,
-  includeMetadata,
-  setIncludeHiddenFields,
-  setIncludeMetadata,
-  includeCreatedAt,
-  setIncludeCreatedAt,
-}: {
-  t: TFnType;
-  selectedSurvey: TSurvey;
-  control: Control<IntegrationModalInputs>;
-  includeVariables: boolean;
-  setIncludeVariables: (value: boolean) => void;
-  includeHiddenFields: boolean;
-  includeMetadata: boolean;
-  setIncludeHiddenFields: (value: boolean) => void;
-  setIncludeMetadata: (value: boolean) => void;
-  includeCreatedAt: boolean;
-  setIncludeCreatedAt: (value: boolean) => void;
-}) => {
-  return (
-    <div className="space-y-4">
-      <div>
-        <Label htmlFor="Surveys">{t("common.questions")}</Label>
-        <div className="mt-1 max-h-[15vh] overflow-y-auto rounded-lg border border-slate-200">
-          <div className="grid content-center rounded-lg bg-slate-50 p-3 text-left text-sm text-slate-900">
-            {replaceHeadlineRecall(selectedSurvey, "default")?.questions.map((question) => (
-              <Controller
-                key={question.id}
-                control={control}
-                name={"questions"}
-                render={({ field }) => (
-                  <div className="my-1 flex items-center space-x-2">
-                    <label htmlFor={question.id} className="flex cursor-pointer items-center">
-                      <Checkbox
-                        type="button"
-                        id={question.id}
-                        value={question.id}
-                        className="bg-white"
-                        checked={field.value?.includes(question.id)}
-                        onCheckedChange={(checked) => {
-                          return checked
-                            ? field.onChange([...field.value, question.id])
-                            : field.onChange(field.value?.filter((value) => value !== question.id));
-                        }}
-                      />
-                      <span className="ml-2">{getLocalizedValue(question.headline, "default")}</span>
-                    </label>
-                  </div>
-                )}
-              />
-            ))}
-          </div>
-        </div>
-      </div>
-      <AdditionalIntegrationSettings
-        includeVariables={includeVariables}
-        setIncludeVariables={setIncludeVariables}
-        includeHiddenFields={includeHiddenFields}
-        includeMetadata={includeMetadata}
-        setIncludeHiddenFields={setIncludeHiddenFields}
-        setIncludeMetadata={setIncludeMetadata}
-        includeCreatedAt={includeCreatedAt}
-        setIncludeCreatedAt={setIncludeCreatedAt}
-      />
-    </div>
-  );
-};
-
 export const AddIntegrationModal = ({
   open,
   setOpenWithStates,
@@ -292,148 +210,182 @@ export const AddIntegrationModal = ({
   };
 
   return (
-    <Dialog open={open} onOpenChange={setOpenWithStates}>
-      <DialogContent className="overflow-visible md:overflow-visible">
-        <DialogHeader>
+    <Modal open={open} setOpen={handleClose} noPadding>
+      <div className="rounded-t-lg bg-slate-100">
+        <div className="flex w-full items-center justify-between p-6">
           <div className="flex items-center space-x-2">
-            <div className="relative size-8">
-              <Image
-                fill
-                className="object-contain object-center"
-                src={AirtableLogo}
-                alt={t("environments.integrations.airtable.airtable_logo")}
-              />
+            <div className="mr-1.5 h-6 w-6 text-slate-500">
+              <Image className="w-12" src={AirtableLogo} alt="Airtable logo" />
             </div>
-            <div className="space-y-0.5">
-              <DialogTitle>{t("environments.integrations.airtable.link_airtable_table")}</DialogTitle>
-              <DialogDescription>
+            <div>
+              <div className="text-xl font-medium text-slate-700">
+                {t("environments.integrations.airtable.link_airtable_table")}
+              </div>
+              <div className="text-sm text-slate-500">
                 {t("environments.integrations.airtable.sync_responses_with_airtable")}
-              </DialogDescription>
+              </div>
             </div>
           </div>
-        </DialogHeader>
-        <form className="space-y-4" onSubmit={handleSubmit(submitHandler)}>
-          <DialogBody className="overflow-visible">
-            <div className="flex w-full flex-col gap-y-4">
-              {airtableArray.length ? (
-                <BaseSelectDropdown
-                  control={control}
-                  isLoading={isLoading}
-                  fetchTable={fetchTable}
-                  airtableArray={airtableArray}
-                  setValue={setValue}
-                  defaultValue={defaultData?.base}
-                />
-              ) : (
-                <NoBaseFoundError />
-              )}
+        </div>
+      </div>
+      <form onSubmit={handleSubmit(submitHandler)}>
+        <div className="flex rounded-lg p-6">
+          <div className="flex w-full flex-col gap-y-4 pt-5">
+            {airtableArray.length ? (
+              <BaseSelectDropdown
+                control={control}
+                isLoading={isLoading}
+                fetchTable={fetchTable}
+                airtableArray={airtableArray}
+                setValue={setValue}
+                defaultValue={defaultData?.base}
+              />
+            ) : (
+              <NoBaseFoundError />
+            )}
 
+            <div className="flex w-full flex-col">
+              <Label htmlFor="table">{t("environments.integrations.airtable.table_name")}</Label>
+              <div className="mt-1 flex">
+                <Controller
+                  control={control}
+                  name="table"
+                  render={({ field }) => (
+                    <Select
+                      required
+                      disabled={!tables.length}
+                      onValueChange={(val) => {
+                        field.onChange(val);
+                      }}
+                      defaultValue={defaultData?.table}>
+                      <SelectTrigger>
+                        <SelectValue />
+                      </SelectTrigger>
+                      {tables.length ? (
+                        <SelectContent>
+                          {tables.map((item) => (
+                            <SelectItem key={item.id} value={item.id}>
+                              {item.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      ) : null}
+                    </Select>
+                  )}
+                />
+              </div>
+            </div>
+
+            {surveys.length ? (
               <div className="flex w-full flex-col">
-                <Label htmlFor="table">{t("environments.integrations.airtable.table_name")}</Label>
+                <Label htmlFor="survey">{t("common.select_survey")}</Label>
                 <div className="mt-1 flex">
                   <Controller
                     control={control}
-                    name="table"
+                    name="survey"
                     render={({ field }) => (
                       <Select
                         required
-                        disabled={!tables.length}
                         onValueChange={(val) => {
                           field.onChange(val);
+                          setValue("questions", []);
                         }}
-                        defaultValue={defaultData?.table}>
+                        defaultValue={defaultData?.survey}>
                         <SelectTrigger>
                           <SelectValue />
                         </SelectTrigger>
-                        {tables.length ? (
-                          <SelectContent>
-                            {tables.map((item) => (
-                              <SelectItem key={item.id} value={item.id}>
-                                {item.name}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        ) : null}
+                        <SelectContent>
+                          {surveys.map((item) => (
+                            <SelectItem key={item.id} value={item.id}>
+                              {item.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
                       </Select>
                     )}
                   />
                 </div>
               </div>
+            ) : null}
 
-              {surveys.length ? (
-                <div className="flex w-full flex-col">
-                  <Label htmlFor="survey">{t("common.select_survey")}</Label>
-                  <div className="mt-1 flex">
-                    <Controller
-                      control={control}
-                      name="survey"
-                      render={({ field }) => (
-                        <Select
-                          required
-                          onValueChange={(val) => {
-                            field.onChange(val);
-                            setValue("questions", []);
-                          }}
-                          defaultValue={defaultData?.survey}>
-                          <SelectTrigger>
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent>
-                            {surveys.map((item) => (
-                              <SelectItem key={item.id} value={item.id}>
-                                {item.name}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                      )}
-                    />
+            {!surveys.length ? (
+              <p className="m-1 text-xs text-slate-500">
+                {t("environments.integrations.create_survey_warning")}
+              </p>
+            ) : null}
+
+            {survey && selectedSurvey && (
+              <div className="space-y-4">
+                <div>
+                  <Label htmlFor="Surveys">{t("common.questions")}</Label>
+                  <div className="mt-1 max-h-[15vh] overflow-y-auto rounded-lg border border-slate-200">
+                    <div className="grid content-center rounded-lg bg-slate-50 p-3 text-left text-sm text-slate-900">
+                      {replaceHeadlineRecall(selectedSurvey, "default")?.questions.map((question) => (
+                        <Controller
+                          key={question.id}
+                          control={control}
+                          name={"questions"}
+                          render={({ field }) => (
+                            <div className="my-1 flex items-center space-x-2">
+                              <label htmlFor={question.id} className="flex cursor-pointer items-center">
+                                <Checkbox
+                                  type="button"
+                                  id={question.id}
+                                  value={question.id}
+                                  className="bg-white"
+                                  checked={field.value?.includes(question.id)}
+                                  onCheckedChange={(checked) => {
+                                    return checked
+                                      ? field.onChange([...field.value, question.id])
+                                      : field.onChange(field.value?.filter((value) => value !== question.id));
+                                  }}
+                                />
+                                <span className="ml-2">
+                                  {getLocalizedValue(question.headline, "default")}
+                                </span>
+                              </label>
+                            </div>
+                          )}
+                        />
+                      ))}
+                    </div>
                   </div>
                 </div>
-              ) : (
-                <p className="m-1 text-xs text-slate-500">
-                  {t("environments.integrations.create_survey_warning")}
-                </p>
-              )}
-
-              {survey &&
-                selectedSurvey &&
-                renderQuestionSelection({
-                  t,
-                  selectedSurvey,
-                  control,
-                  includeVariables,
-                  setIncludeVariables,
-                  includeHiddenFields,
-                  includeMetadata,
-                  setIncludeHiddenFields,
-                  setIncludeMetadata,
-                  includeCreatedAt,
-                  setIncludeCreatedAt,
-                })}
-            </div>
-          </DialogBody>
-          <DialogFooter>
-            {isEditMode ? (
-              <Button
-                onClick={async () => {
-                  await handleDelete(defaultData.index);
-                }}
-                type="button"
-                loading={isLoading}
-                variant="destructive">
-                {t("common.delete")}
-              </Button>
-            ) : (
-              <Button type="button" loading={isLoading} variant="ghost" onClick={handleClose}>
-                {t("common.cancel")}
-              </Button>
+                <AdditionalIntegrationSettings
+                  includeVariables={includeVariables}
+                  setIncludeVariables={setIncludeVariables}
+                  includeHiddenFields={includeHiddenFields}
+                  includeMetadata={includeMetadata}
+                  setIncludeHiddenFields={setIncludeHiddenFields}
+                  setIncludeMetadata={setIncludeMetadata}
+                  includeCreatedAt={includeCreatedAt}
+                  setIncludeCreatedAt={setIncludeCreatedAt}
+                />
+              </div>
             )}
 
-            <Button type="submit">{t("common.save")}</Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
+            <div className="flex justify-end gap-x-2">
+              {isEditMode ? (
+                <Button
+                  onClick={async () => {
+                    await handleDelete(defaultData.index);
+                  }}
+                  type="button"
+                  loading={isLoading}
+                  variant="destructive">
+                  {t("common.delete")}
+                </Button>
+              ) : (
+                <Button type="button" loading={isLoading} variant="ghost" onClick={handleClose}>
+                  {t("common.cancel")}
+                </Button>
+              )}
+
+              <Button type="submit">{t("common.save")}</Button>
+            </div>
+          </div>
+        </div>
+      </form>
+    </Modal>
   );
 };

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

@@ -88,24 +88,9 @@ vi.mock("@/modules/ui/components/dropdown-selector", () => ({
     </div>
   ),
 }));
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
-    open ? (
-      <div data-testid="dialog" role="dialog">
-        {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
-      </div>
-    ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children }: any) => <h2 data-testid="dialog-title">{children}</h2>,
-  DialogDescription: ({ children }: any) => <p data-testid="dialog-description">{children}</p>,
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
-  DialogFooter: ({ children }: any) => <div data-testid="dialog-footer">{children}</div>,
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
+    open ? <div data-testid="modal">{children}</div> : null,
 }));
 vi.mock("next/image", () => ({
   // eslint-disable-next-line @next/next/no-img-element
@@ -319,9 +304,10 @@ describe("AddIntegrationModal", () => {
       />
     );
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Link Google Sheet");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("Sync responses with Google Sheets.");
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Google Sheet", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
     // Use getByPlaceholderText for the input
     expect(
       screen.getByPlaceholderText("https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>")
@@ -346,9 +332,10 @@ describe("AddIntegrationModal", () => {
       />
     );
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Link Google Sheet");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("Sync responses with Google Sheets.");
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Google Sheet", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
     // Use getByPlaceholderText for the input
     expect(
       screen.getByPlaceholderText("https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>")

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

@@ -14,18 +14,10 @@ import { replaceHeadlineRecall } from "@/lib/utils/recall";
 import { AdditionalIntegrationSettings } from "@/modules/ui/components/additional-integration-settings";
 import { Button } from "@/modules/ui/components/button";
 import { Checkbox } from "@/modules/ui/components/checkbox";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
 import { DropdownSelector } from "@/modules/ui/components/dropdown-selector";
 import { Input } from "@/modules/ui/components/input";
 import { Label } from "@/modules/ui/components/label";
+import { Modal } from "@/modules/ui/components/modal";
 import { useTranslate } from "@tolgee/react";
 import Image from "next/image";
 import { useEffect, useState } from "react";
@@ -210,28 +202,31 @@ export const AddIntegrationModal = ({
   };
 
   return (
-    <Dialog open={open} onOpenChange={setOpenWithStates}>
-      <DialogContent>
-        <DialogHeader>
-          <div className="flex items-center space-x-2">
-            <div className="relative size-8">
-              <Image
-                fill
-                className="object-contain object-center"
-                src={GoogleSheetLogo}
-                alt={t("environments.integrations.google_sheets.google_sheet_logo")}
-              />
-            </div>
-            <div className="space-y-0.5">
-              <DialogTitle>{t("environments.integrations.google_sheets.link_google_sheet")}</DialogTitle>
-              <DialogDescription>
-                {t("environments.integrations.google_sheets.google_sheets_integration_description")}
-              </DialogDescription>
+    <Modal open={open} setOpen={setOpenWithStates} noPadding closeOnOutsideClick={true}>
+      <div className="flex h-full flex-col rounded-lg">
+        <div className="rounded-t-lg bg-slate-100">
+          <div className="flex w-full items-center justify-between p-6">
+            <div className="flex items-center space-x-2">
+              <div className="mr-1.5 h-6 w-6 text-slate-500">
+                <Image
+                  className="w-12"
+                  src={GoogleSheetLogo}
+                  alt={t("environments.integrations.google_sheets.google_sheet_logo")}
+                />
+              </div>
+              <div>
+                <div className="text-xl font-medium text-slate-700">
+                  {t("environments.integrations.google_sheets.link_google_sheet")}
+                </div>
+                <div className="text-sm text-slate-500">
+                  {t("environments.integrations.google_sheets.google_sheets_integration_description")}
+                </div>
+              </div>
             </div>
           </div>
-        </DialogHeader>
-        <form className="space-y-4" onSubmit={handleSubmit(linkSheet)}>
-          <DialogBody>
+        </div>
+        <form onSubmit={handleSubmit(linkSheet)}>
+          <div className="flex justify-between rounded-lg p-6">
             <div className="w-full space-y-4">
               <div>
                 <div className="mb-4">
@@ -297,37 +292,39 @@ export const AddIntegrationModal = ({
                 </div>
               )}
             </div>
-          </DialogBody>
-          <DialogFooter>
-            {selectedIntegration ? (
-              <Button
-                type="button"
-                variant="destructive"
-                loading={isDeleting}
-                onClick={() => {
-                  deleteLink();
-                }}>
-                {t("common.delete")}
+          </div>
+          <div className="flex justify-end border-t border-slate-200 p-6">
+            <div className="flex space-x-2">
+              {selectedIntegration ? (
+                <Button
+                  type="button"
+                  variant="destructive"
+                  loading={isDeleting}
+                  onClick={() => {
+                    deleteLink();
+                  }}>
+                  {t("common.delete")}
+                </Button>
+              ) : (
+                <Button
+                  type="button"
+                  variant="ghost"
+                  onClick={() => {
+                    setOpen(false);
+                    resetForm();
+                  }}>
+                  {t("common.cancel")}
+                </Button>
+              )}
+              <Button type="submit" loading={isLinkingSheet}>
+                {selectedIntegration
+                  ? t("common.update")
+                  : t("environments.integrations.google_sheets.link_google_sheet")}
               </Button>
-            ) : (
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={() => {
-                  setOpen(false);
-                  resetForm();
-                }}>
-                {t("common.cancel")}
-              </Button>
-            )}
-            <Button type="submit" loading={isLinkingSheet}>
-              {selectedIntegration
-                ? t("common.update")
-                : t("environments.integrations.google_sheets.link_google_sheet")}
-            </Button>
-          </DialogFooter>
+            </div>
+          </div>
         </form>
-      </DialogContent>
-    </Dialog>
+      </div>
+    </Modal>
   );
 };

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

@@ -74,41 +74,13 @@ vi.mock("@/modules/ui/components/dropdown-selector", () => ({
 vi.mock("@/modules/ui/components/label", () => ({
   Label: ({ children }: { children: React.ReactNode }) => <label>{children}</label>,
 }));
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
-    open ? <div data-testid="dialog">{children}</div> : null,
-  DialogContent: ({ children, className }: { children: React.ReactNode; className?: string }) => (
-    <div data-testid="dialog-content" className={className}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children, className }: { children: React.ReactNode; className?: string }) => (
-    <div data-testid="dialog-header" className={className}>
-      {children}
-    </div>
-  ),
-  DialogDescription: ({ children, className }: { children: React.ReactNode; className?: string }) => (
-    <p data-testid="dialog-description" className={className}>
-      {children}
-    </p>
-  ),
-  DialogTitle: ({ children }: { children: React.ReactNode }) => (
-    <h2 data-testid="dialog-title">{children}</h2>
-  ),
-  DialogBody: ({ children, className }: { children: React.ReactNode; className?: string }) => (
-    <div data-testid="dialog-body" className={className}>
-      {children}
-    </div>
-  ),
-  DialogFooter: ({ children, className }: { children: React.ReactNode; className?: string }) => (
-    <div data-testid="dialog-footer" className={className}>
-      {children}
-    </div>
-  ),
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
+    open ? <div data-testid="modal">{children}</div> : null,
 }));
 vi.mock("lucide-react", () => ({
   PlusIcon: () => <span data-testid="plus-icon">+</span>,
-  TrashIcon: () => <span data-testid="trash-icon">🗑️</span>,
+  XIcon: () => <span data-testid="x-icon">x</span>,
 }));
 vi.mock("next/image", () => ({
   // eslint-disable-next-line @next/next/no-img-element
@@ -362,7 +334,7 @@ describe("AddIntegrationModal (Notion)", () => {
       />
     );
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
     expect(screen.getByText("environments.integrations.notion.link_database")).toBeInTheDocument();
     expect(screen.getByTestId("dropdown-select-a-database")).toBeInTheDocument();
     expect(screen.getByTestId("dropdown-select-survey")).toBeInTheDocument();
@@ -387,7 +359,7 @@ describe("AddIntegrationModal (Notion)", () => {
       />
     );
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
     expect(screen.getByTestId("dropdown-select-a-database")).toHaveValue(databases[0].id);
     expect(screen.getByTestId("dropdown-select-survey")).toHaveValue(surveys[0].id);
     expect(screen.getByText("Map Formbricks fields to Notion property")).toBeInTheDocument();
@@ -409,7 +381,7 @@ describe("AddIntegrationModal (Notion)", () => {
       expect(columnDropdowns[1]).toHaveValue("p2");
 
       expect(screen.getAllByTestId("plus-icon").length).toBeGreaterThan(0);
-      expect(screen.getAllByTestId("trash-icon").length).toBeGreaterThan(0);
+      expect(screen.getAllByTestId("x-icon").length).toBeGreaterThan(0);
     });
 
     expect(screen.getByText("Delete")).toBeInTheDocument();
@@ -473,8 +445,8 @@ describe("AddIntegrationModal (Notion)", () => {
 
     expect(screen.getAllByTestId("dropdown-select-a-survey-question")).toHaveLength(2);
 
-    const trashButton = screen.getAllByTestId("trash-icon")[0]; // Get the first trash button
-    await userEvent.click(trashButton);
+    const xButton = screen.getAllByTestId("x-icon")[0]; // Get the first X button
+    await userEvent.click(xButton);
 
     expect(screen.getAllByTestId("dropdown-select-a-survey-question")).toHaveLength(1);
   });

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

@@ -12,19 +12,11 @@ import { structuredClone } from "@/lib/pollyfills/structuredClone";
 import { replaceHeadlineRecall } from "@/lib/utils/recall";
 import { getQuestionTypes } from "@/modules/survey/lib/questions";
 import { Button } from "@/modules/ui/components/button";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
 import { DropdownSelector } from "@/modules/ui/components/dropdown-selector";
 import { Label } from "@/modules/ui/components/label";
+import { Modal } from "@/modules/ui/components/modal";
 import { useTranslate } from "@tolgee/react";
-import { PlusIcon, TrashIcon } from "lucide-react";
+import { PlusIcon, XIcon } from "lucide-react";
 import Image from "next/image";
 import React, { useEffect, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -344,9 +336,9 @@ export const AddIntegrationModal = ({
           col={mapping[idx].column}
           ques={mapping[idx].question}
         />
-        <div className="flex w-full items-center space-x-2">
+        <div className="flex w-full items-center">
           <div className="flex w-full items-center">
-            <div className="max-w-full flex-1">
+            <div className="w-[340px] max-w-full">
               <DropdownSelector
                 placeholder={t("environments.integrations.notion.select_a_survey_question")}
                 items={filteredQuestionItems}
@@ -392,7 +384,7 @@ export const AddIntegrationModal = ({
               />
             </div>
             <div className="h-px w-4 border-t border-t-slate-300" />
-            <div className="max-w-full flex-1">
+            <div className="w-[340px] max-w-full">
               <DropdownSelector
                 placeholder={t("environments.integrations.notion.select_a_field_to_map")}
                 items={getFilteredDbItems()}
@@ -438,45 +430,53 @@ export const AddIntegrationModal = ({
               />
             </div>
           </div>
-          <div className="flex space-x-2">
-            {mapping.length > 1 && (
-              <Button variant="secondary" size="icon" className="size-10" onClick={deleteRow}>
-                <TrashIcon />
-              </Button>
-            )}
-            <Button variant="secondary" size="icon" className="size-10" onClick={addRow}>
-              <PlusIcon />
-            </Button>
-          </div>
+          <button
+            type="button"
+            className={`rounded-md p-1 hover:bg-slate-300 ${
+              idx === mapping.length - 1 ? "visible" : "invisible"
+            }`}
+            onClick={addRow}>
+            <PlusIcon className="h-5 w-5 font-bold text-slate-500" />
+          </button>
+          <button
+            type="button"
+            className={`flex-1 rounded-md p-1 hover:bg-red-100 ${
+              mapping.length > 1 ? "visible" : "invisible"
+            }`}
+            onClick={deleteRow}>
+            <XIcon className="h-5 w-5 text-red-500" />
+          </button>
         </div>
       </div>
     );
   };
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogContent>
-        <DialogHeader>
-          <div className="mb-4 flex items-start space-x-2">
-            <div className="relative size-8">
-              <Image
-                fill
-                className="object-contain object-center"
-                src={NotionLogo}
-                alt={t("environments.integrations.notion.notion_logo")}
-              />
-            </div>
-            <div className="space-y-0.5">
-              <DialogTitle>{t("environments.integrations.notion.link_notion_database")}</DialogTitle>
-              <DialogDescription>
-                {t("environments.integrations.notion.notion_integration_description")}
-              </DialogDescription>
+    <Modal open={open} setOpen={setOpen} noPadding closeOnOutsideClick={false} size="lg">
+      <div className="flex h-full flex-col rounded-lg">
+        <div className="rounded-t-lg bg-slate-100">
+          <div className="flex w-full items-center justify-between p-6">
+            <div className="flex items-center space-x-2">
+              <div className="mr-1.5 h-6 w-6 text-slate-500">
+                <Image
+                  className="w-12"
+                  src={NotionLogo}
+                  alt={t("environments.integrations.notion.notion_logo")}
+                />
+              </div>
+              <div>
+                <div className="text-xl font-medium text-slate-700">
+                  {t("environments.integrations.notion.link_notion_database")}
+                </div>
+                <div className="text-sm text-slate-500">
+                  {t("environments.integrations.notion.sync_responses_with_a_notion_database")}
+                </div>
+              </div>
             </div>
           </div>
-        </DialogHeader>
-
-        <form onSubmit={handleSubmit(linkDatabase)} className="contents space-y-4">
-          <DialogBody>
+        </div>
+        <form onSubmit={handleSubmit(linkDatabase)} className="w-full">
+          <div className="flex justify-between rounded-lg p-6">
             <div className="w-full space-y-4">
               <div>
                 <div className="mb-4">
@@ -521,7 +521,7 @@ export const AddIntegrationModal = ({
                     <Label>
                       {t("environments.integrations.notion.map_formbricks_fields_to_notion_property")}
                     </Label>
-                    <div className="mt-1 space-y-2 overflow-y-auto">
+                    <div className="mt-4 max-h-[20vh] w-full overflow-y-auto">
                       {mapping.map((_, idx) => (
                         <MappingRow idx={idx} key={idx} />
                       ))}
@@ -530,40 +530,43 @@ export const AddIntegrationModal = ({
                 )}
               </div>
             </div>
-          </DialogBody>
-
-          <DialogFooter>
-            {selectedIntegration ? (
+          </div>
+          <div className="flex justify-end border-t border-slate-200 p-6">
+            <div className="flex space-x-2">
+              {selectedIntegration ? (
+                <Button
+                  type="button"
+                  variant="destructive"
+                  loading={isDeleting}
+                  onClick={() => {
+                    deleteLink();
+                  }}>
+                  {t("common.delete")}
+                </Button>
+              ) : (
+                <Button
+                  type="button"
+                  variant="ghost"
+                  onClick={() => {
+                    setOpen(false);
+                    resetForm();
+                    setMapping([]);
+                  }}>
+                  {t("common.cancel")}
+                </Button>
+              )}
               <Button
-                type="button"
-                variant="destructive"
-                loading={isDeleting}
-                onClick={() => {
-                  deleteLink();
-                }}>
-                {t("common.delete")}
+                type="submit"
+                loading={isLinkingDatabase}
+                disabled={mapping.filter((m) => m.error).length > 0}>
+                {selectedIntegration
+                  ? t("common.update")
+                  : t("environments.integrations.notion.link_database")}
               </Button>
-            ) : (
-              <Button
-                type="button"
-                variant="secondary"
-                onClick={() => {
-                  setOpen(false);
-                  resetForm();
-                  setMapping([]);
-                }}>
-                {t("common.cancel")}
-              </Button>
-            )}
-            <Button
-              type="submit"
-              loading={isLinkingDatabase}
-              disabled={mapping.filter((m) => m.error).length > 0}>
-              {selectedIntegration ? t("common.update") : t("environments.integrations.notion.link_database")}
-            </Button>
-          </DialogFooter>
+            </div>
+          </div>
         </form>
-      </DialogContent>
-    </Dialog>
+      </div>
+    </Modal>
   );
 };

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

@@ -83,24 +83,9 @@ vi.mock("@/modules/ui/components/dropdown-selector", () => ({
     </div>
   ),
 }));
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
-    open ? (
-      <div data-testid="dialog" role="dialog">
-        {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
-      </div>
-    ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children }: any) => <h2 data-testid="dialog-title">{children}</h2>,
-  DialogDescription: ({ children }: any) => <p data-testid="dialog-description">{children}</p>,
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
-  DialogFooter: ({ children }: any) => <div data-testid="dialog-footer">{children}</div>,
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
+    open ? <div data-testid="modal">{children}</div> : null,
 }));
 vi.mock("next/image", () => ({
   // eslint-disable-next-line @next/next/no-img-element
@@ -136,8 +121,6 @@ vi.mock("@tolgee/react", async () => {
       if (key === "common.all_questions") return "All questions";
       if (key === "common.selected_questions") return "Selected questions";
       if (key === "environments.integrations.slack.link_slack_channel") return "Link Slack Channel";
-      if (key === "environments.integrations.slack.slack_integration_description")
-        return "Send responses directly to Slack.";
       if (key === "common.update") return "Update";
       if (key === "common.delete") return "Delete";
       if (key === "common.cancel") return "Cancel";
@@ -329,9 +312,10 @@ describe("AddChannelMappingModal", () => {
       />
     );
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Link Slack Channel");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("Send responses directly to Slack.");
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Slack Channel", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
     expect(screen.getByTestId("channel-dropdown")).toBeInTheDocument();
     expect(screen.getByTestId("survey-dropdown")).toBeInTheDocument();
     expect(screen.getByText("Cancel")).toBeInTheDocument();
@@ -355,9 +339,10 @@ describe("AddChannelMappingModal", () => {
       />
     );
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Link Slack Channel");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("Send responses directly to Slack.");
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Slack Channel", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
     expect(screen.getByTestId("channel-dropdown")).toHaveValue(channels[0].id);
     expect(screen.getByTestId("survey-dropdown")).toHaveValue(surveys[0].id);
     expect(screen.getByText("Questions")).toBeInTheDocument();

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

@@ -7,17 +7,9 @@ import { replaceHeadlineRecall } from "@/lib/utils/recall";
 import { AdditionalIntegrationSettings } from "@/modules/ui/components/additional-integration-settings";
 import { Button } from "@/modules/ui/components/button";
 import { Checkbox } from "@/modules/ui/components/checkbox";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
 import { DropdownSelector } from "@/modules/ui/components/dropdown-selector";
 import { Label } from "@/modules/ui/components/label";
+import { Modal } from "@/modules/ui/components/modal";
 import { useTranslate } from "@tolgee/react";
 import { CircleHelpIcon } from "lucide-react";
 import Image from "next/image";
@@ -197,28 +189,24 @@ export const AddChannelMappingModal = ({
   );
 
   return (
-    <Dialog open={open} onOpenChange={setOpenWithStates}>
-      <DialogContent>
-        <DialogHeader>
-          <div className="flex items-center space-x-2">
-            <div className="relative size-8">
-              <Image
-                fill
-                className="object-contain object-center"
-                src={SlackLogo}
-                alt={t("environments.integrations.slack.slack_logo")}
-              />
-            </div>
-            <div className="space-y-0.5">
-              <DialogTitle>{t("environments.integrations.slack.link_slack_channel")}</DialogTitle>
-              <DialogDescription>
-                {t("environments.integrations.slack.slack_integration_description")}
-              </DialogDescription>
+    <Modal open={open} setOpen={setOpenWithStates} noPadding closeOnOutsideClick={true}>
+      <div className="flex h-full flex-col rounded-lg">
+        <div className="rounded-t-lg bg-slate-100">
+          <div className="flex w-full items-center justify-between p-6">
+            <div className="flex items-center space-x-2">
+              <div className="mr-1.5 h-6 w-6 text-slate-500">
+                <Image className="w-12" src={SlackLogo} alt="Slack logo" />
+              </div>
+              <div>
+                <div className="text-xl font-medium text-slate-700">
+                  {t("environments.integrations.slack.link_slack_channel")}
+                </div>
+              </div>
             </div>
           </div>
-        </DialogHeader>
-        <form className="space-y-4" onSubmit={handleSubmit(linkChannel)}>
-          <DialogBody>
+        </div>
+        <form onSubmit={handleSubmit(linkChannel)}>
+          <div className="flex justify-between rounded-lg p-6">
             <div className="w-full space-y-4">
               <div>
                 <div className="mb-4">
@@ -301,29 +289,31 @@ export const AddChannelMappingModal = ({
                 </div>
               )}
             </div>
-          </DialogBody>
-          <DialogFooter>
-            {selectedIntegration ? (
-              <Button type="button" variant="destructive" loading={isDeleting} onClick={deleteLink}>
-                {t("common.delete")}
+          </div>
+          <div className="flex justify-end border-t border-slate-200 p-6">
+            <div className="flex space-x-2">
+              {selectedIntegration ? (
+                <Button type="button" variant="destructive" loading={isDeleting} onClick={deleteLink}>
+                  {t("common.delete")}
+                </Button>
+              ) : (
+                <Button
+                  type="button"
+                  variant="ghost"
+                  onClick={() => {
+                    setOpen(false);
+                    resetForm();
+                  }}>
+                  {t("common.cancel")}
+                </Button>
+              )}
+              <Button type="submit" loading={isLinkingChannel}>
+                {selectedIntegration ? t("common.update") : t("environments.integrations.slack.link_channel")}
               </Button>
-            ) : (
-              <Button
-                type="button"
-                variant="ghost"
-                onClick={() => {
-                  setOpen(false);
-                  resetForm();
-                }}>
-                {t("common.cancel")}
-              </Button>
-            )}
-            <Button type="submit" loading={isLinkingChannel}>
-              {selectedIntegration ? t("common.update") : t("environments.integrations.slack.link_channel")}
-            </Button>
-          </DialogFooter>
+            </div>
+          </div>
         </form>
-      </DialogContent>
-    </Dialog>
+      </div>
+    </Modal>
   );
 };

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

@@ -20,7 +20,7 @@ vi.mock("@/modules/ui/components/switch", () => ({
 }));
 
 vi.mock("../actions", () => ({
-  updateNotificationSettingsAction: vi.fn(() => Promise.resolve({ data: true })),
+  updateNotificationSettingsAction: vi.fn(() => Promise.resolve()),
 }));
 
 const surveyId = "survey1";
@@ -246,204 +246,4 @@ describe("NotificationSwitch", () => {
     });
     expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
   });
-
-  test("shows error toast when updateNotificationSettingsAction fails for 'alert' type", async () => {
-    const mockErrorResponse = { serverError: "Failed to update notification settings" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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.error).toHaveBeenCalledWith("Failed to update notification settings", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("shows error toast when updateNotificationSettingsAction fails for 'weeklySummary' type", async () => {
-    const mockErrorResponse = { serverError: "Database connection failed" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    const initialSettings = { ...baseNotificationSettings, weeklySummary: { [projectId]: true } };
-    renderSwitch({
-      surveyOrProjectOrOrganizationId: projectId,
-      notificationSettings: initialSettings,
-      notificationType: "weeklySummary",
-    });
-    const switchInput = screen.getByLabelText("toggle notification settings for weeklySummary");
-
-    await act(async () => {
-      await user.click(switchInput);
-    });
-
-    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
-      notificationSettings: { ...initialSettings, weeklySummary: { [projectId]: false } },
-    });
-    expect(toast.error).toHaveBeenCalledWith("Database connection failed", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("shows error toast when updateNotificationSettingsAction fails for 'unsubscribedOrganizationIds' type", async () => {
-    const mockErrorResponse = { serverError: "Permission denied" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    const initialSettings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] };
-    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] },
-    });
-    expect(toast.error).toHaveBeenCalledWith("Permission denied", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("shows error toast when updateNotificationSettingsAction returns null", async () => {
-    const mockErrorResponse = { serverError: "An error occurred" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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.error).toHaveBeenCalledWith("An error occurred", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("shows error toast when updateNotificationSettingsAction returns undefined", async () => {
-    const mockErrorResponse = { serverError: "An error occurred" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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.error).toHaveBeenCalledWith("An error occurred", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("shows error toast when updateNotificationSettingsAction returns response without data property", async () => {
-    const mockErrorResponse = { validationErrors: { _errors: ["Invalid input"] } };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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.error).toHaveBeenCalledWith("Invalid input", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("shows error toast when updateNotificationSettingsAction throws an exception", async () => {
-    const mockErrorResponse = { serverError: "Network error" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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.error).toHaveBeenCalledWith("Network error", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
-
-  test("switch remains enabled after error occurs", async () => {
-    const mockErrorResponse = { serverError: "Failed to update" };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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(toast.error).toHaveBeenCalledWith("Failed to update", {
-      id: "notification-switch",
-    });
-    expect(switchInput).toBeEnabled(); // Switch should be re-enabled after error
-  });
-
-  test("shows error toast with validation errors for specific fields", async () => {
-    const mockErrorResponse = {
-      validationErrors: {
-        notificationSettings: {
-          _errors: ["Invalid notification settings"],
-        },
-      },
-    };
-    vi.mocked(updateNotificationSettingsAction).mockResolvedValueOnce(mockErrorResponse);
-
-    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.error).toHaveBeenCalledWith("notificationSettingsInvalid notification settings", {
-      id: "notification-switch",
-    });
-    expect(toast.success).not.toHaveBeenCalled();
-  });
 });

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

@@ -1,9 +1,7 @@
 "use client";
 
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { Switch } from "@/modules/ui/components/switch";
 import { useTranslate } from "@tolgee/react";
-import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import { TUserNotificationSettings } from "@formbricks/types/user";
@@ -26,7 +24,6 @@ export const NotificationSwitch = ({
 }: NotificationSwitchProps) => {
   const [isLoading, setIsLoading] = useState(false);
   const { t } = useTranslate();
-  const router = useRouter();
   const isChecked =
     notificationType === "unsubscribedOrganizationIds"
       ? !notificationSettings.unsubscribedOrganizationIds?.includes(surveyOrProjectOrOrganizationId)
@@ -53,20 +50,7 @@ export const NotificationSwitch = ({
         !updatedNotificationSettings[notificationType][surveyOrProjectOrOrganizationId];
     }
 
-    const updatedNotificationSettingsActionResponse = await updateNotificationSettingsAction({
-      notificationSettings: updatedNotificationSettings,
-    });
-    if (updatedNotificationSettingsActionResponse?.data) {
-      toast.success(t("environments.settings.notifications.notification_settings_updated"), {
-        id: "notification-switch",
-      });
-      router.refresh();
-    } else {
-      const errorMessage = getFormattedErrorMessage(updatedNotificationSettingsActionResponse);
-      toast.error(errorMessage, {
-        id: "notification-switch",
-      });
-    }
+    await updateNotificationSettingsAction({ notificationSettings: updatedNotificationSettings });
     setIsLoading(false);
   };
 
@@ -120,6 +104,9 @@ export const NotificationSwitch = ({
       disabled={isLoading}
       onCheckedChange={async () => {
         await handleSwitchChange();
+        toast.success(t("environments.settings.notifications.notification_settings_updated"), {
+          id: "notification-switch",
+        });
       }}
     />
   );

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

@@ -13,7 +13,7 @@ import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/co
 import { rateLimit } from "@/lib/utils/rate-limit";
 import { updateBrevoCustomer } from "@/modules/auth/lib/brevo";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
-import { sendForgotPasswordEmail, sendVerificationNewEmail } from "@/modules/email";
+import { sendVerificationNewEmail } from "@/modules/email";
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
 import {
@@ -162,21 +162,3 @@ export const removeAvatarAction = authenticatedActionClient.schema(ZRemoveAvatar
     }
   )
 );
-
-export const resetPasswordAction = authenticatedActionClient.action(
-  withAuditLogging(
-    "passwordReset",
-    "user",
-    async ({ ctx }: { ctx: AuthenticatedActionClientCtx; parsedInput: undefined }) => {
-      if (ctx.user.identityProvider !== "email") {
-        throw new OperationNotAllowedError("Password reset is not allowed for this user.");
-      }
-
-      await sendForgotPasswordEmail(ctx.user);
-
-      ctx.auditLoggingCtx.userId = ctx.user.id;
-
-      return { success: true };
-    }
-  )
-);

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

@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
 import toast from "react-hot-toast";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { TUser } from "@formbricks/types/user";
-import { resetPasswordAction, updateUserAction } from "../actions";
+import { updateUserAction } from "../actions";
 import { EditProfileDetailsForm } from "./EditProfileDetailsForm";
 
 const mockUser = {
@@ -24,8 +24,6 @@ const mockUser = {
   objective: "other",
 } as unknown as TUser;
 
-vi.mock("next-auth/react", () => ({ signOut: vi.fn() }));
-
 // Mock window.location.reload
 const originalLocation = window.location;
 beforeEach(() => {
@@ -37,11 +35,6 @@ beforeEach(() => {
 
 vi.mock("@/app/(app)/environments/[environmentId]/settings/(account)/profile/actions", () => ({
   updateUserAction: vi.fn(),
-  resetPasswordAction: vi.fn(),
-}));
-
-vi.mock("@/modules/auth/forgot-password/actions", () => ({
-  forgotPasswordAction: vi.fn(),
 }));
 
 afterEach(() => {
@@ -57,13 +50,7 @@ describe("EditProfileDetailsForm", () => {
   test("renders with initial user data and updates successfully", async () => {
     vi.mocked(updateUserAction).mockResolvedValue({ ...mockUser, name: "New Name" } as any);
 
-    render(
-      <EditProfileDetailsForm
-        user={mockUser}
-        emailVerificationDisabled={true}
-        isPasswordResetEnabled={false}
-      />
-    );
+    render(<EditProfileDetailsForm user={mockUser} emailVerificationDisabled={true} />);
 
     const nameInput = screen.getByPlaceholderText("common.full_name");
     expect(nameInput).toHaveValue(mockUser.name);
@@ -104,13 +91,7 @@ describe("EditProfileDetailsForm", () => {
     const errorMessage = "Update failed";
     vi.mocked(updateUserAction).mockRejectedValue(new Error(errorMessage));
 
-    render(
-      <EditProfileDetailsForm
-        user={mockUser}
-        emailVerificationDisabled={false}
-        isPasswordResetEnabled={false}
-      />
-    );
+    render(<EditProfileDetailsForm user={mockUser} emailVerificationDisabled={false} />);
 
     const nameInput = screen.getByPlaceholderText("common.full_name");
     await userEvent.clear(nameInput);
@@ -128,13 +109,7 @@ describe("EditProfileDetailsForm", () => {
   });
 
   test("update button is disabled initially and enables on change", async () => {
-    render(
-      <EditProfileDetailsForm
-        user={mockUser}
-        emailVerificationDisabled={false}
-        isPasswordResetEnabled={false}
-      />
-    );
+    render(<EditProfileDetailsForm user={mockUser} emailVerificationDisabled={false} />);
     const updateButton = screen.getByText("common.update");
     expect(updateButton).toBeDisabled();
 
@@ -142,68 +117,4 @@ describe("EditProfileDetailsForm", () => {
     await userEvent.type(nameInput, " updated");
     expect(updateButton).toBeEnabled();
   });
-
-  test("reset password button works", async () => {
-    vi.mocked(resetPasswordAction).mockResolvedValue({ data: { success: true } });
-
-    render(
-      <EditProfileDetailsForm
-        user={mockUser}
-        emailVerificationDisabled={false}
-        isPasswordResetEnabled={true}
-      />
-    );
-
-    const resetButton = screen.getByRole("button", { name: "auth.forgot-password.reset_password" });
-    await userEvent.click(resetButton);
-
-    await waitFor(() => {
-      expect(resetPasswordAction).toHaveBeenCalled();
-    });
-
-    await waitFor(() => {
-      expect(toast.success).toHaveBeenCalledWith("auth.forgot-password.email-sent.heading");
-    });
-  });
-
-  test("reset password button handles error correctly", async () => {
-    const errorMessage = "Reset failed";
-    vi.mocked(resetPasswordAction).mockResolvedValue({ serverError: errorMessage });
-
-    render(
-      <EditProfileDetailsForm
-        user={mockUser}
-        emailVerificationDisabled={false}
-        isPasswordResetEnabled={true}
-      />
-    );
-
-    const resetButton = screen.getByRole("button", { name: "auth.forgot-password.reset_password" });
-    await userEvent.click(resetButton);
-
-    await waitFor(() => {
-      expect(resetPasswordAction).toHaveBeenCalled();
-    });
-
-    await waitFor(() => {
-      expect(toast.error).toHaveBeenCalledWith(errorMessage);
-    });
-  });
-
-  test("reset password button shows loading state", async () => {
-    vi.mocked(resetPasswordAction).mockImplementation(() => new Promise(() => {})); // Never resolves
-
-    render(
-      <EditProfileDetailsForm
-        user={mockUser}
-        emailVerificationDisabled={false}
-        isPasswordResetEnabled={true}
-      />
-    );
-
-    const resetButton = screen.getByRole("button", { name: "auth.forgot-password.reset_password" });
-    await userEvent.click(resetButton);
-
-    expect(resetButton).toBeDisabled();
-  });
 });

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

@@ -14,7 +14,6 @@ import {
 } from "@/modules/ui/components/dropdown-menu";
 import { FormControl, FormError, FormField, FormItem, FormLabel } from "@/modules/ui/components/form";
 import { Input } from "@/modules/ui/components/input";
-import { Label } from "@/modules/ui/components/label";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useTranslate } from "@tolgee/react";
 import { ChevronDownIcon } from "lucide-react";
@@ -23,7 +22,7 @@ import { FormProvider, SubmitHandler, useForm } from "react-hook-form";
 import toast from "react-hot-toast";
 import { z } from "zod";
 import { TUser, TUserUpdateInput, ZUser, ZUserEmail } from "@formbricks/types/user";
-import { resetPasswordAction, updateUserAction } from "../actions";
+import { updateUserAction } from "../actions";
 
 // Schema & types
 const ZEditProfileNameFormSchema = ZUser.pick({ name: true, locale: true, email: true }).extend({
@@ -31,17 +30,13 @@ const ZEditProfileNameFormSchema = ZUser.pick({ name: true, locale: true, email:
 });
 type TEditProfileNameForm = z.infer<typeof ZEditProfileNameFormSchema>;
 
-interface IEditProfileDetailsFormProps {
-  user: TUser;
-  isPasswordResetEnabled?: boolean;
-  emailVerificationDisabled: boolean;
-}
-
 export const EditProfileDetailsForm = ({
   user,
-  isPasswordResetEnabled,
   emailVerificationDisabled,
-}: IEditProfileDetailsFormProps) => {
+}: {
+  user: TUser;
+  emailVerificationDisabled: boolean;
+}) => {
   const { t } = useTranslate();
 
   const form = useForm<TEditProfileNameForm>({
@@ -55,8 +50,6 @@ export const EditProfileDetailsForm = ({
   });
 
   const { isSubmitting, isDirty } = form.formState;
-
-  const [isResettingPassword, setIsResettingPassword] = useState(false);
   const [showModal, setShowModal] = useState(false);
   const { signOut: signOutWithAudit } = useSignOut({ id: user.id, email: user.email });
 
@@ -97,7 +90,6 @@ export const EditProfileDetailsForm = ({
           redirectUrl: "/email-change-without-verification-success",
           redirect: true,
           callbackUrl: "/email-change-without-verification-success",
-          clearEnvironmentId: true,
         });
         return;
       }
@@ -129,28 +121,6 @@ export const EditProfileDetailsForm = ({
     }
   };
 
-  const handleResetPassword = async () => {
-    setIsResettingPassword(true);
-
-    const result = await resetPasswordAction();
-    if (result?.data) {
-      toast.success(t("auth.forgot-password.email-sent.heading"));
-
-      await signOutWithAudit({
-        reason: "password_reset",
-        redirectUrl: "/auth/login",
-        redirect: true,
-        callbackUrl: "/auth/login",
-        clearEnvironmentId: true,
-      });
-    } else {
-      const errorMessage = getFormattedErrorMessage(result);
-      toast.error(errorMessage);
-    }
-
-    setIsResettingPassword(false);
-  };
-
   return (
     <>
       <FormProvider {...form}>
@@ -235,26 +205,6 @@ export const EditProfileDetailsForm = ({
             )}
           />
 
-          {isPasswordResetEnabled && (
-            <div className="mt-4 space-y-2">
-              <Label htmlFor="reset-password">{t("auth.forgot-password.reset_password")}</Label>
-              <p className="mt-1 text-sm text-slate-500">
-                {t("auth.forgot-password.reset_password_description")}
-              </p>
-              <div className="flex items-center justify-between gap-2">
-                <Input type="email" id="reset-password" defaultValue={user.email} disabled />
-                <Button
-                  onClick={handleResetPassword}
-                  loading={isResettingPassword}
-                  disabled={isResettingPassword}
-                  size="default"
-                  variant="secondary">
-                  {t("auth.forgot-password.reset_password")}
-                </Button>
-              </div>
-            </div>
-          )}
-
           <Button
             type="submit"
             className="mt-4"

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/password-confirmation-modal.test.tsx

@@ -4,27 +4,18 @@ import userEvent from "@testing-library/user-event";
 import { afterEach, describe, expect, test, vi } from "vitest";
 import { PasswordConfirmationModal } from "./password-confirmation-modal";
 
-// Mock the Dialog component
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
+// Mock the Modal component
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ children, open, setOpen, title }: any) =>
     open ? (
-      <div data-testid="dialog" role="dialog">
+      <div data-testid="modal">
+        <div data-testid="modal-title">{title}</div>
         {children}
-        <button data-testid="dialog-close" onClick={() => onOpenChange(false)}>
+        <button data-testid="modal-close" onClick={() => setOpen(false)}>
           Close
         </button>
       </div>
     ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children }: any) => <h2 data-testid="dialog-title">{children}</h2>,
-  DialogDescription: ({ children }: any) => <p data-testid="dialog-description">{children}</p>,
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
-  DialogFooter: ({ children }: any) => <div data-testid="dialog-footer">{children}</div>,
 }));
 
 // Mock the PasswordInput component
@@ -63,13 +54,13 @@ describe("PasswordConfirmationModal", () => {
 
   test("renders nothing when open is false", () => {
     render(<PasswordConfirmationModal {...defaultProps} open={false} />);
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 
-  test("renders dialog content when open is true", () => {
+  test("renders modal content when open is true", () => {
     render(<PasswordConfirmationModal {...defaultProps} />);
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(screen.getByTestId("modal-title")).toBeInTheDocument();
   });
 
   test("displays old and new email addresses", () => {

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/password-confirmation-modal.tsx

@@ -1,16 +1,8 @@
 "use client";
 
 import { Button } from "@/modules/ui/components/button";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
 import { FormControl, FormError, FormField, FormItem } from "@/modules/ui/components/form";
+import { Modal } from "@/modules/ui/components/modal";
 import { PasswordInput } from "@/modules/ui/components/password-input";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useTranslate } from "@tolgee/react";
@@ -62,69 +54,64 @@ export const PasswordConfirmationModal = ({
   };
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>{t("auth.forgot-password.reset.confirm_password")}</DialogTitle>
-          <DialogDescription>{t("auth.email-change.confirm_password_description")}</DialogDescription>
-        </DialogHeader>
-        <FormProvider {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-            <DialogBody>
-              <div className="space-y-4">
-                <div className="flex flex-col gap-2 text-sm sm:flex-row sm:justify-between sm:gap-4">
-                  <p>
-                    <strong>{t("auth.email-change.old_email")}:</strong>
-                    <br /> {oldEmail.toLowerCase()}
-                  </p>
-                  <p>
-                    <strong>{t("auth.email-change.new_email")}:</strong>
-                    <br /> {newEmail.toLowerCase()}
-                  </p>
-                </div>
+    <Modal open={open} setOpen={setOpen} title={t("auth.forgot-password.reset.confirm_password")}>
+      <FormProvider {...form}>
+        <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+          <p className="text-muted-foreground text-sm">
+            {t("auth.email-change.confirm_password_description")}
+          </p>
 
-                <FormField
-                  control={form.control}
-                  name="password"
-                  render={({ field, fieldState: { error } }) => (
-                    <FormItem className="w-full">
-                      <FormControl>
-                        <div>
-                          <PasswordInput
-                            id="password"
-                            autoComplete="current-password"
-                            placeholder="*******"
-                            aria-placeholder="password"
-                            aria-label="password"
-                            aria-required="true"
-                            required
-                            className="focus:border-brand-dark focus:ring-brand-dark block w-full rounded-md border-slate-300 shadow-sm sm:text-sm"
-                            value={field.value}
-                            onChange={(password) => field.onChange(password)}
-                          />
-                          {error?.message && <FormError className="text-left">{error.message}</FormError>}
-                        </div>
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-              </div>
-            </DialogBody>
-            <DialogFooter>
-              <Button type="button" variant="secondary" onClick={handleCancel}>
-                {t("common.cancel")}
-              </Button>
-              <Button
-                type="submit"
-                variant="default"
-                loading={isSubmitting}
-                disabled={isSubmitting || !isDirty || oldEmail.toLowerCase() === newEmail.toLowerCase()}>
-                {t("common.confirm")}
-              </Button>
-            </DialogFooter>
-          </form>
-        </FormProvider>
-      </DialogContent>
-    </Dialog>
+          <div className="flex flex-col gap-2 text-sm sm:flex-row sm:justify-between sm:gap-4">
+            <p>
+              <strong>{t("auth.email-change.old_email")}:</strong>
+              <br /> {oldEmail.toLowerCase()}
+            </p>
+            <p>
+              <strong>{t("auth.email-change.new_email")}:</strong>
+              <br /> {newEmail.toLowerCase()}
+            </p>
+          </div>
+
+          <FormField
+            control={form.control}
+            name="password"
+            render={({ field, fieldState: { error } }) => (
+              <FormItem className="w-full">
+                <FormControl>
+                  <div>
+                    <PasswordInput
+                      id="password"
+                      autoComplete="current-password"
+                      placeholder="*******"
+                      aria-placeholder="password"
+                      aria-label="password"
+                      aria-required="true"
+                      required
+                      className="focus:border-brand-dark focus:ring-brand-dark block w-full rounded-md border-slate-300 shadow-sm sm:text-sm"
+                      value={field.value}
+                      onChange={(password) => field.onChange(password)}
+                    />
+                    {error?.message && <FormError className="text-left">{error.message}</FormError>}
+                  </div>
+                </FormControl>
+              </FormItem>
+            )}
+          />
+
+          <div className="mt-4 space-x-2 text-right">
+            <Button type="button" variant="secondary" onClick={handleCancel}>
+              {t("common.cancel")}
+            </Button>
+            <Button
+              type="submit"
+              variant="default"
+              loading={isSubmitting}
+              disabled={isSubmitting || !isDirty || oldEmail.toLowerCase() === newEmail.toLowerCase()}>
+              {t("common.confirm")}
+            </Button>
+          </div>
+        </form>
+      </FormProvider>
+    </Modal>
   );
 };

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

@@ -12,8 +12,7 @@ import Page from "./page";
 
 // Mock services and utils
 vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: 1,
-  PASSWORD_RESET_DISABLED: 1,
+  IS_FORMBRICKS_CLOUD: true,
   EMAIL_VERIFICATION_DISABLED: true,
 }));
 vi.mock("@/lib/organization/service", () => ({

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

@@ -1,6 +1,6 @@
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { AccountSecurity } from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity";
-import { EMAIL_VERIFICATION_DISABLED, IS_FORMBRICKS_CLOUD, PASSWORD_RESET_DISABLED } from "@/lib/constants";
+import { EMAIL_VERIFICATION_DISABLED, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { getOrganizationsWhereUserIsSingleOwner } from "@/lib/organization/service";
 import { getUser } from "@/lib/user/service";
 import { getIsMultiOrgEnabled, getIsTwoFactorAuthEnabled } from "@/modules/ee/license-check/lib/utils";
@@ -32,8 +32,6 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
     throw new Error(t("common.user_not_found"));
   }
 
-  const isPasswordResetEnabled = !PASSWORD_RESET_DISABLED && user.identityProvider === "email";
-
   return (
     <PageContentWrapper>
       <PageHeader pageTitle={t("common.account_settings")}>
@@ -44,11 +42,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           <SettingsCard
             title={t("environments.settings.profile.personal_information")}
             description={t("environments.settings.profile.update_personal_info")}>
-            <EditProfileDetailsForm
-              user={user}
-              emailVerificationDisabled={EMAIL_VERIFICATION_DISABLED}
-              isPasswordResetEnabled={isPasswordResetEnabled}
-            />
+            <EditProfileDetailsForm emailVerificationDisabled={EMAIL_VERIFICATION_DISABLED} user={user} />
           </SettingsCard>
           <SettingsCard
             title={t("common.avatar")}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseCardModal.test.tsx

@@ -26,26 +26,8 @@ vi.mock("@/modules/ui/components/button", () => ({
   )),
 }));
 
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: vi.fn(({ children, open, onOpenChange }) =>
-    open ? (
-      <div data-testid="dialog" role="dialog">
-        {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
-      </div>
-    ) : null
-  ),
-  DialogContent: vi.fn(({ children, hideCloseButton, width, className }) => (
-    <div
-      data-testid="dialog-content"
-      data-hide-close-button={hideCloseButton}
-      data-width={width}
-      className={className}>
-      {children}
-    </div>
-  )),
-  DialogBody: vi.fn(({ children }) => <div data-testid="dialog-body">{children}</div>),
-  DialogFooter: vi.fn(({ children }) => <div data-testid="dialog-footer">{children}</div>),
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: vi.fn(({ children, open }) => (open ? <div data-testid="modal">{children}</div> : null)),
 }));
 
 const mockResponses = [
@@ -181,12 +163,12 @@ describe("ResponseCardModal", () => {
   test("should not render if selectedResponseId is null", () => {
     const { container } = render(<ResponseCardModal {...defaultProps} selectedResponseId={null} />);
     expect(container.firstChild).toBeNull();
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 
-  test("should render the dialog when a response is selected", () => {
+  test("should render the modal when a response is selected", () => {
     render(<ResponseCardModal {...defaultProps} />);
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
     expect(screen.getByTestId("single-response-card")).toBeInTheDocument();
   });
 
@@ -222,6 +204,14 @@ describe("ResponseCardModal", () => {
     expect(nextButton).toBeDisabled();
   });
 
+  test("should call setSelectedResponseId with null when close button is clicked", async () => {
+    render(<ResponseCardModal {...defaultProps} />);
+    const buttons = screen.getAllByTestId("mock-button");
+    const closeButton = buttons.find((button) => button.querySelector("svg.lucide-x"));
+    if (closeButton) await userEvent.click(closeButton);
+    expect(mockSetSelectedResponseId).toHaveBeenCalledWith(null);
+  });
+
   test("useEffect should set open to true and currentIndex when selectedResponseId is provided", () => {
     render(<ResponseCardModal {...defaultProps} selectedResponseId={mockResponses[1].id} />);
     expect(mockSetOpen).toHaveBeenCalledWith(true);
@@ -239,10 +229,11 @@ describe("ResponseCardModal", () => {
     expect(mockSetOpen).toHaveBeenCalledWith(false);
   });
 
-  test("should render ChevronLeft and ChevronRight icons", () => {
+  test("should render ChevronLeft, ChevronRight, and XIcon", () => {
     render(<ResponseCardModal {...defaultProps} />);
     expect(document.querySelector(".lucide-chevron-left")).toBeInTheDocument();
     expect(document.querySelector(".lucide-chevron-right")).toBeInTheDocument();
+    expect(document.querySelector(".lucide-x")).toBeInTheDocument();
   });
 });
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseCardModal.tsx

@@ -1,7 +1,7 @@
 import { SingleResponseCard } from "@/modules/analysis/components/SingleResponseCard";
 import { Button } from "@/modules/ui/components/button";
-import { Dialog, DialogBody, DialogContent, DialogFooter } from "@/modules/ui/components/dialog";
-import { ChevronLeft, ChevronRight } from "lucide-react";
+import { Modal } from "@/modules/ui/components/modal";
+import { ChevronLeft, ChevronRight, XIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TResponse } from "@formbricks/types/responses";
@@ -64,20 +64,42 @@ export const ResponseCardModal = ({
     }
   };
 
-  const handleClose = (open: boolean) => {
-    setOpen(open);
-    if (!open) {
-      setSelectedResponseId(null);
-    }
+  const handleClose = () => {
+    setSelectedResponseId(null);
   };
 
   // If no response is selected or currentIndex is null, do not render the modal
   if (selectedResponseId === null || currentIndex === null) return null;
 
   return (
-    <Dialog open={open} onOpenChange={handleClose}>
-      <DialogContent width="wide">
-        <DialogBody>
+    <Modal
+      hideCloseButton
+      open={open}
+      setOpen={setOpen}
+      size="xxl"
+      className="max-h-[80vh] overflow-auto"
+      noPadding>
+      <div className="h-full rounded-lg">
+        <div className="relative h-full w-full overflow-auto p-4">
+          <div className="mb-4 flex items-center justify-end space-x-2">
+            <Button
+              onClick={handleBack}
+              disabled={currentIndex === 0}
+              variant="ghost"
+              className="border bg-white p-2">
+              <ChevronLeft className="h-5 w-5" />
+            </Button>
+            <Button
+              onClick={handleNext}
+              disabled={currentIndex === responses.length - 1}
+              variant="ghost"
+              className="border bg-white p-2">
+              <ChevronRight className="h-5 w-5" />
+            </Button>
+            <Button className="border bg-white p-2" onClick={handleClose} variant="ghost">
+              <XIcon className="h-5 w-5" />
+            </Button>
+          </div>
           <SingleResponseCard
             survey={survey}
             response={responses[currentIndex]}
@@ -91,20 +113,8 @@ export const ResponseCardModal = ({
             setSelectedResponseId={setSelectedResponseId}
             locale={locale}
           />
-        </DialogBody>
-        <DialogFooter>
-          <Button onClick={handleBack} disabled={currentIndex === 0} variant="outline" size="icon">
-            <ChevronLeft />
-          </Button>
-          <Button
-            onClick={handleNext}
-            disabled={currentIndex === responses.length - 1}
-            variant="outline"
-            size="icon">
-            <ChevronRight />
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
+        </div>
+      </div>
+    </Modal>
   );
 };

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/page.tsx

@@ -1,15 +1,13 @@
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { ResponsePage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
-import { IS_FORMBRICKS_CLOUD, RESPONSES_PER_PAGE } from "@/lib/constants";
+import { RESPONSES_PER_PAGE } from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { getUser } from "@/lib/user/service";
 import { findMatchingLocale } from "@/lib/utils/locale";
-import { getSegments } from "@/modules/ee/contacts/segments/lib/segments";
-import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
 import { PageHeader } from "@/modules/ui/components/page-header";
@@ -35,9 +33,6 @@ const Page = async (props) => {
 
   const tags = await getTagsByEnvironmentId(params.environmentId);
 
-  const isContactsEnabled = await getIsContactsEnabled();
-  const segments = isContactsEnabled ? await getSegments(params.environmentId) : [];
-
   // Get response count for the CTA component
   const responseCount = await getResponseCountBySurveyId(params.surveyId);
 
@@ -56,9 +51,6 @@ const Page = async (props) => {
             user={user}
             publicDomain={publicDomain}
             responseCount={responseCount}
-            segments={segments}
-            isContactsEnabled={isContactsEnabled}
-            isFormbricksCloud={IS_FORMBRICKS_CLOUD}
           />
         }>
         <SurveyAnalysisNavigation environmentId={environment.id} survey={survey} activeId="responses" />

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts

@@ -1,23 +1,18 @@
 "use server";
 
 import { getEmailTemplateHtml } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate";
-import { WEBAPP_URL } from "@/lib/constants";
-import { putFile } from "@/lib/storage/service";
 import { getSurvey, updateSurvey } from "@/lib/survey/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
-import { convertToCsv } from "@/lib/utils/file-conversion";
 import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
-import { generatePersonalLinks } from "@/modules/ee/contacts/lib/contacts";
-import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getOrganizationLogoUrl } from "@/modules/ee/whitelabel/email-customization/lib/organization";
 import { sendEmbedSurveyPreviewEmail } from "@/modules/email";
 import { customAlphabet } from "nanoid";
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { OperationNotAllowedError, ResourceNotFoundError, UnknownError } from "@formbricks/types/errors";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 
 const ZSendEmbedSurveyPreviewEmailAction = z.object({
   surveyId: ZId,
@@ -227,89 +222,3 @@ export const getEmailHtmlAction = authenticatedActionClient
 
     return await getEmailTemplateHtml(parsedInput.surveyId, ctx.user.locale);
   });
-
-const ZGeneratePersonalLinksAction = z.object({
-  surveyId: ZId,
-  segmentId: ZId,
-  environmentId: ZId,
-  expirationDays: z.number().optional(),
-});
-
-export const generatePersonalLinksAction = authenticatedActionClient
-  .schema(ZGeneratePersonalLinksAction)
-  .action(async ({ ctx, parsedInput }) => {
-    const isContactsEnabled = await getIsContactsEnabled();
-    if (!isContactsEnabled) {
-      throw new OperationNotAllowedError("Contacts are not enabled for this environment");
-    }
-
-    await checkAuthorizationUpdated({
-      userId: ctx.user.id,
-      organizationId: await getOrganizationIdFromSurveyId(parsedInput.surveyId),
-      access: [
-        {
-          type: "organization",
-          roles: ["owner", "manager"],
-        },
-        {
-          type: "projectTeam",
-          projectId: await getProjectIdFromSurveyId(parsedInput.surveyId),
-          minPermission: "readWrite",
-        },
-      ],
-    });
-
-    // Get contacts and generate personal links
-    const contactsResult = await generatePersonalLinks(
-      parsedInput.surveyId,
-      parsedInput.segmentId,
-      parsedInput.expirationDays
-    );
-
-    if (!contactsResult || contactsResult.length === 0) {
-      throw new UnknownError("No contacts found for the selected segment");
-    }
-
-    // Prepare CSV data with the specified headers and order
-    const csvHeaders = [
-      "Formbricks Contact ID",
-      "User ID",
-      "First Name",
-      "Last Name",
-      "Email",
-      "Personal Link",
-    ];
-
-    const csvData = contactsResult
-      .map((contact) => {
-        if (!contact) {
-          return null;
-        }
-        const attributes = contact.attributes ?? {};
-        return {
-          "Formbricks Contact ID": contact.contactId,
-          "User ID": attributes.userId ?? "",
-          "First Name": attributes.firstName ?? "",
-          "Last Name": attributes.lastName ?? "",
-          Email: attributes.email ?? "",
-          "Personal Link": contact.surveyUrl,
-        };
-      })
-      .filter((contact) => contact !== null);
-
-    // Convert to CSV using the file conversion utility
-    const csvContent = await convertToCsv(csvHeaders, csvData);
-    const fileName = `personal-links-${parsedInput.surveyId}-${Date.now()}.csv`;
-
-    // Store file temporarily and return download URL
-    const fileBuffer = Buffer.from(csvContent);
-    await putFile(fileName, fileBuffer, "private", parsedInput.environmentId);
-
-    const downloadUrl = `${WEBAPP_URL}/storage/${parsedInput.environmentId}/private/${fileName}`;
-
-    return {
-      downloadUrl,
-      fileName,
-      count: csvData.length,
-    };
-  });

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey.test.tsx

@@ -1,4 +1,4 @@
-import { ShareSurveyModal } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/share-survey-modal";
+import { ShareEmbedSurvey } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey";
 import { cleanup, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { LucideIcon } from "lucide-react";
@@ -90,6 +90,14 @@ const mockUser = {
   locale: "en-US",
 } as unknown as TUser;
 
+// Mocks
+const mockRouterRefresh = vi.fn();
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({
+    refresh: mockRouterRefresh,
+  }),
+}));
+
 vi.mock("@tolgee/react", () => ({
   useTranslate: () => ({
     t: (str: string) => str,
@@ -104,14 +112,14 @@ vi.mock("@/modules/ui/components/badge", () => ({
   Badge: vi.fn(({ text }) => <span data-testid="badge-mock">{text}</span>),
 }));
 
-const mockShareViewComponent = vi.fn();
-vi.mock("./shareEmbedModal/share-view", () => ({
-  ShareView: (props: any) => mockShareViewComponent(props),
+const mockEmbedViewComponent = vi.fn();
+vi.mock("./shareEmbedModal/EmbedView", () => ({
+  EmbedView: (props: any) => mockEmbedViewComponent(props),
 }));
 
-// Mock getSurveyUrl to return a predictable URL
-vi.mock("@/modules/analysis/utils", () => ({
-  getSurveyUrl: vi.fn().mockResolvedValue("https://public-domain.com/s/survey1"),
+const mockPanelInfoViewComponent = vi.fn();
+vi.mock("./shareEmbedModal/PanelInfoView", () => ({
+  PanelInfoView: (props: any) => mockPanelInfoViewComponent(props),
 }));
 
 let capturedDialogOnOpenChange: ((open: boolean) => void) | undefined;
@@ -125,6 +133,8 @@ vi.mock("@/modules/ui/components/dialog", async () => {
       capturedDialogOnOpenChange = props.onOpenChange;
       return <actual.Dialog {...props} />;
     },
+    // DialogTitle, DialogContent, DialogDescription will be the actual components
+    // due to ...actual spread and no specific mock for them here.
   };
 });
 
@@ -141,91 +151,119 @@ describe("ShareEmbedSurvey", () => {
     survey: mockSurveyWeb,
     publicDomain: "https://public-domain.com",
     open: true,
-    modalView: "start" as "start" | "share",
+    modalView: "start" as "start" | "embed" | "panel",
     setOpen: mockSetOpen,
     user: mockUser,
-    segments: [],
-    isContactsEnabled: true,
-    isFormbricksCloud: true,
   };
 
   beforeEach(() => {
-    mockShareViewComponent.mockImplementation(
-      ({ tabs, activeId, survey, email, surveyUrl, publicDomain, locale }) => (
+    mockEmbedViewComponent.mockImplementation(
+      ({ handleInitialPageButton, tabs, activeId, survey, email, surveyUrl, publicDomain, locale }) => (
         <div>
-          <div data-testid="shareview-tabs">{JSON.stringify(tabs)}</div>
-          <div data-testid="shareview-activeid">{activeId}</div>
-          <div data-testid="shareview-survey-id">{survey.id}</div>
-          <div data-testid="shareview-email">{email}</div>
-          <div data-testid="shareview-surveyUrl">{surveyUrl}</div>
-          <div data-testid="shareview-publicDomain">{publicDomain}</div>
-          <div data-testid="shareview-locale">{locale}</div>
+          <button onClick={() => handleInitialPageButton()}>EmbedViewMockContent</button>
+          <div data-testid="embedview-tabs">{JSON.stringify(tabs)}</div>
+          <div data-testid="embedview-activeid">{activeId}</div>
+          <div data-testid="embedview-survey-id">{survey.id}</div>
+          <div data-testid="embedview-email">{email}</div>
+          <div data-testid="embedview-surveyUrl">{surveyUrl}</div>
+          <div data-testid="embedview-publicDomain">{publicDomain}</div>
+          <div data-testid="embedview-locale">{locale}</div>
         </div>
       )
     );
+    mockPanelInfoViewComponent.mockImplementation(({ handleInitialPageButton }) => (
+      <button onClick={() => handleInitialPageButton()}>PanelInfoViewMockContent</button>
+    ));
   });
 
-  test("renders initial 'start' view correctly when open and modalView is 'start' for link survey", () => {
-    render(<ShareSurveyModal {...defaultProps} survey={mockSurveyLink} />);
+  test("renders initial 'start' view correctly when open and modalView is 'start'", () => {
+    render(<ShareEmbedSurvey {...defaultProps} />);
     expect(screen.getByText("environments.surveys.summary.your_survey_is_public 🎉")).toBeInTheDocument();
     expect(screen.getByText("ShareSurveyLinkMock")).toBeInTheDocument();
     expect(screen.getByText("environments.surveys.summary.whats_next")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.share_survey")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.embed_survey")).toBeInTheDocument();
     expect(screen.getByText("environments.surveys.summary.configure_alerts")).toBeInTheDocument();
     expect(screen.getByText("environments.surveys.summary.setup_integrations")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.use_personal_links")).toBeInTheDocument();
-    expect(screen.getByTestId("badge-mock")).toHaveTextContent("common.new");
-  });
-
-  test("renders initial 'start' view correctly when open and modalView is 'start' for app survey", () => {
-    render(<ShareSurveyModal {...defaultProps} survey={mockSurveyWeb} />);
-    // For app surveys, ShareSurveyLink should not be rendered
-    expect(screen.queryByText("ShareSurveyLinkMock")).not.toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.whats_next")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.share_survey")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.configure_alerts")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.setup_integrations")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.use_personal_links")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.send_to_panel")).toBeInTheDocument();
     expect(screen.getByTestId("badge-mock")).toHaveTextContent("common.new");
   });
 
   test("switches to 'embed' view when 'Embed survey' button is clicked", async () => {
-    render(<ShareSurveyModal {...defaultProps} />);
-    const embedButton = screen.getByText("environments.surveys.summary.share_survey");
+    render(<ShareEmbedSurvey {...defaultProps} />);
+    const embedButton = screen.getByText("environments.surveys.summary.embed_survey");
     await userEvent.click(embedButton);
-    expect(mockShareViewComponent).toHaveBeenCalled();
-    expect(screen.getByTestId("shareview-tabs")).toBeInTheDocument();
+    expect(mockEmbedViewComponent).toHaveBeenCalled();
+    expect(screen.getByText("EmbedViewMockContent")).toBeInTheDocument();
+  });
+
+  test("switches to 'panel' view when 'Send to panel' button is clicked", async () => {
+    render(<ShareEmbedSurvey {...defaultProps} />);
+    const panelButton = screen.getByText("environments.surveys.summary.send_to_panel");
+    await userEvent.click(panelButton);
+    expect(mockPanelInfoViewComponent).toHaveBeenCalled();
+    expect(screen.getByText("PanelInfoViewMockContent")).toBeInTheDocument();
+  });
+
+  test("returns to 'start' view when handleInitialPageButton is triggered from EmbedView", async () => {
+    render(<ShareEmbedSurvey {...defaultProps} modalView="embed" />);
+    expect(mockEmbedViewComponent).toHaveBeenCalled();
+    expect(screen.getByText("EmbedViewMockContent")).toBeInTheDocument();
+
+    const embedViewButton = screen.getByText("EmbedViewMockContent");
+    await userEvent.click(embedViewButton);
+
+    // Should go back to start view, not close the modal
+    expect(screen.getByText("environments.surveys.summary.your_survey_is_public 🎉")).toBeInTheDocument();
+    expect(screen.queryByText("EmbedViewMockContent")).not.toBeInTheDocument();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("returns to 'start' view when handleInitialPageButton is triggered from PanelInfoView", async () => {
+    render(<ShareEmbedSurvey {...defaultProps} modalView="panel" />);
+    expect(mockPanelInfoViewComponent).toHaveBeenCalled();
+    expect(screen.getByText("PanelInfoViewMockContent")).toBeInTheDocument();
+
+    const panelInfoViewButton = screen.getByText("PanelInfoViewMockContent");
+    await userEvent.click(panelInfoViewButton);
+
+    // Should go back to start view, not close the modal
+    expect(screen.getByText("environments.surveys.summary.your_survey_is_public 🎉")).toBeInTheDocument();
+    expect(screen.queryByText("PanelInfoViewMockContent")).not.toBeInTheDocument();
+    expect(mockSetOpen).not.toHaveBeenCalled();
   });
 
   test("handleOpenChange (when Dialog calls its onOpenChange prop)", () => {
-    render(<ShareSurveyModal {...defaultProps} open={true} survey={mockSurveyWeb} />);
+    render(<ShareEmbedSurvey {...defaultProps} open={true} survey={mockSurveyWeb} />);
     expect(capturedDialogOnOpenChange).toBeDefined();
 
     // Simulate Dialog closing
     if (capturedDialogOnOpenChange) capturedDialogOnOpenChange(false);
     expect(mockSetOpen).toHaveBeenCalledWith(false);
+    expect(mockRouterRefresh).toHaveBeenCalledTimes(1);
 
     // Simulate Dialog opening
+    mockRouterRefresh.mockClear();
     mockSetOpen.mockClear();
     if (capturedDialogOnOpenChange) capturedDialogOnOpenChange(true);
     expect(mockSetOpen).toHaveBeenCalledWith(true);
+    expect(mockRouterRefresh).toHaveBeenCalledTimes(1);
   });
 
   test("correctly configures for 'link' survey type in embed view", () => {
-    render(<ShareSurveyModal {...defaultProps} survey={mockSurveyLink} modalView="share" />);
-    const embedViewProps = vi.mocked(mockShareViewComponent).mock.calls[0][0] as {
+    render(<ShareEmbedSurvey {...defaultProps} survey={mockSurveyLink} modalView="embed" />);
+    const embedViewProps = vi.mocked(mockEmbedViewComponent).mock.calls[0][0] as {
       tabs: { id: string; label: string; icon: LucideIcon }[];
       activeId: string;
     };
-    expect(embedViewProps.tabs.length).toBe(4);
+    expect(embedViewProps.tabs.length).toBe(3);
     expect(embedViewProps.tabs.find((tab) => tab.id === "app")).toBeUndefined();
-    expect(embedViewProps.tabs[0].id).toBe("link");
-    expect(embedViewProps.activeId).toBe("link");
+    expect(embedViewProps.tabs[0].id).toBe("email");
+    expect(embedViewProps.activeId).toBe("email");
   });
 
   test("correctly configures for 'web' survey type in embed view", () => {
-    render(<ShareSurveyModal {...defaultProps} survey={mockSurveyWeb} modalView="share" />);
-    const embedViewProps = vi.mocked(mockShareViewComponent).mock.calls[0][0] as {
+    render(<ShareEmbedSurvey {...defaultProps} survey={mockSurveyWeb} modalView="embed" />);
+    const embedViewProps = vi.mocked(mockEmbedViewComponent).mock.calls[0][0] as {
       tabs: { id: string; label: string; icon: LucideIcon }[];
       activeId: string;
     };
@@ -236,50 +274,53 @@ describe("ShareEmbedSurvey", () => {
 
   test("useEffect does not change activeId if survey.type changes from web to link (while in embed view)", () => {
     const { rerender } = render(
-      <ShareSurveyModal {...defaultProps} survey={mockSurveyWeb} modalView="share" />
+      <ShareEmbedSurvey {...defaultProps} survey={mockSurveyWeb} modalView="embed" />
     );
-    expect(vi.mocked(mockShareViewComponent).mock.calls[0][0].activeId).toBe("app");
+    expect(vi.mocked(mockEmbedViewComponent).mock.calls[0][0].activeId).toBe("app");
 
-    rerender(<ShareSurveyModal {...defaultProps} survey={mockSurveyLink} modalView="share" />);
-    expect(vi.mocked(mockShareViewComponent).mock.calls[1][0].activeId).toBe("app"); // Current behavior
+    rerender(<ShareEmbedSurvey {...defaultProps} survey={mockSurveyLink} modalView="embed" />);
+    expect(vi.mocked(mockEmbedViewComponent).mock.calls[1][0].activeId).toBe("app"); // Current behavior
   });
 
   test("initial showView is set by modalView prop when open is true", () => {
-    render(<ShareSurveyModal {...defaultProps} open={true} modalView="share" />);
-    expect(mockShareViewComponent).toHaveBeenCalled();
-    expect(screen.getByTestId("shareview-tabs")).toBeInTheDocument();
+    render(<ShareEmbedSurvey {...defaultProps} open={true} modalView="embed" />);
+    expect(mockEmbedViewComponent).toHaveBeenCalled();
+    expect(screen.getByText("EmbedViewMockContent")).toBeInTheDocument();
     cleanup();
 
-    render(<ShareSurveyModal {...defaultProps} open={true} modalView="start" />);
-    // Start view shows the share survey button
-    expect(screen.getByText("environments.surveys.summary.share_survey")).toBeInTheDocument();
+    render(<ShareEmbedSurvey {...defaultProps} open={true} modalView="panel" />);
+    expect(mockPanelInfoViewComponent).toHaveBeenCalled();
+    expect(screen.getByText("PanelInfoViewMockContent")).toBeInTheDocument();
   });
 
   test("useEffect sets showView to 'start' when open becomes false", () => {
-    const { rerender } = render(<ShareSurveyModal {...defaultProps} open={true} modalView="share" />);
-    expect(screen.getByTestId("shareview-tabs")).toBeInTheDocument(); // Starts in embed
+    const { rerender } = render(<ShareEmbedSurvey {...defaultProps} open={true} modalView="embed" />);
+    expect(screen.getByText("EmbedViewMockContent")).toBeInTheDocument(); // Starts in embed
 
-    rerender(<ShareSurveyModal {...defaultProps} open={false} modalView="share" />);
+    rerender(<ShareEmbedSurvey {...defaultProps} open={false} modalView="embed" />);
     // Dialog mock returns null when open is false, so EmbedViewMockContent is not found
-    expect(screen.queryByTestId("shareview-tabs")).not.toBeInTheDocument();
+    expect(screen.queryByText("EmbedViewMockContent")).not.toBeInTheDocument();
+    // To verify showView is 'start', we'd need to inspect internal state or render start view elements
+    // For now, we trust the useEffect sets showView, and if it were to re-open in 'start' mode, it would show.
+    // The main check is that the previous view ('embed') is gone.
   });
 
   test("renders correct label for link tab based on singleUse survey property", () => {
-    render(<ShareSurveyModal {...defaultProps} survey={mockSurveyLink} modalView="share" />);
-    let embedViewProps = vi.mocked(mockShareViewComponent).mock.calls[0][0] as {
+    render(<ShareEmbedSurvey {...defaultProps} survey={mockSurveyLink} modalView="embed" />);
+    let embedViewProps = vi.mocked(mockEmbedViewComponent).mock.calls[0][0] as {
       tabs: { id: string; label: string }[];
     };
     let linkTab = embedViewProps.tabs.find((tab) => tab.id === "link");
     expect(linkTab?.label).toBe("environments.surveys.summary.share_the_link");
     cleanup();
-    vi.mocked(mockShareViewComponent).mockClear();
+    vi.mocked(mockEmbedViewComponent).mockClear();
 
     const mockSurveyLinkSingleUse: TSurvey = {
       ...mockSurveyLink,
       singleUse: { enabled: true, isEncrypted: true },
     };
-    render(<ShareSurveyModal {...defaultProps} survey={mockSurveyLinkSingleUse} modalView="share" />);
-    embedViewProps = vi.mocked(mockShareViewComponent).mock.calls[0][0] as {
+    render(<ShareEmbedSurvey {...defaultProps} survey={mockSurveyLinkSingleUse} modalView="embed" />);
+    embedViewProps = vi.mocked(mockEmbedViewComponent).mock.calls[0][0] as {
       tabs: { id: string; label: string }[];
     };
     linkTab = embedViewProps.tabs.find((tab) => tab.id === "link");

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey.tsx

@@ -0,0 +1,187 @@
+"use client";
+
+import { ShareSurveyLink } from "@/modules/analysis/components/ShareSurveyLink";
+import { getSurveyUrl } from "@/modules/analysis/utils";
+import { Badge } from "@/modules/ui/components/badge";
+import { Dialog, DialogContent, DialogDescription, DialogTitle } from "@/modules/ui/components/dialog";
+import { useTranslate } from "@tolgee/react";
+import {
+  BellRing,
+  BlocksIcon,
+  Code2Icon,
+  LinkIcon,
+  MailIcon,
+  SmartphoneIcon,
+  UsersRound,
+} from "lucide-react";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useEffect, useMemo, useState } from "react";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import { TUser } from "@formbricks/types/user";
+import { EmbedView } from "./shareEmbedModal/EmbedView";
+import { PanelInfoView } from "./shareEmbedModal/PanelInfoView";
+
+interface ShareEmbedSurveyProps {
+  survey: TSurvey;
+  publicDomain: string;
+  open: boolean;
+  modalView: "start" | "embed" | "panel";
+  setOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  user: TUser;
+}
+
+export const ShareEmbedSurvey = ({
+  survey,
+  publicDomain,
+  open,
+  modalView,
+  setOpen,
+  user,
+}: ShareEmbedSurveyProps) => {
+  const router = useRouter();
+  const environmentId = survey.environmentId;
+  const isSingleUseLinkSurvey = survey.singleUse?.enabled ?? false;
+  const { email } = user;
+  const { t } = useTranslate();
+  const tabs = useMemo(
+    () =>
+      [
+        { id: "email", label: t("environments.surveys.summary.embed_in_an_email"), icon: MailIcon },
+        { id: "webpage", label: t("environments.surveys.summary.embed_on_website"), icon: Code2Icon },
+        {
+          id: "link",
+          label: `${isSingleUseLinkSurvey ? t("environments.surveys.summary.single_use_links") : t("environments.surveys.summary.share_the_link")}`,
+          icon: LinkIcon,
+        },
+        { id: "app", label: t("environments.surveys.summary.embed_in_app"), icon: SmartphoneIcon },
+      ].filter((tab) => !(survey.type === "link" && tab.id === "app")),
+    [t, isSingleUseLinkSurvey, survey.type]
+  );
+
+  const [activeId, setActiveId] = useState(survey.type === "link" ? tabs[0].id : tabs[3].id);
+  const [showView, setShowView] = useState<"start" | "embed" | "panel">("start");
+  const [surveyUrl, setSurveyUrl] = useState("");
+
+  useEffect(() => {
+    const fetchSurveyUrl = async () => {
+      try {
+        const url = await getSurveyUrl(survey, publicDomain, "default");
+        setSurveyUrl(url);
+      } catch (error) {
+        console.error("Failed to fetch survey URL:", error);
+        // Fallback to a default URL if fetching fails
+        setSurveyUrl(`${publicDomain}/s/${survey.id}`);
+      }
+    };
+    fetchSurveyUrl();
+  }, [survey, publicDomain]);
+
+  useEffect(() => {
+    if (survey.type !== "link") {
+      setActiveId(tabs[3].id);
+    }
+  }, [survey.type, tabs]);
+
+  useEffect(() => {
+    if (open) {
+      setShowView(modalView);
+    } else {
+      setShowView("start");
+    }
+  }, [open, modalView]);
+
+  const handleOpenChange = (open: boolean) => {
+    setActiveId(survey.type === "link" ? tabs[0].id : tabs[3].id);
+    setOpen(open);
+    if (!open) {
+      setShowView("start");
+    }
+    router.refresh();
+  };
+
+  const handleInitialPageButton = () => {
+    setShowView("start");
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTitle className="sr-only" />
+      <DialogContent className="w-full max-w-xl bg-white p-0 md:max-w-3xl lg:h-[700px] lg:max-w-5xl">
+        {showView === "start" ? (
+          <div className="h-full max-w-full overflow-hidden">
+            <div className="flex h-[200px] w-full flex-col items-center justify-center space-y-6 p-8 text-center lg:h-2/5">
+              <DialogTitle>
+                <p className="pt-2 text-xl font-semibold text-slate-800">
+                  {t("environments.surveys.summary.your_survey_is_public")} 🎉
+                </p>
+              </DialogTitle>
+              <DialogDescription className="hidden" />
+              <ShareSurveyLink
+                survey={survey}
+                surveyUrl={surveyUrl}
+                publicDomain={publicDomain}
+                setSurveyUrl={setSurveyUrl}
+                locale={user.locale}
+              />
+            </div>
+            <div className="flex h-[300px] flex-col items-center justify-center gap-8 rounded-b-lg bg-slate-50 px-8 lg:h-3/5">
+              <p className="-mt-8 text-sm text-slate-500">{t("environments.surveys.summary.whats_next")}</p>
+              <div className="grid grid-cols-4 gap-2">
+                <button
+                  type="button"
+                  onClick={() => setShowView("embed")}
+                  className="flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-sm text-slate-500 hover:border-slate-200 md:p-8">
+                  <Code2Icon className="h-6 w-6 text-slate-700" />
+                  {t("environments.surveys.summary.embed_survey")}
+                </button>
+                <Link
+                  href={`/environments/${environmentId}/settings/notifications`}
+                  className="flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-sm text-slate-500 hover:border-slate-200 md:p-8">
+                  <BellRing className="h-6 w-6 text-slate-700" />
+                  {t("environments.surveys.summary.configure_alerts")}
+                </Link>
+                <Link
+                  href={`/environments/${environmentId}/integrations`}
+                  className="flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-sm text-slate-500 hover:border-slate-200 md:p-8">
+                  <BlocksIcon className="h-6 w-6 text-slate-700" />
+                  {t("environments.surveys.summary.setup_integrations")}
+                </Link>
+                <button
+                  type="button"
+                  onClick={() => setShowView("panel")}
+                  className="relative flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-sm text-slate-500 hover:border-slate-200 md:p-8">
+                  <UsersRound className="h-6 w-6 text-slate-700" />
+                  {t("environments.surveys.summary.send_to_panel")}
+                  <Badge
+                    size="tiny"
+                    type="success"
+                    className="absolute right-3 top-3"
+                    text={t("common.new")}
+                  />
+                </button>
+              </div>
+            </div>
+          </div>
+        ) : showView === "embed" ? (
+          <EmbedView
+            handleInitialPageButton={handleInitialPageButton}
+            tabs={survey.type === "link" ? tabs : [tabs[3]]}
+            disableBack={false}
+            activeId={activeId}
+            environmentId={environmentId}
+            setActiveId={setActiveId}
+            survey={survey}
+            email={email}
+            surveyUrl={surveyUrl}
+            publicDomain={publicDomain}
+            setSurveyUrl={setSurveyUrl}
+            locale={user.locale}
+          />
+        ) : showView === "panel" ? (
+          <PanelInfoView handleInitialPageButton={handleInitialPageButton} disableBack={false} />
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  );
+};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareSurveyResults.test.tsx

@@ -20,22 +20,9 @@ vi.mock("@/modules/ui/components/button", () => ({
   }),
 }));
 
-// Mock Dialog
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: vi.fn(({ children, open, onOpenChange }) =>
-    open ? (
-      <div data-testid="dialog" role="dialog">
-        {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
-      </div>
-    ) : null
-  ),
-  DialogContent: vi.fn(({ children, ...props }) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  )),
-  DialogBody: vi.fn(({ children }) => <div data-testid="dialog-body">{children}</div>),
+// Mock Modal
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: vi.fn(({ children, open }) => (open ? <div data-testid="modal">{children}</div> : null)),
 }));
 
 // Mock useTranslate
@@ -133,7 +120,7 @@ describe("ShareSurveyResults", () => {
 
   test("does not render content when modal is closed (open is false)", () => {
     render(<ShareSurveyResults {...defaultProps} open={false} />);
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
     expect(screen.queryByText("environments.surveys.summary.publish_to_web_warning")).not.toBeInTheDocument();
     expect(
       screen.queryByText("environments.surveys.summary.survey_results_are_public")

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareSurveyResults.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Button } from "@/modules/ui/components/button";
-import { Dialog, DialogBody, DialogContent } from "@/modules/ui/components/dialog";
+import { Modal } from "@/modules/ui/components/modal";
 import { useTranslate } from "@tolgee/react";
 import { AlertCircleIcon, CheckCircle2Icon } from "lucide-react";
 import { Clipboard } from "lucide-react";
@@ -26,72 +26,70 @@ export const ShareSurveyResults = ({
 }: ShareEmbedSurveyProps) => {
   const { t } = useTranslate();
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogContent>
-        <DialogBody>
-          {showPublishModal && surveyUrl ? (
-            <div className="flex flex-col items-center gap-y-6 text-center">
-              <CheckCircle2Icon className="text-primary h-20 w-20" />
-              <div>
-                <p className="text-primary text-lg font-medium">
-                  {t("environments.surveys.summary.survey_results_are_public")}
-                </p>
-                <p className="text-balanced mt-2 text-sm text-slate-500">
-                  {t("environments.surveys.summary.survey_results_are_shared_with_anyone_who_has_the_link")}
-                </p>
-              </div>
-              <div className="flex gap-2">
-                <div className="whitespace-nowrap rounded-lg border border-slate-300 bg-white px-3 py-2 text-slate-800">
-                  <span>{surveyUrl}</span>
-                </div>
-                <Button
-                  variant="secondary"
-                  size="sm"
-                  title="Copy survey link to clipboard"
-                  aria-label="Copy survey link to clipboard"
-                  className="hover:cursor-pointer"
-                  onClick={() => {
-                    navigator.clipboard.writeText(surveyUrl);
-                    toast.success(t("common.link_copied"));
-                  }}>
-                  <Clipboard />
-                </Button>
-              </div>
-              <div className="flex gap-2">
-                <Button
-                  type="submit"
-                  variant="secondary"
-                  className="text-center"
-                  onClick={() => handleUnpublish()}>
-                  {t("environments.surveys.summary.unpublish_from_web")}
-                </Button>
-                <Button className="text-center" asChild>
-                  <Link href={surveyUrl} target="_blank" rel="noopener noreferrer">
-                    {t("environments.surveys.summary.view_site")}
-                  </Link>
-                </Button>
-              </div>
+    <Modal open={open} setOpen={setOpen} size="lg">
+      {showPublishModal && surveyUrl ? (
+        <div className="flex flex-col rounded-2xl bg-white px-12 py-6">
+          <div className="flex flex-col items-center gap-y-6 text-center">
+            <CheckCircle2Icon className="h-20 w-20 text-slate-300" />
+            <div>
+              <p className="text-lg font-medium text-slate-600">
+                {t("environments.surveys.summary.survey_results_are_public")}
+              </p>
+              <p className="text-balanced mt-2 text-sm text-slate-500">
+                {t("environments.surveys.summary.survey_results_are_shared_with_anyone_who_has_the_link")}
+              </p>
             </div>
-          ) : (
-            <div className="flex flex-col rounded-2xl bg-white p-8">
-              <div className="flex flex-col items-center gap-y-6 text-center">
-                <AlertCircleIcon className="h-20 w-20 text-slate-300" />
-                <div>
-                  <p className="text-lg font-medium text-slate-600">
-                    {t("environments.surveys.summary.publish_to_web_warning")}
-                  </p>
-                  <p className="text-balanced mt-2 text-sm text-slate-500">
-                    {t("environments.surveys.summary.publish_to_web_warning_description")}
-                  </p>
-                </div>
-                <Button type="submit" className="h-full text-center" onClick={() => handlePublish()}>
-                  {t("environments.surveys.summary.publish_to_web")}
-                </Button>
+            <div className="flex gap-2">
+              <div className="whitespace-nowrap rounded-lg border border-slate-300 bg-white px-3 py-2 text-slate-800">
+                <span>{surveyUrl}</span>
               </div>
+              <Button
+                variant="secondary"
+                size="sm"
+                title="Copy survey link to clipboard"
+                aria-label="Copy survey link to clipboard"
+                className="hover:cursor-pointer"
+                onClick={() => {
+                  navigator.clipboard.writeText(surveyUrl);
+                  toast.success(t("common.link_copied"));
+                }}>
+                <Clipboard />
+              </Button>
             </div>
-          )}
-        </DialogBody>
-      </DialogContent>
-    </Dialog>
+            <div className="flex gap-2">
+              <Button
+                type="submit"
+                variant="secondary"
+                className="text-center"
+                onClick={() => handleUnpublish()}>
+                {t("environments.surveys.summary.unpublish_from_web")}
+              </Button>
+              <Button className="text-center" asChild>
+                <Link href={surveyUrl} target="_blank" rel="noopener noreferrer">
+                  {t("environments.surveys.summary.view_site")}
+                </Link>
+              </Button>
+            </div>
+          </div>
+        </div>
+      ) : (
+        <div className="flex flex-col rounded-2xl bg-white p-8">
+          <div className="flex flex-col items-center gap-y-6 text-center">
+            <AlertCircleIcon className="h-20 w-20 text-slate-300" />
+            <div>
+              <p className="text-lg font-medium text-slate-600">
+                {t("environments.surveys.summary.publish_to_web_warning")}
+              </p>
+              <p className="text-balanced mt-2 text-sm text-slate-500">
+                {t("environments.surveys.summary.publish_to_web_warning_description")}
+              </p>
+            </div>
+            <Button type="submit" className="h-full text-center" onClick={() => handlePublish()}>
+              {t("environments.surveys.summary.publish_to_web")}
+            </Button>
+          </div>
+        </div>
+      )}
+    </Modal>
   );
 };

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryMetadata.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { Button } from "@/modules/ui/components/button";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";
 import { useTranslate } from "@tolgee/react";
 import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
@@ -118,13 +117,13 @@ export const SummaryMetadata = ({
                     )}
                   </span>
                   {!isLoading && (
-                    <Button variant="secondary" className="h-6 w-6">
+                    <span className="ml-1 flex items-center rounded-md bg-slate-800 px-2 py-1 text-xs text-slate-50 group-hover:bg-slate-700">
                       {showDropOffs ? (
                         <ChevronUpIcon className="h-4 w-4" />
                       ) : (
                         <ChevronDownIcon className="h-4 w-4" />
                       )}
-                    </Button>
+                    </span>
                   )}
                 </div>
               </div>

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.test.tsx

@@ -69,13 +69,13 @@ vi.mock("@/modules/survey/hooks/useSingleUseId", () => ({
 
 const mockSearchParams = new URLSearchParams();
 const mockPush = vi.fn();
-const mockReplace = vi.fn();
 
 // Mock next/navigation
 vi.mock("next/navigation", () => ({
-  useRouter: () => ({ push: mockPush, replace: mockReplace }),
+  useRouter: () => ({ push: mockPush }),
   useSearchParams: () => mockSearchParams,
-  usePathname: () => "/current-path",
+  usePathname: () => "/current",
+  useParams: () => ({ environmentId: "env123", surveyId: "survey123" }),
 }));
 
 // Mock copySurveyLink to return a predictable string
@@ -131,281 +131,280 @@ const dummySurvey = {
   id: "survey123",
   type: "link",
   environmentId: "env123",
-  status: "inProgress",
-  resultShareKey: null,
+  status: "active",
 } as unknown as TSurvey;
-
-const dummyAppSurvey = {
-  id: "survey123",
-  type: "app",
-  environmentId: "env123",
-  status: "inProgress",
-} as unknown as TSurvey;
-
 const dummyEnvironment = { id: "env123", appSetupCompleted: true } as TEnvironment;
 const dummyUser = { id: "user123", name: "Test User" } as TUser;
 
-describe("SurveyAnalysisCTA", () => {
+describe("SurveyAnalysisCTA - handleCopyLink", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("calls copySurveyLink and clipboard.writeText on success", async () => {
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
+
+    const copyButton = screen.getByRole("button", { name: "common.copy_link" });
+    fireEvent.click(copyButton);
+
+    await waitFor(() => {
+      expect(refreshSingleUseIdSpy).toHaveBeenCalled();
+      expect(writeTextMock).toHaveBeenCalledWith("https://public-domain.com/s/survey123?suId=newSingleUseId");
+      expect(toast.success).toHaveBeenCalledWith("common.copied_to_clipboard");
+    });
+  });
+
+  test("shows error toast on failure", async () => {
+    refreshSingleUseIdSpy.mockImplementationOnce(() => Promise.reject(new Error("fail")));
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
+
+    const copyButton = screen.getByRole("button", { name: "common.copy_link" });
+    fireEvent.click(copyButton);
+
+    await waitFor(() => {
+      expect(refreshSingleUseIdSpy).toHaveBeenCalled();
+      expect(writeTextMock).not.toHaveBeenCalled();
+      expect(toast.error).toHaveBeenCalledWith("environments.surveys.summary.failed_to_copy_link");
+    });
+  });
+});
+
+// New tests for squarePenIcon and edit functionality
+describe("SurveyAnalysisCTA - Edit functionality", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    mockSearchParams.delete("share"); // reset params
   });
 
   afterEach(() => {
     cleanup();
   });
 
-  describe("Edit functionality", () => {
-    test("opens EditPublicSurveyAlertDialog when edit icon is clicked and response count > 0", async () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
+  test("opens EditPublicSurveyAlertDialog when edit icon is clicked and response count > 0", async () => {
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
 
-      // Find the edit button
-      const editButton = screen.getByRole("button", { name: "common.edit" });
-      await fireEvent.click(editButton);
+    // Find the edit button
+    const editButton = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButton);
 
-      // Check if dialog is shown
-      const dialogTitle = screen.getByText("environments.surveys.edit.caution_edit_published_survey");
-      expect(dialogTitle).toBeInTheDocument();
-    });
-
-    test("navigates directly to edit page when response count = 0", async () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={0}
-        />
-      );
-
-      // Find the edit button
-      const editButton = screen.getByRole("button", { name: "common.edit" });
-      await fireEvent.click(editButton);
-
-      // Should navigate directly to edit page
-      expect(mockPush).toHaveBeenCalledWith(
-        `/environments/${dummyEnvironment.id}/surveys/${dummySurvey.id}/edit`
-      );
-    });
-
-    test("doesn't show edit button when isReadOnly is true", () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={true}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-
-      const editButton = screen.queryByRole("button", { name: "common.edit" });
-      expect(editButton).not.toBeInTheDocument();
-    });
+    // Check if dialog is shown
+    const dialogTitle = screen.getByText("environments.surveys.edit.caution_edit_published_survey");
+    expect(dialogTitle).toBeInTheDocument();
   });
 
-  describe("Duplicate functionality", () => {
-    test("duplicates survey and redirects on primary button click", async () => {
-      mockCopySurveyToOtherEnvironmentAction.mockResolvedValue({
-        data: { id: "newSurvey456" },
-      });
+  test("navigates directly to edit page when response count = 0", async () => {
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={0}
+      />
+    );
 
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
+    // Find the edit button
+    const editButton = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButton);
 
-      const editButton = screen.getByRole("button", { name: "common.edit" });
-      fireEvent.click(editButton);
-
-      const primaryButton = await screen.findByText("environments.surveys.edit.caution_edit_duplicate");
-      fireEvent.click(primaryButton);
-
-      await waitFor(() => {
-        expect(mockCopySurveyToOtherEnvironmentAction).toHaveBeenCalledWith({
-          environmentId: "env123",
-          surveyId: "survey123",
-          targetEnvironmentId: "env123",
-        });
-        expect(mockPush).toHaveBeenCalledWith("/environments/env123/surveys/newSurvey456/edit");
-        expect(toast.success).toHaveBeenCalledWith("environments.surveys.survey_duplicated_successfully");
-      });
-    });
-
-    test("shows error toast on duplication failure", async () => {
-      const error = { error: "Duplication failed" };
-      mockCopySurveyToOtherEnvironmentAction.mockResolvedValue(error);
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-
-      const editButton = screen.getByRole("button", { name: "common.edit" });
-      fireEvent.click(editButton);
-
-      const primaryButton = await screen.findByText("environments.surveys.edit.caution_edit_duplicate");
-      fireEvent.click(primaryButton);
-
-      await waitFor(() => {
-        expect(toast.error).toHaveBeenCalledWith("Duplication failed");
-      });
-    });
+    // Should navigate directly to edit page
+    expect(mockPush).toHaveBeenCalledWith(
+      `/environments/${dummyEnvironment.id}/surveys/${dummySurvey.id}/edit`
+    );
   });
 
-  describe("Share button and modal", () => {
-    test("opens share modal when 'Share survey' button is clicked", async () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
+  test("doesn't show edit button when isReadOnly is true", () => {
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={true}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
 
-      const shareButton = screen.getByText("environments.surveys.summary.share_survey");
-      fireEvent.click(shareButton);
+    // Try to find the edit button (it shouldn't exist)
+    const editButton = screen.queryByRole("button", { name: "common.edit" });
+    expect(editButton).not.toBeInTheDocument();
+  });
+});
 
-      // The share button opens the embed modal, not a URL
-      // We can verify this by checking that the ShareEmbedSurvey component is rendered
-      // with the embed modal open
-      expect(screen.getByText("environments.surveys.summary.share_survey")).toBeInTheDocument();
-    });
-
-    test("renders ShareEmbedSurvey component when share modal is open", async () => {
-      mockSearchParams.set("share", "true");
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-
-      // Assuming ShareEmbedSurvey renders a dialog with a specific title when open
-      const dialog = await screen.findByRole("dialog");
-      expect(dialog).toBeInTheDocument();
-    });
+// Updated test description to mention EditPublicSurveyAlertDialog
+describe("SurveyAnalysisCTA - duplicateSurveyAndRoute and EditPublicSurveyAlertDialog", () => {
+  afterEach(() => {
+    cleanup();
   });
 
-  describe("General UI and visibility", () => {
-    test("shows public results badge when resultShareKey is present", () => {
-      const surveyWithShareKey = { ...dummySurvey, resultShareKey: "someKey" } as TSurvey;
-      render(
-        <SurveyAnalysisCTA
-          survey={surveyWithShareKey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-
-      expect(screen.getByText("environments.surveys.summary.results_are_public")).toBeInTheDocument();
+  test("duplicates survey successfully and navigates to edit page", async () => {
+    // Mock the API response
+    mockCopySurveyToOtherEnvironmentAction.mockResolvedValueOnce({
+      data: { id: "duplicated-survey-456" },
     });
 
-    test("shows SurveyStatusDropdown for non-draft surveys", () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
 
-      expect(screen.getByRole("combobox")).toBeInTheDocument();
+    // Find and click the edit button to show dialog
+    const editButton = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButton);
+
+    // Find and click the duplicate button in dialog
+    const duplicateButton = screen.getByRole("button", {
+      name: "environments.surveys.edit.caution_edit_duplicate",
+    });
+    await fireEvent.click(duplicateButton);
+
+    // Verify the API was called with correct parameters
+    expect(mockCopySurveyToOtherEnvironmentAction).toHaveBeenCalledWith({
+      environmentId: dummyEnvironment.id,
+      surveyId: dummySurvey.id,
+      targetEnvironmentId: dummyEnvironment.id,
     });
 
-    test("does not show SurveyStatusDropdown for draft surveys", () => {
-      const draftSurvey = { ...dummySurvey, status: "draft" } as TSurvey;
-      render(
-        <SurveyAnalysisCTA
-          survey={draftSurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-      expect(screen.queryByRole("combobox")).not.toBeInTheDocument();
+    // Verify success toast was shown
+    expect(toast.success).toHaveBeenCalledWith("environments.surveys.survey_duplicated_successfully");
+
+    // Verify navigation to edit page
+    expect(mockPush).toHaveBeenCalledWith(
+      `/environments/${dummyEnvironment.id}/surveys/duplicated-survey-456/edit`
+    );
+  });
+
+  test("shows error toast when duplication fails with error object", async () => {
+    // Mock API failure with error object
+    mockCopySurveyToOtherEnvironmentAction.mockResolvedValueOnce({
+      error: "Test error message",
     });
 
-    test("hides status dropdown and edit actions when isReadOnly is true", () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={true}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
 
-      expect(screen.queryByRole("combobox")).not.toBeInTheDocument();
-      expect(screen.queryByRole("button", { name: "common.edit" })).not.toBeInTheDocument();
+    // Open dialog
+    const editButton = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButton);
+
+    // Click duplicate
+    const duplicateButton = screen.getByRole("button", {
+      name: "environments.surveys.edit.caution_edit_duplicate",
+    });
+    await fireEvent.click(duplicateButton);
+
+    // Verify error toast
+    expect(toast.error).toHaveBeenCalledWith("Test error message");
+  });
+
+  test("navigates to edit page when cancel button is clicked in dialog", async () => {
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
+
+    // Open dialog
+    const editButton = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButton);
+
+    // Click edit (cancel) button
+    const editButtonInDialog = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButtonInDialog);
+
+    // Verify navigation
+    expect(mockPush).toHaveBeenCalledWith(
+      `/environments/${dummyEnvironment.id}/surveys/${dummySurvey.id}/edit`
+    );
+  });
+
+  test("shows loading state when duplicating survey", async () => {
+    // Create a promise that we can resolve manually
+    let resolvePromise: (value: any) => void;
+    const promise = new Promise((resolve) => {
+      resolvePromise = resolve;
     });
 
-    test("shows preview button for link surveys", () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummySurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-      expect(screen.getByRole("button", { name: "common.preview" })).toBeInTheDocument();
+    mockCopySurveyToOtherEnvironmentAction.mockImplementation(() => promise);
+
+    render(
+      <SurveyAnalysisCTA
+        survey={dummySurvey}
+        environment={dummyEnvironment}
+        isReadOnly={false}
+        publicDomain={mockPublicDomain}
+        user={dummyUser}
+        responseCount={5}
+      />
+    );
+
+    // Open dialog
+    const editButton = screen.getByRole("button", { name: "common.edit" });
+    await fireEvent.click(editButton);
+
+    // Click duplicate
+    const duplicateButton = screen.getByRole("button", {
+      name: "environments.surveys.edit.caution_edit_duplicate",
+    });
+    await fireEvent.click(duplicateButton);
+
+    // Button should now be in loading state
+    // expect(duplicateButton).toHaveAttribute("data-state", "loading");
+
+    // Resolve the promise
+    resolvePromise!({
+      data: { id: "duplicated-survey-456" },
     });
 
-    test("hides preview button for app surveys", () => {
-      render(
-        <SurveyAnalysisCTA
-          survey={dummyAppSurvey}
-          environment={dummyEnvironment}
-          isReadOnly={false}
-          publicDomain={mockPublicDomain}
-          user={dummyUser}
-          responseCount={5}
-        />
-      );
-      expect(screen.queryByRole("button", { name: "common.preview" })).not.toBeInTheDocument();
+    // Wait for the promise to resolve
+    await waitFor(() => {
+      expect(mockPush).toHaveBeenCalled();
     });
   });
 });

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.tsx

@@ -1,21 +1,21 @@
 "use client";
 
+import { ShareEmbedSurvey } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ShareEmbedSurvey";
 import { SuccessMessage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SuccessMessage";
-import { ShareSurveyModal } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/share-survey-modal";
 import { SurveyStatusDropdown } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { EditPublicSurveyAlertDialog } from "@/modules/survey/components/edit-public-survey-alert-dialog";
+import { useSingleUseId } from "@/modules/survey/hooks/useSingleUseId";
+import { copySurveyLink } from "@/modules/survey/lib/client-utils";
 import { copySurveyToOtherEnvironmentAction } from "@/modules/survey/list/actions";
 import { Badge } from "@/modules/ui/components/badge";
-import { Button } from "@/modules/ui/components/button";
 import { IconBar } from "@/modules/ui/components/iconbar";
 import { useTranslate } from "@tolgee/react";
-import { BellRing, Eye, SquarePenIcon } from "lucide-react";
+import { BellRing, Code2Icon, Eye, LinkIcon, SquarePenIcon, UsersRound } from "lucide-react";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
 import toast from "react-hot-toast";
 import { TEnvironment } from "@formbricks/types/environment";
-import { TSegment } from "@formbricks/types/segment";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { TUser } from "@formbricks/types/user";
 
@@ -26,14 +26,13 @@ interface SurveyAnalysisCTAProps {
   user: TUser;
   publicDomain: string;
   responseCount: number;
-  segments: TSegment[];
-  isContactsEnabled: boolean;
-  isFormbricksCloud: boolean;
 }
 
 interface ModalState {
-  start: boolean;
   share: boolean;
+  embed: boolean;
+  panel: boolean;
+  dropdown: boolean;
 }
 
 export const SurveyAnalysisCTA = ({
@@ -43,9 +42,6 @@ export const SurveyAnalysisCTA = ({
   user,
   publicDomain,
   responseCount,
-  segments,
-  isContactsEnabled,
-  isFormbricksCloud,
 }: SurveyAnalysisCTAProps) => {
   const { t } = useTranslate();
   const searchParams = useSearchParams();
@@ -54,18 +50,21 @@ export const SurveyAnalysisCTA = ({
   const [loading, setLoading] = useState(false);
 
   const [modalState, setModalState] = useState<ModalState>({
-    start: searchParams.get("share") === "true",
-    share: false,
+    share: searchParams.get("share") === "true",
+    embed: false,
+    panel: false,
+    dropdown: false,
   });
 
   const surveyUrl = useMemo(() => `${publicDomain}/s/${survey.id}`, [survey.id, publicDomain]);
+  const { refreshSingleUseId } = useSingleUseId(survey);
 
   const widgetSetupCompleted = survey.type === "app" && environment.appSetupCompleted;
 
   useEffect(() => {
     setModalState((prev) => ({
       ...prev,
-      start: searchParams.get("share") === "true",
+      share: searchParams.get("share") === "true",
     }));
   }, [searchParams]);
 
@@ -77,7 +76,23 @@ export const SurveyAnalysisCTA = ({
       params.delete("share");
     }
     router.push(`${pathname}?${params.toString()}`);
-    setModalState((prev) => ({ ...prev, start: open }));
+    setModalState((prev) => ({ ...prev, share: open }));
+  };
+
+  const handleCopyLink = () => {
+    refreshSingleUseId()
+      .then((newId) => {
+        const linkToCopy = copySurveyLink(surveyUrl, newId);
+        return navigator.clipboard.writeText(linkToCopy);
+      })
+      .then(() => {
+        toast.success(t("common.copied_to_clipboard"));
+      })
+      .catch((err) => {
+        toast.error(t("environments.surveys.summary.failed_to_copy_link"));
+        console.error(err);
+      });
+    setModalState((prev) => ({ ...prev, dropdown: false }));
   };
 
   const duplicateSurveyAndRoute = async (surveyId: string) => {
@@ -103,9 +118,40 @@ export const SurveyAnalysisCTA = ({
     return `${surveyUrl}${separator}preview=true`;
   };
 
+  const handleModalState = (modalView: keyof Omit<ModalState, "dropdown">) => {
+    return (open: boolean | ((prevState: boolean) => boolean)) => {
+      const newValue = typeof open === "function" ? open(modalState[modalView]) : open;
+      setModalState((prev) => ({ ...prev, [modalView]: newValue }));
+    };
+  };
+
+  const shareEmbedViews = [
+    { key: "share", modalView: "start" as const, setOpen: handleShareModalToggle },
+    { key: "embed", modalView: "embed" as const, setOpen: handleModalState("embed") },
+    { key: "panel", modalView: "panel" as const, setOpen: handleModalState("panel") },
+  ];
+
   const [isCautionDialogOpen, setIsCautionDialogOpen] = useState(false);
 
   const iconActions = [
+    {
+      icon: Eye,
+      tooltip: t("common.preview"),
+      onClick: () => window.open(getPreviewUrl(), "_blank"),
+      isVisible: survey.type === "link",
+    },
+    {
+      icon: LinkIcon,
+      tooltip: t("common.copy_link"),
+      onClick: handleCopyLink,
+      isVisible: survey.type === "link",
+    },
+    {
+      icon: Code2Icon,
+      tooltip: t("common.embed"),
+      onClick: () => handleModalState("embed")(true),
+      isVisible: !isReadOnly,
+    },
     {
       icon: BellRing,
       tooltip: t("environments.surveys.summary.configure_alerts"),
@@ -113,10 +159,13 @@ export const SurveyAnalysisCTA = ({
       isVisible: !isReadOnly,
     },
     {
-      icon: Eye,
-      tooltip: t("common.preview"),
-      onClick: () => window.open(getPreviewUrl(), "_blank"),
-      isVisible: survey.type === "link",
+      icon: UsersRound,
+      tooltip: t("environments.surveys.summary.send_to_panel"),
+      onClick: () => {
+        handleModalState("panel")(true);
+        setModalState((prev) => ({ ...prev, dropdown: false }));
+      },
+      isVisible: !isReadOnly,
     },
     {
       icon: SquarePenIcon,
@@ -146,33 +195,23 @@ export const SurveyAnalysisCTA = ({
       )}
 
       <IconBar actions={iconActions} />
-      <Button
-        className="h-10"
-        onClick={() => {
-          setModalState((prev) => ({ ...prev, share: true }));
-        }}>
-        {t("environments.surveys.summary.share_survey")}
-      </Button>
 
       {user && (
-        <ShareSurveyModal
-          survey={survey}
-          publicDomain={publicDomain}
-          open={modalState.start || modalState.share}
-          setOpen={(open) => {
-            if (!open) {
-              handleShareModalToggle(false);
-              setModalState((prev) => ({ ...prev, share: false }));
-            }
-          }}
-          user={user}
-          modalView={modalState.start ? "start" : "share"}
-          segments={segments}
-          isContactsEnabled={isContactsEnabled}
-          isFormbricksCloud={isFormbricksCloud}
-        />
+        <>
+          {shareEmbedViews.map(({ key, modalView, setOpen }) => (
+            <ShareEmbedSurvey
+              key={key}
+              survey={survey}
+              publicDomain={publicDomain}
+              open={modalState[key as keyof ModalState]}
+              setOpen={setOpen}
+              user={user}
+              modalView={modalView}
+            />
+          ))}
+          <SuccessMessage environment={environment} survey={survey} />
+        </>
       )}
-      <SuccessMessage environment={environment} survey={survey} />
 
       {responseCount > 0 && (
         <EditPublicSurveyAlertDialog

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/share-survey-modal.tsx

@@ -1,161 +0,0 @@
-"use client";
-
-import { getSurveyUrl } from "@/modules/analysis/utils";
-import { Dialog, DialogContent } from "@/modules/ui/components/dialog";
-import { useTranslate } from "@tolgee/react";
-import { Code2Icon, LinkIcon, MailIcon, SmartphoneIcon, UserIcon } from "lucide-react";
-import { useEffect, useMemo, useState } from "react";
-import { logger } from "@formbricks/logger";
-import { TSegment } from "@formbricks/types/segment";
-import { TSurvey } from "@formbricks/types/surveys/types";
-import { TUser } from "@formbricks/types/user";
-import { ShareView } from "./shareEmbedModal/share-view";
-import { SuccessView } from "./shareEmbedModal/success-view";
-
-type ModalView = "start" | "share";
-
-enum ShareViewType {
-  LINK = "link",
-  PERSONAL_LINKS = "personal-links",
-  EMAIL = "email",
-  WEBPAGE = "webpage",
-  APP = "app",
-}
-
-interface ShareSurveyModalProps {
-  survey: TSurvey;
-  publicDomain: string;
-  open: boolean;
-  modalView: ModalView;
-  setOpen: React.Dispatch<React.SetStateAction<boolean>>;
-  user: TUser;
-  segments: TSegment[];
-  isContactsEnabled: boolean;
-  isFormbricksCloud: boolean;
-}
-
-export const ShareSurveyModal = ({
-  survey,
-  publicDomain,
-  open,
-  modalView,
-  setOpen,
-  user,
-  segments,
-  isContactsEnabled,
-  isFormbricksCloud,
-}: ShareSurveyModalProps) => {
-  const environmentId = survey.environmentId;
-  const isSingleUseLinkSurvey = survey.singleUse?.enabled ?? false;
-  const { email } = user;
-  const { t } = useTranslate();
-  const linkTabs: { id: ShareViewType; label: string; icon: React.ElementType }[] = useMemo(
-    () => [
-      {
-        id: ShareViewType.LINK,
-        label: `${isSingleUseLinkSurvey ? t("environments.surveys.summary.single_use_links") : t("environments.surveys.summary.share_the_link")}`,
-        icon: LinkIcon,
-      },
-      {
-        id: ShareViewType.PERSONAL_LINKS,
-        label: t("environments.surveys.summary.personal_links"),
-        icon: UserIcon,
-      },
-      {
-        id: ShareViewType.EMAIL,
-        label: t("environments.surveys.summary.email_embed"),
-        icon: MailIcon,
-      },
-      {
-        id: ShareViewType.WEBPAGE,
-        label: t("environments.surveys.summary.embed_on_website"),
-        icon: Code2Icon,
-      },
-    ],
-    [t, isSingleUseLinkSurvey]
-  );
-
-  const appTabs = [
-    {
-      id: ShareViewType.APP,
-      label: t("environments.surveys.summary.embed_in_app"),
-      icon: SmartphoneIcon,
-    },
-  ];
-
-  const [activeId, setActiveId] = useState(survey.type === "link" ? ShareViewType.LINK : ShareViewType.APP);
-  const [showView, setShowView] = useState<ModalView>(modalView);
-  const [surveyUrl, setSurveyUrl] = useState("");
-
-  useEffect(() => {
-    const fetchSurveyUrl = async () => {
-      try {
-        const url = await getSurveyUrl(survey, publicDomain, "default");
-        setSurveyUrl(url);
-      } catch (error) {
-        logger.error("Failed to fetch survey URL:", error);
-        // Fallback to a default URL if fetching fails
-        setSurveyUrl(`${publicDomain}/s/${survey.id}`);
-      }
-    };
-    fetchSurveyUrl();
-  }, [survey, publicDomain]);
-
-  useEffect(() => {
-    if (open) {
-      setShowView(modalView);
-    }
-  }, [open, modalView]);
-
-  const handleOpenChange = (open: boolean) => {
-    setActiveId(survey.type === "link" ? ShareViewType.LINK : ShareViewType.APP);
-    setOpen(open);
-    if (!open) {
-      setShowView("start");
-    }
-  };
-
-  const handleViewChange = (view: ModalView) => {
-    setShowView(view);
-  };
-
-  const handleEmbedViewWithTab = (tabId: ShareViewType) => {
-    setShowView("share");
-    setActiveId(tabId);
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={handleOpenChange}>
-      <DialogContent className="w-full bg-white p-0 lg:h-[700px]" width="wide">
-        {showView === "start" ? (
-          <SuccessView
-            survey={survey}
-            surveyUrl={surveyUrl}
-            publicDomain={publicDomain}
-            setSurveyUrl={setSurveyUrl}
-            user={user}
-            tabs={linkTabs}
-            handleViewChange={handleViewChange}
-            handleEmbedViewWithTab={handleEmbedViewWithTab}
-          />
-        ) : (
-          <ShareView
-            tabs={survey.type === "link" ? linkTabs : appTabs}
-            activeId={activeId}
-            environmentId={environmentId}
-            setActiveId={setActiveId}
-            survey={survey}
-            email={email}
-            surveyUrl={surveyUrl}
-            publicDomain={publicDomain}
-            setSurveyUrl={setSurveyUrl}
-            locale={user.locale}
-            segments={segments}
-            isContactsEnabled={isContactsEnabled}
-            isFormbricksCloud={isFormbricksCloud}
-          />
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/EmailTab.tsx

@@ -4,9 +4,8 @@ import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { Button } from "@/modules/ui/components/button";
 import { CodeBlock } from "@/modules/ui/components/code-block";
 import { LoadingSpinner } from "@/modules/ui/components/loading-spinner";
-import { OptionsSwitch } from "@/modules/ui/components/options-switch";
 import { useTranslate } from "@tolgee/react";
-import { CopyIcon, MailIcon } from "lucide-react";
+import { Code2Icon, CopyIcon, MailIcon } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import toast from "react-hot-toast";
 import { AuthenticationError } from "@formbricks/types/errors";
@@ -17,16 +16,26 @@ interface EmailTabProps {
   email: string;
 }
 
-const PreviewTab = ({
-  emailHtmlPreview,
-  email,
-  surveyId,
-}: {
-  emailHtmlPreview: string;
-  email: string;
-  surveyId: string;
-}) => {
+export const EmailTab = ({ surveyId, email }: EmailTabProps) => {
+  const [showEmbed, setShowEmbed] = useState(false);
+  const [emailHtmlPreview, setEmailHtmlPreview] = useState<string>("");
   const { t } = useTranslate();
+  const emailHtml = useMemo(() => {
+    if (!emailHtmlPreview) return "";
+    return emailHtmlPreview
+      .replaceAll("?preview=true&amp;", "?")
+      .replaceAll("?preview=true&;", "?")
+      .replaceAll("?preview=true", "");
+  }, [emailHtmlPreview]);
+
+  useEffect(() => {
+    const getData = async () => {
+      const emailHtml = await getEmailHtmlAction({ surveyId });
+      setEmailHtmlPreview(emailHtml?.data || "");
+    };
+
+    getData();
+  }, [surveyId]);
 
   const sendPreviewEmail = async () => {
     try {
@@ -47,105 +56,77 @@ const PreviewTab = ({
   };
 
   return (
-    <div className="space-y-4">
-      <div className="grow overflow-y-auto rounded-xl border border-slate-200 bg-white p-4">
-        <div className="mb-6 flex gap-2">
-          <div className="h-3 w-3 rounded-full bg-red-500"></div>
-          <div className="h-3 w-3 rounded-full bg-amber-500"></div>
-          <div className="h-3 w-3 rounded-full bg-emerald-500"></div>
-        </div>
-        <div>
-          <div className="mb-2 border-b border-slate-200 pb-2 text-sm">To : {email || "user@mail.com"}</div>
-          <div className="border-b border-slate-200 pb-2 text-sm">
-            Subject : {t("environments.surveys.summary.formbricks_email_survey_preview")}
-          </div>
-          <div className="p-4">
-            {emailHtmlPreview ? (
-              <div dangerouslySetInnerHTML={{ __html: emailHtmlPreview }}></div>
-            ) : (
-              <LoadingSpinner />
-            )}
-          </div>
-        </div>
+    <div className="flex flex-col gap-5">
+      <div className="flex items-center justify-end gap-4">
+        {showEmbed ? (
+          <Button
+            variant="secondary"
+            title="Embed survey in your website"
+            aria-label="Embed survey in your website"
+            onClick={() => {
+              toast.success(t("environments.surveys.summary.embed_code_copied_to_clipboard"));
+              navigator.clipboard.writeText(emailHtml);
+            }}
+            className="shrink-0">
+            {t("common.copy_code")}
+            <CopyIcon />
+          </Button>
+        ) : (
+          <>
+            <Button
+              variant="secondary"
+              title="send preview email"
+              aria-label="send preview email"
+              onClick={() => sendPreviewEmail()}
+              className="shrink-0">
+              {t("environments.surveys.summary.send_preview")}
+              <MailIcon />
+            </Button>
+          </>
+        )}
+        <Button
+          title={t("environments.surveys.summary.view_embed_code_for_email")}
+          aria-label={t("environments.surveys.summary.view_embed_code_for_email")}
+          onClick={() => {
+            setShowEmbed(!showEmbed);
+          }}
+          className="shrink-0">
+          {showEmbed
+            ? t("environments.surveys.summary.hide_embed_code")
+            : t("environments.surveys.summary.view_embed_code")}
+          <Code2Icon />
+        </Button>
       </div>
-      <Button
-        variant="default"
-        title="send preview email"
-        aria-label="send preview email"
-        onClick={() => sendPreviewEmail()}
-        className="shrink-0">
-        {t("environments.surveys.summary.send_preview")}
-        <MailIcon />
-      </Button>
-    </div>
-  );
-};
-
-const EmbedCodeTab = ({ emailHtml }: { emailHtml: string }) => {
-  const { t } = useTranslate();
-
-  return (
-    <div className="space-y-4">
-      <div className="prose prose-slate -mt-4 max-w-full">
-        <CodeBlock
-          customCodeClass="text-sm h-48 overflow-y-scroll"
-          language="html"
-          showCopyToClipboard={false}>
-          {emailHtml}
-        </CodeBlock>
-      </div>
-      <Button
-        variant="default"
-        title="Embed survey in your website"
-        aria-label="Embed survey in your website"
-        onClick={() => {
-          toast.success(t("environments.surveys.summary.embed_code_copied_to_clipboard"));
-          navigator.clipboard.writeText(emailHtml);
-        }}
-        className="shrink-0">
-        {t("common.copy_code")}
-        <CopyIcon />
-      </Button>
-    </div>
-  );
-};
-
-export const EmailTab = ({ surveyId, email }: EmailTabProps) => {
-  const [emailHtmlPreview, setEmailHtmlPreview] = useState<string>("");
-  const [selectedTab, setSelectedTab] = useState("preview");
-  const { t } = useTranslate();
-  const emailHtml = useMemo(() => {
-    if (!emailHtmlPreview) return "";
-    return emailHtmlPreview
-      .replaceAll("?preview=true&amp;", "?")
-      .replaceAll("?preview=true&;", "?")
-      .replaceAll("?preview=true", "");
-  }, [emailHtmlPreview]);
-
-  useEffect(() => {
-    const getData = async () => {
-      const emailHtml = await getEmailHtmlAction({ surveyId });
-      setEmailHtmlPreview(emailHtml?.data || "");
-    };
-
-    getData();
-  }, [surveyId]);
-
-  return (
-    <div className="flex max-h-full flex-col gap-4">
-      <OptionsSwitch
-        options={[
-          { value: "preview", label: t("environments.surveys.summary.preview") },
-          { value: "embed", label: t("environments.surveys.summary.embed_code") },
-        ]}
-        currentOption={selectedTab}
-        handleOptionChange={(value) => setSelectedTab(value)}
-      />
-
-      {selectedTab === "preview" ? (
-        <PreviewTab emailHtmlPreview={emailHtmlPreview} email={email} surveyId={surveyId} />
+      {showEmbed ? (
+        <div className="prose prose-slate -mt-4 max-w-full">
+          <CodeBlock
+            customCodeClass="text-sm h-48 overflow-y-scroll"
+            language="html"
+            showCopyToClipboard={false}>
+            {emailHtml}
+          </CodeBlock>
+        </div>
       ) : (
-        <EmbedCodeTab emailHtml={emailHtml} />
+        <div className="mb-12 grow overflow-y-auto rounded-xl border border-slate-200 bg-white p-4">
+          <div className="mb-6 flex gap-2">
+            <div className="h-3 w-3 rounded-full bg-red-500"></div>
+            <div className="h-3 w-3 rounded-full bg-amber-500"></div>
+            <div className="h-3 w-3 rounded-full bg-emerald-500"></div>
+          </div>
+          <div>
+            <div className="mb-2 border-b border-slate-200 pb-2 text-sm">To : {email || "user@mail.com"}</div>
+            <div className="border-b border-slate-200 pb-2 text-sm">
+              Subject : {t("environments.surveys.summary.formbricks_email_survey_preview")}
+            </div>
+            <div className="p-4">
+              {emailHtml ? (
+                <div dangerouslySetInnerHTML={{ __html: emailHtmlPreview }}></div>
+              ) : (
+                <LoadingSpinner />
+              )}
+            </div>
+          </div>
+        </div>
       )}
     </div>
   );

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/EmbedView.test.tsx

@@ -0,0 +1,154 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { EmbedView } from "./EmbedView";
+
+// Mock child components
+vi.mock("./AppTab", () => ({
+  AppTab: () => <div data-testid="app-tab">AppTab Content</div>,
+}));
+vi.mock("./EmailTab", () => ({
+  EmailTab: (props: { surveyId: string; email: string }) => (
+    <div data-testid="email-tab">
+      EmailTab Content for {props.surveyId} with {props.email}
+    </div>
+  ),
+}));
+vi.mock("./LinkTab", () => ({
+  LinkTab: (props: { survey: any; surveyUrl: string }) => (
+    <div data-testid="link-tab">
+      LinkTab Content for {props.survey.id} at {props.surveyUrl}
+    </div>
+  ),
+}));
+vi.mock("./WebsiteTab", () => ({
+  WebsiteTab: (props: { surveyUrl: string; environmentId: string }) => (
+    <div data-testid="website-tab">
+      WebsiteTab Content for {props.surveyUrl} in {props.environmentId}
+    </div>
+  ),
+}));
+
+// Mock @tolgee/react
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key: string) => key,
+  }),
+}));
+
+// Mock lucide-react
+vi.mock("lucide-react", () => ({
+  ArrowLeftIcon: () => <div data-testid="arrow-left-icon">ArrowLeftIcon</div>,
+  MailIcon: () => <div data-testid="mail-icon">MailIcon</div>,
+  LinkIcon: () => <div data-testid="link-icon">LinkIcon</div>,
+  GlobeIcon: () => <div data-testid="globe-icon">GlobeIcon</div>,
+  SmartphoneIcon: () => <div data-testid="smartphone-icon">SmartphoneIcon</div>,
+}));
+
+const mockTabs = [
+  { id: "email", label: "Email", icon: () => <div data-testid="email-tab-icon" /> },
+  { id: "webpage", label: "Web Page", icon: () => <div data-testid="webpage-tab-icon" /> },
+  { id: "link", label: "Link", icon: () => <div data-testid="link-tab-icon" /> },
+  { id: "app", label: "App", icon: () => <div data-testid="app-tab-icon" /> },
+];
+
+const mockSurveyLink = { id: "survey1", type: "link" };
+const mockSurveyWeb = { id: "survey2", type: "web" };
+
+const defaultProps = {
+  handleInitialPageButton: vi.fn(),
+  tabs: mockTabs,
+  activeId: "email",
+  setActiveId: vi.fn(),
+  environmentId: "env1",
+  survey: mockSurveyLink,
+  email: "test@example.com",
+  surveyUrl: "http://example.com/survey1",
+  publicDomain: "http://example.com",
+  setSurveyUrl: vi.fn(),
+  locale: "en" as any,
+  disableBack: false,
+};
+
+describe("EmbedView", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("does not render back button when disableBack is true", () => {
+    render(<EmbedView {...defaultProps} disableBack={true} />);
+    expect(screen.queryByRole("button", { name: "common.back" })).not.toBeInTheDocument();
+  });
+
+  test("does not render desktop tabs for non-link survey type", () => {
+    render(<EmbedView {...defaultProps} survey={mockSurveyWeb} />);
+    // Desktop tabs container should not be present or not have lg:flex if it's a common parent
+    const desktopTabsButtons = screen.queryAllByRole("button", { name: /Email|Web Page|Link|App/i });
+    // Check if any of these buttons are part of a container that is only visible on large screens
+    const desktopTabContainer = desktopTabsButtons[0]?.closest("div.lg\\:flex");
+    expect(desktopTabContainer).toBeNull();
+  });
+
+  test("calls setActiveId when a tab is clicked (desktop)", async () => {
+    render(<EmbedView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
+    const webpageTabButton = screen.getAllByRole("button", { name: "Web Page" })[0]; // First one is desktop
+    await userEvent.click(webpageTabButton);
+    expect(defaultProps.setActiveId).toHaveBeenCalledWith("webpage");
+  });
+
+  test("renders EmailTab when activeId is 'email'", () => {
+    render(<EmbedView {...defaultProps} activeId="email" />);
+    expect(screen.getByTestId("email-tab")).toBeInTheDocument();
+    expect(
+      screen.getByText(`EmailTab Content for ${defaultProps.survey.id} with ${defaultProps.email}`)
+    ).toBeInTheDocument();
+  });
+
+  test("renders WebsiteTab when activeId is 'webpage'", () => {
+    render(<EmbedView {...defaultProps} activeId="webpage" />);
+    expect(screen.getByTestId("website-tab")).toBeInTheDocument();
+    expect(
+      screen.getByText(`WebsiteTab Content for ${defaultProps.surveyUrl} in ${defaultProps.environmentId}`)
+    ).toBeInTheDocument();
+  });
+
+  test("renders LinkTab when activeId is 'link'", () => {
+    render(<EmbedView {...defaultProps} activeId="link" />);
+    expect(screen.getByTestId("link-tab")).toBeInTheDocument();
+    expect(
+      screen.getByText(`LinkTab Content for ${defaultProps.survey.id} at ${defaultProps.surveyUrl}`)
+    ).toBeInTheDocument();
+  });
+
+  test("renders AppTab when activeId is 'app'", () => {
+    render(<EmbedView {...defaultProps} activeId="app" />);
+    expect(screen.getByTestId("app-tab")).toBeInTheDocument();
+  });
+
+  test("calls setActiveId when a responsive tab is clicked", async () => {
+    render(<EmbedView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
+    // Get the responsive tab button (second instance of the button with this name)
+    const responsiveWebpageTabButton = screen.getAllByRole("button", { name: "Web Page" })[1];
+    await userEvent.click(responsiveWebpageTabButton);
+    expect(defaultProps.setActiveId).toHaveBeenCalledWith("webpage");
+  });
+
+  test("applies active styles to the active tab (desktop)", () => {
+    render(<EmbedView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
+    const emailTabButton = screen.getAllByRole("button", { name: "Email" })[0];
+    expect(emailTabButton).toHaveClass("border-slate-200 bg-slate-100 font-semibold text-slate-900");
+
+    const webpageTabButton = screen.getAllByRole("button", { name: "Web Page" })[0];
+    expect(webpageTabButton).toHaveClass("border-transparent text-slate-500 hover:text-slate-700");
+  });
+
+  test("applies active styles to the active tab (responsive)", () => {
+    render(<EmbedView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
+    const responsiveEmailTabButton = screen.getAllByRole("button", { name: "Email" })[1];
+    expect(responsiveEmailTabButton).toHaveClass("bg-white text-slate-900 shadow-sm");
+
+    const responsiveWebpageTabButton = screen.getAllByRole("button", { name: "Web Page" })[1];
+    expect(responsiveWebpageTabButton).toHaveClass("border-transparent text-slate-700 hover:text-slate-900");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/EmbedView.tsx

@@ -0,0 +1,113 @@
+"use client";
+
+import { cn } from "@/lib/cn";
+import { Button } from "@/modules/ui/components/button";
+import { useTranslate } from "@tolgee/react";
+import { ArrowLeftIcon } from "lucide-react";
+import { TUserLocale } from "@formbricks/types/user";
+import { AppTab } from "./AppTab";
+import { EmailTab } from "./EmailTab";
+import { LinkTab } from "./LinkTab";
+import { WebsiteTab } from "./WebsiteTab";
+
+interface EmbedViewProps {
+  handleInitialPageButton: () => void;
+  tabs: Array<{ id: string; label: string; icon: any }>;
+  activeId: string;
+  setActiveId: React.Dispatch<React.SetStateAction<string>>;
+  environmentId: string;
+  disableBack: boolean;
+  survey: any;
+  email: string;
+  surveyUrl: string;
+  publicDomain: string;
+  setSurveyUrl: React.Dispatch<React.SetStateAction<string>>;
+  locale: TUserLocale;
+}
+
+export const EmbedView = ({
+  handleInitialPageButton,
+  tabs,
+  disableBack,
+  activeId,
+  setActiveId,
+  environmentId,
+  survey,
+  email,
+  surveyUrl,
+  publicDomain,
+  setSurveyUrl,
+  locale,
+}: EmbedViewProps) => {
+  const { t } = useTranslate();
+  return (
+    <div className="h-full overflow-hidden">
+      {!disableBack && (
+        <div className="border-b border-slate-200 py-2 pl-2">
+          <Button variant="ghost" className="focus:ring-0" onClick={handleInitialPageButton}>
+            <ArrowLeftIcon />
+            {t("common.back")}
+          </Button>
+        </div>
+      )}
+      <div className="grid h-full grid-cols-4">
+        {survey.type === "link" && (
+          <div className={cn("col-span-1 hidden flex-col gap-3 border-r border-slate-200 p-4 lg:flex")}>
+            {tabs.map((tab) => (
+              <Button
+                variant="ghost"
+                key={tab.id}
+                onClick={() => setActiveId(tab.id)}
+                autoFocus={tab.id === activeId}
+                className={cn(
+                  "flex justify-start rounded-md border px-4 py-2 text-slate-600",
+                  // "focus:ring-0 focus:ring-offset-0", // enable these classes to remove the focus rings on buttons
+                  tab.id === activeId
+                    ? "border-slate-200 bg-slate-100 font-semibold text-slate-900"
+                    : "border-transparent text-slate-500 hover:text-slate-700"
+                )}
+                aria-current={tab.id === activeId ? "page" : undefined}>
+                <tab.icon />
+                {tab.label}
+              </Button>
+            ))}
+          </div>
+        )}
+        <div
+          className={`col-span-4 h-full overflow-y-auto bg-slate-50 px-4 py-6 ${survey.type === "link" ? "lg:col-span-3" : ""} lg:p-6`}>
+          {activeId === "email" ? (
+            <EmailTab surveyId={survey.id} email={email} />
+          ) : activeId === "webpage" ? (
+            <WebsiteTab surveyUrl={surveyUrl} environmentId={environmentId} />
+          ) : activeId === "link" ? (
+            <LinkTab
+              survey={survey}
+              surveyUrl={surveyUrl}
+              publicDomain={publicDomain}
+              setSurveyUrl={setSurveyUrl}
+              locale={locale}
+            />
+          ) : activeId === "app" ? (
+            <AppTab />
+          ) : null}
+          <div className="mt-2 rounded-md p-3 text-center lg:hidden">
+            {tabs.slice(0, 2).map((tab) => (
+              <Button
+                variant="ghost"
+                key={tab.id}
+                onClick={() => setActiveId(tab.id)}
+                className={cn(
+                  "rounded-md px-4 py-2",
+                  tab.id === activeId
+                    ? "bg-white text-slate-900 shadow-sm"
+                    : "border-transparent text-slate-700 hover:text-slate-900"
+                )}>
+                {tab.label}
+              </Button>
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/PanelInfoView.test.tsx

@@ -0,0 +1,108 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { PanelInfoView } from "./PanelInfoView";
+
+// Mock next/image
+vi.mock("next/image", () => ({
+  default: ({ src, alt, className }: { src: any; alt: string; className?: string }) => (
+    // eslint-disable-next-line @next/next/no-img-element
+    <img src={src.src} alt={alt} className={className} />
+  ),
+}));
+
+// Mock next/link
+vi.mock("next/link", () => ({
+  default: ({ children, href, target }: { children: React.ReactNode; href: string; target?: string }) => (
+    <a href={href} target={target}>
+      {children}
+    </a>
+  ),
+}));
+
+// Mock Button component
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, variant, asChild }: any) => {
+    if (asChild) {
+      return <div onClick={onClick}>{children}</div>; // NOSONAR
+    }
+    return (
+      <button onClick={onClick} data-variant={variant}>
+        {children}
+      </button>
+    );
+  },
+}));
+
+// Mock lucide-react
+vi.mock("lucide-react", () => ({
+  ArrowLeftIcon: vi.fn(() => <div data-testid="arrow-left-icon">ArrowLeftIcon</div>),
+}));
+
+const mockHandleInitialPageButton = vi.fn();
+
+describe("PanelInfoView", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly with back button and all sections", async () => {
+    render(<PanelInfoView disableBack={false} handleInitialPageButton={mockHandleInitialPageButton} />);
+
+    // Check for back button
+    const backButton = screen.getByText("common.back");
+    expect(backButton).toBeInTheDocument();
+    expect(screen.getByTestId("arrow-left-icon")).toBeInTheDocument();
+
+    // Check images
+    expect(screen.getAllByAltText("Prolific panel selection UI")[0]).toBeInTheDocument();
+    expect(screen.getAllByAltText("Prolific panel selection UI")[1]).toBeInTheDocument();
+
+    // Check text content (Tolgee keys)
+    expect(screen.getByText("environments.surveys.summary.what_is_a_panel")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.what_is_a_panel_answer")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.when_do_i_need_it")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.when_do_i_need_it_answer")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.what_is_prolific")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.what_is_prolific_answer")).toBeInTheDocument();
+
+    expect(screen.getByText("environments.surveys.summary.how_to_create_a_panel")).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_1")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_1_description")
+    ).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_2")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_2_description")
+    ).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_3")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_3_description")
+    ).toBeInTheDocument();
+    expect(screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_4")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.surveys.summary.how_to_create_a_panel_step_4_description")
+    ).toBeInTheDocument();
+
+    // Check "Learn more" link
+    const learnMoreLink = screen.getByRole("link", { name: "common.learn_more" });
+    expect(learnMoreLink).toBeInTheDocument();
+    expect(learnMoreLink).toHaveAttribute(
+      "href",
+      "https://formbricks.com/docs/xm-and-surveys/surveys/link-surveys/market-research-panel"
+    );
+    expect(learnMoreLink).toHaveAttribute("target", "_blank");
+
+    // Click back button
+    await userEvent.click(backButton);
+    expect(mockHandleInitialPageButton).toHaveBeenCalledTimes(1);
+  });
+
+  test("renders correctly without back button when disableBack is true", () => {
+    render(<PanelInfoView disableBack={true} handleInitialPageButton={mockHandleInitialPageButton} />);
+
+    expect(screen.queryByRole("button", { name: "common.back" })).not.toBeInTheDocument();
+    expect(screen.queryByTestId("arrow-left-icon")).not.toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/PanelInfoView.tsx

@@ -0,0 +1,98 @@
+"use client";
+
+import ProlificLogo from "@/images/prolific-logo.webp";
+import ProlificUI from "@/images/prolific-screenshot.webp";
+import { Button } from "@/modules/ui/components/button";
+import { useTranslate } from "@tolgee/react";
+import { ArrowLeftIcon } from "lucide-react";
+import Image from "next/image";
+import Link from "next/link";
+
+interface PanelInfoViewProps {
+  disableBack: boolean;
+  handleInitialPageButton: () => void;
+}
+
+export const PanelInfoView = ({ disableBack, handleInitialPageButton }: PanelInfoViewProps) => {
+  const { t } = useTranslate();
+  return (
+    <div className="h-full overflow-hidden text-slate-900">
+      {!disableBack && (
+        <div className="border-b border-slate-200 py-2">
+          <Button variant="ghost" onClick={handleInitialPageButton}>
+            <ArrowLeftIcon />
+            {t("common.back")}
+          </Button>
+        </div>
+      )}
+      <div className="grid h-full grid-cols-2">
+        <div className="flex flex-col gap-y-6 border-r border-slate-200 p-8">
+          <Image src={ProlificUI} alt="Prolific panel selection UI" className="rounded-lg shadow-lg" />
+          <div>
+            <p className="text-md font-semibold">{t("environments.surveys.summary.what_is_a_panel")}</p>
+            <p className="text-slate-600">{t("environments.surveys.summary.what_is_a_panel_answer")}</p>
+          </div>
+          <div>
+            <p className="text-md font-semibold">{t("environments.surveys.summary.when_do_i_need_it")}</p>
+            <p className="text-slate-600">{t("environments.surveys.summary.when_do_i_need_it_answer")}</p>
+          </div>
+          <div>
+            <p className="text-md font-semibold">{t("environments.surveys.summary.what_is_prolific")}</p>
+            <p className="text-slate-600">{t("environments.surveys.summary.what_is_prolific_answer")}</p>
+          </div>
+        </div>
+        <div className="relative flex flex-col gap-y-6 bg-slate-50 p-8">
+          <Image
+            src={ProlificLogo}
+            alt="Prolific panel selection UI"
+            className="absolute right-8 top-8 w-32"
+          />
+          <div>
+            <h3 className="text-xl font-semibold">
+              {t("environments.surveys.summary.how_to_create_a_panel")}
+            </h3>
+          </div>
+          <div>
+            <p className="text-md font-semibold">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_1")}
+            </p>
+            <p className="text-slate-600">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_1_description")}
+            </p>
+          </div>
+          <div>
+            <p className="text-md font-semibold">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_2")}
+            </p>
+            <p className="text-slate-600">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_2_description")}
+            </p>
+          </div>
+          <div>
+            <p className="text-md font-semibold">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_3")}
+            </p>
+            <p className="text-slate-600">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_3_description")}
+            </p>
+          </div>
+          <div>
+            <p className="text-md font-semibold">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_4")}
+            </p>
+            <p className="text-slate-600">
+              {t("environments.surveys.summary.how_to_create_a_panel_step_4_description")}
+            </p>
+          </div>
+          <Button className="justify-center" asChild>
+            <Link
+              href="https://formbricks.com/docs/xm-and-surveys/surveys/link-surveys/market-research-panel"
+              target="_blank">
+              {t("common.learn_more")}
+            </Link>
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/personal-links-tab.test.tsx

@@ -1,519 +0,0 @@
-import { generatePersonalLinksAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions";
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
-import toast from "react-hot-toast";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { PersonalLinksTab } from "./personal-links-tab";
-
-// Mock dependencies
-vi.mock("@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions", () => ({
-  generatePersonalLinksAction: vi.fn(),
-}));
-
-vi.mock("react-hot-toast", () => ({
-  default: {
-    loading: vi.fn(),
-    success: vi.fn(),
-    error: vi.fn(),
-  },
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getFormattedErrorMessage: vi.fn(),
-}));
-
-vi.mock("@tolgee/react", () => ({
-  useTranslate: () => ({
-    t: (key: string) => key,
-  }),
-}));
-
-// Mock UI components
-vi.mock("@/modules/ui/components/alert", () => ({
-  Alert: ({ children, variant }: any) => (
-    <div data-testid="alert" data-variant={variant}>
-      {children}
-    </div>
-  ),
-  AlertButton: ({ children }: any) => <div data-testid="alert-button">{children}</div>,
-  AlertDescription: ({ children }: any) => <div data-testid="alert-description">{children}</div>,
-  AlertTitle: ({ children }: any) => <div data-testid="alert-title">{children}</div>,
-}));
-
-vi.mock("@/modules/ui/components/button", () => ({
-  Button: ({ children, onClick, disabled, loading, className, ...props }: any) => (
-    <button
-      data-testid="button"
-      onClick={onClick}
-      disabled={disabled}
-      data-loading={loading}
-      className={className}
-      {...props}>
-      {children}
-    </button>
-  ),
-}));
-
-vi.mock("@/modules/ui/components/date-picker", () => ({
-  DatePicker: ({ date, updateSurveyDate, minDate, onClearDate }: any) => (
-    <div data-testid="date-picker">
-      <input
-        data-testid="date-input"
-        type="date"
-        value={date ? date.toISOString().split("T")[0] : ""}
-        onChange={(e) => {
-          const newDate = e.target.value ? new Date(e.target.value) : null;
-          updateSurveyDate(newDate);
-        }}
-      />
-      <button data-testid="clear-date" onClick={() => onClearDate()}>
-        Clear
-      </button>
-      <div data-testid="min-date">{minDate ? minDate.toISOString() : ""}</div>
-    </div>
-  ),
-}));
-
-vi.mock("@/modules/ui/components/select", () => {
-  let globalOnValueChange: ((value: string) => void) | null = null;
-
-  return {
-    Select: ({ children, value, onValueChange, disabled }: any) => {
-      globalOnValueChange = onValueChange;
-      return (
-        <div data-testid="select" data-disabled={disabled} data-value={value}>
-          <div data-testid="select-current-value">{value || "Select option"}</div>
-          {children}
-        </div>
-      );
-    },
-    SelectContent: ({ children }: any) => <div data-testid="select-content">{children}</div>,
-    SelectItem: ({ children, value }: any) => (
-      <div
-        data-testid="select-item"
-        data-value={value}
-        onClick={() => {
-          if (globalOnValueChange) {
-            globalOnValueChange(value);
-          }
-        }}>
-        {children}
-      </div>
-    ),
-    SelectTrigger: ({ children, className }: any) => (
-      <div data-testid="select-trigger" className={className}>
-        {children}
-      </div>
-    ),
-    SelectValue: ({ placeholder }: any) => <div data-testid="select-value">{placeholder}</div>,
-  };
-});
-
-// Mock icons
-vi.mock("lucide-react", () => ({
-  DownloadIcon: () => <div data-testid="download-icon" />,
-  KeyIcon: () => <div data-testid="key-icon" />,
-}));
-
-// Mock Next.js Link
-vi.mock("next/link", () => ({
-  default: ({ children, href, target, rel }: any) => (
-    <a data-testid="link" href={href} target={target} rel={rel}>
-      {children}
-    </a>
-  ),
-}));
-
-const mockGeneratePersonalLinksAction = vi.mocked(generatePersonalLinksAction);
-const mockToast = vi.mocked(toast);
-const mockGetFormattedErrorMessage = vi.mocked(getFormattedErrorMessage);
-
-// Mock segments data
-const mockSegments = [
-  {
-    id: "segment1",
-    title: "Public Segment 1",
-    isPrivate: false,
-    description: "Test segment 1",
-    filters: [],
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    environmentId: "env1",
-    surveys: [],
-  },
-  {
-    id: "segment2",
-    title: "Public Segment 2",
-    isPrivate: false,
-    description: "Test segment 2",
-    filters: [],
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    environmentId: "env1",
-    surveys: [],
-  },
-  {
-    id: "segment3",
-    title: "Private Segment",
-    isPrivate: true,
-    description: "Test private segment",
-    filters: [],
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    environmentId: "env1",
-    surveys: [],
-  },
-];
-
-const defaultProps = {
-  environmentId: "test-env-id",
-  surveyId: "test-survey-id",
-  segments: mockSegments,
-  isContactsEnabled: true,
-  isFormbricksCloud: false,
-};
-
-// Helper function to trigger select change
-const selectOption = (value: string) => {
-  const selectItems = screen.getAllByTestId("select-item");
-  const targetItem = selectItems.find((item) => item.getAttribute("data-value") === value);
-  if (targetItem) {
-    fireEvent.click(targetItem);
-  }
-};
-
-describe("PersonalLinksTab", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    cleanup();
-  });
-
-  test("renders the component with correct title and description", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    expect(
-      screen.getByText("environments.surveys.summary.generate_personal_links_title")
-    ).toBeInTheDocument();
-    expect(
-      screen.getByText("environments.surveys.summary.generate_personal_links_description")
-    ).toBeInTheDocument();
-  });
-
-  test("renders recipients section with segment selection", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    expect(screen.getByText("common.recipients")).toBeInTheDocument();
-    expect(screen.getByTestId("select")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.create_and_manage_segments")).toBeInTheDocument();
-  });
-
-  test("renders expiry date section with date picker", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    expect(screen.getByText("environments.surveys.summary.expiry_date_optional")).toBeInTheDocument();
-    expect(screen.getByTestId("date-picker")).toBeInTheDocument();
-    expect(screen.getByText("environments.surveys.summary.expiry_date_description")).toBeInTheDocument();
-  });
-
-  test("renders generate button with correct initial state", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    const button = screen.getByTestId("button");
-    expect(button).toBeInTheDocument();
-    expect(button).toBeDisabled();
-    expect(screen.getByText("environments.surveys.summary.generate_and_download_links")).toBeInTheDocument();
-    expect(screen.getByTestId("download-icon")).toBeInTheDocument();
-  });
-
-  test("renders info alert with correct content", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    expect(screen.getByTestId("alert")).toBeInTheDocument();
-    expect(
-      screen.getByText("environments.surveys.summary.personal_links_work_with_segments")
-    ).toBeInTheDocument();
-    expect(screen.getByTestId("link")).toHaveAttribute(
-      "href",
-      "https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/advanced-targeting#segment-configuration"
-    );
-  });
-
-  test("filters out private segments and shows only public segments", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    const selectItems = screen.getAllByTestId("select-item");
-    expect(selectItems).toHaveLength(2); // Only public segments
-    expect(selectItems[0]).toHaveTextContent("Public Segment 1");
-    expect(selectItems[1]).toHaveTextContent("Public Segment 2");
-  });
-
-  test("shows no segments message when no public segments available", () => {
-    const propsWithPrivateSegments = {
-      ...defaultProps,
-      segments: [mockSegments[2]], // Only private segment
-    };
-
-    render(<PersonalLinksTab {...propsWithPrivateSegments} />);
-
-    expect(screen.getByText("environments.surveys.summary.no_segments_available")).toBeInTheDocument();
-    expect(screen.getByTestId("select")).toHaveAttribute("data-disabled", "true");
-    expect(screen.getByTestId("button")).toBeDisabled();
-  });
-
-  test("enables button when segment is selected", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    // Initially disabled
-    expect(screen.getByTestId("button")).toBeDisabled();
-
-    // Select a segment
-    selectOption("segment1");
-
-    // Should now be enabled
-    expect(screen.getByTestId("button")).not.toBeDisabled();
-  });
-
-  test("handles date selection correctly", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    const dateInput = screen.getByTestId("date-input");
-    const testDate = "2024-12-31";
-
-    fireEvent.change(dateInput, { target: { value: testDate } });
-
-    expect(dateInput).toHaveValue(testDate);
-  });
-
-  test("clears date when clear button is clicked", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    const dateInput = screen.getByTestId("date-input");
-    const clearButton = screen.getByTestId("clear-date");
-
-    // Set a date first
-    fireEvent.change(dateInput, { target: { value: "2024-12-31" } });
-
-    // Clear the date
-    fireEvent.click(clearButton);
-
-    expect(dateInput).toHaveValue("");
-  });
-
-  test("sets minimum date to tomorrow", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    const minDateElement = screen.getByTestId("min-date");
-    // Should have some ISO date string for a future date
-    expect(minDateElement.textContent).toMatch(/\d{4}-\d{2}-\d{2}T/);
-  });
-
-  test("successfully generates and downloads links", async () => {
-    const mockResult = {
-      data: {
-        downloadUrl: "https://example.com/download/file.csv",
-        fileName: "personal-links.csv",
-        count: 5,
-      },
-    };
-    mockGeneratePersonalLinksAction.mockResolvedValue(mockResult);
-
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    // Select a segment
-    selectOption("segment1");
-
-    // Click generate button
-    const generateButton = screen.getByTestId("button");
-    fireEvent.click(generateButton);
-
-    // Verify action was called
-    await waitFor(() => {
-      expect(mockGeneratePersonalLinksAction).toHaveBeenCalledWith({
-        surveyId: "test-survey-id",
-        segmentId: "segment1",
-        environmentId: "test-env-id",
-        expirationDays: undefined,
-      });
-    });
-
-    // Verify loading toast
-    expect(mockToast.loading).toHaveBeenCalledWith("environments.surveys.summary.generating_links_toast", {
-      duration: 5000,
-      id: "generating-links",
-    });
-  });
-
-  test("generates links with expiry date when date is selected", async () => {
-    const mockResult = {
-      data: {
-        downloadUrl: "https://example.com/download/file.csv",
-        fileName: "personal-links.csv",
-        count: 3,
-      },
-    };
-    mockGeneratePersonalLinksAction.mockResolvedValue(mockResult);
-
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    // Select a segment
-    selectOption("segment1");
-
-    // Set expiry date (10 days from now)
-    const dateInput = screen.getByTestId("date-input");
-    const futureDate = new Date();
-    futureDate.setDate(futureDate.getDate() + 10);
-    const expiryDate = futureDate.toISOString().split("T")[0];
-    fireEvent.change(dateInput, { target: { value: expiryDate } });
-
-    // Click generate button
-    const generateButton = screen.getByTestId("button");
-    fireEvent.click(generateButton);
-
-    await waitFor(() => {
-      expect(mockGeneratePersonalLinksAction).toHaveBeenCalledWith({
-        surveyId: "test-survey-id",
-        segmentId: "segment1",
-        environmentId: "test-env-id",
-        expirationDays: expect.any(Number),
-      });
-    });
-
-    // Verify that expirationDays is a reasonable value (between 9-10 days)
-    const callArgs = mockGeneratePersonalLinksAction.mock.calls[0][0];
-    expect(callArgs.expirationDays).toBeGreaterThanOrEqual(9);
-    expect(callArgs.expirationDays).toBeLessThanOrEqual(10);
-  });
-
-  test("handles error response from generatePersonalLinksAction", async () => {
-    const mockErrorResult = {
-      serverError: "Test error message",
-    };
-    mockGeneratePersonalLinksAction.mockResolvedValue(mockErrorResult);
-    mockGetFormattedErrorMessage.mockReturnValue("Formatted error message");
-
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    // Select a segment
-    selectOption("segment1");
-
-    // Click generate button
-    const generateButton = screen.getByTestId("button");
-    fireEvent.click(generateButton);
-
-    // Wait for the action to be called
-    await waitFor(() => {
-      expect(mockGeneratePersonalLinksAction).toHaveBeenCalledWith({
-        surveyId: "test-survey-id",
-        segmentId: "segment1",
-        environmentId: "test-env-id",
-        expirationDays: undefined,
-      });
-    });
-
-    // Wait for error handling
-    await waitFor(() => {
-      expect(mockGetFormattedErrorMessage).toHaveBeenCalledWith(mockErrorResult);
-      expect(mockToast.error).toHaveBeenCalledWith("Formatted error message", {
-        duration: 5000,
-        id: "generating-links",
-      });
-    });
-  });
-
-  test("shows generating state when triggered", async () => {
-    // Mock a promise that resolves quickly
-    const mockResult = { data: { downloadUrl: "test", fileName: "test.csv", count: 1 } };
-    mockGeneratePersonalLinksAction.mockResolvedValue(mockResult);
-
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    // Select a segment
-    selectOption("segment1");
-
-    // Click generate button
-    const generateButton = screen.getByTestId("button");
-    fireEvent.click(generateButton);
-
-    // Verify loading toast is called
-    expect(mockToast.loading).toHaveBeenCalledWith("environments.surveys.summary.generating_links_toast", {
-      duration: 5000,
-      id: "generating-links",
-    });
-  });
-
-  test("button is disabled when no segment is selected", () => {
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    const generateButton = screen.getByTestId("button");
-    expect(generateButton).toBeDisabled();
-  });
-
-  test("button is disabled when no public segments are available", () => {
-    const propsWithNoPublicSegments = {
-      ...defaultProps,
-      segments: [mockSegments[2]], // Only private segments
-    };
-
-    render(<PersonalLinksTab {...propsWithNoPublicSegments} />);
-
-    const generateButton = screen.getByTestId("button");
-    expect(generateButton).toBeDisabled();
-  });
-
-  test("handles empty segments array", () => {
-    const propsWithEmptySegments = {
-      ...defaultProps,
-      segments: [],
-    };
-
-    render(<PersonalLinksTab {...propsWithEmptySegments} />);
-
-    expect(screen.getByText("environments.surveys.summary.no_segments_available")).toBeInTheDocument();
-    expect(screen.getByTestId("button")).toBeDisabled();
-  });
-
-  test("calculates expiration days correctly for different dates", async () => {
-    const mockResult = {
-      data: {
-        downloadUrl: "https://example.com/download/file.csv",
-        fileName: "test.csv",
-        count: 1,
-      },
-    };
-    mockGeneratePersonalLinksAction.mockResolvedValue(mockResult);
-
-    render(<PersonalLinksTab {...defaultProps} />);
-
-    // Select a segment
-    selectOption("segment1");
-
-    // Set expiry date to 5 days from now
-    const dateInput = screen.getByTestId("date-input");
-    const futureDate = new Date();
-    futureDate.setDate(futureDate.getDate() + 5);
-    const expiryDate = futureDate.toISOString().split("T")[0];
-    fireEvent.change(dateInput, { target: { value: expiryDate } });
-
-    // Click generate button
-    const generateButton = screen.getByTestId("button");
-    fireEvent.click(generateButton);
-
-    await waitFor(() => {
-      expect(mockGeneratePersonalLinksAction).toHaveBeenCalledWith({
-        surveyId: "test-survey-id",
-        segmentId: "segment1",
-        environmentId: "test-env-id",
-        expirationDays: expect.any(Number),
-      });
-    });
-
-    // Verify that expirationDays is a reasonable value (between 4-5 days)
-    const callArgs = mockGeneratePersonalLinksAction.mock.calls[0][0];
-    expect(callArgs.expirationDays).toBeGreaterThanOrEqual(4);
-    expect(callArgs.expirationDays).toBeLessThanOrEqual(5);
-  });
-});

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/personal-links-tab.tsx

@@ -1,231 +0,0 @@
-"use client";
-
-import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { Alert, AlertButton, AlertTitle } from "@/modules/ui/components/alert";
-import { Button } from "@/modules/ui/components/button";
-import { DatePicker } from "@/modules/ui/components/date-picker";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/modules/ui/components/select";
-import { UpgradePrompt } from "@/modules/ui/components/upgrade-prompt";
-import { useTranslate } from "@tolgee/react";
-import { DownloadIcon } from "lucide-react";
-import Link from "next/link";
-import { useState } from "react";
-import toast from "react-hot-toast";
-import { TSegment } from "@formbricks/types/segment";
-import { generatePersonalLinksAction } from "../../actions";
-
-interface PersonalLinksTabProps {
-  environmentId: string;
-  surveyId: string;
-  segments: TSegment[];
-  isContactsEnabled: boolean;
-  isFormbricksCloud: boolean;
-}
-
-// Custom DatePicker component with date restrictions
-const RestrictedDatePicker = ({
-  date,
-  updateSurveyDate,
-}: {
-  date: Date | null;
-  updateSurveyDate: (date: Date | null) => void;
-}) => {
-  // Get tomorrow's date
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  tomorrow.setHours(0, 0, 0, 0);
-
-  const handleDateUpdate = (date: Date) => {
-    updateSurveyDate(date);
-  };
-
-  return (
-    <DatePicker
-      date={date}
-      updateSurveyDate={handleDateUpdate}
-      minDate={tomorrow}
-      onClearDate={() => updateSurveyDate(null)}
-    />
-  );
-};
-
-export const PersonalLinksTab = ({
-  environmentId,
-  segments,
-  surveyId,
-  isContactsEnabled,
-  isFormbricksCloud,
-}: PersonalLinksTabProps) => {
-  const { t } = useTranslate();
-  const [selectedSegment, setSelectedSegment] = useState<string>("");
-  const [expiryDate, setExpiryDate] = useState<Date | null>(null);
-  const [isGenerating, setIsGenerating] = useState(false);
-  const publicSegments = segments.filter((segment) => !segment.isPrivate);
-
-  // Utility function for file downloads
-  const downloadFile = (url: string, filename: string) => {
-    const link = document.createElement("a");
-    link.href = url;
-    link.download = filename;
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  };
-
-  const handleGenerateLinks = async () => {
-    if (!selectedSegment || isGenerating) return;
-
-    setIsGenerating(true);
-
-    // Show initial toast
-    toast.loading(t("environments.surveys.summary.generating_links_toast"), {
-      duration: 5000,
-      id: "generating-links",
-    });
-
-    const result = await generatePersonalLinksAction({
-      surveyId: surveyId,
-      segmentId: selectedSegment,
-      environmentId: environmentId,
-      expirationDays: expiryDate
-        ? Math.max(1, Math.floor((expiryDate.getTime() - new Date().getTime()) / (1000 * 60 * 60 * 24)))
-        : undefined,
-    });
-
-    if (result?.data) {
-      downloadFile(result.data.downloadUrl, result.data.fileName || "personal-links.csv");
-      toast.success(t("environments.surveys.summary.links_generated_success_toast"), {
-        duration: 5000,
-        id: "generating-links",
-      });
-    } else {
-      const errorMessage = getFormattedErrorMessage(result);
-      toast.error(errorMessage, {
-        duration: 5000,
-        id: "generating-links",
-      });
-    }
-    setIsGenerating(false);
-  };
-
-  // Button state logic
-  const isButtonDisabled = !selectedSegment || isGenerating || publicSegments.length === 0;
-  const buttonText = isGenerating
-    ? t("environments.surveys.summary.generating_links")
-    : t("environments.surveys.summary.generate_and_download_links");
-
-  if (!isContactsEnabled) {
-    return (
-      <UpgradePrompt
-        title={t("environments.surveys.summary.personal_links_upgrade_prompt_title")}
-        description={t("environments.surveys.summary.personal_links_upgrade_prompt_description")}
-        buttons={[
-          {
-            text: isFormbricksCloud ? t("common.start_free_trial") : t("common.request_trial_license"),
-            href: isFormbricksCloud
-              ? `/environments/${environmentId}/settings/billing`
-              : "https://formbricks.com/upgrade-self-hosting-license",
-          },
-          {
-            text: t("common.learn_more"),
-            href: isFormbricksCloud
-              ? `/environments/${environmentId}/settings/billing`
-              : "https://formbricks.com/learn-more-self-hosting-license",
-          },
-        ]}
-      />
-    );
-  }
-
-  return (
-    <div className="flex h-full grow flex-col gap-6">
-      <div>
-        <h2 className="mb-2 text-lg font-semibold text-slate-800">
-          {t("environments.surveys.summary.generate_personal_links_title")}
-        </h2>
-        <p className="text-sm text-slate-600">
-          {t("environments.surveys.summary.generate_personal_links_description")}
-        </p>
-      </div>
-
-      <div className="space-y-6">
-        {/* Recipients Section */}
-        <div>
-          <label htmlFor="segment-select" className="mb-2 block text-sm font-medium text-slate-700">
-            {t("common.recipients")}
-          </label>
-          <Select
-            value={selectedSegment}
-            onValueChange={setSelectedSegment}
-            disabled={publicSegments.length === 0}>
-            <SelectTrigger id="segment-select" className="w-full bg-white">
-              <SelectValue
-                placeholder={
-                  publicSegments.length === 0
-                    ? t("environments.surveys.summary.no_segments_available")
-                    : t("environments.surveys.summary.select_segment")
-                }
-              />
-            </SelectTrigger>
-            <SelectContent>
-              {publicSegments.map((segment) => (
-                <SelectItem key={segment.id} value={segment.id}>
-                  {segment.title}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <p className="mt-1 text-xs text-slate-500">
-            {t("environments.surveys.summary.create_and_manage_segments")}
-          </p>
-        </div>
-
-        {/* Expiry Date Section */}
-        <div>
-          <label htmlFor="expiry-date-picker" className="mb-2 block text-sm font-medium text-slate-700">
-            {t("environments.surveys.summary.expiry_date_optional")}
-          </label>
-          <div id="expiry-date-picker">
-            <RestrictedDatePicker
-              date={expiryDate}
-              updateSurveyDate={(date: Date | null) => setExpiryDate(date)}
-            />
-          </div>
-          <p className="mt-1 text-xs text-slate-500">
-            {t("environments.surveys.summary.expiry_date_description")}
-          </p>
-        </div>
-
-        {/* Generate Button */}
-        <Button
-          onClick={handleGenerateLinks}
-          disabled={isButtonDisabled}
-          loading={isGenerating}
-          className="w-fit">
-          <DownloadIcon className="mr-2 h-4 w-4" />
-          {buttonText}
-        </Button>
-      </div>
-      <hr />
-
-      {/* Info Box */}
-      <Alert variant="info" size="small">
-        <AlertTitle>{t("environments.surveys.summary.personal_links_work_with_segments")}</AlertTitle>
-        <AlertButton>
-          <Link
-            href="https://formbricks.com/docs/xm-and-surveys/surveys/website-app-surveys/advanced-targeting#segment-configuration"
-            target="_blank"
-            rel="noopener noreferrer">
-            {t("common.learn_more")}
-          </Link>
-        </AlertButton>
-      </Alert>
-    </div>
-  );
-};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/share-view.test.tsx

@@ -1,376 +0,0 @@
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { TSurvey, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
-import { ShareView } from "./share-view";
-
-// Mock child components
-vi.mock("./AppTab", () => ({
-  AppTab: () => <div data-testid="app-tab">AppTab Content</div>,
-}));
-vi.mock("./EmailTab", () => ({
-  EmailTab: (props: { surveyId: string; email: string }) => (
-    <div data-testid="email-tab">
-      EmailTab Content for {props.surveyId} with {props.email}
-    </div>
-  ),
-}));
-vi.mock("./LinkTab", () => ({
-  LinkTab: (props: { survey: any; surveyUrl: string }) => (
-    <div data-testid="link-tab">
-      LinkTab Content for {props.survey.id} at {props.surveyUrl}
-    </div>
-  ),
-}));
-vi.mock("./WebsiteTab", () => ({
-  WebsiteTab: (props: { surveyUrl: string; environmentId: string }) => (
-    <div data-testid="website-tab">
-      WebsiteTab Content for {props.surveyUrl} in {props.environmentId}
-    </div>
-  ),
-}));
-
-vi.mock("./personal-links-tab", () => ({
-  PersonalLinksTab: (props: { segments: any[]; surveyId: string; environmentId: string }) => (
-    <div data-testid="personal-links-tab">
-      PersonalLinksTab Content for {props.surveyId} in {props.environmentId}
-    </div>
-  ),
-}));
-
-vi.mock("@/modules/ui/components/upgrade-prompt", () => ({
-  UpgradePrompt: (props: { title: string; description: string; buttons: any[] }) => (
-    <div data-testid="upgrade-prompt">
-      {props.title} - {props.description}
-    </div>
-  ),
-}));
-
-// Mock lucide-react
-vi.mock("lucide-react", () => ({
-  ArrowLeftIcon: () => <div data-testid="arrow-left-icon">ArrowLeftIcon</div>,
-  MailIcon: () => <div data-testid="mail-icon">MailIcon</div>,
-  LinkIcon: () => <div data-testid="link-icon">LinkIcon</div>,
-  GlobeIcon: () => <div data-testid="globe-icon">GlobeIcon</div>,
-  SmartphoneIcon: () => <div data-testid="smartphone-icon">SmartphoneIcon</div>,
-  AlertCircle: ({ className }: { className?: string }) => (
-    <div className={className} data-testid="alert-circle">
-      AlertCircle
-    </div>
-  ),
-  AlertTriangle: ({ className }: { className?: string }) => (
-    <div className={className} data-testid="alert-triangle">
-      AlertTriangle
-    </div>
-  ),
-  Info: ({ className }: { className?: string }) => (
-    <div className={className} data-testid="info">
-      Info
-    </div>
-  ),
-}));
-
-// Mock sidebar components
-vi.mock("@/modules/ui/components/sidebar", () => ({
-  SidebarProvider: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  Sidebar: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarGroup: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarGroupContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarGroupLabel: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarMenu: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarMenuItem: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  SidebarMenuButton: ({
-    children,
-    onClick,
-    tooltip,
-    className,
-  }: {
-    children: React.ReactNode;
-    onClick: () => void;
-    tooltip: string;
-    className?: string;
-  }) => (
-    <button type="button" onClick={onClick} className={className} aria-label={tooltip}>
-      {children}
-    </button>
-  ),
-}));
-
-// Mock tooltip and typography components
-vi.mock("@/modules/ui/components/tooltip", () => ({
-  TooltipRenderer: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-}));
-
-vi.mock("@/modules/ui/components/typography", () => ({
-  Small: ({ children }: { children: React.ReactNode }) => <small>{children}</small>,
-}));
-
-// Mock button component
-vi.mock("@/modules/ui/components/button", () => ({
-  Button: ({
-    children,
-    onClick,
-    className,
-    variant,
-  }: {
-    children: React.ReactNode;
-    onClick: () => void;
-    className?: string;
-    variant?: string;
-  }) => (
-    <button type="button" onClick={onClick} className={className} data-variant={variant}>
-      {children}
-    </button>
-  ),
-}));
-
-// Mock cn utility
-vi.mock("@/lib/cn", () => ({
-  cn: (...args: any[]) => args.filter(Boolean).join(" "),
-}));
-
-const mockTabs = [
-  { id: "email", label: "Email", icon: () => <div data-testid="email-tab-icon" /> },
-  { id: "webpage", label: "Web Page", icon: () => <div data-testid="webpage-tab-icon" /> },
-  { id: "link", label: "Link", icon: () => <div data-testid="link-tab-icon" /> },
-  { id: "app", label: "App", icon: () => <div data-testid="app-tab-icon" /> },
-];
-
-// Create proper mock survey objects
-const createMockSurvey = (type: "link" | "app", id = "survey1"): TSurvey => ({
-  id,
-  createdAt: new Date(),
-  updatedAt: new Date(),
-  name: `Test Survey ${id}`,
-  type,
-  environmentId: "env1",
-  createdBy: "user123",
-  status: "inProgress",
-  displayOption: "displayOnce",
-  autoClose: null,
-  triggers: [],
-  recontactDays: null,
-  displayLimit: null,
-  welcomeCard: {
-    enabled: false,
-    headline: { default: "" },
-    html: { default: "" },
-    fileUrl: undefined,
-    buttonLabel: { default: "" },
-    timeToFinish: false,
-    showResponseCount: false,
-  },
-  questions: [
-    {
-      id: "q1",
-      type: TSurveyQuestionTypeEnum.OpenText,
-      headline: { default: "Test Question" },
-      subheader: { default: "" },
-      required: true,
-      inputType: "text",
-      placeholder: { default: "" },
-      longAnswer: false,
-      logic: [],
-      charLimit: { enabled: false },
-      buttonLabel: { default: "" },
-      backButtonLabel: { default: "" },
-    },
-  ],
-  endings: [
-    {
-      id: "end1",
-      type: "endScreen",
-      headline: { default: "Thank you!" },
-      subheader: { default: "" },
-      buttonLabel: { default: "" },
-      buttonLink: undefined,
-    },
-  ],
-  hiddenFields: { enabled: false, fieldIds: [] },
-  variables: [],
-  followUps: [],
-  delay: 0,
-  autoComplete: null,
-  runOnDate: null,
-  closeOnDate: null,
-  projectOverwrites: null,
-  styling: null,
-  showLanguageSwitch: null,
-  surveyClosedMessage: null,
-  segment: null,
-  singleUse: null,
-  isVerifyEmailEnabled: false,
-  recaptcha: null,
-  isSingleResponsePerEmailEnabled: false,
-  isBackButtonHidden: false,
-  pin: null,
-  resultShareKey: null,
-  displayPercentage: null,
-  languages: [
-    {
-      enabled: true,
-      default: true,
-      language: {
-        id: "lang1",
-        createdAt: new Date(),
-        updatedAt: new Date(),
-        code: "en",
-        alias: "English",
-        projectId: "project1",
-      },
-    },
-  ],
-});
-
-const mockSurveyLink = createMockSurvey("link", "survey1");
-const mockSurveyApp = createMockSurvey("app", "survey2");
-
-const defaultProps = {
-  tabs: mockTabs,
-  activeId: "email",
-  setActiveId: vi.fn(),
-  environmentId: "env1",
-  survey: mockSurveyLink,
-  email: "test@example.com",
-  surveyUrl: "http://example.com/survey1",
-  publicDomain: "http://example.com",
-  setSurveyUrl: vi.fn(),
-  locale: "en" as any,
-  segments: [],
-  isContactsEnabled: true,
-  isFormbricksCloud: false,
-};
-
-describe("ShareView", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  test("does not render desktop tabs for non-link survey type", () => {
-    render(<ShareView {...defaultProps} survey={mockSurveyApp} />);
-
-    // For non-link survey types, desktop sidebar should not be rendered
-    // Check that SidebarProvider is not rendered by looking for sidebar-specific elements
-    const sidebarLabel = screen.queryByText("Share via");
-    expect(sidebarLabel).toBeNull();
-  });
-
-  test("renders desktop tabs for link survey type", () => {
-    render(<ShareView {...defaultProps} survey={mockSurveyLink} />);
-
-    // For link survey types, desktop sidebar should be rendered
-    const sidebarLabel = screen.getByText("Share via");
-    expect(sidebarLabel).toBeInTheDocument();
-  });
-
-  test("calls setActiveId when a tab is clicked (desktop)", async () => {
-    render(<ShareView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
-
-    const webpageTabButton = screen.getByLabelText("Web Page");
-    await userEvent.click(webpageTabButton);
-    expect(defaultProps.setActiveId).toHaveBeenCalledWith("webpage");
-  });
-
-  test("renders EmailTab when activeId is 'email'", () => {
-    render(<ShareView {...defaultProps} activeId="email" />);
-    expect(screen.getByTestId("email-tab")).toBeInTheDocument();
-    expect(
-      screen.getByText(`EmailTab Content for ${defaultProps.survey.id} with ${defaultProps.email}`)
-    ).toBeInTheDocument();
-  });
-
-  test("renders WebsiteTab when activeId is 'webpage'", () => {
-    render(<ShareView {...defaultProps} activeId="webpage" />);
-    expect(screen.getByTestId("website-tab")).toBeInTheDocument();
-    expect(
-      screen.getByText(`WebsiteTab Content for ${defaultProps.surveyUrl} in ${defaultProps.environmentId}`)
-    ).toBeInTheDocument();
-  });
-
-  test("renders LinkTab when activeId is 'link'", () => {
-    render(<ShareView {...defaultProps} activeId="link" />);
-    expect(screen.getByTestId("link-tab")).toBeInTheDocument();
-    expect(
-      screen.getByText(`LinkTab Content for ${defaultProps.survey.id} at ${defaultProps.surveyUrl}`)
-    ).toBeInTheDocument();
-  });
-
-  test("renders AppTab when activeId is 'app'", () => {
-    render(<ShareView {...defaultProps} activeId="app" />);
-    expect(screen.getByTestId("app-tab")).toBeInTheDocument();
-  });
-
-  test("renders PersonalLinksTab when activeId is 'personal-links'", () => {
-    render(<ShareView {...defaultProps} activeId="personal-links" />);
-    expect(screen.getByTestId("personal-links-tab")).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        `PersonalLinksTab Content for ${defaultProps.survey.id} in ${defaultProps.environmentId}`
-      )
-    ).toBeInTheDocument();
-  });
-
-  test("calls setActiveId when a responsive tab is clicked", async () => {
-    render(<ShareView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
-
-    // Get responsive buttons - these are Button components containing icons
-    const responsiveButtons = screen.getAllByTestId("webpage-tab-icon");
-    // The responsive button should be the one inside the md:hidden container
-    const responsiveButton = responsiveButtons
-      .find((icon) => {
-        const button = icon.closest("button");
-        return button && button.getAttribute("data-variant") === "ghost";
-      })
-      ?.closest("button");
-
-    if (responsiveButton) {
-      await userEvent.click(responsiveButton);
-      expect(defaultProps.setActiveId).toHaveBeenCalledWith("webpage");
-    }
-  });
-
-  test("applies active styles to the active tab (desktop)", () => {
-    render(<ShareView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
-
-    const emailTabButton = screen.getByLabelText("Email");
-    expect(emailTabButton).toHaveClass("bg-slate-100");
-    expect(emailTabButton).toHaveClass("font-medium");
-    expect(emailTabButton).toHaveClass("text-slate-900");
-
-    const webpageTabButton = screen.getByLabelText("Web Page");
-    expect(webpageTabButton).not.toHaveClass("bg-slate-100");
-    expect(webpageTabButton).not.toHaveClass("font-medium");
-  });
-
-  test("applies active styles to the active tab (responsive)", () => {
-    render(<ShareView {...defaultProps} survey={mockSurveyLink} activeId="email" />);
-
-    // Get responsive buttons - these are Button components with ghost variant
-    const responsiveButtons = screen.getAllByTestId("email-tab-icon");
-    const responsiveEmailButton = responsiveButtons
-      .find((icon) => {
-        const button = icon.closest("button");
-        return button && button.getAttribute("data-variant") === "ghost";
-      })
-      ?.closest("button");
-
-    if (responsiveEmailButton) {
-      // Check that the button has the active classes
-      expect(responsiveEmailButton).toHaveClass("bg-white text-slate-900 shadow-sm hover:bg-white");
-    }
-
-    const responsiveWebpageButtons = screen.getAllByTestId("webpage-tab-icon");
-    const responsiveWebpageButton = responsiveWebpageButtons
-      .find((icon) => {
-        const button = icon.closest("button");
-        return button && button.getAttribute("data-variant") === "ghost";
-      })
-      ?.closest("button");
-
-    if (responsiveWebpageButton) {
-      expect(responsiveWebpageButton).toHaveClass("border-transparent text-slate-700 hover:text-slate-900");
-    }
-  });
-});

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/share-view.tsx

@@ -1,174 +0,0 @@
-"use client";
-
-import { cn } from "@/lib/cn";
-import { Button } from "@/modules/ui/components/button";
-import {
-  Sidebar,
-  SidebarContent,
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarGroupLabel,
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  SidebarProvider,
-} from "@/modules/ui/components/sidebar";
-import { TooltipRenderer } from "@/modules/ui/components/tooltip";
-import { Small } from "@/modules/ui/components/typography";
-import { useEffect, useState } from "react";
-import { TSegment } from "@formbricks/types/segment";
-import { TSurvey } from "@formbricks/types/surveys/types";
-import { TUserLocale } from "@formbricks/types/user";
-import { AppTab } from "./AppTab";
-import { EmailTab } from "./EmailTab";
-import { LinkTab } from "./LinkTab";
-import { WebsiteTab } from "./WebsiteTab";
-import { PersonalLinksTab } from "./personal-links-tab";
-
-interface ShareViewProps {
-  tabs: Array<{ id: string; label: string; icon: React.ElementType }>;
-  activeId: string;
-  setActiveId: React.Dispatch<React.SetStateAction<string>>;
-  environmentId: string;
-  survey: TSurvey;
-  email: string;
-  surveyUrl: string;
-  publicDomain: string;
-  setSurveyUrl: React.Dispatch<React.SetStateAction<string>>;
-  locale: TUserLocale;
-  segments: TSegment[];
-  isContactsEnabled: boolean;
-  isFormbricksCloud: boolean;
-}
-
-export const ShareView = ({
-  tabs,
-  activeId,
-  setActiveId,
-  environmentId,
-  survey,
-  email,
-  surveyUrl,
-  publicDomain,
-  setSurveyUrl,
-  locale,
-  segments,
-  isContactsEnabled,
-  isFormbricksCloud,
-}: ShareViewProps) => {
-  const [isLargeScreen, setIsLargeScreen] = useState(true);
-
-  useEffect(() => {
-    const checkScreenSize = () => {
-      setIsLargeScreen(window.innerWidth >= 1024);
-    };
-
-    checkScreenSize();
-
-    window.addEventListener("resize", checkScreenSize);
-
-    return () => window.removeEventListener("resize", checkScreenSize);
-  }, []);
-
-  const renderActiveTab = () => {
-    switch (activeId) {
-      case "email":
-        return <EmailTab surveyId={survey.id} email={email} />;
-      case "webpage":
-        return <WebsiteTab surveyUrl={surveyUrl} environmentId={environmentId} />;
-      case "link":
-        return (
-          <LinkTab
-            survey={survey}
-            surveyUrl={surveyUrl}
-            publicDomain={publicDomain}
-            setSurveyUrl={setSurveyUrl}
-            locale={locale}
-          />
-        );
-      case "app":
-        return <AppTab />;
-      case "personal-links":
-        return (
-          <PersonalLinksTab
-            segments={segments}
-            surveyId={survey.id}
-            environmentId={environmentId}
-            isContactsEnabled={isContactsEnabled}
-            isFormbricksCloud={isFormbricksCloud}
-          />
-        );
-      default:
-        return null;
-    }
-  };
-
-  return (
-    <div className="h-full">
-      <div className={`flex h-full ${survey.type === "link" ? "lg:grid lg:grid-cols-4" : ""}`}>
-        {survey.type === "link" && (
-          <SidebarProvider
-            open={isLargeScreen}
-            className="flex min-h-0 w-auto lg:col-span-1"
-            style={
-              {
-                "--sidebar-width": "100%",
-              } as React.CSSProperties
-            }>
-            <Sidebar className="relative h-full p-0" variant="inset" collapsible="icon">
-              <SidebarContent className="h-full border-r border-slate-200 bg-white p-4">
-                <SidebarGroup className="p-0">
-                  <SidebarGroupLabel>
-                    <Small className="text-xs text-slate-500">Share via</Small>
-                  </SidebarGroupLabel>
-                  <SidebarGroupContent>
-                    <SidebarMenu className="flex flex-col gap-1">
-                      {tabs.map((tab) => (
-                        <SidebarMenuItem key={tab.id}>
-                          <SidebarMenuButton
-                            onClick={() => setActiveId(tab.id)}
-                            className={cn(
-                              "flex w-full justify-start rounded-md p-2 text-slate-600 hover:bg-slate-100 hover:text-slate-900",
-                              tab.id === activeId
-                                ? "bg-slate-100 font-medium text-slate-900"
-                                : "text-slate-700"
-                            )}
-                            tooltip={tab.label}
-                            isActive={tab.id === activeId}>
-                            <tab.icon className="h-4 w-4 text-slate-700" />
-                            <span>{tab.label}</span>
-                          </SidebarMenuButton>
-                        </SidebarMenuItem>
-                      ))}
-                    </SidebarMenu>
-                  </SidebarGroupContent>
-                </SidebarGroup>
-              </SidebarContent>
-            </Sidebar>
-          </SidebarProvider>
-        )}
-        <div
-          className={`h-full w-full grow overflow-y-auto bg-slate-50 px-4 py-6 lg:p-6 ${survey.type === "link" ? "lg:col-span-3" : ""}`}>
-          {renderActiveTab()}
-          <div className="flex justify-center gap-2 rounded-md pt-6 text-center md:hidden">
-            {tabs.map((tab) => (
-              <TooltipRenderer tooltipContent={tab.label} key={tab.id}>
-                <Button
-                  variant="ghost"
-                  onClick={() => setActiveId(tab.id)}
-                  className={cn(
-                    "rounded-md px-4 py-2",
-                    tab.id === activeId
-                      ? "bg-white text-slate-900 shadow-sm hover:bg-white"
-                      : "border-transparent text-slate-700 hover:text-slate-900"
-                  )}>
-                  <tab.icon className="h-4 w-4 text-slate-700" />
-                </Button>
-              </TooltipRenderer>
-            ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/shareEmbedModal/success-view.tsx

@@ -1,83 +0,0 @@
-import { ShareSurveyLink } from "@/modules/analysis/components/ShareSurveyLink";
-import { Badge } from "@/modules/ui/components/badge";
-import { useTranslate } from "@tolgee/react";
-import { BellRing, BlocksIcon, Share2Icon, UserIcon } from "lucide-react";
-import Link from "next/link";
-import React from "react";
-import { TSurvey } from "@formbricks/types/surveys/types";
-import { TUser } from "@formbricks/types/user";
-
-interface SuccessViewProps {
-  survey: TSurvey;
-  surveyUrl: string;
-  publicDomain: string;
-  setSurveyUrl: (url: string) => void;
-  user: TUser;
-  tabs: { id: string; label: string; icon: React.ElementType }[];
-  handleViewChange: (view: string) => void;
-  handleEmbedViewWithTab: (tabId: string) => void;
-}
-
-export const SuccessView: React.FC<SuccessViewProps> = ({
-  survey,
-  surveyUrl,
-  publicDomain,
-  setSurveyUrl,
-  user,
-  tabs,
-  handleViewChange,
-  handleEmbedViewWithTab,
-}) => {
-  const { t } = useTranslate();
-  const environmentId = survey.environmentId;
-  return (
-    <div className="flex h-full max-w-full flex-col overflow-hidden">
-      {survey.type === "link" && (
-        <div className="flex h-2/5 w-full flex-col items-center justify-center gap-8 py-[100px] text-center">
-          <p className="text-xl font-semibold text-slate-900">
-            {t("environments.surveys.summary.your_survey_is_public")} 🎉
-          </p>
-          <ShareSurveyLink
-            survey={survey}
-            surveyUrl={surveyUrl}
-            publicDomain={publicDomain}
-            setSurveyUrl={setSurveyUrl}
-            locale={user.locale}
-          />
-        </div>
-      )}
-      <div className="flex h-full flex-col items-center justify-center gap-8 rounded-b-lg bg-slate-50 px-8 py-4">
-        <p className="text-sm font-medium text-slate-900">{t("environments.surveys.summary.whats_next")}</p>
-        <div className="grid grid-cols-4 gap-2">
-          <button
-            type="button"
-            onClick={() => handleViewChange("share")}
-            className="flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-center text-sm text-slate-900 hover:border-slate-200 md:p-8">
-            <Share2Icon className="h-8 w-8 stroke-1 text-slate-900" />
-            {t("environments.surveys.summary.share_survey")}
-          </button>
-          <button
-            type="button"
-            onClick={() => handleEmbedViewWithTab(tabs[1].id)}
-            className="relative flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-center text-sm text-slate-900 hover:border-slate-200 md:p-8">
-            <UserIcon className="h-8 w-8 stroke-1 text-slate-900" />
-            {t("environments.surveys.summary.use_personal_links")}
-            <Badge size="normal" type="success" className="absolute right-3 top-3" text={t("common.new")} />
-          </button>
-          <Link
-            href={`/environments/${environmentId}/settings/notifications`}
-            className="flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-center text-sm text-slate-900 hover:border-slate-200 md:p-8">
-            <BellRing className="h-8 w-8 stroke-1 text-slate-900" />
-            {t("environments.surveys.summary.configure_alerts")}
-          </Link>
-          <Link
-            href={`/environments/${environmentId}/integrations`}
-            className="flex flex-col items-center gap-3 rounded-lg border border-slate-100 bg-white p-4 text-center text-sm text-slate-900 hover:border-slate-200 md:p-8">
-            <BlocksIcon className="h-8 w-8 stroke-1 text-slate-900" />
-            {t("environments.surveys.summary.setup_integrations")}
-          </Link>
-        </div>
-      </div>
-    </div>
-  );
-};

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.test.tsx

@@ -101,7 +101,7 @@ const mockProject = {
     highlightBorderColor: null,
     cardBackgroundColor: { light: "#FFFFFF", dark: "#000000" },
     cardBorderColor: { light: "#FFFFFF", dark: "#000000" },
-
+    cardShadowColor: { light: "#FFFFFF", dark: "#000000" },
     questionColor: { light: "#FFFFFF", dark: "#000000" },
     inputColor: { light: "#FFFFFF", dark: "#000000" },
     inputBorderColor: { light: "#FFFFFF", dark: "#000000" },
@@ -123,7 +123,7 @@ const mockComputedStyling = {
   inputBorderColor: "#000000",
   cardBackgroundColor: "#FFFFFF",
   cardBorderColor: "#EEEEEE",
-
+  cardShadowColor: "#AAAAAA",
   highlightBorderColor: null,
   thankYouCardIconColor: "#007BFF",
   thankYouCardIconBgColor: "#DDDDDD",

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/page.tsx

@@ -2,12 +2,10 @@ import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentI
 import { SummaryPage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
 import { getSurveySummary } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/surveySummary";
-import { DEFAULT_LOCALE, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
+import { DEFAULT_LOCALE } from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getSurvey } from "@/lib/survey/service";
 import { getUser } from "@/lib/user/service";
-import { getSegments } from "@/modules/ee/contacts/segments/lib/segments";
-import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
 import { PageHeader } from "@/modules/ui/components/page-header";
@@ -38,8 +36,6 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   if (!user) {
     throw new Error(t("common.user_not_found"));
   }
-  const isContactsEnabled = await getIsContactsEnabled();
-  const segments = isContactsEnabled ? await getSegments(environment.id) : [];
 
   // Fetch initial survey summary data on the server to prevent duplicate API calls during hydration
   const initialSurveySummary = await getSurveySummary(surveyId);
@@ -58,9 +54,6 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
             user={user}
             publicDomain={publicDomain}
             responseCount={initialSurveySummary?.meta.totalResponses ?? 0}
-            segments={segments}
-            isContactsEnabled={isContactsEnabled}
-            isFormbricksCloud={IS_FORMBRICKS_CLOUD}
           />
         }>
         <SurveyAnalysisNavigation environmentId={environment.id} survey={survey} activeId="summary" />

apps/web/app/api/v1/client/[environmentId]/environment/lib/environmentState.test.ts

@@ -274,7 +274,7 @@ describe("getEnvironmentState", () => {
 
     expect(withCache).toHaveBeenCalledWith(expect.any(Function), {
       key: `fb:env:${environmentId}:state`,
-      ttl: 5 * 60 * 1000, // 5 minutes in milliseconds
+      ttl: 60 * 30 * 1000, // 30 minutes in milliseconds
     });
   });
 });

apps/web/app/api/v1/client/[environmentId]/environment/lib/environmentState.ts

@@ -83,8 +83,9 @@ export const getEnvironmentState = async (
     {
       // Use enterprise-grade cache key pattern
       key: createCacheKey.environment.state(environmentId),
-      // This is a temporary fix for the invalidation issues, will be changed later with a proper solution
-      ttl: 5 * 60 * 1000, // 5 minutes in milliseconds
+      // 30 minutes TTL ensures fresh data for hourly SDK checks
+      // Balances performance with freshness requirements
+      ttl: 60 * 30 * 1000, // 30 minutes in milliseconds
     }
   );
 

apps/web/app/api/v1/management/action-classes/route.ts

@@ -52,6 +52,14 @@ export const POST = withApiLogging(
       }
 
       const inputValidation = ZActionClassInput.safeParse(actionClassInput);
+      const environmentId = actionClassInput.environmentId;
+
+      if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
+        return {
+          response: responses.unauthorizedResponse(),
+        };
+      }
+
       if (!inputValidation.success) {
         return {
           response: responses.badRequestResponse(
@@ -62,14 +70,6 @@ export const POST = withApiLogging(
         };
       }
 
-      const environmentId = inputValidation.data.environmentId;
-
-      if (!hasPermission(authentication.environmentPermissions, environmentId, "POST")) {
-        return {
-          response: responses.unauthorizedResponse(),
-        };
-      }
-
       const actionClass: TActionClass = await createActionClass(environmentId, inputValidation.data);
       auditLog.targetId = actionClass.id;
       auditLog.newObject = actionClass;

apps/web/app/api/v1/management/responses/lib/response.test.ts

@@ -186,18 +186,6 @@ describe("Response Lib Tests", () => {
       expect(logger.error).not.toHaveBeenCalled(); // Should be caught and re-thrown as DatabaseError
     });
 
-    test("should handle RelatedRecordDoesNotExist error with specific message", async () => {
-      const prismaError = new Prisma.PrismaClientKnownRequestError("Related record does not exist", {
-        code: "P2025", // PrismaErrorType.RelatedRecordDoesNotExist
-        clientVersion: "2.0",
-      });
-      vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrganization);
-      vi.mocked(prisma.response.create).mockRejectedValue(prismaError);
-
-      await expect(createResponse(mockResponseInput)).rejects.toThrow(DatabaseError);
-      await expect(createResponse(mockResponseInput)).rejects.toThrow("Display ID does not exist");
-    });
-
     test("should handle generic errors", async () => {
       const genericError = new Error("Something went wrong");
       vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrganization);

apps/web/app/api/v1/management/responses/lib/response.ts

@@ -12,7 +12,6 @@ import { validateInputs } from "@/lib/utils/validate";
 import { Prisma } from "@prisma/client";
 import { cache as reactCache } from "react";
 import { prisma } from "@formbricks/database";
-import { PrismaErrorType } from "@formbricks/database/types/error";
 import { logger } from "@formbricks/logger";
 import { ZId, ZOptionalNumber } from "@formbricks/types/common";
 import { TContactAttributes } from "@formbricks/types/contact-attribute";
@@ -177,9 +176,6 @@ export const createResponse = async (responseInput: TResponseInput): Promise<TRe
     return response;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      if (error.code === PrismaErrorType.RelatedRecordDoesNotExist) {
-        throw new DatabaseError("Display ID does not exist");
-      }
       throw new DatabaseError(error.message);
     }
 

apps/web/app/api/v1/management/responses/route.ts

@@ -149,10 +149,6 @@ export const POST = withApiLogging(
           return {
             response: responses.badRequestResponse(error.message),
           };
-        } else if (error instanceof DatabaseError) {
-          return {
-            response: responses.badRequestResponse(error.message),
-          };
         }
         logger.error({ error, url: request.url }, "Error in POST /api/v1/management/responses");
         return {
@@ -162,7 +158,7 @@ export const POST = withApiLogging(
     } catch (error) {
       if (error instanceof DatabaseError) {
         return {
-          response: responses.badRequestResponse("An unexpected error occurred while creating the response"),
+          response: responses.badRequestResponse(error.message),
         };
       }
       throw error;

apps/web/app/api/v2/management/contacts/route.ts

@@ -1 +0,0 @@
-export { POST } from "@/modules/ee/contacts/api/v2/management/contacts/route";

apps/web/app/layout.test.tsx

@@ -31,8 +31,6 @@ vi.mock("@/lib/constants", () => ({
   WEBAPP_URL: "test-webapp-url",
   IS_PRODUCTION: false,
   SENTRY_DSN: "mock-sentry-dsn",
-  SENTRY_RELEASE: "mock-sentry-release",
-  SENTRY_ENVIRONMENT: "mock-sentry-environment",
 }));
 
 vi.mock("@/tolgee/language", () => ({
@@ -61,18 +59,9 @@ vi.mock("@/tolgee/client", () => ({
 }));
 
 vi.mock("@/app/sentry/SentryProvider", () => ({
-  SentryProvider: ({
-    children,
-    sentryDsn,
-    sentryRelease,
-  }: {
-    children: React.ReactNode;
-    sentryDsn?: string;
-    sentryRelease?: string;
-  }) => (
+  SentryProvider: ({ children, sentryDsn }: { children: React.ReactNode; sentryDsn?: string }) => (
     <div data-testid="sentry-provider">
       SentryProvider: {sentryDsn}
-      {sentryRelease && ` - Release: ${sentryRelease}`}
       {children}
     </div>
   ),

apps/web/app/layout.tsx

@@ -1,5 +1,5 @@
 import { SentryProvider } from "@/app/sentry/SentryProvider";
-import { IS_PRODUCTION, SENTRY_DSN, SENTRY_ENVIRONMENT, SENTRY_RELEASE } from "@/lib/constants";
+import { IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
 import { TolgeeNextProvider } from "@/tolgee/client";
 import { getLocale } from "@/tolgee/language";
 import { getTolgee } from "@/tolgee/server";
@@ -25,11 +25,7 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => {
   return (
     <html lang={locale} translate="no">
       <body className="flex h-dvh flex-col transition-all ease-in-out">
-        <SentryProvider
-          sentryDsn={SENTRY_DSN}
-          sentryRelease={SENTRY_RELEASE}
-          sentryEnvironment={SENTRY_ENVIRONMENT}
-          isEnabled={IS_PRODUCTION}>
+        <SentryProvider sentryDsn={SENTRY_DSN} isEnabled={IS_PRODUCTION}>
           <TolgeeNextProvider language={locale} staticData={staticData as unknown as TolgeeStaticData}>
             {children}
           </TolgeeNextProvider>

apps/web/app/lib/templates.ts

@@ -3517,7 +3517,21 @@ export const previewSurvey = (projectName: string, t: TFnType) => {
     styling: null,
     segment: null,
     questions: [
-       {
+      {
+        ...buildRatingQuestion({
+          id: "lbdxozwikh838yc6a8vbwuju",
+          range: 5,
+          scale: "star",
+          headline: t("templates.preview_survey_question_1_headline", { projectName }),
+          required: true,
+          subheader: t("templates.preview_survey_question_1_subheader"),
+          lowerLabel: t("templates.preview_survey_question_1_lower_label"),
+          upperLabel: t("templates.preview_survey_question_1_upper_label"),
+          t,
+        }),
+        isDraft: true,
+      },
+      {
         ...buildMultipleChoiceQuestion({
           id: "rjpu42ps6dzirsn9ds6eydgt",
           type: TSurveyQuestionTypeEnum.MultipleChoiceSingle,
@@ -3534,20 +3548,6 @@ export const previewSurvey = (projectName: string, t: TFnType) => {
         }),
         isDraft: true,
       },
-      {
-        ...buildRatingQuestion({
-          id: "lbdxozwikh838yc6a8vbwuju",
-          range: 5,
-          scale: "star",
-          headline: t("templates.preview_survey_question_1_headline", { projectName }),
-          required: true,
-          subheader: t("templates.preview_survey_question_1_subheader"),
-          lowerLabel: t("templates.preview_survey_question_1_lower_label"),
-          upperLabel: t("templates.preview_survey_question_1_upper_label"),
-          t,
-        }),
-        isDraft: true,
-      },
     ],
     endings: [
       {

apps/web/app/page.test.tsx

@@ -8,7 +8,7 @@ import { TUser } from "@formbricks/types/user";
 import Page from "./page";
 
 vi.mock("@/lib/project/service", () => ({
-  getUserProjectEnvironmentsByOrganizationIds: vi.fn(),
+  getProjectEnvironmentsByOrganizationIds: vi.fn(),
 }));
 
 vi.mock("@/lib/instance/service", () => ({
@@ -152,7 +152,7 @@ describe("Page", () => {
     const { getIsFreshInstance } = await import("@/lib/instance/service");
     const { getUser } = await import("@/lib/user/service");
     const { getOrganizationsByUserId } = await import("@/lib/organization/service");
-    const { getUserProjectEnvironmentsByOrganizationIds } = await import("@/lib/project/service");
+    const { getProjectEnvironmentsByOrganizationIds } = await import("@/lib/project/service");
     const { getMembershipByUserIdOrganizationId } = await import("@/lib/membership/service");
     const { getAccessFlags } = await import("@/lib/membership/utils");
     const { redirect } = await import("next/navigation");
@@ -220,7 +220,7 @@ describe("Page", () => {
     } as any);
     vi.mocked(getIsFreshInstance).mockResolvedValue(false);
     vi.mocked(getUser).mockResolvedValue(mockUser);
-    vi.mocked(getUserProjectEnvironmentsByOrganizationIds).mockResolvedValue(
+    vi.mocked(getProjectEnvironmentsByOrganizationIds).mockResolvedValue(
       mockUserProjects as unknown as TProject[]
     );
     vi.mocked(getOrganizationsByUserId).mockResolvedValue([mockOrganization]);
@@ -241,7 +241,7 @@ describe("Page", () => {
     const { getServerSession } = await import("next-auth");
     const { getIsFreshInstance } = await import("@/lib/instance/service");
     const { getUser } = await import("@/lib/user/service");
-    const { getUserProjectEnvironmentsByOrganizationIds } = await import("@/lib/project/service");
+    const { getProjectEnvironmentsByOrganizationIds } = await import("@/lib/project/service");
     const { getOrganizationsByUserId } = await import("@/lib/organization/service");
     const { getMembershipByUserIdOrganizationId } = await import("@/lib/membership/service");
     const { getAccessFlags } = await import("@/lib/membership/utils");
@@ -310,7 +310,7 @@ describe("Page", () => {
     } as any);
     vi.mocked(getIsFreshInstance).mockResolvedValue(false);
     vi.mocked(getUser).mockResolvedValue(mockUser);
-    vi.mocked(getUserProjectEnvironmentsByOrganizationIds).mockResolvedValue(
+    vi.mocked(getProjectEnvironmentsByOrganizationIds).mockResolvedValue(
       mockUserProjects as unknown as TProject[]
     );
     vi.mocked(getOrganizationsByUserId).mockResolvedValue([mockOrganization]);
@@ -334,7 +334,7 @@ describe("Page", () => {
     const { getOrganizationsByUserId } = await import("@/lib/organization/service");
     const { getMembershipByUserIdOrganizationId } = await import("@/lib/membership/service");
     const { getAccessFlags } = await import("@/lib/membership/utils");
-    const { getUserProjectEnvironmentsByOrganizationIds } = await import("@/lib/project/service");
+    const { getProjectEnvironmentsByOrganizationIds } = await import("@/lib/project/service");
     const { render } = await import("@testing-library/react");
 
     const mockUser: TUser = {
@@ -432,7 +432,7 @@ describe("Page", () => {
     vi.mocked(getUser).mockResolvedValue(mockUser);
     vi.mocked(getOrganizationsByUserId).mockResolvedValue([mockOrganization]);
     vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
-    vi.mocked(getUserProjectEnvironmentsByOrganizationIds).mockResolvedValue(mockUserProjects);
+    vi.mocked(getProjectEnvironmentsByOrganizationIds).mockResolvedValue(mockUserProjects);
     vi.mocked(getAccessFlags).mockReturnValue({
       isManager: false,
       isOwner: false,

apps/web/app/page.tsx

@@ -3,7 +3,7 @@ import { getIsFreshInstance } from "@/lib/instance/service";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getOrganizationsByUserId } from "@/lib/organization/service";
-import { getUserProjectEnvironmentsByOrganizationIds } from "@/lib/project/service";
+import { getProjectEnvironmentsByOrganizationIds } from "@/lib/project/service";
 import { getUser } from "@/lib/user/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { ClientLogout } from "@/modules/ui/components/client-logout";
@@ -34,10 +34,7 @@ const Page = async () => {
     return redirect("/setup/organization/create");
   }
 
-  const projectsByOrg = await getUserProjectEnvironmentsByOrganizationIds(
-    userOrganizations.map((org) => org.id),
-    user.id
-  );
+  const projectsByOrg = await getProjectEnvironmentsByOrganizationIds(userOrganizations.map((org) => org.id));
 
   // Flatten all environments from all projects across all organizations
   const allEnvironments = projectsByOrg.flatMap((project) => project.environments);

apps/web/app/sentry/SentryProvider.test.tsx

@@ -48,24 +48,6 @@ describe("SentryProvider", () => {
     );
   });
 
-  test("calls Sentry.init with sentryRelease when provided", () => {
-    const initSpy = vi.spyOn(Sentry, "init").mockImplementation(() => undefined);
-    const testRelease = "v1.2.3";
-
-    render(
-      <SentryProvider sentryDsn={sentryDsn} sentryRelease={testRelease} isEnabled>
-        <div data-testid="child">Test Content</div>
-      </SentryProvider>
-    );
-
-    expect(initSpy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        dsn: sentryDsn,
-        release: testRelease,
-      })
-    );
-  });
-
   test("does not call Sentry.init when sentryDsn is not provided", () => {
     const initSpy = vi.spyOn(Sentry, "init").mockImplementation(() => undefined);
 

apps/web/app/sentry/SentryProvider.tsx

@@ -6,24 +6,14 @@ import { useEffect } from "react";
 interface SentryProviderProps {
   children: React.ReactNode;
   sentryDsn?: string;
-  sentryRelease?: string;
-  sentryEnvironment?: string;
   isEnabled?: boolean;
 }
 
-export const SentryProvider = ({
-  children,
-  sentryDsn,
-  sentryRelease,
-  sentryEnvironment,
-  isEnabled,
-}: SentryProviderProps) => {
+export const SentryProvider = ({ children, sentryDsn, isEnabled }: SentryProviderProps) => {
   useEffect(() => {
     if (sentryDsn && isEnabled) {
       Sentry.init({
         dsn: sentryDsn,
-        release: sentryRelease,
-        environment: sentryEnvironment,
 
         // No tracing while Sentry doesn't update to telemetry 2.0.0 - https://github.com/getsentry/sentry-javascript/issues/15737
         tracesSampleRate: 0,

apps/web/lib/constants.ts

@@ -233,8 +233,8 @@ export enum STRIPE_PROJECT_NAMES {
 }
 
 export enum STRIPE_PRICE_LOOKUP_KEYS {
-  STARTUP_MAY25_MONTHLY = "STARTUP_MAY25_MONTHLY",
-  STARTUP_MAY25_YEARLY = "STARTUP_MAY25_YEARLY",
+  STARTUP_MONTHLY = "formbricks_startup_monthly",
+  STARTUP_YEARLY = "formbricks_startup_yearly",
   SCALE_MONTHLY = "formbricks_scale_monthly",
   SCALE_YEARLY = "formbricks_scale_yearly",
 }
@@ -273,30 +273,17 @@ export const RECAPTCHA_SITE_KEY = env.RECAPTCHA_SITE_KEY;
 export const RECAPTCHA_SECRET_KEY = env.RECAPTCHA_SECRET_KEY;
 export const IS_RECAPTCHA_CONFIGURED = Boolean(RECAPTCHA_SITE_KEY && RECAPTCHA_SECRET_KEY);
 
-// Use the app version for Sentry release (updated during build in production)
-// Fallback to environment variable if package.json is not accessible
-export const SENTRY_RELEASE = (() => {
-  if (process.env.NODE_ENV !== "production") {
-    return undefined;
-  }
-
-  // Try to read from package.json with proper error handling
-  try {
-    const pkg = require("../package.json");
-    return pkg.version === "0.0.0" ? undefined : `v${pkg.version}`;
-  } catch {
-    // If package.json can't be read (e.g., in some deployment scenarios),
-    // return undefined and let Sentry work without release tracking
-    return undefined;
-  }
-})();
-export const SENTRY_ENVIRONMENT = env.SENTRY_ENVIRONMENT;
 export const SENTRY_DSN = env.SENTRY_DSN;
 
 export const PROMETHEUS_ENABLED = env.PROMETHEUS_ENABLED === "1";
 
 export const USER_MANAGEMENT_MINIMUM_ROLE = env.USER_MANAGEMENT_MINIMUM_ROLE ?? "manager";
 
-export const AUDIT_LOG_ENABLED = env.AUDIT_LOG_ENABLED === "1";
+export const AUDIT_LOG_ENABLED =
+  env.AUDIT_LOG_ENABLED === "1" &&
+  env.REDIS_URL &&
+  env.REDIS_URL !== "" &&
+  env.ENCRYPTION_KEY &&
+  env.ENCRYPTION_KEY !== ""; // The audit log requires Redis to be configured
 export const AUDIT_LOG_GET_USER_IP = env.AUDIT_LOG_GET_USER_IP === "1";
 export const SESSION_MAX_AGE = Number(env.SESSION_MAX_AGE) || 86400;

apps/web/lib/env.ts

@@ -127,7 +127,6 @@ export const env = createEnv({
       .string()
       .transform((val) => parseInt(val))
       .optional(),
-    SENTRY_ENVIRONMENT: z.string().optional(),
   },
 
   /*
@@ -226,6 +225,5 @@ export const env = createEnv({
     AUDIT_LOG_ENABLED: process.env.AUDIT_LOG_ENABLED,
     AUDIT_LOG_GET_USER_IP: process.env.AUDIT_LOG_GET_USER_IP,
     SESSION_MAX_AGE: process.env.SESSION_MAX_AGE,
-    SENTRY_ENVIRONMENT: process.env.SENTRY_ENVIRONMENT,
   },
 });

apps/web/lib/fileValidation.ts

@@ -65,8 +65,7 @@ export const validateSingleFile = (
   return !allowedFileExtensions || allowedFileExtensions.includes(extension as TAllowedFileExtension);
 };
 
-export const validateFileUploads = (data?: TResponseData, questions?: TSurveyQuestion[]): boolean => {
-  if (!data) return true;
+export const validateFileUploads = (data: TResponseData, questions?: TSurveyQuestion[]): boolean => {
   for (const key of Object.keys(data)) {
     const question = questions?.find((q) => q.id === key);
     if (!question || question.type !== TSurveyQuestionTypeEnum.FileUpload) continue;

apps/web/lib/organization/service.test.ts

@@ -1,16 +1,9 @@
 import { BILLING_LIMITS, PROJECT_FEATURE_KEYS } from "@/lib/constants";
-import { updateUser } from "@/lib/user/service";
 import { Prisma } from "@prisma/client";
 import { afterEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { DatabaseError } from "@formbricks/types/errors";
-import {
-  createOrganization,
-  getOrganization,
-  getOrganizationsByUserId,
-  subscribeOrganizationMembersToSurveyResponses,
-  updateOrganization,
-} from "./service";
+import { createOrganization, getOrganization, getOrganizationsByUserId, updateOrganization } from "./service";
 
 vi.mock("@formbricks/database", () => ({
   prisma: {
@@ -20,16 +13,9 @@ vi.mock("@formbricks/database", () => ({
       create: vi.fn(),
       update: vi.fn(),
     },
-    user: {
-      findUnique: vi.fn(),
-    },
   },
 }));
 
-vi.mock("@/lib/user/service", () => ({
-  updateUser: vi.fn(),
-}));
-
 describe("Organization Service", () => {
   afterEach(() => {
     vi.clearAllMocks();
@@ -266,62 +252,4 @@ describe("Organization Service", () => {
       });
     });
   });
-
-  describe("subscribeOrganizationMembersToSurveyResponses", () => {
-    test("should subscribe user to survey responses when not unsubscribed", async () => {
-      const mockUser = {
-        id: "user-123",
-        notificationSettings: {
-          alert: { "existing-survey-id": true },
-          weeklySummary: {},
-          unsubscribedOrganizationIds: [], // User is subscribed to all organizations
-        },
-      } as any;
-
-      const surveyId = "survey-123";
-      const userId = "user-123";
-      const organizationId = "org-123";
-
-      vi.mocked(prisma.user.findUnique).mockResolvedValueOnce(mockUser);
-      vi.mocked(updateUser).mockResolvedValueOnce({} as any);
-
-      await subscribeOrganizationMembersToSurveyResponses(surveyId, userId, organizationId);
-
-      expect(prisma.user.findUnique).toHaveBeenCalledWith({
-        where: { id: userId },
-      });
-      expect(updateUser).toHaveBeenCalledWith(userId, {
-        notificationSettings: {
-          alert: {
-            "existing-survey-id": true,
-            "survey-123": true,
-          },
-          weeklySummary: {},
-          unsubscribedOrganizationIds: [],
-        },
-      });
-    });
-
-    test("should not subscribe user when unsubscribed from organization", async () => {
-      const mockUser = {
-        id: "user-123",
-        notificationSettings: {
-          alert: { "existing-survey-id": true },
-          weeklySummary: {},
-          unsubscribedOrganizationIds: ["org-123"], // User has unsubscribed from this organization
-        },
-      } as any;
-
-      const surveyId = "survey-123";
-      const userId = "user-123";
-      const organizationId = "org-123";
-
-      vi.mocked(prisma.user.findUnique).mockResolvedValueOnce(mockUser);
-
-      await subscribeOrganizationMembersToSurveyResponses(surveyId, userId, organizationId);
-
-      // Should not call updateUser because user is unsubscribed from this organization
-      expect(updateUser).not.toHaveBeenCalled();
-    });
-  });
 });

apps/web/lib/project/service.test.ts

@@ -7,8 +7,8 @@ import { ITEMS_PER_PAGE } from "../constants";
 import {
   getProject,
   getProjectByEnvironmentId,
+  getProjectEnvironmentsByOrganizationIds,
   getProjects,
-  getUserProjectEnvironmentsByOrganizationIds,
   getUserProjects,
 } from "./service";
 
@@ -21,7 +21,6 @@ vi.mock("@formbricks/database", () => ({
     },
     membership: {
       findFirst: vi.fn(),
-      findMany: vi.fn(),
     },
   },
 }));
@@ -489,7 +488,6 @@ describe("Project Service", () => {
   test("getProjectsByOrganizationIds should return projects for given organization IDs", async () => {
     const organizationId1 = createId();
     const organizationId2 = createId();
-    const userId = createId();
     const mockProjects = [
       {
         environments: [],
@@ -499,34 +497,16 @@ describe("Project Service", () => {
       },
     ];
 
-    vi.mocked(prisma.membership.findMany).mockResolvedValue([
-      {
-        userId,
-        organizationId: organizationId1,
-        role: "owner" as any,
-        accepted: true,
-        deprecatedRole: null,
-      },
-      {
-        userId,
-        organizationId: organizationId2,
-        role: "owner" as any,
-        accepted: true,
-        deprecatedRole: null,
-      },
-    ]);
-
     vi.mocked(prisma.project.findMany).mockResolvedValue(mockProjects as any);
 
-    const result = await getUserProjectEnvironmentsByOrganizationIds(
-      [organizationId1, organizationId2],
-      userId
-    );
+    const result = await getProjectEnvironmentsByOrganizationIds([organizationId1, organizationId2]);
 
     expect(result).toEqual(mockProjects);
     expect(prisma.project.findMany).toHaveBeenCalledWith({
       where: {
-        OR: [{ organizationId: organizationId1 }, { organizationId: organizationId2 }],
+        organizationId: {
+          in: [organizationId1, organizationId2],
+        },
       },
       select: { environments: true },
     });
@@ -535,36 +515,17 @@ describe("Project Service", () => {
   test("getProjectsByOrganizationIds should return empty array when no projects are found", async () => {
     const organizationId1 = createId();
     const organizationId2 = createId();
-    const userId = createId();
-
-    vi.mocked(prisma.membership.findMany).mockResolvedValue([
-      {
-        userId,
-        organizationId: organizationId1,
-        role: "owner" as any,
-        accepted: true,
-        deprecatedRole: null,
-      },
-      {
-        userId,
-        organizationId: organizationId2,
-        role: "owner" as any,
-        accepted: true,
-        deprecatedRole: null,
-      },
-    ]);
 
     vi.mocked(prisma.project.findMany).mockResolvedValue([]);
 
-    const result = await getUserProjectEnvironmentsByOrganizationIds(
-      [organizationId1, organizationId2],
-      userId
-    );
+    const result = await getProjectEnvironmentsByOrganizationIds([organizationId1, organizationId2]);
 
     expect(result).toEqual([]);
     expect(prisma.project.findMany).toHaveBeenCalledWith({
       where: {
-        OR: [{ organizationId: organizationId1 }, { organizationId: organizationId2 }],
+        organizationId: {
+          in: [organizationId1, organizationId2],
+        },
       },
       select: { environments: true },
     });
@@ -573,111 +534,18 @@ describe("Project Service", () => {
   test("getProjectsByOrganizationIds should throw DatabaseError when prisma throws", async () => {
     const organizationId1 = createId();
     const organizationId2 = createId();
-    const userId = createId();
     const prismaError = new Prisma.PrismaClientKnownRequestError("Database error", {
       code: "P2002",
       clientVersion: "5.0.0",
     });
-
-    vi.mocked(prisma.membership.findMany).mockResolvedValue([
-      {
-        userId,
-        organizationId: organizationId1,
-        role: "owner" as any,
-        accepted: true,
-        deprecatedRole: null,
-      },
-    ]);
-
     vi.mocked(prisma.project.findMany).mockRejectedValue(prismaError);
 
-    await expect(
-      getUserProjectEnvironmentsByOrganizationIds([organizationId1, organizationId2], userId)
-    ).rejects.toThrow(DatabaseError);
+    await expect(getProjectEnvironmentsByOrganizationIds([organizationId1, organizationId2])).rejects.toThrow(
+      DatabaseError
+    );
   });
 
   test("getProjectsByOrganizationIds should throw ValidationError with wrong input", async () => {
-    const userId = createId();
-    await expect(getUserProjectEnvironmentsByOrganizationIds(["wrong-id"], userId)).rejects.toThrow(
-      ValidationError
-    );
-  });
-
-  test("getProjectsByOrganizationIds should return empty array when user has no memberships", async () => {
-    const organizationId1 = createId();
-    const organizationId2 = createId();
-    const userId = createId();
-
-    // Mock no memberships found
-    vi.mocked(prisma.membership.findMany).mockResolvedValue([]);
-
-    const result = await getUserProjectEnvironmentsByOrganizationIds(
-      [organizationId1, organizationId2],
-      userId
-    );
-
-    expect(result).toEqual([]);
-    expect(prisma.membership.findMany).toHaveBeenCalledWith({
-      where: {
-        userId,
-        organizationId: {
-          in: [organizationId1, organizationId2],
-        },
-      },
-    });
-    // Should not call project.findMany when no memberships
-    expect(prisma.project.findMany).not.toHaveBeenCalled();
-  });
-
-  test("getProjectsByOrganizationIds should handle member role with team access", async () => {
-    const organizationId1 = createId();
-    const organizationId2 = createId();
-    const userId = createId();
-    const mockProjects = [
-      {
-        environments: [],
-      },
-    ];
-
-    // Mock membership where user is a member
-    vi.mocked(prisma.membership.findMany).mockResolvedValue([
-      {
-        userId,
-        organizationId: organizationId1,
-        role: "member" as any,
-        accepted: true,
-        deprecatedRole: null,
-      },
-    ]);
-
-    vi.mocked(prisma.project.findMany).mockResolvedValue(mockProjects as any);
-
-    const result = await getUserProjectEnvironmentsByOrganizationIds(
-      [organizationId1, organizationId2],
-      userId
-    );
-
-    expect(result).toEqual(mockProjects);
-    expect(prisma.project.findMany).toHaveBeenCalledWith({
-      where: {
-        OR: [
-          {
-            organizationId: organizationId1,
-            projectTeams: {
-              some: {
-                team: {
-                  teamUsers: {
-                    some: {
-                      userId,
-                    },
-                  },
-                },
-              },
-            },
-          },
-        ],
-      },
-      select: { environments: true },
-    });
+    await expect(getProjectEnvironmentsByOrganizationIds(["wrong-id"])).rejects.toThrow(ValidationError);
   });
 });

apps/web/lib/project/service.ts

@@ -171,56 +171,20 @@ export const getOrganizationProjectsCount = reactCache(async (organizationId: st
   }
 });
 
-export const getUserProjectEnvironmentsByOrganizationIds = reactCache(
-  async (organizationIds: string[], userId: string): Promise<Pick<TProject, "environments">[]> => {
-    validateInputs([organizationIds, ZId.array()], [userId, ZId]);
+export const getProjectEnvironmentsByOrganizationIds = reactCache(
+  async (organizationIds: string[]): Promise<Pick<TProject, "environments">[]> => {
+    validateInputs([organizationIds, ZId.array()]);
     try {
       if (organizationIds.length === 0) {
         return [];
       }
 
-      const memberships = await prisma.membership.findMany({
+      const projects = await prisma.project.findMany({
         where: {
-          userId,
           organizationId: {
             in: organizationIds,
           },
         },
-      });
-
-      if (memberships.length === 0) {
-        return [];
-      }
-
-      const whereConditions: Prisma.ProjectWhereInput[] = memberships.map((membership) => {
-        let projectWhereClause: Prisma.ProjectWhereInput = {
-          organizationId: membership.organizationId,
-        };
-
-        if (membership.role === "member") {
-          projectWhereClause = {
-            ...projectWhereClause,
-            projectTeams: {
-              some: {
-                team: {
-                  teamUsers: {
-                    some: {
-                      userId,
-                    },
-                  },
-                },
-              },
-            },
-          };
-        }
-
-        return projectWhereClause;
-      });
-
-      const projects = await prisma.project.findMany({
-        where: {
-          OR: whereConditions,
-        },
         select: { environments: true },
       });
 

apps/web/lib/styling/constants.ts

@@ -8,6 +8,7 @@ export const COLOR_DEFAULTS = {
   inputBorderColor: "#cbd5e1",
   cardBackgroundColor: "#ffffff",
   cardBorderColor: "#f8fafc",
+  cardShadowColor: "#000000",
   highlightBorderColor: "#64748b",
 } as const;
 
@@ -31,6 +32,9 @@ export const defaultStyling: TProjectStyling = {
   cardBorderColor: {
     light: COLOR_DEFAULTS.cardBorderColor,
   },
+  cardShadowColor: {
+    light: COLOR_DEFAULTS.cardShadowColor,
+  },
   isLogoHidden: false,
   highlightBorderColor: undefined,
   isDarkModeEnabled: false,

apps/web/lib/survey/__mock__/survey.mock.ts

@@ -143,6 +143,7 @@ export const mockPrismaPerson: Prisma.ContactGetPayload<{
   include: typeof selectContact;
 }> = {
   id: mockId,
+  userId: mockId,
   attributes: [
     {
       value: "de",

apps/web/lib/tag/service.test.ts

@@ -1,8 +1,5 @@
-import { TagError } from "@/modules/projects/settings/types/tag";
-import { Prisma } from "@prisma/client";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
-import { PrismaErrorType } from "@formbricks/database/types/error";
 import { TTag } from "@formbricks/types/tags";
 import { createTag, getTag, getTagsByEnvironmentId } from "./service";
 
@@ -113,7 +110,7 @@ describe("Tag Service", () => {
       vi.mocked(prisma.tag.create).mockResolvedValue(mockTag);
 
       const result = await createTag("env1", "New Tag");
-      expect(result).toEqual({ ok: true, data: mockTag });
+      expect(result).toEqual(mockTag);
       expect(prisma.tag.create).toHaveBeenCalledWith({
         data: {
           name: "New Tag",
@@ -121,30 +118,5 @@ describe("Tag Service", () => {
         },
       });
     });
-
-    test("should handle duplicate tag name error", async () => {
-      // const duplicateError = new Error("Unique constraint failed");
-      // (duplicateError as any).code = "P2002";
-      const duplicateError = new Prisma.PrismaClientKnownRequestError("Unique constraint failed", {
-        code: PrismaErrorType.UniqueConstraintViolation,
-        clientVersion: "4.0.0",
-      });
-
-      vi.mocked(prisma.tag.create).mockRejectedValue(duplicateError);
-      const result = await createTag("env1", "Duplicate Tag");
-      expect(result).toEqual({
-        ok: false,
-        error: { message: "Tag with this name already exists", code: TagError.TAG_NAME_ALREADY_EXISTS },
-      });
-    });
-    test("should handle general database errors", async () => {
-      const generalError = new Error("Database connection failed");
-      vi.mocked(prisma.tag.create).mockRejectedValue(generalError);
-      const result = await createTag("env1", "New Tag");
-      expect(result).toStrictEqual({
-        ok: false,
-        error: { message: "Database connection failed", code: TagError.UNEXPECTED_ERROR },
-      });
-    });
   });
 });

apps/web/lib/tag/service.ts

@@ -1,11 +1,7 @@
 import "server-only";
-import { TagError } from "@/modules/projects/settings/types/tag";
-import { Prisma } from "@prisma/client";
 import { cache as reactCache } from "react";
 import { prisma } from "@formbricks/database";
-import { PrismaErrorType } from "@formbricks/database/types/error";
 import { ZId, ZOptionalNumber, ZString } from "@formbricks/types/common";
-import { Result, err, ok } from "@formbricks/types/error-handlers";
 import { TTag } from "@formbricks/types/tags";
 import { ITEMS_PER_PAGE } from "../constants";
 import { validateInputs } from "../utils/validate";
@@ -46,10 +42,7 @@ export const getTag = reactCache(async (id: string): Promise<TTag | null> => {
   }
 });
 
-export const createTag = async (
-  environmentId: string,
-  name: string
-): Promise<Result<TTag, { code: TagError; message: string; meta?: Record<string, string> }>> => {
+export const createTag = async (environmentId: string, name: string): Promise<TTag> => {
   validateInputs([environmentId, ZId], [name, ZString]);
 
   try {
@@ -60,19 +53,8 @@ export const createTag = async (
       },
     });
 
-    return ok(tag);
+    return tag;
   } catch (error) {
-    if (error instanceof Prisma.PrismaClientKnownRequestError) {
-      if (error.code === PrismaErrorType.UniqueConstraintViolation) {
-        return err({
-          code: TagError.TAG_NAME_ALREADY_EXISTS,
-          message: "Tag with this name already exists",
-        });
-      }
-    }
-    return err({
-      code: TagError.UNEXPECTED_ERROR,
-      message: error.message,
-    });
+    throw error;
   }
 };

apps/web/locales/de-DE.json

@@ -108,10 +108,6 @@
     "thanks_for_upgrading": "Vielen Dank, dass Du dein Formbricks-Abonnement aktualisiert hast.",
     "upgrade_successful": "Upgrade erfolgreich"
   },
-  "c": {
-    "link_expired": "Dein Link ist abgelaufen.",
-    "link_expired_description": "Der von dir verwendete Link ist nicht mehr gültig."
-  },
   "common": {
     "accepted": "Akzeptiert",
     "account": "Konto",
@@ -316,7 +312,6 @@
     "question_id": "Frage-ID",
     "questions": "Fragen",
     "read_docs": "Dokumentation lesen",
-    "recipients": "Empfänger",
     "remove": "Entfernen",
     "reorder_and_hide_columns": "Spalten neu anordnen und ausblenden",
     "report_survey": "Umfrage melden",
@@ -1248,8 +1243,6 @@
         "add_description": "Beschreibung hinzufügen",
         "add_ending": "Abschluss hinzufügen",
         "add_ending_below": "Abschluss unten hinzufügen",
-        "add_fallback": "Hinzufügen",
-        "add_fallback_placeholder": "Hinzufügen eines Platzhalters, der angezeigt wird, wenn die Frage übersprungen wird:",
         "add_hidden_field_id": "Verstecktes Feld ID hinzufügen",
         "add_highlight_border": "Rahmen hinzufügen",
         "add_highlight_border_description": "Füge deiner Umfragekarte einen äußeren Rahmen hinzu.",
@@ -1307,11 +1300,12 @@
         "casual": "Lässig",
         "caution_edit_duplicate": "Duplizieren & bearbeiten",
         "caution_edit_published_survey": "Eine veröffentlichte Umfrage bearbeiten?",
+        "caution_explanation_all_data_as_download": "Alle Daten, einschließlich früherer Antworten, stehen als Download zur Verfügung.",
         "caution_explanation_intro": "Wir verstehen, dass du vielleicht noch Änderungen vornehmen möchtest. Hier erfährst du, was passiert, wenn du das tust:",
-        "caution_explanation_new_responses_separated": "Antworten vor der Änderung werden möglicherweise nicht oder nur teilweise in der Umfragezusammenfassung berücksichtigt.",
-        "caution_explanation_only_new_responses_in_summary": "Alle Daten, einschließlich früherer Antworten, bleiben auf der Umfrageübersichtsseite als Download verfügbar.",
-        "caution_explanation_responses_are_safe": "Ältere und neuere Antworten vermischen sich, was zu irreführenden Datensummen führen kann.",
-        "caution_recommendation": "Dies kann im Umfrageübersicht zu Dateninkonsistenzen führen. Wir empfehlen stattdessen, die Umfrage zu duplizieren.",
+        "caution_explanation_new_responses_separated": "Neue Antworten werden separat gesammelt.",
+        "caution_explanation_only_new_responses_in_summary": "Nur neue Antworten erscheinen in der Umfragezusammenfassung.",
+        "caution_explanation_responses_are_safe": "Vorhandene Antworten bleiben sicher.",
+        "caution_recommendation": "Das Bearbeiten deiner Umfrage kann zu Dateninkonsistenzen in der Umfragezusammenfassung führen. Wir empfehlen stattdessen, die Umfrage zu duplizieren.",
         "caution_text": "Änderungen werden zu Inkonsistenzen führen",
         "centered_modal_overlay_color": "Zentrierte modale Überlagerungsfarbe",
         "change_anyway": "Trotzdem ändern",
@@ -1388,7 +1382,6 @@
         "error_saving_changes": "Fehler beim Speichern der Änderungen",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Sogar nachdem sie eine Antwort eingereicht haben (z.B. Feedback-Box)",
         "everyone": "Jeder",
-        "fallback_for": "Ersatz für",
         "fallback_missing": "Fehlender Fallback",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} wird in der Logik der Frage {questionIndex} verwendet. Bitte entferne es zuerst aus der Logik.",
         "field_name_eg_score_price": "Feldname z.B. Punktzahl, Preis",
@@ -1713,7 +1706,6 @@
         "congrats": "Glückwunsch! Deine Umfrage ist jetzt live.",
         "connect_your_website_or_app_with_formbricks_to_get_started": "Verbinde deine Website oder App mit Formbricks, um loszulegen.",
         "copy_link_to_public_results": "Link zu öffentlichen Ergebnissen kopieren",
-        "create_and_manage_segments": "Erstellen und verwalten Sie Ihre Segmente unter Kontakte > Segmente",
         "create_single_use_links": "Single-Use Links erstellen",
         "create_single_use_links_description": "Akzeptiere nur eine Antwort pro Link. So geht's.",
         "custom_range": "Benutzerdefinierter Bereich...",
@@ -1723,30 +1715,32 @@
         "drop_offs": "Drop-Off Rate",
         "drop_offs_tooltip": "So oft wurde die Umfrage gestartet, aber nicht abgeschlossen.",
         "dynamic_popup": "Dynamisch (Pop-up)",
-        "email_embed": "E-Mail-Einbettung",
         "email_sent": "E-Mail gesendet!",
-        "embed_code": "Einbettungscode",
         "embed_code_copied_to_clipboard": "Einbettungscode in die Zwischenablage kopiert!",
         "embed_in_an_email": "In eine E-Mail einbetten",
         "embed_in_app": "In App einbetten",
         "embed_mode": "Einbettungsmodus",
         "embed_mode_description": "Bette deine Umfrage mit einem minimalistischen Design ein, ohne Karten und Hintergrund.",
+        "embed_on_website": "Auf Website einbetten",
         "embed_pop_up_survey_title": "Wie man eine Pop-up-Umfrage auf seiner Website einbindet",
-        "expiry_date_description": "Sobald der Link abläuft, kann der Empfänger nicht mehr auf die Umfrage antworten.",
-        "expiry_date_optional": "Ablaufdatum (optional)",
+        "embed_survey": "Umfrage einbetten",
         "failed_to_copy_link": "Kopieren des Links fehlgeschlagen",
         "filter_added_successfully": "Filter erfolgreich hinzugefügt",
         "filter_updated_successfully": "Filter erfolgreich aktualisiert",
         "filtered_responses_csv": "Gefilterte Antworten (CSV)",
         "filtered_responses_excel": "Gefilterte Antworten (Excel)",
         "formbricks_email_survey_preview": "Formbricks E-Mail-Umfrage Vorschau",
-        "generate_and_download_links": "Links generieren und herunterladen",
-        "generate_personal_links_description": "Erstellen Sie persönliche Links für ein Segment und ordnen Sie Umfrageantworten jedem Kontakt zu. Eine CSV-Datei Ihrer persönlichen Links inklusive relevanter Kontaktinformationen wird automatisch heruntergeladen.",
-        "generate_personal_links_title": "Maximieren Sie Erkenntnisse mit persönlichen Umfragelinks",
-        "generating_links": "Links werden generiert",
-        "generating_links_toast": "Links werden generiert, der Download startet in Kürze…",
         "go_to_setup_checklist": "Gehe zur Einrichtungs-Checkliste \uD83D\uDC49",
         "hide_embed_code": "Einbettungscode ausblenden",
+        "how_to_create_a_panel": "Wie man ein Panel erstellt",
+        "how_to_create_a_panel_step_1": "Schritt 1: Erstelle ein Konto bei Prolific",
+        "how_to_create_a_panel_step_1_description": "Erstelle ein Konto bei Prolific und bestätige deine E-Mail-Adresse.",
+        "how_to_create_a_panel_step_2": "Schritt 2: Eine Studie erstellen",
+        "how_to_create_a_panel_step_2_description": "Bei Prolific erstellst Du eine neue Studie, bei der Du dein bevorzugtes Publikum basierend auf Hunderten von Merkmalen auswählen kannst.",
+        "how_to_create_a_panel_step_3": "Schritt 3: Verbinde deine Umfrage",
+        "how_to_create_a_panel_step_3_description": "Richte in deiner Formbricks-Umfrage versteckte Felder ein, um nachzuverfolgen, welcher Teilnehmer welche Antwort gegeben hat.",
+        "how_to_create_a_panel_step_4": "Schritt 4: Starte deine Studie",
+        "how_to_create_a_panel_step_4_description": "Sobald alles eingerichtet ist, kannst Du deine Studie starten. Innerhalb weniger Stunden wirst Du die ersten Antworten erhalten.",
         "impressions": "Eindrücke",
         "impressions_tooltip": "Anzahl der Aufrufe der Umfrage.",
         "includes_all": "Beinhaltet alles",
@@ -1761,19 +1755,12 @@
         "last_quarter": "Letztes Quartal",
         "last_year": "Letztes Jahr",
         "link_to_public_results_copied": "Link zu öffentlichen Ergebnissen kopiert",
-        "links_generated_success_toast": "Links erfolgreich generiert, Ihr Download beginnt in Kürze.",
         "make_sure_the_survey_type_is_set_to": "Stelle sicher, dass der Umfragetyp richtig eingestellt ist",
         "mobile_app": "Mobile App",
         "no_responses_found": "Keine Antworten gefunden",
-        "no_segments_available": "Keine Segmente verfügbar",
         "only_completed": "Nur vollständige Antworten",
         "other_values_found": "Andere Werte gefunden",
         "overall": "Insgesamt",
-        "personal_links": "Persönliche Links",
-        "personal_links_upgrade_prompt_description": "Erstellen Sie persönliche Links für ein Segment und verknüpfen Sie Umfrageantworten mit jedem Kontakt.",
-        "personal_links_upgrade_prompt_title": "Verwende persönliche Links mit einem höheren Plan",
-        "personal_links_work_with_segments": "Persönliche Links funktionieren mit Segmenten.",
-        "preview": "Vorschau",
         "publish_to_web": "Im Web veröffentlichen",
         "publish_to_web_warning": "Du bist dabei, diese Umfrageergebnisse öffentlich zugänglich zu machen.",
         "publish_to_web_warning_description": "Deine Umfrageergebnisse werden öffentlich sein. Jeder außerhalb deiner Organisation kann darauf zugreifen, wenn er den Link hat.",
@@ -1782,10 +1769,10 @@
         "quickstart_web_apps": "Schnellstart: Web-Apps",
         "quickstart_web_apps_description": "Bitte folge der Schnellstartanleitung, um loszulegen:",
         "results_are_public": "Ergebnisse sind öffentlich",
-        "select_segment": "Segment auswählen",
         "selected_responses_csv": "Ausgewählte Antworten (CSV)",
         "selected_responses_excel": "Ausgewählte Antworten (Excel)",
         "send_preview": "Vorschau senden",
+        "send_to_panel": "An das Panel senden",
         "setup_instructions": "Einrichtung",
         "setup_integrations": "Integrationen einrichten",
         "share_results": "Ergebnisse teilen",
@@ -1811,13 +1798,18 @@
         "unknown_question_type": "Unbekannter Fragetyp",
         "unpublish_from_web": "Aus dem Web entfernen",
         "unsupported_video_tag_warning": "Dein Browser unterstützt das Video-Tag nicht.",
-        "use_personal_links": "Nutze persönliche Links",
         "view_embed_code": "Einbettungscode anzeigen",
         "view_embed_code_for_email": "Einbettungscode für E-Mail anzeigen",
         "view_site": "Seite ansehen",
         "waiting_for_response": "Warte auf eine Antwort \uD83E\uDDD8‍♂️",
         "web_app": "Web-App",
+        "what_is_a_panel": "Was ist ein Panel?",
+        "what_is_a_panel_answer": "Ein Panel ist eine Gruppe von Teilnehmern, die basierend auf Merkmalen wie Alter, Beruf, Geschlecht usw. ausgewählt werden.",
+        "what_is_prolific": "Was ist Prolific?",
+        "what_is_prolific_answer": "Wir arbeiten mit Prolific zusammen, um dir Zugang zu einem Pool von über 200.000 geprüften Teilnehmern zu geben.",
         "whats_next": "Was kommt als Nächstes?",
+        "when_do_i_need_it": "Wann brauche ich das?",
+        "when_do_i_need_it_answer": "Wenn Du keinen Zugang zu genügend Leuten hast, die deiner Zielgruppe entsprechen, macht es Sinn, für ein Panel zu bezahlen.",
         "you_can_do_a_lot_more_with_links_surveys": "Mit Links-Umfragen kannst Du viel mehr machen \uD83D\uDCA1",
         "your_survey_is_public": "Deine Umfrage ist öffentlich",
         "youre_not_plugged_in_yet": "Du bist noch nicht verbunden!"
@@ -2585,7 +2577,7 @@
     "preview_survey_question_2_back_button_label": "Zurück",
     "preview_survey_question_2_choice_1_label": "Ja, halte mich auf dem Laufenden.",
     "preview_survey_question_2_choice_2_label": "Nein, danke!",
-    "preview_survey_question_2_headline": "Möchtest Du auf dem Laufenden bleiben?",
+    "preview_survey_question_2_headline": "Willst du auf dem Laufenden bleiben?",
     "preview_survey_welcome_card_headline": "Willkommen!",
     "preview_survey_welcome_card_html": "Danke für dein Feedback - los geht's!",
     "prioritize_features_description": "Identifiziere die Funktionen, die deine Nutzer am meisten und am wenigsten brauchen.",

apps/web/locales/en-US.json

@@ -108,10 +108,6 @@
     "thanks_for_upgrading": "Thanks a lot for upgrading your Formbricks subscription.",
     "upgrade_successful": "Upgrade successful"
   },
-  "c": {
-    "link_expired": "Your link is expired.",
-    "link_expired_description": "The link you used is no longer valid."
-  },
   "common": {
     "accepted": "Accepted",
     "account": "Account",
@@ -316,7 +312,6 @@
     "question_id": "Question ID",
     "questions": "Questions",
     "read_docs": "Read Docs",
-    "recipients": "Recipients",
     "remove": "Remove",
     "reorder_and_hide_columns": "Reorder and hide columns",
     "report_survey": "Report Survey",
@@ -1248,8 +1243,6 @@
         "add_description": "Add description",
         "add_ending": "Add ending",
         "add_ending_below": "Add ending below",
-        "add_fallback": "Add",
-        "add_fallback_placeholder": "Add a placeholder to show if the question gets skipped:",
         "add_hidden_field_id": "Add hidden field ID",
         "add_highlight_border": "Add highlight border",
         "add_highlight_border_description": "Add an outer border to your survey card.",
@@ -1307,11 +1300,12 @@
         "casual": "Casual",
         "caution_edit_duplicate": "Duplicate & edit",
         "caution_edit_published_survey": "Edit a published survey?",
+        "caution_explanation_all_data_as_download": "All data, including past responses are available as download.",
         "caution_explanation_intro": "We understand you might still want to make changes. Here’s what happens if you do: ",
-        "caution_explanation_new_responses_separated": "Responses before the change may not or only partially be included in the survey summary.",
-        "caution_explanation_only_new_responses_in_summary": "All data, including past responses, remain available as download on the survey summary page.",
-        "caution_explanation_responses_are_safe": "Older and newer responses get mixed which can lead to misleading data summaries.",
-        "caution_recommendation": "This may cause data inconsistencies in the survey summary. We recommend duplicating the survey instead.",
+        "caution_explanation_new_responses_separated": "New responses are collected separately.",
+        "caution_explanation_only_new_responses_in_summary": "Only new responses appear in the survey summary.",
+        "caution_explanation_responses_are_safe": "Existing responses remain safe.",
+        "caution_recommendation": "Editing your survey may cause data inconsistencies in the survey summary. We recommend duplicating the survey instead.",
         "caution_text": "Changes will lead to inconsistencies",
         "centered_modal_overlay_color": "Centered modal overlay color",
         "change_anyway": "Change anyway",
@@ -1388,7 +1382,6 @@
         "error_saving_changes": "Error saving changes",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Even after they submitted a response (e.g. Feedback Box)",
         "everyone": "Everyone",
-        "fallback_for": "Fallback for ",
         "fallback_missing": "Fallback missing",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} is used in logic of question {questionIndex}. Please remove it from logic first.",
         "field_name_eg_score_price": "Field name e.g, score, price",
@@ -1713,7 +1706,6 @@
         "congrats": "Congrats! Your survey is live.",
         "connect_your_website_or_app_with_formbricks_to_get_started": "Connect your website or app with Formbricks to get started.",
         "copy_link_to_public_results": "Copy link to public results",
-        "create_and_manage_segments": "Create and manage your Segments under Contacts > Segments",
         "create_single_use_links": "Create single-use links",
         "create_single_use_links_description": "Accept only one submission per link. Here is how.",
         "custom_range": "Custom range...",
@@ -1723,30 +1715,32 @@
         "drop_offs": "Drop-Offs",
         "drop_offs_tooltip": "Number of times the survey has been started but not completed.",
         "dynamic_popup": "Dynamic (Pop-up)",
-        "email_embed": "Email embed",
         "email_sent": "Email sent!",
-        "embed_code": "Embed code",
         "embed_code_copied_to_clipboard": "Embed code copied to clipboard!",
         "embed_in_an_email": "Embed in an email",
         "embed_in_app": "Embed in app",
         "embed_mode": "Embed Mode",
         "embed_mode_description": "Embed your survey with a minimalist design, discarding padding and background.",
+        "embed_on_website": "Embed on website",
         "embed_pop_up_survey_title": "How to embed a pop-up survey on your website",
-        "expiry_date_description": "Once the link expires, the recipient cannot respond to survey any longer.",
-        "expiry_date_optional": "Expiry date (optional)",
+        "embed_survey": "Embed survey",
         "failed_to_copy_link": "Failed to copy link",
         "filter_added_successfully": "Filter added successfully",
         "filter_updated_successfully": "Filter updated successfully",
         "filtered_responses_csv": "Filtered responses (CSV)",
         "filtered_responses_excel": "Filtered responses (Excel)",
         "formbricks_email_survey_preview": "Formbricks Email Survey Preview",
-        "generate_and_download_links": "Generate & download links",
-        "generate_personal_links_description": "Generate personal links for a segment and match survey responses to each contact. A CSV of you personal links incl. relevant contact information will be downloaded automatically.",
-        "generate_personal_links_title": "Maximize insights with personal survey links",
-        "generating_links": "Generating links",
-        "generating_links_toast": "Generating links, download will start soon…",
         "go_to_setup_checklist": "Go to Setup Checklist \uD83D\uDC49",
         "hide_embed_code": "Hide embed code",
+        "how_to_create_a_panel": "How to create a panel",
+        "how_to_create_a_panel_step_1": "Step 1: Create an account with Prolific",
+        "how_to_create_a_panel_step_1_description": "Create an account with Prolific and verify your email address.",
+        "how_to_create_a_panel_step_2": "Step 2: Create a study",
+        "how_to_create_a_panel_step_2_description": "At Prolific, you create a new study where you can pick your preferred audience based on hundreds of characteristics.",
+        "how_to_create_a_panel_step_3": "Step 3: Connect your survey",
+        "how_to_create_a_panel_step_3_description": "Set up hidden fields in your Formbricks survey to track which participant provided which answer.",
+        "how_to_create_a_panel_step_4": "Step 4: Launch your study",
+        "how_to_create_a_panel_step_4_description": "Once everything is setup, you can launch your study. Within a few hours you’ll receive the first responses.",
         "impressions": "Impressions",
         "impressions_tooltip": "Number of times the survey has been viewed.",
         "includes_all": "Includes all",
@@ -1761,19 +1755,12 @@
         "last_quarter": "Last quarter",
         "last_year": "Last year",
         "link_to_public_results_copied": "Link to public results copied",
-        "links_generated_success_toast": "Links generated successfully, your download will start soon.",
         "make_sure_the_survey_type_is_set_to": "Make sure the survey type is set to",
         "mobile_app": "Mobile app",
         "no_responses_found": "No responses found",
-        "no_segments_available": "No segments available",
         "only_completed": "Only completed",
         "other_values_found": "Other values found",
         "overall": "Overall",
-        "personal_links": "Personal links",
-        "personal_links_upgrade_prompt_description": "Generate personal links for a segment and link survey responses to each contact.",
-        "personal_links_upgrade_prompt_title": "Use personal links with a higher plan",
-        "personal_links_work_with_segments": "Personal links work with segments.",
-        "preview": "Preview",
         "publish_to_web": "Publish to web",
         "publish_to_web_warning": "You are about to release these survey results to the public.",
         "publish_to_web_warning_description": "Your survey results will be public. Anyone outside your organization can access them if they have the link.",
@@ -1782,10 +1769,10 @@
         "quickstart_web_apps": "Quickstart: Web apps",
         "quickstart_web_apps_description": "Please follow the Quickstart guide to get started:",
         "results_are_public": "Results are public",
-        "select_segment": "Select segment",
         "selected_responses_csv": "Selected responses (CSV)",
         "selected_responses_excel": "Selected responses (Excel)",
         "send_preview": "Send preview",
+        "send_to_panel": "Send to panel",
         "setup_instructions": "Setup instructions",
         "setup_integrations": "Setup integrations",
         "share_results": "Share results",
@@ -1811,13 +1798,18 @@
         "unknown_question_type": "Unknown Question Type",
         "unpublish_from_web": "Unpublish from web",
         "unsupported_video_tag_warning": "Your browser does not support the video tag.",
-        "use_personal_links": "Use personal links",
         "view_embed_code": "View embed code",
         "view_embed_code_for_email": "View embed code for email",
         "view_site": "View site",
         "waiting_for_response": "Waiting for a response \uD83E\uDDD8‍♂️",
         "web_app": "Web app",
+        "what_is_a_panel": "What is a panel?",
+        "what_is_a_panel_answer": "A panel is a group of participants selected based on characteristics such as age, profession, gender, etc.",
+        "what_is_prolific": "What is Prolific?",
+        "what_is_prolific_answer": "We're partnering with Prolific to give you access to a pool of over 200.000 vetted participants.",
         "whats_next": "What's next?",
+        "when_do_i_need_it": "When do I need it?",
+        "when_do_i_need_it_answer": "If you don’t have access to enough people who match your target audience, it makes sense to pay for access to a panel.",
         "you_can_do_a_lot_more_with_links_surveys": "You can do a lot more with links surveys \uD83D\uDCA1",
         "your_survey_is_public": "Your survey is public",
         "youre_not_plugged_in_yet": "You're not plugged in yet!"
@@ -2585,7 +2577,7 @@
     "preview_survey_question_2_back_button_label": "Back",
     "preview_survey_question_2_choice_1_label": "Yes, keep me informed.",
     "preview_survey_question_2_choice_2_label": "No, thank you!",
-    "preview_survey_question_2_headline": "Want to stay in the loop?",
+    "preview_survey_question_2_headline": "What to stay in the loop?",
     "preview_survey_welcome_card_headline": "Welcome!",
     "preview_survey_welcome_card_html": "Thanks for providing your feedback - let's go!",
     "prioritize_features_description": "Identify features your users need most and least.",

apps/web/locales/fr-FR.json

@@ -108,10 +108,6 @@
     "thanks_for_upgrading": "Merci beaucoup d'avoir mis à niveau votre abonnement Formbricks.",
     "upgrade_successful": "Mise à niveau réussie"
   },
-  "c": {
-    "link_expired": "Votre lien est expiré.",
-    "link_expired_description": "Le lien que vous avez utilisé n'est plus valide."
-  },
   "common": {
     "accepted": "Accepté",
     "account": "Compte",
@@ -316,7 +312,6 @@
     "question_id": "ID de la question",
     "questions": "Questions",
     "read_docs": "Lire les documents",
-    "recipients": "Destinataires",
     "remove": "Retirer",
     "reorder_and_hide_columns": "Réorganiser et masquer des colonnes",
     "report_survey": "Rapport d'enquête",
@@ -1248,8 +1243,6 @@
         "add_description": "Ajouter une description",
         "add_ending": "Ajouter une fin",
         "add_ending_below": "Ajouter une fin ci-dessous",
-        "add_fallback": "Ajouter",
-        "add_fallback_placeholder": "Ajouter un espace réservé pour montrer si la question est ignorée :",
         "add_hidden_field_id": "Ajouter un champ caché ID",
         "add_highlight_border": "Ajouter une bordure de surlignage",
         "add_highlight_border_description": "Ajoutez une bordure extérieure à votre carte d'enquête.",
@@ -1307,11 +1300,12 @@
         "casual": "Décontracté",
         "caution_edit_duplicate": "Dupliquer et modifier",
         "caution_edit_published_survey": "Modifier un sondage publié ?",
+        "caution_explanation_all_data_as_download": "Toutes les données, y compris les réponses passées, sont disponibles en téléchargement.",
         "caution_explanation_intro": "Nous comprenons que vous souhaitiez encore apporter des modifications. Voici ce qui se passe si vous le faites : ",
-        "caution_explanation_new_responses_separated": "Les réponses avant le changement peuvent ne pas être ou ne faire partie que partiellement du résumé de l'enquête.",
-        "caution_explanation_only_new_responses_in_summary": "Toutes les données, y compris les réponses passées, restent disponibles en téléchargement sur la page de résumé de l'enquête.",
-        "caution_explanation_responses_are_safe": "Les réponses anciennes et nouvelles se mélangent, ce qui peut entraîner des résumés de données trompeurs.",
-        "caution_recommendation": "Cela peut entraîner des incohérences de données dans le résumé du sondage. Nous recommandons de dupliquer le sondage à la place.",
+        "caution_explanation_new_responses_separated": "Les nouvelles réponses sont collectées séparément.",
+        "caution_explanation_only_new_responses_in_summary": "Seules les nouvelles réponses apparaissent dans le résumé de l'enquête.",
+        "caution_explanation_responses_are_safe": "Les réponses existantes restent en sécurité.",
+        "caution_recommendation": "Modifier votre enquête peut entraîner des incohérences dans le résumé de l'enquête. Nous vous recommandons de dupliquer l'enquête à la place.",
         "caution_text": "Les changements entraîneront des incohérences.",
         "centered_modal_overlay_color": "Couleur de superposition modale centrée",
         "change_anyway": "Changer de toute façon",
@@ -1388,7 +1382,6 @@
         "error_saving_changes": "Erreur lors de l'enregistrement des modifications",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Même après avoir soumis une réponse (par exemple, la boîte de feedback)",
         "everyone": "Tout le monde",
-        "fallback_for": "Solution de repli pour ",
         "fallback_missing": "Fallback manquant",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} est utilisé dans la logique de la question {questionIndex}. Veuillez d'abord le supprimer de la logique.",
         "field_name_eg_score_price": "Nom du champ par exemple, score, prix",
@@ -1713,7 +1706,6 @@
         "congrats": "Félicitations ! Votre enquête est en ligne.",
         "connect_your_website_or_app_with_formbricks_to_get_started": "Connectez votre site web ou votre application à Formbricks pour commencer.",
         "copy_link_to_public_results": "Copier le lien vers les résultats publics",
-        "create_and_manage_segments": "Créez et gérez vos Segments sous Contacts > Segments",
         "create_single_use_links": "Créer des liens à usage unique",
         "create_single_use_links_description": "Acceptez uniquement une soumission par lien. Voici comment.",
         "custom_range": "Plage personnalisée...",
@@ -1723,30 +1715,32 @@
         "drop_offs": "Dépôts",
         "drop_offs_tooltip": "Nombre de fois que l'enquête a été commencée mais non terminée.",
         "dynamic_popup": "Dynamique (Pop-up)",
-        "email_embed": "Email intégré",
         "email_sent": "Email envoyé !",
-        "embed_code": "Code d'intégration",
         "embed_code_copied_to_clipboard": "Code d'intégration copié dans le presse-papiers !",
         "embed_in_an_email": "Inclure dans un e-mail",
         "embed_in_app": "Intégrer dans l'application",
         "embed_mode": "Mode d'intégration",
         "embed_mode_description": "Intégrez votre enquête avec un design minimaliste, en supprimant les marges et l'arrière-plan.",
+        "embed_on_website": "Incorporer sur le site web",
         "embed_pop_up_survey_title": "Comment intégrer une enquête pop-up sur votre site web",
-        "expiry_date_description": "Une fois le lien expiré, le destinataire ne peut plus répondre au sondage.",
-        "expiry_date_optional": "Date d'expiration (facultatif)",
+        "embed_survey": "Intégrer l'enquête",
         "failed_to_copy_link": "Échec de la copie du lien",
         "filter_added_successfully": "Filtre ajouté avec succès",
         "filter_updated_successfully": "Filtre mis à jour avec succès",
         "filtered_responses_csv": "Réponses filtrées (CSV)",
         "filtered_responses_excel": "Réponses filtrées (Excel)",
         "formbricks_email_survey_preview": "Aperçu de l'enquête par e-mail Formbricks",
-        "generate_and_download_links": "Générer et télécharger les liens",
-        "generate_personal_links_description": "Générez des liens personnels pour un segment et associez les réponses du sondage à chaque contact. Un fichier CSV de vos liens personnels incluant les informations de contact pertinentes sera téléchargé automatiquement.",
-        "generate_personal_links_title": "Maximisez les insights avec des liens d'enquête personnels",
-        "generating_links": "Génération de liens",
-        "generating_links_toast": "Génération des liens, le téléchargement commencera bientôt…",
         "go_to_setup_checklist": "Allez à la liste de contrôle de configuration \uD83D\uDC49",
         "hide_embed_code": "Cacher le code d'intégration",
+        "how_to_create_a_panel": "Comment créer un panneau",
+        "how_to_create_a_panel_step_1": "Étape 1 : Créez un compte avec Prolific",
+        "how_to_create_a_panel_step_1_description": "Créez un compte avec Prolific et vérifiez votre adresse e-mail.",
+        "how_to_create_a_panel_step_2": "Étape 2 : Créer une étude",
+        "how_to_create_a_panel_step_2_description": "Chez Prolific, vous créez une nouvelle étude où vous pouvez choisir votre audience préférée en fonction de centaines de caractéristiques.",
+        "how_to_create_a_panel_step_3": "Étape 3 : Connectez votre enquête",
+        "how_to_create_a_panel_step_3_description": "Configurez des champs cachés dans votre enquête Formbricks pour suivre quel participant a fourni quelle réponse.",
+        "how_to_create_a_panel_step_4": "Étape 4 : Lancez votre étude",
+        "how_to_create_a_panel_step_4_description": "Une fois que tout est configuré, vous pouvez lancer votre étude. Dans quelques heures, vous recevrez les premières réponses.",
         "impressions": "Impressions",
         "impressions_tooltip": "Nombre de fois que l'enquête a été consultée.",
         "includes_all": "Comprend tous",
@@ -1761,19 +1755,12 @@
         "last_quarter": "dernier trimestre",
         "last_year": "l'année dernière",
         "link_to_public_results_copied": "Lien vers les résultats publics copié",
-        "links_generated_success_toast": "Liens générés avec succès, votre téléchargement commencera bientôt.",
         "make_sure_the_survey_type_is_set_to": "Assurez-vous que le type d'enquête est défini sur",
         "mobile_app": "Application mobile",
         "no_responses_found": "Aucune réponse trouvée",
-        "no_segments_available": "Aucun segment disponible",
         "only_completed": "Uniquement terminé",
         "other_values_found": "D'autres valeurs trouvées",
         "overall": "Globalement",
-        "personal_links": "Liens personnels",
-        "personal_links_upgrade_prompt_description": "Générez des liens personnels pour un segment et associez les réponses du sondage à chaque contact.",
-        "personal_links_upgrade_prompt_title": "Utilisez des liens personnels avec un plan supérieur",
-        "personal_links_work_with_segments": "Les liens personnels fonctionnent avec les segments.",
-        "preview": "Aperçu",
         "publish_to_web": "Publier sur le web",
         "publish_to_web_warning": "Vous êtes sur le point de rendre ces résultats d'enquête publics.",
         "publish_to_web_warning_description": "Les résultats de votre enquête seront publics. Toute personne en dehors de votre organisation pourra y accéder si elle a le lien.",
@@ -1782,10 +1769,10 @@
         "quickstart_web_apps": "Démarrage rapide : Applications web",
         "quickstart_web_apps_description": "Veuillez suivre le guide de démarrage rapide pour commencer :",
         "results_are_public": "Les résultats sont publics.",
-        "select_segment": "Sélectionner le segment",
         "selected_responses_csv": "Réponses sélectionnées (CSV)",
         "selected_responses_excel": "Réponses sélectionnées (Excel)",
         "send_preview": "Envoyer un aperçu",
+        "send_to_panel": "Envoyer au panneau",
         "setup_instructions": "Instructions d'installation",
         "setup_integrations": "Configurer les intégrations",
         "share_results": "Partager les résultats",
@@ -1811,13 +1798,18 @@
         "unknown_question_type": "Type de question inconnu",
         "unpublish_from_web": "Désactiver la publication sur le web",
         "unsupported_video_tag_warning": "Votre navigateur ne prend pas en charge la balise vidéo.",
-        "use_personal_links": "Utilisez des liens personnels",
         "view_embed_code": "Voir le code d'intégration",
         "view_embed_code_for_email": "Voir le code d'intégration pour l'email",
         "view_site": "Voir le site",
         "waiting_for_response": "En attente d'une réponse \uD83E\uDDD8‍♂️",
         "web_app": "application web",
+        "what_is_a_panel": "Qu'est-ce qu'un panneau ?",
+        "what_is_a_panel_answer": "Un panel est un groupe de participants sélectionnés en fonction de caractéristiques telles que l'âge, la profession, le sexe, etc.",
+        "what_is_prolific": "Qu'est-ce que Prolific ?",
+        "what_is_prolific_answer": "Nous nous associons à Prolific pour vous donner accès à un panel de plus de 200 000 participants vérifiés.",
         "whats_next": "Qu'est-ce qui vient ensuite ?",
+        "when_do_i_need_it": "Quand en ai-je besoin ?",
+        "when_do_i_need_it_answer": "Si vous n'avez pas accès à suffisamment de personnes correspondant à votre public cible, il est logique de payer pour accéder à un panel.",
         "you_can_do_a_lot_more_with_links_surveys": "Vous pouvez faire beaucoup plus avec des sondages par lien \uD83D\uDCA1",
         "your_survey_is_public": "Votre enquête est publique.",
         "youre_not_plugged_in_yet": "Vous n'êtes pas encore branché !"
@@ -2585,7 +2577,7 @@
     "preview_survey_question_2_back_button_label": "Retour",
     "preview_survey_question_2_choice_1_label": "Oui, tiens-moi au courant.",
     "preview_survey_question_2_choice_2_label": "Non, merci !",
-    "preview_survey_question_2_headline": "Vous voulez rester informé ?",
+    "preview_survey_question_2_headline": "Tu veux rester dans la boucle ?",
     "preview_survey_welcome_card_headline": "Bienvenue !",
     "preview_survey_welcome_card_html": "Merci pour vos retours - allons-y !",
     "prioritize_features_description": "Identifiez les fonctionnalités dont vos utilisateurs ont le plus et le moins besoin.",

apps/web/locales/pt-BR.json

@@ -108,10 +108,6 @@
     "thanks_for_upgrading": "Valeu demais por atualizar sua assinatura do Formbricks.",
     "upgrade_successful": "Atualização bem-sucedida"
   },
-  "c": {
-    "link_expired": "Seu link está expirado.",
-    "link_expired_description": "O link que você usou não é mais válido."
-  },
   "common": {
     "accepted": "Aceito",
     "account": "conta",
@@ -207,7 +203,7 @@
     "formbricks_version": "Versão do Formbricks",
     "full_name": "Nome completo",
     "gathering_responses": "Recolhendo respostas",
-    "general": "Geral",
+    "general": "geral",
     "go_back": "Voltar",
     "go_to_dashboard": "Ir para o Painel",
     "hidden": "Escondido",
@@ -316,7 +312,6 @@
     "question_id": "ID da Pergunta",
     "questions": "Perguntas",
     "read_docs": "Ler Documentos",
-    "recipients": "Destinatários",
     "remove": "remover",
     "reorder_and_hide_columns": "Reordenar e ocultar colunas",
     "report_survey": "Relatório de Pesquisa",
@@ -378,7 +373,7 @@
     "switch_to": "Mudar para {environment}",
     "table_items_deleted_successfully": "{type}s deletados com sucesso",
     "table_settings": "Arrumação da mesa",
-    "tags": "Etiquetas",
+    "tags": "etiquetas",
     "targeting": "mirando",
     "team": "Time",
     "team_access": "Acesso da equipe",
@@ -1248,8 +1243,6 @@
         "add_description": "Adicionar Descrição",
         "add_ending": "Adicionar final",
         "add_ending_below": "Adicione o final abaixo",
-        "add_fallback": "Adicionar",
-        "add_fallback_placeholder": "Adicionar um texto padrão para mostrar se a pergunta for ignorada:",
         "add_hidden_field_id": "Adicionar campo oculto ID",
         "add_highlight_border": "Adicionar borda de destaque",
         "add_highlight_border_description": "Adicione uma borda externa ao seu cartão de pesquisa.",
@@ -1307,11 +1300,12 @@
         "casual": "Casual",
         "caution_edit_duplicate": "Duplicar e editar",
         "caution_edit_published_survey": "Editar uma pesquisa publicada?",
+        "caution_explanation_all_data_as_download": "Todos os dados, incluindo respostas anteriores, estão disponíveis para download.",
         "caution_explanation_intro": "Entendemos que você ainda pode querer fazer alterações. Aqui está o que acontece se você fizer:",
-        "caution_explanation_new_responses_separated": "Respostas antes da mudança podem não ser ou apenas parcialmente incluídas no resumo da pesquisa.",
-        "caution_explanation_only_new_responses_in_summary": "Todos os dados, incluindo respostas anteriores, permanecem disponíveis para download na página de resumo da pesquisa.",
-        "caution_explanation_responses_are_safe": "Respostas antigas e novas são misturadas, o que pode levar a resumos de dados enganosos.",
-        "caution_recommendation": "Isso pode causar inconsistências de dados no resumo da pesquisa. Recomendamos duplicar a pesquisa em vez disso.",
+        "caution_explanation_new_responses_separated": "Novas respostas são coletadas separadamente.",
+        "caution_explanation_only_new_responses_in_summary": "Apenas novas respostas aparecem no resumo da pesquisa.",
+        "caution_explanation_responses_are_safe": "As respostas existentes permanecem seguras.",
+        "caution_recommendation": "Editar sua pesquisa pode causar inconsistências de dados no resumo da pesquisa. Recomendamos duplicar a pesquisa em vez disso.",
         "caution_text": "Mudanças vão levar a inconsistências",
         "centered_modal_overlay_color": "cor de sobreposição modal centralizada",
         "change_anyway": "Mudar mesmo assim",
@@ -1388,7 +1382,6 @@
         "error_saving_changes": "Erro ao salvar alterações",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Mesmo depois de eles enviarem uma resposta (por exemplo, Caixa de Feedback)",
         "everyone": "Todo mundo",
-        "fallback_for": "Alternativa para",
         "fallback_missing": "Faltando alternativa",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} é usado na lógica da pergunta {questionIndex}. Por favor, remova-o da lógica primeiro.",
         "field_name_eg_score_price": "Nome do campo, por exemplo, pontuação, preço",
@@ -1555,7 +1548,7 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
         "response_options": "Opções de Resposta",
-        "roundness": "Circularidade",
+        "roundness": "redondeza",
         "row_used_in_logic_error": "Esta linha é usada na lógica da pergunta {questionIndex}. Por favor, remova-a da lógica primeiro.",
         "rows": "linhas",
         "save_and_close": "Salvar e Fechar",
@@ -1591,7 +1584,7 @@
         "star": "Estrela",
         "starts_with": "Começa com",
         "state": "Estado",
-        "straight": "Alinhado",
+        "straight": "hétero",
         "style_the_question_texts_descriptions_and_input_fields": "Estilize os textos das perguntas, descrições e campos de entrada.",
         "style_the_survey_card": "Estilize o cartão da pesquisa.",
         "styling_set_to_theme_styles": "Estilo definido para os estilos do tema",
@@ -1713,7 +1706,6 @@
         "congrats": "Parabéns! Sua pesquisa está no ar.",
         "connect_your_website_or_app_with_formbricks_to_get_started": "Conecte seu site ou app com o Formbricks para começar.",
         "copy_link_to_public_results": "Copiar link para resultados públicos",
-        "create_and_manage_segments": "Crie e gerencie seus Segmentos em Contatos > Segmentos",
         "create_single_use_links": "Crie links de uso único",
         "create_single_use_links_description": "Aceite apenas uma submissão por link. Aqui está como.",
         "custom_range": "Intervalo personalizado...",
@@ -1723,30 +1715,32 @@
         "drop_offs": "Pontos de Entrega",
         "drop_offs_tooltip": "Número de vezes que a pesquisa foi iniciada mas não concluída.",
         "dynamic_popup": "Dinâmico (Pop-up)",
-        "email_embed": "Incorporação de Email",
         "email_sent": "Email enviado!",
-        "embed_code": "Código de incorporação",
         "embed_code_copied_to_clipboard": "Código incorporado copiado para a área de transferência!",
         "embed_in_an_email": "Incorporar em um e-mail",
         "embed_in_app": "Integrar no app",
         "embed_mode": "Modo Embutido",
         "embed_mode_description": "Incorpore sua pesquisa com um design minimalista, sem preenchimento e fundo.",
+        "embed_on_website": "Incorporar no site",
         "embed_pop_up_survey_title": "Como incorporar uma pesquisa pop-up no seu site",
-        "expiry_date_description": "Quando o link expirar, o destinatário não poderá mais responder à pesquisa.",
-        "expiry_date_optional": "Data de expiração (opcional)",
+        "embed_survey": "Incorporar pesquisa",
         "failed_to_copy_link": "Falha ao copiar link",
         "filter_added_successfully": "Filtro adicionado com sucesso",
         "filter_updated_successfully": "Filtro atualizado com sucesso",
         "filtered_responses_csv": "Respostas filtradas (CSV)",
         "filtered_responses_excel": "Respostas filtradas (Excel)",
         "formbricks_email_survey_preview": "Prévia da Pesquisa por E-mail do Formbricks",
-        "generate_and_download_links": "Gerar & baixar links",
-        "generate_personal_links_description": "Gerar links pessoais para um segmento e associar respostas de pesquisa a cada contato. Um CSV dos seus links pessoais com as informações de contato relevantes será baixado automaticamente.",
-        "generate_personal_links_title": "Maximize insights com links de pesquisa personalizados",
-        "generating_links": "Gerando links",
-        "generating_links_toast": "Gerando links, o download começará em breve…",
         "go_to_setup_checklist": "Vai para a Lista de Configuração \uD83D\uDC49",
         "hide_embed_code": "Esconder código de incorporação",
+        "how_to_create_a_panel": "Como criar um painel",
+        "how_to_create_a_panel_step_1": "Passo 1: Crie uma conta no Prolific",
+        "how_to_create_a_panel_step_1_description": "Cria uma conta no Prolific e verifica teu e-mail.",
+        "how_to_create_a_panel_step_2": "Passo 2: Crie um estudo",
+        "how_to_create_a_panel_step_2_description": "Na Prolific, você cria um novo estudo onde pode escolher seu público preferido com base em centenas de características.",
+        "how_to_create_a_panel_step_3": "Passo 3: Conecte sua pesquisa",
+        "how_to_create_a_panel_step_3_description": "Configure campos ocultos na sua pesquisa do Formbricks para rastrear qual participante forneceu qual resposta.",
+        "how_to_create_a_panel_step_4": "Passo 4: Lançar seu estudo",
+        "how_to_create_a_panel_step_4_description": "Depois que tudo estiver configurado, você pode iniciar seu estudo. Em algumas horas, você vai receber as primeiras respostas.",
         "impressions": "Impressões",
         "impressions_tooltip": "Número de vezes que a pesquisa foi visualizada.",
         "includes_all": "Inclui tudo",
@@ -1761,19 +1755,12 @@
         "last_quarter": "Último trimestre",
         "last_year": "Último ano",
         "link_to_public_results_copied": "Link pros resultados públicos copiado",
-        "links_generated_success_toast": "Links gerados com sucesso, o download começará em breve.",
         "make_sure_the_survey_type_is_set_to": "Certifique-se de que o tipo de pesquisa esteja definido como",
         "mobile_app": "app de celular",
         "no_responses_found": "Nenhuma resposta encontrada",
-        "no_segments_available": "Nenhum segmento disponível",
         "only_completed": "Somente concluído",
         "other_values_found": "Outros valores encontrados",
         "overall": "No geral",
-        "personal_links": "Links pessoais",
-        "personal_links_upgrade_prompt_description": "Gerar links pessoais para um segmento e vincular respostas de pesquisa a cada contato.",
-        "personal_links_upgrade_prompt_title": "Use links pessoais com um plano superior",
-        "personal_links_work_with_segments": "Links pessoais funcionam com segmentos.",
-        "preview": "Prévia",
         "publish_to_web": "Publicar na web",
         "publish_to_web_warning": "Você está prestes a divulgar esses resultados da pesquisa para o público.",
         "publish_to_web_warning_description": "Os resultados da sua pesquisa serão públicos. Qualquer pessoa fora da sua organização pode acessá-los se tiver o link.",
@@ -1782,10 +1769,10 @@
         "quickstart_web_apps": "Início rápido: Aplicativos web",
         "quickstart_web_apps_description": "Por favor, siga o guia de início rápido para começar:",
         "results_are_public": "Os resultados são públicos",
-        "select_segment": "Selecionar segmento",
         "selected_responses_csv": "Respostas selecionadas (CSV)",
         "selected_responses_excel": "Respostas selecionadas (Excel)",
         "send_preview": "Enviar prévia",
+        "send_to_panel": "Enviar para o painel",
         "setup_instructions": "Instruções de configuração",
         "setup_integrations": "Configurar integrações",
         "share_results": "Compartilhar resultados",
@@ -1811,13 +1798,18 @@
         "unknown_question_type": "Tipo de pergunta desconhecido",
         "unpublish_from_web": "Despublicar da web",
         "unsupported_video_tag_warning": "Seu navegador não suporta a tag de vídeo.",
-        "use_personal_links": "Use links pessoais",
         "view_embed_code": "Ver código incorporado",
         "view_embed_code_for_email": "Ver código incorporado para e-mail",
         "view_site": "Ver site",
         "waiting_for_response": "Aguardando uma resposta \uD83E\uDDD8‍♂️",
         "web_app": "aplicativo web",
+        "what_is_a_panel": "O que é um painel?",
+        "what_is_a_panel_answer": "Um painel é um grupo de participantes selecionados com base em características como idade, profissão, gênero, etc.",
+        "what_is_prolific": "O que é Prolific?",
+        "what_is_prolific_answer": "Estamos fazendo parceria com a Prolific pra te dar acesso a um grupo de mais de 200.000 participantes verificados.",
         "whats_next": "E agora?",
+        "when_do_i_need_it": "Quando eu preciso disso?",
+        "when_do_i_need_it_answer": "Se você não tem acesso a pessoas suficientes que correspondam ao seu público-alvo, faz sentido pagar por acesso a um painel.",
         "you_can_do_a_lot_more_with_links_surveys": "Você pode fazer muito mais com pesquisas de links \uD83D\uDCA1",
         "your_survey_is_public": "Sua pesquisa é pública",
         "youre_not_plugged_in_yet": "Você ainda não tá conectado!"

apps/web/locales/pt-PT.json

@@ -108,10 +108,6 @@
     "thanks_for_upgrading": "Muito obrigado por atualizar a sua subscrição do Formbricks.",
     "upgrade_successful": "Atualização bem-sucedida"
   },
-  "c": {
-    "link_expired": "O seu link expirou.",
-    "link_expired_description": "O link que utilizou já não é válido."
-  },
   "common": {
     "accepted": "Aceite",
     "account": "Conta",
@@ -316,7 +312,6 @@
     "question_id": "ID da pergunta",
     "questions": "Perguntas",
     "read_docs": "Ler Documentos",
-    "recipients": "Destinatários",
     "remove": "Remover",
     "reorder_and_hide_columns": "Reordenar e ocultar colunas",
     "report_survey": "Relatório de Inquérito",
@@ -1248,8 +1243,6 @@
         "add_description": "Adicionar descrição",
         "add_ending": "Adicionar encerramento",
         "add_ending_below": "Adicionar encerramento abaixo",
-        "add_fallback": "Adicionar",
-        "add_fallback_placeholder": "Adicionar um espaço reservado para mostrar se a pergunta for ignorada:",
         "add_hidden_field_id": "Adicionar ID do campo oculto",
         "add_highlight_border": "Adicionar borda de destaque",
         "add_highlight_border_description": "Adicione uma borda externa ao seu cartão de inquérito.",
@@ -1307,11 +1300,12 @@
         "casual": "Casual",
         "caution_edit_duplicate": "Duplicar e editar",
         "caution_edit_published_survey": "Editar um inquérito publicado?",
+        "caution_explanation_all_data_as_download": "Todos os dados, incluindo respostas anteriores, estão disponíveis para download.",
         "caution_explanation_intro": "Entendemos que ainda pode querer fazer alterações. Eis o que acontece se o fizer:",
-        "caution_explanation_new_responses_separated": "Respostas antes da alteração podem não estar incluídas ou estar apenas parcialmente incluídas no resumo do inquérito.",
-        "caution_explanation_only_new_responses_in_summary": "Todos os dados, incluindo respostas anteriores, permanecem disponíveis para download na página de resumo do inquérito.",
-        "caution_explanation_responses_are_safe": "As respostas mais antigas e mais recentes se misturam, o que pode levar a resumos de dados enganosos.",
-        "caution_recommendation": "Isso pode causar inconsistências de dados no resumo do inquérito. Recomendamos duplicar o inquérito em vez disso.",
+        "caution_explanation_new_responses_separated": "As novas respostas são recolhidas separadamente.",
+        "caution_explanation_only_new_responses_in_summary": "Apenas novas respostas aparecem no resumo do inquérito.",
+        "caution_explanation_responses_are_safe": "As respostas existentes permanecem seguras.",
+        "caution_recommendation": "Editar o seu inquérito pode causar inconsistências de dados no resumo do inquérito. Recomendamos duplicar o inquérito em vez disso.",
         "caution_text": "As alterações levarão a inconsistências",
         "centered_modal_overlay_color": "Cor da sobreposição modal centralizada",
         "change_anyway": "Alterar mesmo assim",
@@ -1388,7 +1382,6 @@
         "error_saving_changes": "Erro ao guardar alterações",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Mesmo depois de terem enviado uma resposta (por exemplo, Caixa de Feedback)",
         "everyone": "Todos",
-        "fallback_for": "Alternativa para ",
         "fallback_missing": "Substituição em falta",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} é usado na lógica da pergunta {questionIndex}. Por favor, remova-o da lógica primeiro.",
         "field_name_eg_score_price": "Nome do campo, por exemplo, pontuação, preço",
@@ -1713,7 +1706,6 @@
         "congrats": "Parabéns! O seu inquérito está ativo.",
         "connect_your_website_or_app_with_formbricks_to_get_started": "Ligue o seu website ou aplicação ao Formbricks para começar.",
         "copy_link_to_public_results": "Copiar link para resultados públicos",
-        "create_and_manage_segments": "Crie e gere os seus Segmentos em Contactos > Segmentos",
         "create_single_use_links": "Criar links de uso único",
         "create_single_use_links_description": "Aceitar apenas uma submissão por link. Aqui está como.",
         "custom_range": "Intervalo personalizado...",
@@ -1723,30 +1715,32 @@
         "drop_offs": "Desistências",
         "drop_offs_tooltip": "Número de vezes que o inquérito foi iniciado mas não concluído.",
         "dynamic_popup": "Dinâmico (Pop-up)",
-        "email_embed": "Incorporação de Email",
         "email_sent": "Email enviado!",
-        "embed_code": "Código de incorporação",
         "embed_code_copied_to_clipboard": "Código incorporado copiado para a área de transferência!",
         "embed_in_an_email": "Incorporar num email",
         "embed_in_app": "Incorporar na aplicação",
         "embed_mode": "Modo de Incorporação",
         "embed_mode_description": "Incorpore o seu inquérito com um design minimalista, descartando o preenchimento e o fundo.",
+        "embed_on_website": "Incorporar no site",
         "embed_pop_up_survey_title": "Como incorporar um questionário pop-up no seu site",
-        "expiry_date_description": "Uma vez que o link expira, o destinatário não pode mais responder ao questionário.",
-        "expiry_date_optional": "Data de expiração (opcional)",
+        "embed_survey": "Incorporar inquérito",
         "failed_to_copy_link": "Falha ao copiar link",
         "filter_added_successfully": "Filtro adicionado com sucesso",
         "filter_updated_successfully": "Filtro atualizado com sucesso",
         "filtered_responses_csv": "Respostas filtradas (CSV)",
         "filtered_responses_excel": "Respostas filtradas (Excel)",
         "formbricks_email_survey_preview": "Pré-visualização da Pesquisa de E-mail do Formbricks",
-        "generate_and_download_links": "Gerar & descarregar links",
-        "generate_personal_links_description": "Gerar links pessoais para um segmento e associar as respostas do inquérito a cada contacto. Um ficheiro CSV dos seus links pessoais, incluindo a informação relevante de contacto, será descarregado automaticamente.",
-        "generate_personal_links_title": "Maximize os insights com links pessoais de inquérito",
-        "generating_links": "Gerando links",
-        "generating_links_toast": "A gerar links, o download começará em breve…",
         "go_to_setup_checklist": "Ir para a Lista de Verificação de Configuração \uD83D\uDC49",
         "hide_embed_code": "Ocultar código de incorporação",
+        "how_to_create_a_panel": "Como criar um painel",
+        "how_to_create_a_panel_step_1": "Passo 1: Crie uma conta com a Prolific",
+        "how_to_create_a_panel_step_1_description": "Crie uma conta no Prolific e verifique o seu endereço de email.",
+        "how_to_create_a_panel_step_2": "Passo 2: Criar um estudo",
+        "how_to_create_a_panel_step_2_description": "No Prolific, cria um novo estudo onde pode escolher o seu público preferido com base em centenas de características.",
+        "how_to_create_a_panel_step_3": "Passo 3: Conecte o seu inquérito",
+        "how_to_create_a_panel_step_3_description": "Configure campos ocultos no seu inquérito Formbricks para rastrear qual participante forneceu qual resposta.",
+        "how_to_create_a_panel_step_4": "Passo 4: Lançar o seu estudo",
+        "how_to_create_a_panel_step_4_description": "Depois de tudo configurado, pode lançar o seu estudo. Dentro de algumas horas, receberá as primeiras respostas.",
         "impressions": "Impressões",
         "impressions_tooltip": "Número de vezes que o inquérito foi visualizado.",
         "includes_all": "Inclui tudo",
@@ -1761,19 +1755,12 @@
         "last_quarter": "Último trimestre",
         "last_year": "Ano passado",
         "link_to_public_results_copied": "Link para resultados públicos copiado",
-        "links_generated_success_toast": "Links gerados com sucesso, o seu download começará em breve.",
         "make_sure_the_survey_type_is_set_to": "Certifique-se de que o tipo de inquérito está definido para",
         "mobile_app": "Aplicação móvel",
         "no_responses_found": "Nenhuma resposta encontrada",
-        "no_segments_available": "Sem segmentos disponíveis",
         "only_completed": "Apenas concluído",
         "other_values_found": "Outros valores encontrados",
         "overall": "Geral",
-        "personal_links": "Links pessoais",
-        "personal_links_upgrade_prompt_description": "Gerar links pessoais para um segmento e associar as respostas do inquérito a cada contacto.",
-        "personal_links_upgrade_prompt_title": "Utilize links pessoais com um plano superior",
-        "personal_links_work_with_segments": "Os links pessoais funcionam com segmentos.",
-        "preview": "Pré-visualização",
         "publish_to_web": "Publicar na web",
         "publish_to_web_warning": "Está prestes a divulgar estes resultados do inquérito ao público.",
         "publish_to_web_warning_description": "Os resultados do seu inquérito serão públicos. Qualquer pessoa fora da sua organização pode aceder a eles se tiver o link.",
@@ -1782,10 +1769,10 @@
         "quickstart_web_apps": "Início rápido: Aplicações web",
         "quickstart_web_apps_description": "Por favor, siga o guia de início rápido para começar:",
         "results_are_public": "Os resultados são públicos",
-        "select_segment": "Selecionar segmento",
         "selected_responses_csv": "Respostas selecionadas (CSV)",
         "selected_responses_excel": "Respostas selecionadas (Excel)",
         "send_preview": "Enviar pré-visualização",
+        "send_to_panel": "Enviar para painel",
         "setup_instructions": "Instruções de configuração",
         "setup_integrations": "Configurar integrações",
         "share_results": "Partilhar resultados",
@@ -1811,13 +1798,18 @@
         "unknown_question_type": "Tipo de Pergunta Desconhecido",
         "unpublish_from_web": "Despublicar da web",
         "unsupported_video_tag_warning": "O seu navegador não suporta a tag de vídeo.",
-        "use_personal_links": "Utilize links pessoais",
         "view_embed_code": "Ver código de incorporação",
         "view_embed_code_for_email": "Ver código de incorporação para email",
         "view_site": "Ver site",
         "waiting_for_response": "A aguardar uma resposta \uD83E\uDDD8‍♂️",
         "web_app": "Aplicação web",
+        "what_is_a_panel": "O que é um painel?",
+        "what_is_a_panel_answer": "Um painel é um grupo de participantes selecionados com base em características como idade, profissão, género, etc.",
+        "what_is_prolific": "O que é o Prolific?",
+        "what_is_prolific_answer": "Estamos a colaborar com a Prolific para lhe dar acesso a um grupo de mais de 200.000 participantes verificados.",
         "whats_next": "O que se segue?",
+        "when_do_i_need_it": "Quando é que preciso disso?",
+        "when_do_i_need_it_answer": "Se não tiver acesso a pessoas suficientes que correspondam ao seu público-alvo, faz sentido pagar pelo acesso a um painel.",
         "you_can_do_a_lot_more_with_links_surveys": "Pode fazer muito mais com inquéritos de links \uD83D\uDCA1",
         "your_survey_is_public": "O seu inquérito é público",
         "youre_not_plugged_in_yet": "Ainda não está ligado!"

apps/web/locales/zh-Hant-TW.json

@@ -108,10 +108,6 @@
     "thanks_for_upgrading": "非常感謝您升級您的 Formbricks 訂閱。",
     "upgrade_successful": "升級成功"
   },
-  "c": {
-    "link_expired": "您 的 連結 已過期。",
-    "link_expired_description": "您 使用 的 連結 已無效。"
-  },
   "common": {
     "accepted": "已接受",
     "account": "帳戶",
@@ -316,7 +312,6 @@
     "question_id": "問題 ID",
     "questions": "問題",
     "read_docs": "閱讀文件",
-    "recipients": "收件者",
     "remove": "移除",
     "reorder_and_hide_columns": "重新排序和隱藏欄位",
     "report_survey": "報告問卷",
@@ -1248,8 +1243,6 @@
         "add_description": "新增描述",
         "add_ending": "新增結尾",
         "add_ending_below": "在下方新增結尾",
-        "add_fallback": "新增",
-        "add_fallback_placeholder": "新增用于顯示問題被跳過時的佔位符",
         "add_hidden_field_id": "新增隱藏欄位 ID",
         "add_highlight_border": "新增醒目提示邊框",
         "add_highlight_border_description": "在您的問卷卡片新增外邊框。",
@@ -1307,11 +1300,12 @@
         "casual": "隨意",
         "caution_edit_duplicate": "複製 & 編輯",
         "caution_edit_published_survey": "編輯已發佈的調查？",
+        "caution_explanation_all_data_as_download": "所有數據，包括過去的回應，都可以下載。",
         "caution_explanation_intro": "我們了解您可能仍然想要進行更改。如果您這樣做，將會發生以下情況：",
-        "caution_explanation_new_responses_separated": "更改前的回應可能未被納入或只有部分包含在調查摘要中。",
-        "caution_explanation_only_new_responses_in_summary": "所有數據，包括過去的回應，仍可在調查摘要頁面下載。",
-        "caution_explanation_responses_are_safe": "較舊和較新的回應會混在一起，可能導致數據摘要失準。",
-        "caution_recommendation": "這可能導致調查摘要中的數據不一致。我們建議複製這個調查。",
+        "caution_explanation_new_responses_separated": "新回應會分開收集。",
+        "caution_explanation_only_new_responses_in_summary": "只有新的回應會出現在調查摘要中。",
+        "caution_explanation_responses_are_safe": "現有回應仍然安全。",
+        "caution_recommendation": "編輯您的調查可能會導致調查摘要中的數據不一致。我們建議複製調查。",
         "caution_text": "變更會導致不一致",
         "centered_modal_overlay_color": "置中彈窗覆蓋顏色",
         "change_anyway": "仍然變更",
@@ -1388,7 +1382,6 @@
         "error_saving_changes": "儲存變更時發生錯誤",
         "even_after_they_submitted_a_response_e_g_feedback_box": "即使他們提交回應之後（例如，意見反應方塊）",
         "everyone": "所有人",
-        "fallback_for": "備用 用於 ",
         "fallback_missing": "遺失的回退",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "'{'fieldId'}' 用於問題 '{'questionIndex'}' 的邏輯中。請先從邏輯中移除。",
         "field_name_eg_score_price": "欄位名稱，例如：分數、價格",
@@ -1713,7 +1706,6 @@
         "congrats": "恭喜！您的問卷已上線。",
         "connect_your_website_or_app_with_formbricks_to_get_started": "將您的網站或應用程式與 Formbricks 連線以開始使用。",
         "copy_link_to_public_results": "複製公開結果的連結",
-        "create_and_manage_segments": "在 聯絡人 > 分段 中建立和管理您的分段",
         "create_single_use_links": "建立單次使用連結",
         "create_single_use_links_description": "每個連結只接受一次提交。以下是如何操作。",
         "custom_range": "自訂範圍...",
@@ -1723,30 +1715,32 @@
         "drop_offs": "放棄",
         "drop_offs_tooltip": "問卷已開始但未完成的次數。",
         "dynamic_popup": "動態（彈窗）",
-        "email_embed": "電子郵件嵌入",
         "email_sent": "已發送電子郵件！",
-        "embed_code": "嵌入程式碼",
         "embed_code_copied_to_clipboard": "嵌入程式碼已複製到剪貼簿！",
         "embed_in_an_email": "嵌入電子郵件中",
         "embed_in_app": "嵌入應用程式",
         "embed_mode": "嵌入模式",
         "embed_mode_description": "以簡約設計嵌入您的問卷，捨棄邊距和背景。",
+        "embed_on_website": "嵌入網站",
         "embed_pop_up_survey_title": "如何在您的網站上嵌入彈出式問卷",
-        "expiry_date_description": "一旦連結過期，收件者將無法再回應 survey。",
-        "expiry_date_optional": "到期日 （可選）",
+        "embed_survey": "嵌入問卷",
         "failed_to_copy_link": "無法複製連結",
         "filter_added_successfully": "篩選器已成功新增",
         "filter_updated_successfully": "篩選器已成功更新",
         "filtered_responses_csv": "篩選回應 (CSV)",
         "filtered_responses_excel": "篩選回應 (Excel)",
         "formbricks_email_survey_preview": "Formbricks 電子郵件問卷預覽",
-        "generate_and_download_links": "生成 & 下載 連結",
-        "generate_personal_links_description": "為 一個 群組 生成 個人 連結，並 將 調查 回應 對應 到 每個 聯絡人。含 有 相關 聯絡信息 的 個人 連結 CSV 會 自動 下載。",
-        "generate_personal_links_title": "透過個人化調查連結最大化洞察",
-        "generating_links": "生成 連結",
-        "generating_links_toast": "生成 連結，下載 將 會 很快 開始…",
         "go_to_setup_checklist": "前往設定檢查清單 \uD83D\uDC49",
         "hide_embed_code": "隱藏嵌入程式碼",
+        "how_to_create_a_panel": "如何建立小組",
+        "how_to_create_a_panel_step_1": "步驟 1：使用 Prolific 建立帳戶",
+        "how_to_create_a_panel_step_1_description": "使用 Prolific 建立帳戶並驗證您的電子郵件地址。",
+        "how_to_create_a_panel_step_2": "步驟 2：建立研究",
+        "how_to_create_a_panel_step_2_description": "在 Prolific 中，您建立一個新的研究，您可以在其中根據數百個特徵選擇您偏好的受眾。",
+        "how_to_create_a_panel_step_3": "步驟 3：連線您的問卷",
+        "how_to_create_a_panel_step_3_description": "在您的 Formbricks 問卷中設定隱藏欄位，以追蹤哪個參與者提供了哪個答案。",
+        "how_to_create_a_panel_step_4": "步驟 4：啟動您的研究",
+        "how_to_create_a_panel_step_4_description": "設定完成後，您可以啟動您的研究。在幾個小時內，您就會收到第一個回應。",
         "impressions": "曝光數",
         "impressions_tooltip": "問卷已檢視的次數。",
         "includes_all": "包含全部",
@@ -1761,19 +1755,12 @@
         "last_quarter": "上一季",
         "last_year": "去年",
         "link_to_public_results_copied": "已複製公開結果的連結",
-        "links_generated_success_toast": "連結 成功 生成，您的 下載 將 會 很快 開始。",
         "make_sure_the_survey_type_is_set_to": "請確保問卷類型設定為",
         "mobile_app": "行動應用程式",
         "no_responses_found": "找不到回應",
-        "no_segments_available": "沒有可用的區段",
         "only_completed": "僅已完成",
         "other_values_found": "找到其他值",
         "overall": "整體",
-        "personal_links": "個人 連結",
-        "personal_links_upgrade_prompt_description": "為一個群組生成個人連結，並將調查回應連結到每個聯絡人。",
-        "personal_links_upgrade_prompt_title": "使用 個人 連結 與 更高 的 計劃",
-        "personal_links_work_with_segments": "個人 連結 可 與 分段 一起 使用",
-        "preview": "預覽",
         "publish_to_web": "發布至網站",
         "publish_to_web_warning": "您即將將這些問卷結果發布到公共領域。",
         "publish_to_web_warning_description": "您的問卷結果將會是公開的。任何組織外的人員都可以存取這些結果（如果他們有連結）。",
@@ -1782,10 +1769,10 @@
         "quickstart_web_apps": "快速入門：Web apps",
         "quickstart_web_apps_description": "請按照 Quickstart 指南開始：",
         "results_are_public": "結果是公開的",
-        "select_segment": "選擇 區隔",
         "selected_responses_csv": "選擇的回應 (CSV)",
         "selected_responses_excel": "選擇的回應 (Excel)",
         "send_preview": "發送預覽",
+        "send_to_panel": "發送到小組",
         "setup_instructions": "設定說明",
         "setup_integrations": "設定整合",
         "share_results": "分享結果",
@@ -1811,13 +1798,18 @@
         "unknown_question_type": "未知的問題類型",
         "unpublish_from_web": "從網站取消發布",
         "unsupported_video_tag_warning": "您的瀏覽器不支援 video 標籤。",
-        "use_personal_links": "使用 個人 連結",
         "view_embed_code": "檢視嵌入程式碼",
         "view_embed_code_for_email": "檢視電子郵件的嵌入程式碼",
         "view_site": "檢視網站",
         "waiting_for_response": "正在等待回應 \uD83E\uDDD8‍♂️",
         "web_app": "Web 應用程式",
+        "what_is_a_panel": "什麼是小組？",
+        "what_is_a_panel_answer": "小組是一組根據年齡、職業、性別等特徵選取的參與者。",
+        "what_is_prolific": "什麼是 Prolific？",
+        "what_is_prolific_answer": "我們正在與 Prolific 合作，為您提供超過 200,000 名經過審核的參與者。",
         "whats_next": "下一步是什麼？",
+        "when_do_i_need_it": "我何時需要它？",
+        "when_do_i_need_it_answer": "如果您無法存取足夠的符合您目標受眾的人員，則可以付費存取小組。",
         "you_can_do_a_lot_more_with_links_surveys": "使用連結問卷，您可以做更多事情 \uD83D\uDCA1",
         "your_survey_is_public": "您的問卷是公開的",
         "youre_not_plugged_in_yet": "您尚未插入任何內容！"
@@ -2585,7 +2577,7 @@
     "preview_survey_question_2_back_button_label": "返回",
     "preview_survey_question_2_choice_1_label": "是，請保持通知我。",
     "preview_survey_question_2_choice_2_label": "不用了，謝謝！",
-    "preview_survey_question_2_headline": "想要緊跟最新動態嗎？",
+    "preview_survey_question_2_headline": "想要保持最新消息嗎？",
     "preview_survey_welcome_card_headline": "歡迎！",
     "preview_survey_welcome_card_html": "感謝您提供回饋 - 開始吧！",
     "prioritize_features_description": "找出您的使用者最需要和最不需要的功能。",

apps/web/modules/account/components/DeleteAccountModal/index.test.tsx

@@ -1,3 +1,4 @@
+import { FORMBRICKS_ENVIRONMENT_ID_LS } from "@/lib/localStorage";
 import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { afterEach, describe, expect, test, vi } from "vitest";
 import { TOrganization } from "@formbricks/types/organizations";
@@ -99,6 +100,8 @@ describe("DeleteAccountModal", () => {
       />
     );
 
+    const removeItemSpy = vi.spyOn(window.localStorage, "removeItem");
+
     const input = screen.getByTestId("deleteAccountConfirmation");
     fireEvent.change(input, { target: { value: mockUser.email } });
 
@@ -110,8 +113,8 @@ describe("DeleteAccountModal", () => {
       expect(mockSignOut).toHaveBeenCalledWith({
         reason: "account_deletion",
         redirect: false, // Updated to match new implementation
-        clearEnvironmentId: true,
       });
+      expect(removeItemSpy).toHaveBeenCalledWith(FORMBRICKS_ENVIRONMENT_ID_LS);
       expect(window.location.replace).toHaveBeenCalledWith("/auth/login");
       expect(mockSetOpen).toHaveBeenCalledWith(false);
     });
@@ -148,13 +151,15 @@ describe("DeleteAccountModal", () => {
     const form = screen.getByTestId("deleteAccountForm");
     fireEvent.submit(form);
 
+    const removeItemSpy = vi.spyOn(window.localStorage, "removeItem");
+
     await waitFor(() => {
       expect(deleteUserAction).toHaveBeenCalled();
       expect(mockSignOut).toHaveBeenCalledWith({
         reason: "account_deletion",
         redirect: false, // Updated to match new implementation
-        clearEnvironmentId: true,
       });
+      expect(removeItemSpy).toHaveBeenCalledWith(FORMBRICKS_ENVIRONMENT_ID_LS);
       expect(window.location.replace).toHaveBeenCalledWith(
         "https://app.formbricks.com/s/clri52y3z8f221225wjdhsoo2"
       );

apps/web/modules/account/components/DeleteAccountModal/index.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { FORMBRICKS_ENVIRONMENT_ID_LS } from "@/lib/localStorage";
 import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
 import { DeleteDialog } from "@/modules/ui/components/delete-dialog";
 import { Input } from "@/modules/ui/components/input";
@@ -38,11 +39,12 @@ export const DeleteAccountModal = ({
       setDeleting(true);
       await deleteUserAction();
 
+      localStorage.removeItem(FORMBRICKS_ENVIRONMENT_ID_LS);
+
       // Sign out with account deletion reason (no automatic redirect)
       await signOutWithAudit({
         reason: "account_deletion",
         redirect: false, // Prevent NextAuth automatic redirect
-        clearEnvironmentId: true,
       });
 
       // Manual redirect after signOut completes