refactor: simplify Docker build by removing dummy secret requirements

- Add build-time defaults for DATABASE_URL, ENCRYPTION_KEY, and REDIS_URL in env.ts
- Remove secret mounting for dummy values from Dockerfile
- Delete read-secrets.sh script (no longer needed)
- Update all GitHub Actions and workflows to remove DUMMY_* secrets
- Only SENTRY_AUTH_TOKEN remains as optional secret for sourcemap uploads

This simplifies local Docker builds - users can now build with just:
  docker build -f apps/web/Dockerfile -t formbricks-web .

Build-time validation uses defaults, runtime validation remains strict.

.cursor/rules/database.mdc

@@ -1,13 +1,8 @@
 ---
 description: >
-  This rule provides comprehensive knowledge about the Formbricks database structure, relationships, 
-  and data patterns. It should be used **only when the agent explicitly requests database schema-level 
-  details** to support tasks such as: writing/debugging Prisma queries, designing/reviewing data models, 
-  investigating multi-tenancy behavior, creating API endpoints, or understanding data relationships.
-globs: []
-alwaysApply: agent-requested
+globs: schema.prisma
+alwaysApply: false
 ---
-
 # Formbricks Database Schema Reference
 
 This rule provides a reference to the Formbricks database structure. For the most up-to-date and complete schema definitions, please refer to the schema.prisma file directly.

.cursor/rules/performance-optimization.mdc

@@ -1,5 +0,0 @@
----
-description:
-globs:
-alwaysApply: false
----

.cursor/rules/react-context-providers.mdc

@@ -1,5 +0,0 @@
----
-description:
-globs:
-alwaysApply: false
----

.github/actions/build-and-push-docker/action.yml

@@ -281,15 +281,9 @@ runs:
         tags: ${{ inputs.registry_type == 'ecr' && steps.ecr-tags.outputs.tags || (inputs.registry_type == 'ghcr' && inputs.experimental_mode == 'true' && steps.ghcr-meta-experimental.outputs.tags) || (inputs.registry_type == 'ghcr' && inputs.experimental_mode == 'false' && steps.ghcr-extra-tags.outputs.tags) || (inputs.registry_type == 'ghcr' && format('ghcr.io/{0}:{1}', inputs.ghcr_image_name, steps.version.outputs.version)) || (inputs.registry_type == 'ecr' && format('{0}/{1}:{2}', inputs.ecr_registry, inputs.ecr_repository, steps.version.outputs.version)) }}
         labels: ${{ inputs.registry_type == 'ghcr' && inputs.experimental_mode == 'true' && steps.ghcr-meta-experimental.outputs.labels || '' }}
         secrets: |
-          database_url=${{ env.DUMMY_DATABASE_URL }}
-          encryption_key=${{ env.DUMMY_ENCRYPTION_KEY }}
-          redis_url=${{ env.DUMMY_REDIS_URL }}
           sentry_auth_token=${{ env.SENTRY_AUTH_TOKEN }}
       env:
         DEPOT_PROJECT_TOKEN: ${{ env.DEPOT_PROJECT_TOKEN }}
-        DUMMY_DATABASE_URL: ${{ env.DUMMY_DATABASE_URL }}
-        DUMMY_ENCRYPTION_KEY: ${{ env.DUMMY_ENCRYPTION_KEY }}
-        DUMMY_REDIS_URL: ${{ env.DUMMY_REDIS_URL }}
         SENTRY_AUTH_TOKEN: ${{ env.SENTRY_AUTH_TOKEN }}
 
     - name: Sign GHCR image (GHCR only)

.github/workflows/build-and-push-ecr.yml

@@ -88,7 +88,4 @@ jobs:
           make_latest: ${{ inputs.MAKE_LATEST }}
         env:
           DEPOT_PROJECT_TOKEN: ${{ secrets.DEPOT_PROJECT_TOKEN }}
-          DUMMY_DATABASE_URL: ${{ secrets.DUMMY_DATABASE_URL }}
-          DUMMY_ENCRYPTION_KEY: ${{ secrets.DUMMY_ENCRYPTION_KEY }}
-          DUMMY_REDIS_URL: ${{ secrets.DUMMY_REDIS_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

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

@@ -70,9 +70,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           secrets: |
-            database_url=${{ secrets.DUMMY_DATABASE_URL }}
-            encryption_key=${{ secrets.DUMMY_ENCRYPTION_KEY }}
-            redis_url=redis://localhost:6379
+            sentry_auth_token=
 
       - name: Verify and Initialize PostgreSQL
         run: |
@@ -129,7 +127,6 @@ jobs:
         shell: bash
         env:
           GITHUB_SHA: ${{ github.sha }}
-          DUMMY_ENCRYPTION_KEY: ${{ secrets.DUMMY_ENCRYPTION_KEY }}
         run: |
           echo "🧪 Testing if the Docker image starts correctly..."
 
@@ -141,7 +138,7 @@ jobs:
             $DOCKER_RUN_ARGS \
             -p 3000:3000 \
             -e DATABASE_URL="postgresql://test:test@host.docker.internal:5432/formbricks" \
-            -e ENCRYPTION_KEY="$DUMMY_ENCRYPTION_KEY" \
+            -e ENCRYPTION_KEY="test-key-00000000000000000000000000000000000000000000000000" \
             -e REDIS_URL="redis://host.docker.internal:6379" \
             -d "formbricks-test:$GITHUB_SHA"
 

.github/workflows/e2e.yml

@@ -17,7 +17,6 @@ on:
   workflow_dispatch:
 
 env:
-  TELEMETRY_DISABLED: 1
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
 

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

@@ -44,7 +44,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEPOT_PROJECT_TOKEN: ${{ secrets.DEPOT_PROJECT_TOKEN }}
-          DUMMY_DATABASE_URL: ${{ secrets.DUMMY_DATABASE_URL }}
-          DUMMY_ENCRYPTION_KEY: ${{ secrets.DUMMY_ENCRYPTION_KEY }}
-          DUMMY_REDIS_URL: ${{ secrets.DUMMY_REDIS_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

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

@@ -102,7 +102,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEPOT_PROJECT_TOKEN: ${{ secrets.DEPOT_PROJECT_TOKEN }}
-          DUMMY_DATABASE_URL: ${{ secrets.DUMMY_DATABASE_URL }}
-          DUMMY_ENCRYPTION_KEY: ${{ secrets.DUMMY_ENCRYPTION_KEY }}
-          DUMMY_REDIS_URL: ${{ secrets.DUMMY_REDIS_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

apps/web/Dockerfile

@@ -25,10 +25,6 @@ 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
-
 # Increase Node.js memory limit as a regular build argument
 ARG NODE_OPTIONS="--max_old_space_size=8192"
 ENV NODE_OPTIONS=${NODE_OPTIONS}
@@ -37,6 +33,10 @@ ENV NODE_OPTIONS=${NODE_OPTIONS}
 # but needs explicit declaration for some build systems (like Depot)
 ARG TARGETARCH
 
+# Base path for the application (optional)
+ARG BASE_PATH=""
+ENV BASE_PATH=${BASE_PATH}
+
 # Set the working directory
 WORKDIR /app
 
@@ -57,13 +57,11 @@ 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 \
-    --mount=type=secret,id=encryption_key \
-    --mount=type=secret,id=redis_url \
-    --mount=type=secret,id=sentry_auth_token \
-    /tmp/read-secrets.sh pnpm build --filter=@formbricks/web...
+# Build the project - only mount Sentry token for optional sourcemap uploads
+# DATABASE_URL, REDIS_URL, ENCRYPTION_KEY defaults are provided by env.ts during build
+RUN --mount=type=secret,id=sentry_auth_token \
+    SENTRY_AUTH_TOKEN=$(cat /run/secrets/sentry_auth_token 2>/dev/null || echo "") \
+    pnpm build --filter=@formbricks/web...
 
 # Extract Prisma version
 RUN jq -r '.devDependencies.prisma' packages/database/package.json > /prisma_version.txt

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

@@ -1,8 +1,6 @@
 import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
 import { AuthorizationError } from "@formbricks/types/errors";
-import { PosthogIdentify } from "@/app/(app)/environments/[environmentId]/components/PosthogIdentify";
-import { IS_POSTHOG_CONFIGURED } from "@/lib/constants";
 import { canUserAccessOrganization } from "@/lib/organization/auth";
 import { getOrganization } from "@/lib/organization/service";
 import { getUser } from "@/lib/user/service";
@@ -40,14 +38,6 @@ const ProjectOnboardingLayout = async (props) => {
 
   return (
     <div className="flex-1 bg-slate-50">
-      <PosthogIdentify
-        session={session}
-        user={user}
-        organizationId={organization.id}
-        organizationName={organization.name}
-        organizationBilling={organization.billing}
-        isPosthogEnabled={IS_POSTHOG_CONFIGURED}
-      />
       <ToasterClient />
       {children}
     </div>

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

@@ -1,14 +1,13 @@
 import { redirect } from "next/navigation";
 import { getEnvironment } from "@/lib/environment/service";
 import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
-import { EnvironmentIdBaseLayout } from "@/modules/ui/components/environmentId-base-layout";
 
 const SurveyEditorEnvironmentLayout = async (props) => {
   const params = await props.params;
 
   const { children } = props;
 
-  const { t, session, user, organization } = await environmentIdLayoutChecks(params.environmentId);
+  const { t, session, user } = await environmentIdLayoutChecks(params.environmentId);
 
   if (!session) {
     return redirect(`/auth/login`);
@@ -25,15 +24,9 @@ const SurveyEditorEnvironmentLayout = async (props) => {
   }
 
   return (
-    <EnvironmentIdBaseLayout
-      environmentId={params.environmentId}
-      session={session}
-      user={user}
-      organization={organization}>
-      <div className="flex h-screen flex-col">
-        <div className="h-full overflow-y-auto bg-slate-50">{children}</div>
-      </div>
-    </EnvironmentIdBaseLayout>
+    <div className="flex h-screen flex-col">
+      <div className="h-full overflow-y-auto bg-slate-50">{children}</div>
+    </div>
   );
 };
 

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

@@ -1,61 +0,0 @@
-"use client";
-
-import type { Session } from "next-auth";
-import { usePostHog } from "posthog-js/react";
-import { useEffect } from "react";
-import { TOrganizationBilling } from "@formbricks/types/organizations";
-import { TUser } from "@formbricks/types/user";
-
-interface PosthogIdentifyProps {
-  session: Session;
-  user: TUser;
-  environmentId?: string;
-  organizationId?: string;
-  organizationName?: string;
-  organizationBilling?: TOrganizationBilling;
-  isPosthogEnabled: boolean;
-}
-
-export const PosthogIdentify = ({
-  session,
-  user,
-  environmentId,
-  organizationId,
-  organizationName,
-  organizationBilling,
-  isPosthogEnabled,
-}: PosthogIdentifyProps) => {
-  const posthog = usePostHog();
-
-  useEffect(() => {
-    if (isPosthogEnabled && session.user && posthog) {
-      posthog.identify(session.user.id, {
-        name: user.name,
-        email: user.email,
-      });
-      if (environmentId) {
-        posthog.group("environment", environmentId, { name: environmentId });
-      }
-      if (organizationId) {
-        posthog.group("organization", organizationId, {
-          name: organizationName,
-          plan: organizationBilling?.plan,
-          responseLimit: organizationBilling?.limits.monthly.responses,
-          miuLimit: organizationBilling?.limits.monthly.miu,
-        });
-      }
-    }
-  }, [
-    posthog,
-    session.user,
-    environmentId,
-    organizationId,
-    organizationName,
-    organizationBilling,
-    user.name,
-    user.email,
-    isPosthogEnabled,
-  ]);
-
-  return null;
-};

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

@@ -4,7 +4,6 @@ import { EnvironmentLayout } from "@/app/(app)/environments/[environmentId]/comp
 import { EnvironmentContextWrapper } from "@/app/(app)/environments/[environmentId]/context/environment-context";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { getEnvironmentLayoutData } from "@/modules/environments/lib/utils";
-import { EnvironmentIdBaseLayout } from "@/modules/ui/components/environmentId-base-layout";
 import EnvironmentStorageHandler from "./components/EnvironmentStorageHandler";
 
 const EnvLayout = async (props: {
@@ -24,11 +23,7 @@ const EnvLayout = async (props: {
   const layoutData = await getEnvironmentLayoutData(params.environmentId, session.user.id);
 
   return (
-    <EnvironmentIdBaseLayout
-      environmentId={params.environmentId}
-      session={layoutData.session}
-      user={layoutData.user}
-      organization={layoutData.organization}>
+    <>
       <EnvironmentStorageHandler environmentId={params.environmentId} />
       <EnvironmentContextWrapper
         environment={layoutData.environment}
@@ -36,7 +31,7 @@ const EnvLayout = async (props: {
         organization={layoutData.organization}>
         <EnvironmentLayout layoutData={layoutData}>{children}</EnvironmentLayout>
       </EnvironmentContextWrapper>
-    </EnvironmentIdBaseLayout>
+    </>
   );
 };
 

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

@@ -1,5 +1,6 @@
 import { Metadata } from "next";
 import { getServerSession } from "next-auth";
+import { ResponseFilterProvider } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
@@ -25,7 +26,7 @@ export const generateMetadata = async (props: Props): Promise<Metadata> => {
 };
 
 const SurveyLayout = async ({ children }) => {
-  return <>{children}</>;
+  return <ResponseFilterProvider>{children}</ResponseFilterProvider>;
 };
 
 export default SurveyLayout;

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

@@ -8,8 +8,8 @@ import { TResponseWithQuotas } from "@formbricks/types/responses";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { TTag } from "@formbricks/types/tags";
 import { TUser, TUserLocale } from "@formbricks/types/user";
-import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
 import { getResponsesAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions";
+import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import { ResponseDataView } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseDataView";
 import { CustomFilter } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter";
 import { getFormattedFilters } from "@/app/lib/surveys/surveys";

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

@@ -8,6 +8,7 @@ import { timeSince } from "@/lib/time";
 import { getContactIdentifier } from "@/lib/utils/contact";
 import { ArrayResponse } from "@/modules/ui/components/array-response";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 import { QuestionSummaryHeader } from "./QuestionSummaryHeader";
 
 interface AddressSummaryProps {
@@ -29,42 +30,48 @@ export const AddressSummary = ({ questionSummary, environmentId, survey, locale
           <div className="px-4 md:px-6">{t("common.time")}</div>
         </div>
         <div className="max-h-[62vh] w-full overflow-y-auto">
-          {questionSummary.samples.map((response) => {
-            return (
-              <div
-                key={response.id}
-                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
-                <div className="pl-4 md:pl-6">
-                  {response.contact ? (
-                    <Link
-                      className="ph-no-capture group flex items-center"
-                      href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
-                      <div className="hidden md:flex">
-                        <PersonAvatar personId={response.contact.id} />
+          {questionSummary.samples.length === 0 ? (
+            <div className="p-8">
+              <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
+            </div>
+          ) : (
+            questionSummary.samples.map((response) => {
+              return (
+                <div
+                  key={response.id}
+                  className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
+                  <div className="pl-4 md:pl-6">
+                    {response.contact ? (
+                      <Link
+                        className="ph-no-capture group flex items-center"
+                        href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
+                        <div className="hidden md:flex">
+                          <PersonAvatar personId={response.contact.id} />
+                        </div>
+                        <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                          {getContactIdentifier(response.contact, response.contactAttributes)}
+                        </p>
+                      </Link>
+                    ) : (
+                      <div className="group flex items-center">
+                        <div className="hidden md:flex">
+                          <PersonAvatar personId="anonymous" />
+                        </div>
+                        <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
                       </div>
-                      <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
-                        {getContactIdentifier(response.contact, response.contactAttributes)}
-                      </p>
-                    </Link>
-                  ) : (
-                    <div className="group flex items-center">
-                      <div className="hidden md:flex">
-                        <PersonAvatar personId="anonymous" />
-                      </div>
-                      <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
-                    </div>
-                  )}
-                </div>
-                <div className="ph-no-capture col-span-2 pl-6 font-semibold">
-                  <ArrayResponse value={response.value} />
-                </div>
+                    )}
+                  </div>
+                  <div className="ph-no-capture col-span-2 pl-6 font-semibold">
+                    <ArrayResponse value={response.value} />
+                  </div>
 
-                <div className="px-4 text-slate-500 md:px-6">
-                  {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                  <div className="px-4 text-slate-500 md:px-6">
+                    {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                  </div>
                 </div>
-              </div>
-            );
-          })}
+              );
+            })
+          )}
         </div>
       </div>
     </div>

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

@@ -8,6 +8,7 @@ import { timeSince } from "@/lib/time";
 import { getContactIdentifier } from "@/lib/utils/contact";
 import { ArrayResponse } from "@/modules/ui/components/array-response";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 import { QuestionSummaryHeader } from "./QuestionSummaryHeader";
 
 interface ContactInfoSummaryProps {
@@ -34,42 +35,48 @@ export const ContactInfoSummary = ({
           <div className="px-4 md:px-6">{t("common.time")}</div>
         </div>
         <div className="max-h-[62vh] w-full overflow-y-auto">
-          {questionSummary.samples.map((response) => {
-            return (
-              <div
-                key={response.id}
-                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
-                <div className="pl-4 md:pl-6">
-                  {response.contact ? (
-                    <Link
-                      className="ph-no-capture group flex items-center"
-                      href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
-                      <div className="hidden md:flex">
-                        <PersonAvatar personId={response.contact.id} />
+          {questionSummary.samples.length === 0 ? (
+            <div className="p-8">
+              <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
+            </div>
+          ) : (
+            questionSummary.samples.map((response) => {
+              return (
+                <div
+                  key={response.id}
+                  className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
+                  <div className="pl-4 md:pl-6">
+                    {response.contact ? (
+                      <Link
+                        className="ph-no-capture group flex items-center"
+                        href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
+                        <div className="hidden md:flex">
+                          <PersonAvatar personId={response.contact.id} />
+                        </div>
+                        <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                          {getContactIdentifier(response.contact, response.contactAttributes)}
+                        </p>
+                      </Link>
+                    ) : (
+                      <div className="group flex items-center">
+                        <div className="hidden md:flex">
+                          <PersonAvatar personId="anonymous" />
+                        </div>
+                        <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
                       </div>
-                      <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
-                        {getContactIdentifier(response.contact, response.contactAttributes)}
-                      </p>
-                    </Link>
-                  ) : (
-                    <div className="group flex items-center">
-                      <div className="hidden md:flex">
-                        <PersonAvatar personId="anonymous" />
-                      </div>
-                      <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
-                    </div>
-                  )}
-                </div>
-                <div className="ph-no-capture col-span-2 pl-6 font-semibold">
-                  <ArrayResponse value={response.value} />
-                </div>
+                    )}
+                  </div>
+                  <div className="ph-no-capture col-span-2 pl-6 font-semibold">
+                    <ArrayResponse value={response.value} />
+                  </div>
 
-                <div className="px-4 text-slate-500 md:px-6">
-                  {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                  <div className="px-4 text-slate-500 md:px-6">
+                    {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                  </div>
                 </div>
-              </div>
-            );
-          })}
+              );
+            })
+          )}
         </div>
       </div>
     </div>

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

@@ -10,6 +10,7 @@ import { getContactIdentifier } from "@/lib/utils/contact";
 import { formatDateWithOrdinal } from "@/lib/utils/datetime";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 import { QuestionSummaryHeader } from "./QuestionSummaryHeader";
 
 interface DateQuestionSummary {
@@ -55,41 +56,47 @@ export const DateQuestionSummary = ({
           <div className="px-4 md:px-6">{t("common.time")}</div>
         </div>
         <div className="max-h-[62vh] w-full overflow-y-auto">
-          {questionSummary.samples.slice(0, visibleResponses).map((response) => (
-            <div
-              key={response.id}
-              className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
-              <div className="pl-4 md:pl-6">
-                {response.contact ? (
-                  <Link
-                    className="ph-no-capture group flex items-center"
-                    href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
-                    <div className="hidden md:flex">
-                      <PersonAvatar personId={response.contact.id} />
-                    </div>
-                    <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
-                      {getContactIdentifier(response.contact, response.contactAttributes)}
-                    </p>
-                  </Link>
-                ) : (
-                  <div className="group flex items-center">
-                    <div className="hidden md:flex">
-                      <PersonAvatar personId="anonymous" />
-                    </div>
-                    <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
-                  </div>
-                )}
-              </div>
-              <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
-                {renderResponseValue(response.value)}
-              </div>
-              <div className="px-4 text-slate-500 md:px-6">
-                {timeSince(new Date(response.updatedAt).toISOString(), locale)}
-              </div>
+          {questionSummary.samples.length === 0 ? (
+            <div className="p-8">
+              <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
             </div>
-          ))}
+          ) : (
+            questionSummary.samples.slice(0, visibleResponses).map((response) => (
+              <div
+                key={response.id}
+                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
+                <div className="pl-4 md:pl-6">
+                  {response.contact ? (
+                    <Link
+                      className="ph-no-capture group flex items-center"
+                      href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
+                      <div className="hidden md:flex">
+                        <PersonAvatar personId={response.contact.id} />
+                      </div>
+                      <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                        {getContactIdentifier(response.contact, response.contactAttributes)}
+                      </p>
+                    </Link>
+                  ) : (
+                    <div className="group flex items-center">
+                      <div className="hidden md:flex">
+                        <PersonAvatar personId="anonymous" />
+                      </div>
+                      <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
+                    </div>
+                  )}
+                </div>
+                <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
+                  {renderResponseValue(response.value)}
+                </div>
+                <div className="px-4 text-slate-500 md:px-6">
+                  {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                </div>
+              </div>
+            ))
+          )}
         </div>
-        {visibleResponses < questionSummary.samples.length && (
+        {questionSummary.samples.length > 0 && visibleResponses < questionSummary.samples.length && (
           <div className="flex justify-center py-4">
             <Button onClick={handleLoadMore} variant="secondary" size="sm">
               {t("common.load_more")}

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

@@ -11,6 +11,7 @@ import { getContactIdentifier } from "@/lib/utils/contact";
 import { getOriginalFileNameFromUrl } from "@/modules/storage/utils";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 import { QuestionSummaryHeader } from "./QuestionSummaryHeader";
 
 interface FileUploadSummaryProps {
@@ -45,71 +46,77 @@ export const FileUploadSummary = ({
           <div className="px-4 md:px-6">{t("common.time")}</div>
         </div>
         <div className="max-h-[62vh] w-full overflow-y-auto">
-          {questionSummary.files.slice(0, visibleResponses).map((response) => (
-            <div
-              key={response.id}
-              className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
-              <div className="pl-4 md:pl-6">
-                {response.contact ? (
-                  <Link
-                    className="ph-no-capture group flex items-center"
-                    href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
-                    <div className="hidden md:flex">
-                      <PersonAvatar personId={response.contact.id} />
-                    </div>
-                    <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
-                      {getContactIdentifier(response.contact, response.contactAttributes)}
-                    </p>
-                  </Link>
-                ) : (
-                  <div className="group flex items-center">
-                    <div className="hidden md:flex">
-                      <PersonAvatar personId="anonymous" />
-                    </div>
-                    <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
-                  </div>
-                )}
-              </div>
-
-              <div className="col-span-2 grid">
-                {Array.isArray(response.value) &&
-                  (response.value.length > 0 ? (
-                    response.value.map((fileUrl) => {
-                      const fileName = getOriginalFileNameFromUrl(fileUrl);
-
-                      return (
-                        <div className="relative m-2 rounded-lg bg-slate-200" key={fileUrl}>
-                          <a href={fileUrl} key={fileUrl} target="_blank" rel="noopener noreferrer">
-                            <div className="absolute right-0 top-0 m-2">
-                              <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-slate-50 hover:bg-white">
-                                <DownloadIcon className="h-6 text-slate-500" />
-                              </div>
-                            </div>
-                          </a>
-
-                          <div className="flex flex-col items-center justify-center p-2">
-                            <FileIcon className="h-6 text-slate-500" />
-                            <p className="mt-2 text-sm text-slate-500 dark:text-slate-400">{fileName}</p>
-                          </div>
-                        </div>
-                      );
-                    })
-                  ) : (
-                    <div className="flex w-full flex-col items-center justify-center p-2">
-                      <p className="mt-2 text-sm font-semibold text-slate-500 dark:text-slate-400">
-                        {t("common.skipped")}
-                      </p>
-                    </div>
-                  ))}
-              </div>
-
-              <div className="px-4 text-slate-500 md:px-6">
-                {timeSince(new Date(response.updatedAt).toISOString(), locale)}
-              </div>
+          {questionSummary.files.length === 0 ? (
+            <div className="p-8">
+              <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
             </div>
-          ))}
+          ) : (
+            questionSummary.files.slice(0, visibleResponses).map((response) => (
+              <div
+                key={response.id}
+                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
+                <div className="pl-4 md:pl-6">
+                  {response.contact ? (
+                    <Link
+                      className="ph-no-capture group flex items-center"
+                      href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
+                      <div className="hidden md:flex">
+                        <PersonAvatar personId={response.contact.id} />
+                      </div>
+                      <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                        {getContactIdentifier(response.contact, response.contactAttributes)}
+                      </p>
+                    </Link>
+                  ) : (
+                    <div className="group flex items-center">
+                      <div className="hidden md:flex">
+                        <PersonAvatar personId="anonymous" />
+                      </div>
+                      <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
+                    </div>
+                  )}
+                </div>
+
+                <div className="col-span-2 grid">
+                  {Array.isArray(response.value) &&
+                    (response.value.length > 0 ? (
+                      response.value.map((fileUrl) => {
+                        const fileName = getOriginalFileNameFromUrl(fileUrl);
+
+                        return (
+                          <div className="relative m-2 rounded-lg bg-slate-200" key={fileUrl}>
+                            <a href={fileUrl} key={fileUrl} target="_blank" rel="noopener noreferrer">
+                              <div className="absolute right-0 top-0 m-2">
+                                <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-slate-50 hover:bg-white">
+                                  <DownloadIcon className="h-6 text-slate-500" />
+                                </div>
+                              </div>
+                            </a>
+
+                            <div className="flex flex-col items-center justify-center p-2">
+                              <FileIcon className="h-6 text-slate-500" />
+                              <p className="mt-2 text-sm text-slate-500 dark:text-slate-400">{fileName}</p>
+                            </div>
+                          </div>
+                        );
+                      })
+                    ) : (
+                      <div className="flex w-full flex-col items-center justify-center p-2">
+                        <p className="mt-2 text-sm font-semibold text-slate-500 dark:text-slate-400">
+                          {t("common.skipped")}
+                        </p>
+                      </div>
+                    ))}
+                </div>
+
+                <div className="px-4 text-slate-500 md:px-6">
+                  {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                </div>
+              </div>
+            ))
+          )}
         </div>
-        {visibleResponses < questionSummary.files.length && (
+        {questionSummary.files.length > 0 && visibleResponses < questionSummary.files.length && (
           <div className="flex justify-center py-4">
             <Button onClick={handleLoadMore} variant="secondary" size="sm">
               {t("common.load_more")}

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

@@ -10,6 +10,7 @@ import { timeSince } from "@/lib/time";
 import { getContactIdentifier } from "@/lib/utils/contact";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 
 interface HiddenFieldsSummaryProps {
   environment: TEnvironment;
@@ -51,40 +52,46 @@ export const HiddenFieldsSummary = ({ environment, questionSummary, locale }: Hi
           <div className="col-span-2 pl-4 md:pl-6">{t("common.response")}</div>
           <div className="px-4 md:px-6">{t("common.time")}</div>
         </div>
-        {questionSummary.samples.slice(0, visibleResponses).map((response, idx) => (
-          <div
-            key={`${response.value}-${idx}`}
-            className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 md:text-base">
-            <div className="pl-4 md:pl-6">
-              {response.contact ? (
-                <Link
-                  className="ph-no-capture group flex items-center"
-                  href={`/environments/${environment.id}/contacts/${response.contact.id}`}>
-                  <div className="hidden md:flex">
-                    <PersonAvatar personId={response.contact.id} />
-                  </div>
-                  <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
-                    {getContactIdentifier(response.contact, response.contactAttributes)}
-                  </p>
-                </Link>
-              ) : (
-                <div className="group flex items-center">
-                  <div className="hidden md:flex">
-                    <PersonAvatar personId="anonymous" />
-                  </div>
-                  <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
-                </div>
-              )}
-            </div>
-            <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
-              {response.value}
-            </div>
-            <div className="px-4 text-slate-500 md:px-6">
-              {timeSince(new Date(response.updatedAt).toISOString(), locale)}
-            </div>
+        {questionSummary.samples.length === 0 ? (
+          <div className="p-8">
+            <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
           </div>
-        ))}
-        {visibleResponses < questionSummary.samples.length && (
+        ) : (
+          questionSummary.samples.slice(0, visibleResponses).map((response, idx) => (
+            <div
+              key={`${response.value}-${idx}`}
+              className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 md:text-base">
+              <div className="pl-4 md:pl-6">
+                {response.contact ? (
+                  <Link
+                    className="ph-no-capture group flex items-center"
+                    href={`/environments/${environment.id}/contacts/${response.contact.id}`}>
+                    <div className="hidden md:flex">
+                      <PersonAvatar personId={response.contact.id} />
+                    </div>
+                    <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                      {getContactIdentifier(response.contact, response.contactAttributes)}
+                    </p>
+                  </Link>
+                ) : (
+                  <div className="group flex items-center">
+                    <div className="hidden md:flex">
+                      <PersonAvatar personId="anonymous" />
+                    </div>
+                    <p className="break-all text-slate-600 md:ml-2">{t("common.anonymous")}</p>
+                  </div>
+                )}
+              </div>
+              <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
+                {response.value}
+              </div>
+              <div className="px-4 text-slate-500 md:px-6">
+                {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+              </div>
+            </div>
+          ))
+        )}
+        {questionSummary.samples.length > 0 && visibleResponses < questionSummary.samples.length && (
           <div className="flex justify-center py-4">
             <Button onClick={handleLoadMore} variant="secondary" size="sm">
               {t("common.load_more")}

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

@@ -85,96 +85,98 @@ export const MultipleChoiceSummary = ({
           ) : undefined
         }
       />
-      <div className="space-y-5 px-4 pb-6 pt-4 text-sm md:px-6 md:text-base">
-        {results.map((result) => {
-          const choiceId = getChoiceIdByValue(result.value, questionSummary.question);
-          return (
-            <Fragment key={result.value}>
-              <button
-                type="button"
-                className="group w-full cursor-pointer"
-                onClick={() =>
-                  setFilter(
-                    questionSummary.question.id,
-                    questionSummary.question.headline,
-                    questionSummary.question.type,
-                    questionSummary.type === "multipleChoiceSingle" || otherValue === result.value
-                      ? t("environments.surveys.summary.includes_either")
-                      : t("environments.surveys.summary.includes_all"),
-                    [result.value]
-                  )
-                }>
-                <div className="text flex flex-col justify-between px-2 pb-2 sm:flex-row">
-                  <div className="mr-8 flex w-full justify-between space-x-2 sm:justify-normal">
-                    <p className="font-semibold text-slate-700 underline-offset-4 group-hover:underline">
-                      {result.value}
-                    </p>
-                    {choiceId && <IdBadge id={choiceId} />}
-                  </div>
-                  <div className="flex w-full space-x-2">
-                    <p className="flex w-full pt-1 text-slate-600 sm:items-end sm:justify-end sm:pt-0">
-                      {result.count} {result.count === 1 ? t("common.selection") : t("common.selections")}
-                    </p>
-                    <p className="rounded-lg bg-slate-100 px-2 text-slate-700">
-                      {convertFloatToNDecimal(result.percentage, 2)}%
-                    </p>
-                  </div>
-                </div>
-                <div className="group-hover:opacity-80">
-                  <ProgressBar barColor="bg-brand-dark" progress={result.percentage / 100} />
-                </div>
-              </button>
-              {result.others && result.others.length > 0 && (
-                <div className="mt-4 rounded-lg border border-slate-200">
-                  <div className="grid h-12 grid-cols-2 content-center rounded-t-lg bg-slate-100 text-left text-sm font-semibold text-slate-900">
-                    <div className="col-span-1 pl-6">
-                      {t("environments.surveys.summary.other_values_found")}
+      <div className="px-4 pb-6 pt-4 text-sm md:px-6 md:text-base">
+        <div className="space-y-5">
+          {results.map((result) => {
+            const choiceId = getChoiceIdByValue(result.value, questionSummary.question);
+            return (
+              <Fragment key={result.value}>
+                <button
+                  type="button"
+                  className="group w-full cursor-pointer"
+                  onClick={() =>
+                    setFilter(
+                      questionSummary.question.id,
+                      questionSummary.question.headline,
+                      questionSummary.question.type,
+                      questionSummary.type === "multipleChoiceSingle" || otherValue === result.value
+                        ? t("environments.surveys.summary.includes_either")
+                        : t("environments.surveys.summary.includes_all"),
+                      [result.value]
+                    )
+                  }>
+                  <div className="text flex flex-col justify-between px-2 pb-2 sm:flex-row">
+                    <div className="mr-8 flex w-full justify-between space-x-2 sm:justify-normal">
+                      <p className="font-semibold text-slate-700 underline-offset-4 group-hover:underline">
+                        {result.value}
+                      </p>
+                      {choiceId && <IdBadge id={choiceId} />}
+                    </div>
+                    <div className="flex w-full space-x-2">
+                      <p className="flex w-full pt-1 text-slate-600 sm:items-end sm:justify-end sm:pt-0">
+                        {result.count} {result.count === 1 ? t("common.selection") : t("common.selections")}
+                      </p>
+                      <p className="rounded-lg bg-slate-100 px-2 text-slate-700">
+                        {convertFloatToNDecimal(result.percentage, 2)}%
+                      </p>
                     </div>
-                    <div className="col-span-1 pl-6">{surveyType === "app" && t("common.user")}</div>
                   </div>
-                  {result.others
-                    .filter((otherValue) => otherValue.value !== "")
-                    .slice(0, visibleOtherResponses)
-                    .map((otherValue, idx) => (
-                      <div key={`${idx}-${otherValue}`} dir="auto">
-                        {surveyType === "link" && (
-                          <div className="ph-no-capture col-span-1 m-2 flex h-10 items-center rounded-lg pl-4 text-sm font-medium text-slate-900">
-                            <span>{otherValue.value}</span>
-                          </div>
-                        )}
-                        {surveyType === "app" && otherValue.contact && (
-                          <Link
-                            href={
-                              otherValue.contact.id
-                                ? `/environments/${environmentId}/contacts/${otherValue.contact.id}`
-                                : { pathname: null }
-                            }
-                            className="m-2 grid h-16 grid-cols-2 items-center rounded-lg text-sm hover:bg-slate-100">
-                            <div className="ph-no-capture col-span-1 pl-4 font-medium text-slate-900">
+                  <div className="group-hover:opacity-80">
+                    <ProgressBar barColor="bg-brand-dark" progress={result.percentage / 100} />
+                  </div>
+                </button>
+                {result.others && result.others.length > 0 && (
+                  <div className="mt-4 rounded-lg border border-slate-200">
+                    <div className="grid h-12 grid-cols-2 content-center rounded-t-lg bg-slate-100 text-left text-sm font-semibold text-slate-900">
+                      <div className="col-span-1 pl-6">
+                        {t("environments.surveys.summary.other_values_found")}
+                      </div>
+                      <div className="col-span-1 pl-6">{surveyType === "app" && t("common.user")}</div>
+                    </div>
+                    {result.others
+                      .filter((otherValue) => otherValue.value !== "")
+                      .slice(0, visibleOtherResponses)
+                      .map((otherValue, idx) => (
+                        <div key={`${idx}-${otherValue}`} dir="auto">
+                          {surveyType === "link" && (
+                            <div className="ph-no-capture col-span-1 m-2 flex h-10 items-center rounded-lg pl-4 text-sm font-medium text-slate-900">
                               <span>{otherValue.value}</span>
                             </div>
-                            <div className="ph-no-capture col-span-1 flex items-center space-x-4 pl-6 font-medium text-slate-900">
-                              {otherValue.contact.id && <PersonAvatar personId={otherValue.contact.id} />}
-                              <span>
-                                {getContactIdentifier(otherValue.contact, otherValue.contactAttributes)}
-                              </span>
-                            </div>
-                          </Link>
-                        )}
+                          )}
+                          {surveyType === "app" && otherValue.contact && (
+                            <Link
+                              href={
+                                otherValue.contact.id
+                                  ? `/environments/${environmentId}/contacts/${otherValue.contact.id}`
+                                  : { pathname: null }
+                              }
+                              className="m-2 grid h-16 grid-cols-2 items-center rounded-lg text-sm hover:bg-slate-100">
+                              <div className="ph-no-capture col-span-1 pl-4 font-medium text-slate-900">
+                                <span>{otherValue.value}</span>
+                              </div>
+                              <div className="ph-no-capture col-span-1 flex items-center space-x-4 pl-6 font-medium text-slate-900">
+                                {otherValue.contact.id && <PersonAvatar personId={otherValue.contact.id} />}
+                                <span>
+                                  {getContactIdentifier(otherValue.contact, otherValue.contactAttributes)}
+                                </span>
+                              </div>
+                            </Link>
+                          )}
+                        </div>
+                      ))}
+                    {visibleOtherResponses < result.others.length && (
+                      <div className="flex justify-center py-4">
+                        <Button onClick={handleLoadMore} variant="secondary" size="sm">
+                          {t("common.load_more")}
+                        </Button>
                       </div>
-                    ))}
-                  {visibleOtherResponses < result.others.length && (
-                    <div className="flex justify-center py-4">
-                      <Button onClick={handleLoadMore} variant="secondary" size="sm">
-                        {t("common.load_more")}
-                      </Button>
-                    </div>
-                  )}
-                </div>
-              )}
-            </Fragment>
-          );
-        })}
+                    )}
+                  </div>
+                )}
+              </Fragment>
+            );
+          })}
+        </div>
       </div>
     </div>
   );

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

@@ -106,36 +106,38 @@ export const NPSSummary = ({ questionSummary, survey, setFilter }: NPSSummaryPro
         </div>
 
         <TabsContent value="aggregated" className="mt-4">
-          <div className="space-y-5 px-4 pb-6 pt-4 text-sm md:px-6 md:text-base">
-            {["promoters", "passives", "detractors", "dismissed"].map((group) => (
-              <button
-                className="w-full cursor-pointer hover:opacity-80"
-                key={group}
-                onClick={() => applyFilter(group)}>
-                <div
-                  className={`mb-2 flex justify-between ${group === "dismissed" ? "mb-2 border-t bg-white pt-4 text-sm md:text-base" : ""}`}>
-                  <div className="mr-8 flex space-x-1">
-                    <p
-                      className={`font-semibold capitalize text-slate-700 ${group === "dismissed" ? "" : "text-slate-700"}`}>
-                      {group}
-                    </p>
-                    <div>
-                      <p className="rounded-lg bg-slate-100 px-2 text-slate-700">
-                        {convertFloatToNDecimal(questionSummary[group]?.percentage, 2)}%
+          <div className="px-4 pb-6 pt-4 md:px-6">
+            <div className="space-y-5 text-sm md:text-base">
+              {["promoters", "passives", "detractors", "dismissed"].map((group) => (
+                <button
+                  className="w-full cursor-pointer hover:opacity-80"
+                  key={group}
+                  onClick={() => applyFilter(group)}>
+                  <div
+                    className={`mb-2 flex justify-between ${group === "dismissed" ? "mb-2 border-t bg-white pt-4 text-sm md:text-base" : ""}`}>
+                    <div className="mr-8 flex space-x-1">
+                      <p
+                        className={`font-semibold capitalize text-slate-700 ${group === "dismissed" ? "" : "text-slate-700"}`}>
+                        {group}
                       </p>
+                      <div>
+                        <p className="rounded-lg bg-slate-100 px-2 text-slate-700">
+                          {convertFloatToNDecimal(questionSummary[group]?.percentage, 2)}%
+                        </p>
+                      </div>
                     </div>
+                    <p className="flex w-32 items-end justify-end text-slate-600">
+                      {questionSummary[group]?.count}{" "}
+                      {questionSummary[group]?.count === 1 ? t("common.response") : t("common.responses")}
+                    </p>
                   </div>
-                  <p className="flex w-32 items-end justify-end text-slate-600">
-                    {questionSummary[group]?.count}{" "}
-                    {questionSummary[group]?.count === 1 ? t("common.response") : t("common.responses")}
-                  </p>
-                </div>
-                <ProgressBar
-                  barColor={group === "dismissed" ? "bg-slate-600" : "bg-brand-dark"}
-                  progress={questionSummary[group]?.percentage / 100}
-                />
-              </button>
-            ))}
+                  <ProgressBar
+                    barColor={group === "dismissed" ? "bg-slate-600" : "bg-brand-dark"}
+                    progress={questionSummary[group]?.percentage / 100}
+                  />
+                </button>
+              ))}
+            </div>
           </div>
         </TabsContent>
 

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

@@ -10,6 +10,7 @@ import { getContactIdentifier } from "@/lib/utils/contact";
 import { renderHyperlinkedContent } from "@/modules/analysis/utils";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/modules/ui/components/table";
 import { QuestionSummaryHeader } from "./QuestionSummaryHeader";
 
@@ -35,59 +36,65 @@ export const OpenTextSummary = ({ questionSummary, environmentId, survey, locale
     <div className="overflow-hidden rounded-xl border border-slate-200 bg-white shadow-sm">
       <QuestionSummaryHeader questionSummary={questionSummary} survey={survey} />
       <div className="border-t border-slate-200"></div>
-      <div className="max-h-[40vh] overflow-y-auto">
-        <Table>
-          <TableHeader className="bg-slate-100">
-            <TableRow>
-              <TableHead>{t("common.user")}</TableHead>
-              <TableHead>{t("common.response")}</TableHead>
-              <TableHead>{t("common.time")}</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {questionSummary.samples.slice(0, visibleResponses).map((response) => (
-              <TableRow key={response.id}>
-                <TableCell>
-                  {response.contact ? (
-                    <Link
-                      className="ph-no-capture group flex items-center"
-                      href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
-                      <div className="hidden md:flex">
-                        <PersonAvatar personId={response.contact.id} />
-                      </div>
-                      <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
-                        {getContactIdentifier(response.contact, response.contactAttributes)}
-                      </p>
-                    </Link>
-                  ) : (
-                    <div className="group flex items-center">
-                      <div className="hidden md:flex">
-                        <PersonAvatar personId="anonymous" />
-                      </div>
-                      <p className="break-normal text-slate-600 md:ml-2">{t("common.anonymous")}</p>
-                    </div>
-                  )}
-                </TableCell>
-                <TableCell className="font-medium">
-                  {typeof response.value === "string"
-                    ? renderHyperlinkedContent(response.value)
-                    : response.value}
-                </TableCell>
-                <TableCell width={120}>
-                  {timeSince(new Date(response.updatedAt).toISOString(), locale)}
-                </TableCell>
+      {questionSummary.samples.length === 0 ? (
+        <div className="p-8">
+          <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
+        </div>
+      ) : (
+        <div className="max-h-[40vh] overflow-y-auto">
+          <Table>
+            <TableHeader className="bg-slate-100">
+              <TableRow>
+                <TableHead className="w-1/4">{t("common.user")}</TableHead>
+                <TableHead className="w-2/4">{t("common.response")}</TableHead>
+                <TableHead className="w-1/4">{t("common.time")}</TableHead>
               </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-        {visibleResponses < questionSummary.samples.length && (
-          <div className="flex justify-center py-4">
-            <Button onClick={handleLoadMore} variant="secondary" size="sm">
-              {t("common.load_more")}
-            </Button>
-          </div>
-        )}
-      </div>
+            </TableHeader>
+            <TableBody>
+              {questionSummary.samples.slice(0, visibleResponses).map((response) => (
+                <TableRow key={response.id}>
+                  <TableCell className="w-1/4">
+                    {response.contact ? (
+                      <Link
+                        className="ph-no-capture group flex items-center"
+                        href={`/environments/${environmentId}/contacts/${response.contact.id}`}>
+                        <div className="hidden md:flex">
+                          <PersonAvatar personId={response.contact.id} />
+                        </div>
+                        <p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
+                          {getContactIdentifier(response.contact, response.contactAttributes)}
+                        </p>
+                      </Link>
+                    ) : (
+                      <div className="group flex items-center">
+                        <div className="hidden md:flex">
+                          <PersonAvatar personId="anonymous" />
+                        </div>
+                        <p className="break-normal text-slate-600 md:ml-2">{t("common.anonymous")}</p>
+                      </div>
+                    )}
+                  </TableCell>
+                  <TableCell className="w-2/4 font-medium">
+                    {typeof response.value === "string"
+                      ? renderHyperlinkedContent(response.value)
+                      : response.value}
+                  </TableCell>
+                  <TableCell className="w-1/4">
+                    {timeSince(new Date(response.updatedAt).toISOString(), locale)}
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+          {visibleResponses < questionSummary.samples.length && (
+            <div className="flex justify-center py-4">
+              <Button onClick={handleLoadMore} variant="secondary" size="sm">
+                {t("common.load_more")}
+              </Button>
+            </div>
+          )}
+        </div>
+      )}
     </div>
   );
 };

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

@@ -11,6 +11,7 @@ import {
   TSurveyQuestionTypeEnum,
 } from "@formbricks/types/surveys/types";
 import { convertFloatToNDecimal } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/utils";
+import { EmptyState } from "@/modules/ui/components/empty-state";
 import { ProgressBar } from "@/modules/ui/components/progress-bar";
 import { RatingResponse } from "@/modules/ui/components/rating-response";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/modules/ui/components/tabs";
@@ -84,11 +85,7 @@ export const RatingSummary = ({ questionSummary, survey, setFilter }: RatingSumm
           <div className="px-4 pb-6 pt-4 md:px-6">
             {questionSummary.responseCount === 0 ? (
               <>
-                <div className="rounded-lg border border-slate-200 bg-slate-50 p-8 text-center">
-                  <p className="text-sm text-slate-500">
-                    {t("environments.surveys.summary.no_responses_found")}
-                  </p>
-                </div>
+                <EmptyState text={t("environments.surveys.summary.no_responses_found")} variant="simple" />
                 <RatingScaleLegend
                   scale={questionSummary.question.scale}
                   range={questionSummary.question.range}

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

@@ -12,11 +12,11 @@ import {
 } from "@formbricks/types/surveys/types";
 import { getTextContent } from "@formbricks/types/surveys/validation";
 import { TUserLocale } from "@formbricks/types/user";
+import { EmptyAppSurveys } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys";
 import {
   SelectedFilterValue,
   useResponseFilter,
-} from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
-import { EmptyAppSurveys } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys";
+} from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import { CTASummary } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/CTASummary";
 import { CalSummary } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/CalSummary";
 import { ConsentSummary } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ConsentSummary";

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

@@ -8,6 +8,7 @@ import { cn } from "@/modules/ui/lib/utils";
 
 interface SummaryMetadataProps {
   surveySummary: TSurveySummary["meta"];
+  quotasCount: number;
   isLoading: boolean;
   tab: "dropOffs" | "quotas" | undefined;
   setTab: React.Dispatch<React.SetStateAction<"dropOffs" | "quotas" | undefined>>;
@@ -31,6 +32,7 @@ const formatTime = (ttc) => {
 
 export const SummaryMetadata = ({
   surveySummary,
+  quotasCount,
   isLoading,
   tab,
   setTab,
@@ -61,7 +63,7 @@ export const SummaryMetadata = ({
       <div
         className={cn(
           `grid gap-4 sm:grid-cols-2 md:grid-cols-3 md:gap-x-2 lg:grid-cols-3 2xl:grid-cols-5`,
-          isQuotasAllowed && "2xl:grid-cols-6"
+          isQuotasAllowed && quotasCount > 0 && "2xl:grid-cols-6"
         )}>
         <StatCard
           label={t("environments.surveys.summary.impressions")}
@@ -105,7 +107,7 @@ export const SummaryMetadata = ({
           isLoading={isLoading}
         />
 
-        {isQuotasAllowed && (
+        {isQuotasAllowed && quotasCount > 0 && (
           <InteractiveCard
             key="quotas"
             tab="quotas"

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

@@ -5,8 +5,8 @@ import { useEffect, useMemo, useState } from "react";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TSurvey, TSurveySummary } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";
-import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
 import { getSurveySummaryAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions";
+import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import ScrollToTop from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/ScrollToTop";
 import { SummaryDropOffs } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryDropOffs";
 import { CustomFilter } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter";
@@ -115,6 +115,7 @@ export const SummaryPage = ({
     <>
       <SummaryMetadata
         surveySummary={surveySummary.meta}
+        quotasCount={surveySummary.quotas?.length ?? 0}
         isLoading={isLoading}
         tab={tab}
         setTab={setTab}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/CustomFilter.tsx

@@ -25,7 +25,7 @@ import { TSurvey } from "@formbricks/types/surveys/types";
 import {
   DateRange,
   useResponseFilter,
-} from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+} from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import { getResponsesDownloadUrlAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions";
 import { downloadResponsesFile } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/utils";
 import { getFormattedFilters, getTodayDate } from "@/app/lib/surveys/surveys";

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox.tsx

@@ -209,7 +209,7 @@ export const QuestionsComboBox = ({ options, selected, onChangeValue }: Question
 
       {open && (
         <div className="animate-in absolute top-full z-10 mt-1 w-full overflow-auto rounded-md shadow-md outline-none">
-          <CommandList>
+          <CommandList className="max-h-[600px]">
             <CommandEmpty>{t("common.no_result_found")}</CommandEmpty>
             {options?.map((data) => (
               <Fragment key={data.header}>

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/ResponseFilter.tsx

@@ -9,7 +9,7 @@ import {
   SelectedFilterValue,
   TResponseStatus,
   useResponseFilter,
-} from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+} from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import { getSurveyFilterDataAction } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions";
 import { QuestionFilterComboBox } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionFilterComboBox";
 import { generateQuestionAndFilterOptions } from "@/app/lib/surveys/surveys";
@@ -26,7 +26,15 @@ import {
 import { OptionsType, QuestionOption, QuestionsComboBox } from "./QuestionsComboBox";
 
 export type QuestionFilterOptions = {
-  type: TSurveyQuestionTypeEnum | "Attributes" | "Tags" | "Languages" | "Quotas";
+  type:
+    | TSurveyQuestionTypeEnum
+    | "Attributes"
+    | "Tags"
+    | "Languages"
+    | "Quotas"
+    | "Hidden Fields"
+    | "Meta"
+    | OptionsType.OTHERS;
   filterOptions: (string | TI18nString)[];
   filterComboBoxOptions: (string | TI18nString)[];
   id: string;

apps/web/app/(app)/layout.tsx

@@ -1,12 +1,9 @@
 import { getServerSession } from "next-auth";
-import { Suspense } from "react";
 import { IntercomClientWrapper } from "@/app/intercom/IntercomClientWrapper";
-import { IS_POSTHOG_CONFIGURED, POSTHOG_API_HOST, POSTHOG_API_KEY } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { ClientLogout } from "@/modules/ui/components/client-logout";
 import { NoMobileOverlay } from "@/modules/ui/components/no-mobile-overlay";
-import { PHProvider, PostHogPageview } from "@/modules/ui/components/post-hog-client";
 import { ToasterClient } from "@/modules/ui/components/toaster-client";
 
 const AppLayout = async ({ children }) => {
@@ -21,20 +18,9 @@ const AppLayout = async ({ children }) => {
   return (
     <>
       <NoMobileOverlay />
-      <Suspense>
-        <PostHogPageview
-          posthogEnabled={IS_POSTHOG_CONFIGURED}
-          postHogApiHost={POSTHOG_API_HOST}
-          postHogApiKey={POSTHOG_API_KEY}
-        />
-      </Suspense>
-      <PHProvider posthogEnabled={IS_POSTHOG_CONFIGURED}>
-        <>
-          <IntercomClientWrapper user={user} />
-          <ToasterClient />
-          {children}
-        </>
-      </PHProvider>
+      <IntercomClientWrapper user={user} />
+      <ToasterClient />
+      {children}
     </>
   );
 };

apps/web/app/api/lib/utils.ts

@@ -1,34 +0,0 @@
-import { Organization } from "@prisma/client";
-import { logger } from "@formbricks/logger";
-import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
-import { getMonthlyOrganizationResponseCount } from "@/lib/organization/service";
-import { sendPlanLimitsReachedEventToPosthogWeekly } from "@/lib/posthogServer";
-
-export const handleBillingLimitsCheck = async (
-  environmentId: string,
-  organizationId: string,
-  organizationBilling: Organization["billing"]
-): Promise<void> => {
-  if (!IS_FORMBRICKS_CLOUD) return;
-
-  const responsesCount = await getMonthlyOrganizationResponseCount(organizationId);
-  const responsesLimit = organizationBilling.limits.monthly.responses;
-
-  if (responsesLimit && responsesCount >= responsesLimit) {
-    try {
-      await sendPlanLimitsReachedEventToPosthogWeekly(environmentId, {
-        plan: organizationBilling.plan,
-        limits: {
-          projects: null,
-          monthly: {
-            responses: responsesLimit,
-            miu: null,
-          },
-        },
-      });
-    } catch (err) {
-      // Log error but do not throw
-      logger.error(err, "Error sending plan limits reached event to Posthog");
-    }
-  }
-};

apps/web/app/api/v1/client/[environmentId]/app/sync/[userId]/route.ts

@@ -18,10 +18,6 @@ import {
   getMonthlyOrganizationResponseCount,
   getOrganizationByEnvironmentId,
 } from "@/lib/organization/service";
-import {
-  capturePosthogEnvironmentEvent,
-  sendPlanLimitsReachedEventToPosthogWeekly,
-} from "@/lib/posthogServer";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { COLOR_DEFAULTS } from "@/lib/styling/constants";
 
@@ -58,20 +54,6 @@ const checkResponseLimit = async (environmentId: string): Promise<boolean> => {
   const monthlyResponseLimit = organization.billing.limits.monthly.responses;
   const isLimitReached = monthlyResponseLimit !== null && currentResponseCount >= monthlyResponseLimit;
 
-  if (isLimitReached) {
-    try {
-      await sendPlanLimitsReachedEventToPosthogWeekly(environmentId, {
-        plan: organization.billing.plan,
-        limits: {
-          projects: null,
-          monthly: { responses: monthlyResponseLimit, miu: null },
-        },
-      });
-    } catch (error) {
-      logger.error({ error }, `Error sending plan limits reached event to Posthog`);
-    }
-  }
-
   return isLimitReached;
 };
 
@@ -111,10 +93,7 @@ export const GET = withV1ApiWrapper({
       }
 
       if (!environment.appSetupCompleted) {
-        await Promise.all([
-          updateEnvironment(environment.id, { appSetupCompleted: true }),
-          capturePosthogEnvironmentEvent(environmentId, "app setup completed"),
-        ]);
+        await updateEnvironment(environment.id, { appSetupCompleted: true });
       }
 
       // check organization subscriptions and response limits

apps/web/app/api/v1/client/[environmentId]/displays/route.ts

@@ -5,7 +5,6 @@ import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { createDisplay } from "./lib/display";
 
@@ -59,7 +58,6 @@ export const POST = withV1ApiWrapper({
     try {
       const response = await createDisplay(inputValidation.data);
 
-      await capturePosthogEnvironmentEvent(inputValidation.data.environmentId, "display created");
       return {
         response: responses.successResponse(response, true),
       };

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

@@ -8,16 +8,11 @@ import { TOrganization } from "@formbricks/types/organizations";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { cache } from "@/lib/cache";
 import { getMonthlyOrganizationResponseCount } from "@/lib/organization/service";
-import {
-  capturePosthogEnvironmentEvent,
-  sendPlanLimitsReachedEventToPosthogWeekly,
-} from "@/lib/posthogServer";
 import { EnvironmentStateData, getEnvironmentStateData } from "./data";
 import { getEnvironmentState } from "./environmentState";
 
 // Mock dependencies
 vi.mock("@/lib/organization/service");
-vi.mock("@/lib/posthogServer");
 vi.mock("@/lib/cache", () => ({
   cache: {
     withCache: vi.fn(),
@@ -43,7 +38,6 @@ vi.mock("@/lib/constants", () => ({
   RECAPTCHA_SECRET_KEY: "mock_recaptcha_secret_key",
   IS_RECAPTCHA_CONFIGURED: true,
   IS_PRODUCTION: true,
-  IS_POSTHOG_CONFIGURED: false,
   ENTERPRISE_LICENSE_KEY: "mock_enterprise_license_key",
 }));
 
@@ -188,9 +182,7 @@ describe("getEnvironmentState", () => {
     expect(result.data).toEqual(expectedData);
     expect(getEnvironmentStateData).toHaveBeenCalledWith(environmentId);
     expect(prisma.environment.update).not.toHaveBeenCalled();
-    expect(capturePosthogEnvironmentEvent).not.toHaveBeenCalled();
     expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(mockOrganization.id);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).not.toHaveBeenCalled();
   });
 
   test("should throw ResourceNotFoundError if environment not found", async () => {
@@ -226,7 +218,6 @@ describe("getEnvironmentState", () => {
       where: { id: environmentId },
       data: { appSetupCompleted: true },
     });
-    expect(capturePosthogEnvironmentEvent).toHaveBeenCalledWith(environmentId, "app setup completed");
     expect(result.data).toBeDefined();
   });
 
@@ -237,16 +228,6 @@ describe("getEnvironmentState", () => {
 
     expect(result.data.surveys).toEqual([]);
     expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(mockOrganization.id);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).toHaveBeenCalledWith(environmentId, {
-      plan: mockOrganization.billing.plan,
-      limits: {
-        projects: null,
-        monthly: {
-          miu: null,
-          responses: mockOrganization.billing.limits.monthly.responses,
-        },
-      },
-    });
   });
 
   test("should return surveys if monthly response limit not reached (Cloud)", async () => {
@@ -256,21 +237,6 @@ describe("getEnvironmentState", () => {
 
     expect(result.data.surveys).toEqual(mockSurveys);
     expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(mockOrganization.id);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).not.toHaveBeenCalled();
-  });
-
-  test("should handle error when sending Posthog limit reached event", async () => {
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(100);
-    const posthogError = new Error("Posthog failed");
-    vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockRejectedValue(posthogError);
-
-    const result = await getEnvironmentState(environmentId);
-
-    expect(result.data.surveys).toEqual([]);
-    expect(logger.error).toHaveBeenCalledWith(
-      posthogError,
-      "Error sending plan limits reached event to Posthog"
-    );
   });
 
   test("should include recaptchaSiteKey if recaptcha variables are set", async () => {
@@ -313,7 +279,6 @@ describe("getEnvironmentState", () => {
 
     // Should return surveys even with high count since limit is null (unlimited)
     expect(result.data.surveys).toEqual(mockSurveys);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).not.toHaveBeenCalled();
   });
 
   test("should propagate database update errors", async () => {
@@ -331,21 +296,6 @@ describe("getEnvironmentState", () => {
     await expect(getEnvironmentState(environmentId)).rejects.toThrow("Database error");
   });
 
-  test("should propagate PostHog event capture errors", async () => {
-    const incompleteEnvironmentData = {
-      ...mockEnvironmentStateData,
-      environment: {
-        ...mockEnvironmentStateData.environment,
-        appSetupCompleted: false,
-      },
-    };
-    vi.mocked(getEnvironmentStateData).mockResolvedValue(incompleteEnvironmentData);
-    vi.mocked(capturePosthogEnvironmentEvent).mockRejectedValue(new Error("PostHog error"));
-
-    // Should throw error since Promise.all will fail if PostHog event capture fails
-    await expect(getEnvironmentState(environmentId)).rejects.toThrow("PostHog error");
-  });
-
   test("should include recaptchaSiteKey when IS_RECAPTCHA_CONFIGURED is true", async () => {
     const result = await getEnvironmentState(environmentId);
 

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

@@ -1,15 +1,10 @@
 import "server-only";
 import { createCacheKey } from "@formbricks/cache";
 import { prisma } from "@formbricks/database";
-import { logger } from "@formbricks/logger";
 import { TJsEnvironmentState } from "@formbricks/types/js";
 import { cache } from "@/lib/cache";
 import { IS_FORMBRICKS_CLOUD, IS_RECAPTCHA_CONFIGURED, RECAPTCHA_SITE_KEY } from "@/lib/constants";
 import { getMonthlyOrganizationResponseCount } from "@/lib/organization/service";
-import {
-  capturePosthogEnvironmentEvent,
-  sendPlanLimitsReachedEventToPosthogWeekly,
-} from "@/lib/posthogServer";
 import { getEnvironmentStateData } from "./data";
 
 /**
@@ -33,13 +28,10 @@ export const getEnvironmentState = async (
       // Handle app setup completion update if needed
       // This is a one-time setup flag that can tolerate TTL-based cache expiration
       if (!environment.appSetupCompleted) {
-        await Promise.all([
-          prisma.environment.update({
-            where: { id: environmentId },
-            data: { appSetupCompleted: true },
-          }),
-          capturePosthogEnvironmentEvent(environmentId, "app setup completed"),
-        ]);
+        await prisma.environment.update({
+          where: { id: environmentId },
+          data: { appSetupCompleted: true },
+        });
       }
 
       // Check monthly response limits for Formbricks Cloud
@@ -49,24 +41,6 @@ export const getEnvironmentState = async (
         const currentResponseCount = await getMonthlyOrganizationResponseCount(organization.id);
         isMonthlyResponsesLimitReached =
           monthlyResponseLimit !== null && currentResponseCount >= monthlyResponseLimit;
-
-        // Send plan limits event if needed
-        if (isMonthlyResponsesLimitReached) {
-          try {
-            await sendPlanLimitsReachedEventToPosthogWeekly(environmentId, {
-              plan: organization.billing.plan,
-              limits: {
-                projects: null,
-                monthly: {
-                  miu: null,
-                  responses: organization.billing.limits.monthly.responses,
-                },
-              },
-            });
-          } catch (err) {
-            logger.error(err, "Error sending plan limits reached event to Posthog");
-          }
-        }
       }
 
       // Build the response data

apps/web/app/api/v1/client/[environmentId]/responses/lib/response.test.ts

@@ -1,15 +1,10 @@
 import { Prisma } from "@prisma/client";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
-import { logger } from "@formbricks/logger";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TSurveyQuota } from "@formbricks/types/quota";
 import { TResponseInput } from "@formbricks/types/responses";
-import {
-  getMonthlyOrganizationResponseCount,
-  getOrganizationByEnvironmentId,
-} from "@/lib/organization/service";
-import { sendPlanLimitsReachedEventToPosthogWeekly } from "@/lib/posthogServer";
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { calculateTtcTotal } from "@/lib/response/utils";
 import { evaluateResponseQuotas } from "@/modules/ee/quotas/lib/evaluation-service";
 import { createResponse, createResponseWithQuotaEvaluation } from "./response";
@@ -24,22 +19,13 @@ vi.mock("@/lib/constants", () => ({
 }));
 
 vi.mock("@/lib/organization/service", () => ({
-  getMonthlyOrganizationResponseCount: vi.fn(),
   getOrganizationByEnvironmentId: vi.fn(),
 }));
 
-vi.mock("@/lib/posthogServer", () => ({
-  sendPlanLimitsReachedEventToPosthogWeekly: vi.fn(),
-}));
-
 vi.mock("@/lib/response/utils", () => ({
   calculateTtcTotal: vi.fn((ttc) => ttc),
 }));
 
-vi.mock("@/lib/telemetry", () => ({
-  captureTelemetry: vi.fn(),
-}));
-
 vi.mock("@/lib/utils/validate", () => ({
   validateInputs: vi.fn(),
 }));
@@ -138,35 +124,6 @@ describe("createResponse", () => {
     );
   });
 
-  test("should check response limits if IS_FORMBRICKS_CLOUD is true", async () => {
-    mockIsFormbricksCloud = true;
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(50);
-
-    await createResponse(mockResponseInput, prisma);
-
-    expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).not.toHaveBeenCalled();
-  });
-
-  test("should send limit reached event if IS_FORMBRICKS_CLOUD is true and limit reached", async () => {
-    mockIsFormbricksCloud = true;
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(100);
-
-    await createResponse(mockResponseInput, prisma);
-
-    expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).toHaveBeenCalledWith(environmentId, {
-      plan: "free",
-      limits: {
-        projects: null,
-        monthly: {
-          responses: 100,
-          miu: null,
-        },
-      },
-    });
-  });
-
   test("should throw ResourceNotFoundError if organization not found", async () => {
     vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(null);
     await expect(createResponse(mockResponseInput, prisma)).rejects.toThrow(ResourceNotFoundError);
@@ -186,20 +143,6 @@ describe("createResponse", () => {
     vi.mocked(prisma.response.create).mockRejectedValue(genericError);
     await expect(createResponse(mockResponseInput)).rejects.toThrow(genericError);
   });
-
-  test("should log error but not throw if sendPlanLimitsReachedEventToPosthogWeekly fails", async () => {
-    mockIsFormbricksCloud = true;
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(100);
-    const posthogError = new Error("PostHog error");
-    vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockRejectedValue(posthogError);
-
-    await createResponse(mockResponseInput);
-
-    expect(logger.error).toHaveBeenCalledWith(
-      posthogError,
-      "Error sending plan limits reached event to Posthog"
-    );
-  });
 });
 
 describe("createResponseWithQuotaEvaluation", () => {

apps/web/app/api/v1/client/[environmentId]/responses/lib/response.ts

@@ -6,11 +6,9 @@ import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TResponseWithQuotaFull } from "@formbricks/types/quota";
 import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses";
 import { TTag } from "@formbricks/types/tags";
-import { handleBillingLimitsCheck } from "@/app/api/lib/utils";
 import { buildPrismaResponseData } from "@/app/api/v1/lib/utils";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { calculateTtcTotal } from "@/lib/response/utils";
-import { captureTelemetry } from "@/lib/telemetry";
 import { validateInputs } from "@/lib/utils/validate";
 import { evaluateResponseQuotas } from "@/modules/ee/quotas/lib/evaluation-service";
 import { getContactByUserId } from "./contact";
@@ -83,7 +81,6 @@ export const createResponse = async (
   tx: Prisma.TransactionClient
 ): Promise<TResponse> => {
   validateInputs([responseInput, ZResponseInput]);
-  captureTelemetry("response created");
 
   const { environmentId, userId, finished, ttc: initialTtc } = responseInput;
 
@@ -121,8 +118,6 @@ export const createResponse = async (
       tags: responsePrisma.tags.map((tagPrisma: { tag: TTag }) => tagPrisma.tag),
     };
 
-    await handleBillingLimitsCheck(environmentId, organization.id, organization.billing);
-
     return response;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/app/api/v1/client/[environmentId]/responses/route.ts

@@ -10,7 +10,6 @@ import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
 import { sendToPipeline } from "@/app/lib/pipelines";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getSurvey } from "@/lib/survey/service";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { createQuotaFullObject } from "@/modules/ee/quotas/lib/helpers";
@@ -172,11 +171,6 @@ export const POST = withV1ApiWrapper({
       });
     }
 
-    await capturePosthogEnvironmentEvent(survey.environmentId, "response created", {
-      surveyId: responseData.surveyId,
-      surveyType: survey.type,
-    });
-
     const quotaObj = createQuotaFullObject(quotaFull);
 
     const responseDataWithQuota = {

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

@@ -4,11 +4,7 @@ import { prisma } from "@formbricks/database";
 import { logger } from "@formbricks/logger";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TResponse, TResponseInput } from "@formbricks/types/responses";
-import {
-  getMonthlyOrganizationResponseCount,
-  getOrganizationByEnvironmentId,
-} from "@/lib/organization/service";
-import { sendPlanLimitsReachedEventToPosthogWeekly } from "@/lib/posthogServer";
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getResponseContact } from "@/lib/response/service";
 import { calculateTtcTotal } from "@/lib/response/utils";
 import { validateInputs } from "@/lib/utils/validate";
@@ -96,9 +92,6 @@ const mockTransformedResponses = [mockResponse, { ...mockResponse, id: "response
 // Mock dependencies
 vi.mock("@/lib/constants", () => ({
   IS_FORMBRICKS_CLOUD: true,
-  POSTHOG_API_KEY: "mock-posthog-api-key",
-  POSTHOG_HOST: "mock-posthog-host",
-  IS_POSTHOG_CONFIGURED: true,
   ENCRYPTION_KEY: "mock-encryption-key",
   ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
   GITHUB_ID: "mock-github-id",
@@ -118,10 +111,8 @@ vi.mock("@/lib/constants", () => ({
   SENTRY_DSN: "mock-sentry-dsn",
 }));
 vi.mock("@/lib/organization/service");
-vi.mock("@/lib/posthogServer");
 vi.mock("@/lib/response/service");
 vi.mock("@/lib/response/utils");
-vi.mock("@/lib/telemetry");
 vi.mock("@/lib/utils/validate");
 vi.mock("@formbricks/database", () => ({
   prisma: {
@@ -162,7 +153,6 @@ describe("Response Lib Tests", () => {
       vi.mocked(mockTx.response.create).mockResolvedValue({
         ...mockResponsePrisma,
       });
-      vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(50);
 
       const response = await createResponse(mockResponseInputWithUserId, mockTx);
 
@@ -217,68 +207,6 @@ describe("Response Lib Tests", () => {
 
       await expect(createResponse(mockResponseInput, mockTx)).rejects.toThrow(genericError);
     });
-
-    describe("Cloud specific tests", () => {
-      test("should check response limit and send event if limit reached", async () => {
-        // IS_FORMBRICKS_CLOUD is true by default from the top-level mock
-        const limit = 100;
-        const mockOrgWithBilling = {
-          ...mockOrganization,
-          billing: { limits: { monthly: { responses: limit } } },
-        } as any;
-        vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrgWithBilling);
-        vi.mocked(calculateTtcTotal).mockReturnValue({ total: 10 });
-        vi.mocked(mockTx.response.create).mockResolvedValue(mockResponsePrisma);
-        vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(limit); // Limit reached
-
-        await createResponse(mockResponseInput, mockTx);
-
-        expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-        expect(sendPlanLimitsReachedEventToPosthogWeekly).toHaveBeenCalled();
-      });
-
-      test("should check response limit and not send event if limit not reached", async () => {
-        const limit = 100;
-        const mockOrgWithBilling = {
-          ...mockOrganization,
-          billing: { limits: { monthly: { responses: limit } } },
-        } as any;
-        vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrgWithBilling);
-        vi.mocked(calculateTtcTotal).mockReturnValue({ total: 10 });
-        vi.mocked(mockTx.response.create).mockResolvedValue(mockResponsePrisma);
-        vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(limit - 1); // Limit not reached
-
-        await createResponse(mockResponseInput, mockTx);
-
-        expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-        expect(sendPlanLimitsReachedEventToPosthogWeekly).not.toHaveBeenCalled();
-      });
-
-      test("should log error if sendPlanLimitsReachedEventToPosthogWeekly fails", async () => {
-        const limit = 100;
-        const mockOrgWithBilling = {
-          ...mockOrganization,
-          billing: { limits: { monthly: { responses: limit } } },
-        } as any;
-        const posthogError = new Error("Posthog error");
-        vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrgWithBilling);
-        vi.mocked(calculateTtcTotal).mockReturnValue({ total: 10 });
-        vi.mocked(mockTx.response.create).mockResolvedValue(mockResponsePrisma);
-        vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(limit); // Limit reached
-        vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockRejectedValue(posthogError);
-
-        // Expecting successful response creation despite PostHog error
-        const response = await createResponse(mockResponseInput, mockTx);
-
-        expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-        expect(sendPlanLimitsReachedEventToPosthogWeekly).toHaveBeenCalled();
-        expect(logger.error).toHaveBeenCalledWith(
-          posthogError,
-          "Error sending plan limits reached event to Posthog"
-        );
-        expect(response).toEqual(mockResponse); // Should still return the created response
-      });
-    });
   });
 
   describe("getResponsesByEnvironmentIds", () => {

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

@@ -8,14 +8,12 @@ import { TContactAttributes } from "@formbricks/types/contact-attribute";
 import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses";
 import { TTag } from "@formbricks/types/tags";
-import { handleBillingLimitsCheck } from "@/app/api/lib/utils";
 import { buildPrismaResponseData } from "@/app/api/v1/lib/utils";
 import { RESPONSES_PER_PAGE } from "@/lib/constants";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getResponseContact } from "@/lib/response/service";
 import { calculateTtcTotal } from "@/lib/response/utils";
 import { getSurvey } from "@/lib/survey/service";
-import { captureTelemetry } from "@/lib/telemetry";
 import { validateInputs } from "@/lib/utils/validate";
 import { evaluateResponseQuotas } from "@/modules/ee/quotas/lib/evaluation-service";
 import { getContactByUserId } from "./contact";
@@ -93,7 +91,6 @@ export const createResponse = async (
   tx?: Prisma.TransactionClient
 ): Promise<TResponse> => {
   validateInputs([responseInput, ZResponseInput]);
-  captureTelemetry("response created");
 
   const { environmentId, userId, finished, ttc: initialTtc } = responseInput;
 
@@ -131,8 +128,6 @@ export const createResponse = async (
       tags: responsePrisma.tags.map((tagPrisma: { tag: TTag }) => tagPrisma.tag),
     };
 
-    await handleBillingLimitsCheck(environmentId, organization.id, organization.billing);
-
     return response;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/app/api/v2/client/[environmentId]/displays/route.ts

@@ -3,7 +3,6 @@ import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ZDisplayCreateInputV2 } from "@/app/api/v2/client/[environmentId]/displays/types/display";
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { createDisplay } from "./lib/display";
 
@@ -49,7 +48,6 @@ export const POST = async (request: Request, context: Context): Promise<Response
   try {
     const response = await createDisplay(inputValidation.data);
 
-    await capturePosthogEnvironmentEvent(inputValidation.data.environmentId, "display created");
     return responses.successResponse(response, true);
   } catch (error) {
     if (error instanceof ResourceNotFoundError) {

apps/web/app/api/v2/client/[environmentId]/responses/lib/response.test.ts

@@ -8,13 +8,8 @@ import { TResponseWithQuotaFull, TSurveyQuota } from "@formbricks/types/quota";
 import { TResponse } from "@formbricks/types/responses";
 import { TTag } from "@formbricks/types/tags";
 import { TResponseInputV2 } from "@/app/api/v2/client/[environmentId]/responses/types/response";
-import {
-  getMonthlyOrganizationResponseCount,
-  getOrganizationByEnvironmentId,
-} from "@/lib/organization/service";
-import { sendPlanLimitsReachedEventToPosthogWeekly } from "@/lib/posthogServer";
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { calculateTtcTotal } from "@/lib/response/utils";
-import { captureTelemetry } from "@/lib/telemetry";
 import { validateInputs } from "@/lib/utils/validate";
 import { evaluateResponseQuotas } from "@/modules/ee/quotas/lib/evaluation-service";
 import { getContact } from "./contact";
@@ -49,9 +44,7 @@ vi.mock("@/lib/constants", () => ({
 }));
 
 vi.mock("@/lib/organization/service");
-vi.mock("@/lib/posthogServer");
 vi.mock("@/lib/response/utils");
-vi.mock("@/lib/telemetry");
 vi.mock("@/lib/utils/validate");
 vi.mock("@/modules/ee/quotas/lib/evaluation-service");
 vi.mock("@formbricks/database", () => ({
@@ -166,9 +159,6 @@ describe("createResponse V2", () => {
       ...ttc,
       _total: Object.values(ttc).reduce((a, b) => a + b, 0),
     }));
-    vi.mocked(captureTelemetry).mockResolvedValue(undefined);
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(50);
-    vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockResolvedValue(undefined);
     vi.mocked(evaluateResponseQuotas).mockResolvedValue({
       shouldEndSurvey: false,
       quotaFull: null,
@@ -179,32 +169,6 @@ describe("createResponse V2", () => {
     mockIsFormbricksCloud = false;
   });
 
-  test("should check response limits if IS_FORMBRICKS_CLOUD is true", async () => {
-    mockIsFormbricksCloud = true;
-    await createResponse(mockResponseInput, mockTx);
-    expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).not.toHaveBeenCalled();
-  });
-
-  test("should send limit reached event if IS_FORMBRICKS_CLOUD is true and limit reached", async () => {
-    mockIsFormbricksCloud = true;
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(100);
-
-    await createResponse(mockResponseInput, mockTx);
-
-    expect(getMonthlyOrganizationResponseCount).toHaveBeenCalledWith(organizationId);
-    expect(sendPlanLimitsReachedEventToPosthogWeekly).toHaveBeenCalledWith(environmentId, {
-      plan: "free",
-      limits: {
-        projects: null,
-        monthly: {
-          responses: 100,
-          miu: null,
-        },
-      },
-    });
-  });
-
   test("should throw ResourceNotFoundError if organization not found", async () => {
     vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(null);
     await expect(createResponse(mockResponseInput, mockTx)).rejects.toThrow(ResourceNotFoundError);
@@ -225,20 +189,6 @@ describe("createResponse V2", () => {
     await expect(createResponse(mockResponseInput, mockTx)).rejects.toThrow(genericError);
   });
 
-  test("should log error but not throw if sendPlanLimitsReachedEventToPosthogWeekly fails", async () => {
-    mockIsFormbricksCloud = true;
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(100);
-    const posthogError = new Error("PostHog error");
-    vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockRejectedValue(posthogError);
-
-    await createResponse(mockResponseInput, mockTx); // Should not throw
-
-    expect(logger.error).toHaveBeenCalledWith(
-      posthogError,
-      "Error sending plan limits reached event to Posthog"
-    );
-  });
-
   test("should correctly map prisma tags to response tags", async () => {
     const mockTag: TTag = { id: "tag1", name: "Tag 1", environmentId };
     const prismaResponseWithTags = {
@@ -269,7 +219,6 @@ describe("createResponseWithQuotaEvaluation V2", () => {
       ...ttc,
       _total: Object.values(ttc).reduce((a, b) => a + b, 0),
     }));
-    vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(50);
     vi.mocked(evaluateResponseQuotas).mockResolvedValue({
       shouldEndSurvey: false,
       quotaFull: null,

apps/web/app/api/v2/client/[environmentId]/responses/lib/response.ts

@@ -6,12 +6,10 @@ import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TResponseWithQuotaFull } from "@formbricks/types/quota";
 import { TResponse, ZResponseInput } from "@formbricks/types/responses";
 import { TTag } from "@formbricks/types/tags";
-import { handleBillingLimitsCheck } from "@/app/api/lib/utils";
 import { responseSelection } from "@/app/api/v1/client/[environmentId]/responses/lib/response";
 import { TResponseInputV2 } from "@/app/api/v2/client/[environmentId]/responses/types/response";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { calculateTtcTotal } from "@/lib/response/utils";
-import { captureTelemetry } from "@/lib/telemetry";
 import { validateInputs } from "@/lib/utils/validate";
 import { evaluateResponseQuotas } from "@/modules/ee/quotas/lib/evaluation-service";
 import { getContact } from "./contact";
@@ -91,7 +89,6 @@ export const createResponse = async (
   tx?: Prisma.TransactionClient
 ): Promise<TResponse> => {
   validateInputs([responseInput, ZResponseInput]);
-  captureTelemetry("response created");
 
   const { environmentId, contactId, finished, ttc: initialTtc } = responseInput;
 
@@ -129,8 +126,6 @@ export const createResponse = async (
       tags: responsePrisma.tags.map((tagPrisma: { tag: TTag }) => tagPrisma.tag),
     };
 
-    await handleBillingLimitsCheck(environmentId, organization.id, organization.billing);
-
     return response;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/app/api/v2/client/[environmentId]/responses/route.ts

@@ -8,7 +8,6 @@ import { checkSurveyValidity } from "@/app/api/v2/client/[environmentId]/respons
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { sendToPipeline } from "@/app/lib/pipelines";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getSurvey } from "@/lib/survey/service";
 import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/question";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
@@ -148,11 +147,6 @@ export const POST = async (request: Request, context: Context): Promise<Response
     });
   }
 
-  await capturePosthogEnvironmentEvent(environmentId, "response created", {
-    surveyId: responseData.surveyId,
-    surveyType: survey.type,
-  });
-
   const quotaObj = createQuotaFullObject(quotaFull);
 
   const responseDataWithQuota = {

apps/web/app/lib/surveys/surveys.test.ts

@@ -12,7 +12,7 @@ import { TTag } from "@formbricks/types/tags";
 import {
   DateRange,
   SelectedFilterValue,
-} from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+} from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import { OptionsType } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/QuestionsComboBox";
 import { generateQuestionAndFilterOptions, getFormattedFilters, getTodayDate } from "./surveys";
 
@@ -268,6 +268,64 @@ describe("surveys", () => {
       expect(sourceFilterOption).toBeDefined();
       expect(sourceFilterOption?.filterOptions).toEqual(["Equals", "Not equals"]);
     });
+
+    test("should include quota options in filter options when quotas are provided", () => {
+      const survey = {
+        id: "survey1",
+        name: "Test Survey",
+        questions: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        environmentId: "env1",
+        status: "draft",
+      } as unknown as TSurvey;
+
+      const quotas = [{ id: "quota1" }];
+
+      const result = generateQuestionAndFilterOptions(survey, undefined, {}, {}, {}, quotas as any);
+
+      const quotaFilterOption = result.questionFilterOptions.find((o) => o.id === "quota1");
+      expect(quotaFilterOption).toBeDefined();
+      expect(quotaFilterOption?.type).toBe("Quotas");
+      expect(quotaFilterOption?.filterOptions).toEqual(["Status"]);
+      expect(quotaFilterOption?.filterComboBoxOptions).toEqual([
+        "Screened in",
+        "Screened out (overquota)",
+        "Not in quota",
+      ]);
+    });
+
+    test("should include multiple quota options when multiple quotas are provided", () => {
+      const survey = {
+        id: "survey1",
+        name: "Test Survey",
+        questions: [],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+        environmentId: "env1",
+        status: "draft",
+      } as unknown as TSurvey;
+
+      const quotas = [{ id: "quota1" }, { id: "quota2" }];
+
+      const result = generateQuestionAndFilterOptions(survey, undefined, {}, {}, {}, quotas as any);
+
+      const quota1 = result.questionFilterOptions.find((o) => o.id === "quota1");
+      const quota2 = result.questionFilterOptions.find((o) => o.id === "quota2");
+
+      expect(quota1).toBeDefined();
+      expect(quota2).toBeDefined();
+      expect(quota1?.filterComboBoxOptions).toEqual([
+        "Screened in",
+        "Screened out (overquota)",
+        "Not in quota",
+      ]);
+      expect(quota2?.filterComboBoxOptions).toEqual([
+        "Screened in",
+        "Screened out (overquota)",
+        "Not in quota",
+      ]);
+    });
   });
 
   describe("getFormattedFilters", () => {
@@ -867,6 +925,75 @@ describe("surveys", () => {
       expect(result.meta?.url).toEqual({ op: "contains", value: "formbricks.com" });
       expect(result.meta?.source).toEqual({ op: "equals", value: "newsletter" });
     });
+
+    test("should filter by quota with screened in status", () => {
+      const selectedFilter: SelectedFilterValue = {
+        responseStatus: "all",
+        filter: [
+          {
+            questionType: { type: "Quotas", label: "Quota 1", id: "quota1" },
+            filterType: { filterComboBoxValue: "Screened in" },
+          },
+        ],
+      } as any;
+
+      const result = getFormattedFilters(survey, selectedFilter, {} as any);
+
+      expect(result.quotas?.quota1).toEqual({ op: "screenedIn" });
+    });
+
+    test("should filter by quota with screened out status", () => {
+      const selectedFilter: SelectedFilterValue = {
+        responseStatus: "all",
+        filter: [
+          {
+            questionType: { type: "Quotas", label: "Quota 1", id: "quota1" },
+            filterType: { filterComboBoxValue: "Screened out (overquota)" },
+          },
+        ],
+      } as any;
+
+      const result = getFormattedFilters(survey, selectedFilter, {} as any);
+
+      expect(result.quotas?.quota1).toEqual({ op: "screenedOut" });
+    });
+
+    test("should filter by quota with not in quota status", () => {
+      const selectedFilter: SelectedFilterValue = {
+        responseStatus: "all",
+        filter: [
+          {
+            questionType: { type: "Quotas", label: "Quota 1", id: "quota1" },
+            filterType: { filterComboBoxValue: "Not in quota" },
+          },
+        ],
+      } as any;
+
+      const result = getFormattedFilters(survey, selectedFilter, {} as any);
+
+      expect(result.quotas?.quota1).toEqual({ op: "screenedOutNotInQuota" });
+    });
+
+    test("should filter by multiple quotas with different statuses", () => {
+      const selectedFilter: SelectedFilterValue = {
+        responseStatus: "all",
+        filter: [
+          {
+            questionType: { type: "Quotas", label: "Quota 1", id: "quota1" },
+            filterType: { filterComboBoxValue: "Screened in" },
+          },
+          {
+            questionType: { type: "Quotas", label: "Quota 2", id: "quota2" },
+            filterType: { filterComboBoxValue: "Not in quota" },
+          },
+        ],
+      } as any;
+
+      const result = getFormattedFilters(survey, selectedFilter, {} as any);
+
+      expect(result.quotas?.quota1).toEqual({ op: "screenedIn" });
+      expect(result.quotas?.quota2).toEqual({ op: "screenedOutNotInQuota" });
+    });
   });
 
   describe("getTodayDate", () => {

apps/web/app/lib/surveys/surveys.ts

@@ -12,7 +12,7 @@ import {
   DateRange,
   FilterValue,
   SelectedFilterValue,
-} from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+} from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/response-filter-context";
 import {
   OptionsType,
   QuestionOption,
@@ -76,9 +76,9 @@ export const generateQuestionAndFilterOptions = (
   questionFilterOptions: QuestionFilterOptions[];
 } => {
   let questionOptions: QuestionOptions[] = [];
-  let questionFilterOptions: any = [];
+  let questionFilterOptions: QuestionFilterOptions[] = [];
 
-  let questionsOptions: any = [];
+  let questionsOptions: QuestionOption[] = [];
 
   survey.questions.forEach((q) => {
     if (Object.keys(conditionOptions).includes(q.type)) {
@@ -236,7 +236,7 @@ export const generateQuestionAndFilterOptions = (
       questionFilterOptions.push({
         type: "Quotas",
         filterOptions: ["Status"],
-        filterComboBoxOptions: ["Screened in", "Screened out (overquota)", "Screened out (not in quota)"],
+        filterComboBoxOptions: ["Screened in", "Screened out (overquota)", "Not in quota"],
         id: quota.id,
       });
     });
@@ -549,7 +549,7 @@ export const getFormattedFilters = (
       const statusMap: Record<string, "screenedIn" | "screenedOut" | "screenedOutNotInQuota"> = {
         "Screened in": "screenedIn",
         "Screened out (overquota)": "screenedOut",
-        "Screened out (not in quota)": "screenedOutNotInQuota",
+        "Not in quota": "screenedOutNotInQuota",
       };
       const op = statusMap[String(filterType.filterComboBoxValue)];
       if (op) filters.quotas[quotaId] = { op };

apps/web/app/lib/templates.ts

@@ -2073,7 +2073,7 @@ const careerDevelopmentSurvey = (t: TFunction): TTemplate => {
   return buildSurvey(
     {
       name: t("templates.career_development_survey_name"),
-      role: "productManager",
+      role: "peopleManager",
       industries: ["saas", "eCommerce", "other"],
       channels: ["link"],
       description: t("templates.career_development_survey_description"),
@@ -2160,7 +2160,7 @@ const professionalDevelopmentSurvey = (t: TFunction): TTemplate => {
   return buildSurvey(
     {
       name: t("templates.professional_development_survey_name"),
-      role: "productManager",
+      role: "peopleManager",
       industries: ["saas", "eCommerce", "other"],
       channels: ["link"],
       description: t("templates.professional_development_survey_description"),

apps/web/i18n.lock

@@ -304,7 +304,7 @@ checksums:
     common/project_not_found: be3b516c02b05553acb4ae338511f645
     common/project_permission_not_found: ace6b03f06bd14e884e4295c5022d61b
     common/projects: fe8af5cfb3c95cb35534872a325b225e
-    common/question: 0576462ce60d4263d7c482463fcc9547
+    common/question: 2a47e06b62410b16003c4979dee0099f
     common/question_id: d0c3672976c281411bdccf749faf5ffd
     common/questions: 38d08215fd7a8026077c7b64eea6bb59
     common/quota: edd33b180b463ee7a70a64a5c4ad7f02
@@ -596,6 +596,7 @@ checksums:
     environments/contacts/upload_contacts_modal_pick_different_file: e748a6e81a425ef9aa33f96ca4edc157
     environments/contacts/upload_contacts_modal_preview: c4406f8d9a54f131abfff4e9928228bb
     environments/contacts/upload_contacts_modal_upload_btn: 47b7f3bcf478a7d8dc258d2efc80af37
+    environments/contacts/upload_contacts_success: cd5d6b6d587586dd4f944868c92835bc
     environments/formbricks_logo: b7ee57de32c8b13463cc8ca8643eddd4
     environments/integrations/activepieces_integration_description: 62a8fbf86762bab01c7d2db2ba60fff4
     environments/integrations/additional_settings: 20936205a75745fba2c4047375a04db3
@@ -748,8 +749,11 @@ checksums:
     environments/project/app-connection/how_to_setup_description: 2ae5cd9456a8acd3986e3d3678e70ed2
     environments/project/app-connection/receiving_data: 9f2a48c0b0278861add70b526061264c
     environments/project/app-connection/recheck: f95f2bbe6990a123d60255c87bdd59f7
+    environments/project/app-connection/sdk_connection_details: 89f2c169fd1604c1df5a834517f1eae1
+    environments/project/app-connection/sdk_connection_details_description: d9b5d06776a139aef6fc8ed53d71bf0a
     environments/project/app-connection/setup_alert_description: 6d676044d01dc2147731ffab7df6c259
     environments/project/app-connection/setup_alert_title: 9561cca2b391e0df81e8a982921ff2bb
+    environments/project/app-connection/webapp_url: d64d8cc3c4c4ecce780d94755f7e4de9
     environments/project/general/cannot_delete_only_project: 24751701a42d8b4d2ba6112a5f642bad
     environments/project/general/delete_project: e4a2a227105c4ec71e561ab1f140eb26
     environments/project/general/delete_project_confirmation: 54a4ee78867537e0244c7170453cdb3f
@@ -1267,7 +1271,7 @@ checksums:
     environments/surveys/edit/error_saving_changes: b75aa9e4e42e1d43c8f9c33c2b7dc9a7
     environments/surveys/edit/even_after_they_submitted_a_response_e_g_feedback_box: 7b99f30397dcde76f65e1ab64bdbd113
     environments/surveys/edit/everyone: 2112aa71b568773e8e8a792c63f4d413
-    environments/surveys/edit/external_urls_paywall_tooltip: 0dbb62557e8a6fa817f0e74709eeb3d2
+    environments/surveys/edit/external_urls_paywall_tooltip: a8860ff0a2ad5f283bc0becba374cd54
     environments/surveys/edit/fallback_missing: 43dbedbe1a178d455e5f80783a7b6722
     environments/surveys/edit/fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first: ad4afe2980e1dfeffb20aa78eb892350
     environments/surveys/edit/fieldId_is_used_in_quota_please_remove_it_from_quota_first: 374c563964fc805ab0b8974e781687d9

apps/web/lib/constants.ts

@@ -218,10 +218,6 @@ export const INTERCOM_SECRET_KEY = env.INTERCOM_SECRET_KEY;
 export const INTERCOM_APP_ID = env.INTERCOM_APP_ID;
 export const IS_INTERCOM_CONFIGURED = Boolean(env.INTERCOM_APP_ID && INTERCOM_SECRET_KEY);
 
-export const POSTHOG_API_KEY = env.POSTHOG_API_KEY;
-export const POSTHOG_API_HOST = env.POSTHOG_API_HOST;
-export const IS_POSTHOG_CONFIGURED = Boolean(POSTHOG_API_KEY && POSTHOG_API_HOST);
-
 export const TURNSTILE_SECRET_KEY = env.TURNSTILE_SECRET_KEY;
 export const TURNSTILE_SITE_KEY = env.TURNSTILE_SITE_KEY;
 export const IS_TURNSTILE_CONFIGURED = Boolean(env.TURNSTILE_SITE_KEY && TURNSTILE_SECRET_KEY);

apps/web/lib/env.ts

@@ -1,6 +1,10 @@
 import { createEnv } from "@t3-oss/env-nextjs";
 import { z } from "zod";
 
+// During build time, we only need valid-format URLs for Prisma to generate the client.
+// Actual connectivity and secrets are validated at runtime by the startup script.
+const isBuildTime = process.env.NEXT_PHASE === "phase-production-build";
+
 export const env = createEnv({
   /*
    * Serverside Environment variables, not available on the client.
@@ -14,14 +18,21 @@ export const env = createEnv({
     CRON_SECRET: z.string().optional(),
     BREVO_API_KEY: z.string().optional(),
     BREVO_LIST_ID: z.string().optional(),
-    DATABASE_URL: z.string().url(),
+    DATABASE_URL: isBuildTime
+      ? z
+          .string()
+          .optional()
+          .default("postgresql://formbricks:formbricks@localhost:5432/formbricks?schema=public")
+      : z.string().url(),
     DEBUG: z.enum(["1", "0"]).optional(),
     AUTH_DEFAULT_TEAM_ID: z.string().optional(),
     AUTH_SKIP_INVITE_FOR_SSO: z.enum(["1", "0"]).optional(),
     E2E_TESTING: z.enum(["1", "0"]).optional(),
     EMAIL_AUTH_DISABLED: z.enum(["1", "0"]).optional(),
     EMAIL_VERIFICATION_DISABLED: z.enum(["1", "0"]).optional(),
-    ENCRYPTION_KEY: z.string(),
+    ENCRYPTION_KEY: isBuildTime
+      ? z.string().optional().default("0000000000000000000000000000000000000000000000000000000000000000")
+      : z.string(),
     ENTERPRISE_LICENSE_KEY: z.string().optional(),
     GITHUB_ID: z.string().optional(),
     GITHUB_SECRET: z.string().optional(),
@@ -54,13 +65,12 @@ export const env = createEnv({
     OIDC_ISSUER: z.string().optional(),
     OIDC_SIGNING_ALGORITHM: z.string().optional(),
     OPENTELEMETRY_LISTENER_URL: z.string().optional(),
-    REDIS_URL:
-      process.env.NODE_ENV === "test"
+    REDIS_URL: isBuildTime
+      ? z.string().optional().default("redis://localhost:6379")
+      : process.env.NODE_ENV === "test"
         ? z.string().optional()
         : z.string().url("REDIS_URL is required for caching, rate limiting, and audit logging"),
     PASSWORD_RESET_DISABLED: z.enum(["1", "0"]).optional(),
-    POSTHOG_API_HOST: z.string().optional(),
-    POSTHOG_API_KEY: z.string().optional(),
     PRIVACY_URL: z
       .string()
       .url()
@@ -103,7 +113,6 @@ export const env = createEnv({
         }
       )
       .optional(),
-    TELEMETRY_DISABLED: z.enum(["1", "0"]).optional(),
     TERMS_URL: z
       .string()
       .url()
@@ -172,8 +181,6 @@ export const env = createEnv({
     MAIL_FROM_NAME: process.env.MAIL_FROM_NAME,
     NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
     SENTRY_DSN: process.env.SENTRY_DSN,
-    POSTHOG_API_KEY: process.env.POSTHOG_API_KEY,
-    POSTHOG_API_HOST: process.env.POSTHOG_API_HOST,
     OPENTELEMETRY_LISTENER_URL: process.env.OPENTELEMETRY_LISTENER_URL,
     INTERCOM_APP_ID: process.env.INTERCOM_APP_ID,
     NOTION_OAUTH_CLIENT_ID: process.env.NOTION_OAUTH_CLIENT_ID,
@@ -206,7 +213,6 @@ export const env = createEnv({
     STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
     STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
     PUBLIC_URL: process.env.PUBLIC_URL,
-    TELEMETRY_DISABLED: process.env.TELEMETRY_DISABLED,
     TURNSTILE_SECRET_KEY: process.env.TURNSTILE_SECRET_KEY,
     TURNSTILE_SITE_KEY: process.env.TURNSTILE_SITE_KEY,
     RECAPTCHA_SITE_KEY: process.env.RECAPTCHA_SITE_KEY,

apps/web/lib/environment/service.ts

@@ -17,7 +17,6 @@ import {
 } from "@formbricks/types/environment";
 import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors";
 import { getOrganizationsByUserId } from "../organization/service";
-import { capturePosthogEnvironmentEvent } from "../posthogServer";
 import { getUserProjects } from "../project/service";
 import { validateInputs } from "../utils/validate";
 
@@ -173,10 +172,6 @@ export const createEnvironment = async (
       },
     });
 
-    await capturePosthogEnvironmentEvent(environment.id, "environment created", {
-      environmentType: environment.type,
-    });
-
     return environment;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/lib/posthogServer.ts

@@ -1,56 +0,0 @@
-import { PostHog } from "posthog-node";
-import { createCacheKey } from "@formbricks/cache";
-import { logger } from "@formbricks/logger";
-import { TOrganizationBillingPlan, TOrganizationBillingPlanLimits } from "@formbricks/types/organizations";
-import { cache } from "@/lib/cache";
-import { IS_POSTHOG_CONFIGURED, IS_PRODUCTION, POSTHOG_API_HOST, POSTHOG_API_KEY } from "./constants";
-
-const enabled = IS_PRODUCTION && IS_POSTHOG_CONFIGURED;
-
-export const capturePosthogEnvironmentEvent = async (
-  environmentId: string,
-  eventName: string,
-  properties: any = {}
-) => {
-  if (!enabled || typeof POSTHOG_API_HOST !== "string" || typeof POSTHOG_API_KEY !== "string") {
-    return;
-  }
-  try {
-    const client = new PostHog(POSTHOG_API_KEY, {
-      host: POSTHOG_API_HOST,
-    });
-    client.capture({
-      // workaround with a static string as exaplained in PostHog docs: https://posthog.com/docs/product-analytics/group-analytics
-      distinctId: "environmentEvents",
-      event: eventName,
-      groups: { environment: environmentId },
-      properties,
-    });
-    await client.shutdown();
-  } catch (error) {
-    logger.error(error, "error sending posthog event");
-  }
-};
-
-export const sendPlanLimitsReachedEventToPosthogWeekly = async (
-  environmentId: string,
-  billing: {
-    plan: TOrganizationBillingPlan;
-    limits: TOrganizationBillingPlanLimits;
-  }
-) =>
-  await cache.withCache(
-    async () => {
-      try {
-        await capturePosthogEnvironmentEvent(environmentId, "plan limit reached", {
-          ...billing,
-        });
-        return "success";
-      } catch (error) {
-        logger.error(error, "error sending plan limits reached event to posthog weekly");
-        throw error;
-      }
-    },
-    createCacheKey.custom("analytics", environmentId, `plan_limits_${billing.plan}`),
-    60 * 60 * 24 * 7 * 1000 // 7 days in milliseconds
-  );

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

@@ -13,7 +13,6 @@ import {
   getOrganizationByEnvironmentId,
   subscribeOrganizationMembersToSurveyResponses,
 } from "@/lib/organization/service";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { evaluateLogic } from "@/lib/surveyLogic/utils";
 import {
   mockActionClass,
@@ -44,11 +43,6 @@ vi.mock("@/lib/organization/service", () => ({
   subscribeOrganizationMembersToSurveyResponses: vi.fn(),
 }));
 
-// Mock posthogServer
-vi.mock("@/lib/posthogServer", () => ({
-  capturePosthogEnvironmentEvent: vi.fn(),
-}));
-
 // Mock actionClass service
 vi.mock("@/lib/actionClass/service", () => ({
   getActionClasses: vi.fn(),
@@ -646,7 +640,6 @@ describe("Tests for createSurvey", () => {
       expect(prisma.survey.create).toHaveBeenCalled();
       expect(result.name).toEqual(mockSurveyOutput.name);
       expect(subscribeOrganizationMembersToSurveyResponses).toHaveBeenCalled();
-      expect(capturePosthogEnvironmentEvent).toHaveBeenCalled();
     });
 
     test("creates a private segment for app surveys", async () => {

apps/web/lib/survey/service.ts

@@ -13,7 +13,6 @@ import {
 } from "@/lib/organization/service";
 import { getActionClasses } from "../actionClass/service";
 import { ITEMS_PER_PAGE } from "../constants";
-import { capturePosthogEnvironmentEvent } from "../posthogServer";
 import { validateInputs } from "../utils/validate";
 import { checkForInvalidImagesInQuestions, transformPrismaSurvey } from "./utils";
 
@@ -673,11 +672,6 @@ export const createSurvey = async (
       await subscribeOrganizationMembersToSurveyResponses(survey.id, createdBy, organization.id);
     }
 
-    await capturePosthogEnvironmentEvent(survey.environmentId, "survey created", {
-      surveyId: survey.id,
-      surveyType: survey.type,
-    });
-
     return transformedSurvey;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/lib/telemetry.ts

@@ -1,38 +0,0 @@
-/* We use this telemetry service to better understand how Formbricks is being used
-   and how we can improve it. All data including the IP address is collected anonymously
-   and we cannot trace anything back to you or your customers. If you still want to
-   disable telemetry, set the environment variable TELEMETRY_DISABLED=1 */
-import { logger } from "@formbricks/logger";
-import { IS_PRODUCTION } from "./constants";
-import { env } from "./env";
-
-const crypto = require("crypto");
-
-// We are using the hashed CRON_SECRET as the distinct identifier for the instance for telemetry.
-// The hash cannot be traced back to the original value or the instance itself.
-// This is to ensure that the telemetry data is anonymous but still unique to the instance.
-const getTelemetryId = (): string => {
-  return crypto.createHash("sha256").update(env.CRON_SECRET).digest("hex");
-};
-
-export const captureTelemetry = async (eventName: string, properties = {}) => {
-  if (env.TELEMETRY_DISABLED !== "1" && IS_PRODUCTION) {
-    try {
-      await fetch("https://telemetry.formbricks.com/capture/", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          api_key: "phc_SoIFUJ8b9ufDm0YOnoOxJf6PXyuHpO7N6RztxFdZTy", // NOSONAR // This is a public API key for telemetry and not a secret
-          event: eventName,
-          properties: {
-            distinct_id: getTelemetryId(),
-            ...properties,
-          },
-          timestamp: new Date().toISOString(),
-        }),
-      });
-    } catch (error) {
-      logger.error(error, "error sending telemetry");
-    }
-  }
-};

apps/web/locales/de-DE.json

@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Aktualisieren",
       "upload_contacts_modal_pick_different_file": "Wähle eine andere Datei",
       "upload_contacts_modal_preview": "Hier ist eine Vorschau deiner Daten.",
-      "upload_contacts_modal_upload_btn": "Kontakte hochladen"
+      "upload_contacts_modal_upload_btn": "Kontakte hochladen",
+      "upload_contacts_success": "Kontakte erfolgreich hochgeladen"
     },
     "formbricks_logo": "Formbricks-Logo",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Befolge diese Schritte, um das Formbricks Widget in deiner App einzurichten.",
         "receiving_data": "Daten werden empfangen 💃🕺",
         "recheck": "Erneut prüfen",
+        "sdk_connection_details": "SDK-Verbindungsdetails",
+        "sdk_connection_details_description": "Deine eindeutige Umgebungs-ID und SDK-Verbindungs-URL zur Integration von Formbricks mit deiner Anwendung.",
         "setup_alert_description": "Befolge dieses Schritt-für-Schritt-Tutorial, um deine App oder Website in weniger als 5 Minuten zu verbinden.",
-        "setup_alert_title": "Wie man verbindet"
+        "setup_alert_title": "Wie man verbindet",
+        "webapp_url": "SDK-Verbindungs-URL"
       },
       "general": {
         "cannot_delete_only_project": "Dies ist dein einziges Projekt, es kann nicht gelöscht werden. Erstelle zuerst ein neues Projekt.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Fehler beim Speichern der Änderungen",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Mehrfachantworten erlauben; weiterhin anzeigen, auch nach einer Antwort (z.B. Feedback-Box).",
         "everyone": "Jeder",
-        "external_urls_paywall_tooltip": "Bitte aktualisieren, um die externe URL anzupassen. Phishing-Prävention.",
+        "external_urls_paywall_tooltip": "Bitte führen sie ein upgrade auf den Startup-plan durch, um externe URLs anzupassen. Dies hilft uns, phishing zu verhindern.",
         "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.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Verstecktes Feld \"{fieldId}\" wird in der \"{quotaName}\" Quote verwendet",

apps/web/locales/en-US.json

@@ -331,7 +331,7 @@
     "project_not_found": "Project not found",
     "project_permission_not_found": "Project permission not found",
     "projects": "Projects",
-    "question": "Question",
+    "question": "question",
     "question_id": "Question ID",
     "questions": "Questions",
     "quota": "Quota",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Update",
       "upload_contacts_modal_pick_different_file": "Pick a different file",
       "upload_contacts_modal_preview": "Here's a preview of your data.",
-      "upload_contacts_modal_upload_btn": "Upload contacts"
+      "upload_contacts_modal_upload_btn": "Upload contacts",
+      "upload_contacts_success": "Contacts uploaded successfully"
     },
     "formbricks_logo": "Formbricks Logo",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Follow these steps to setup the Formbricks widget within your app.",
         "receiving_data": "Receiving data \uD83D\uDC83\uD83D\uDD7A",
         "recheck": "Re-check",
+        "sdk_connection_details": "SDK Connection Details",
+        "sdk_connection_details_description": "Your unique environment ID and SDK connection URL for integrating Formbricks with your application.",
         "setup_alert_description": "Follow this step-by-step tutorial to connect your app or website in under 5 minutes.",
-        "setup_alert_title": "How to connect"
+        "setup_alert_title": "How to connect",
+        "webapp_url": "SDK Connection URL"
       },
       "general": {
         "cannot_delete_only_project": "This is your only project, it cannot be deleted. Create a new project first.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Error saving changes",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Allow multiple responses; continue showing even after a response (e.g., Feedback Box).",
         "everyone": "Everyone",
-        "external_urls_paywall_tooltip": "Please upgrade to customize external URL. Phishing prevention.",
+        "external_urls_paywall_tooltip": "Please upgrade to Startup plan to customize external URLs. This helps us prevent phishing.",
         "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.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Hidden field \"{fieldId}\" is being used in \"{quotaName}\" quota",

apps/web/locales/es-ES.json

@@ -331,7 +331,7 @@
     "project_not_found": "Proyecto no encontrado",
     "project_permission_not_found": "Permiso de proyecto no encontrado",
     "projects": "Proyectos",
-    "question": "Pregunta",
+    "question": "pregunta",
     "question_id": "ID de pregunta",
     "questions": "Preguntas",
     "quota": "Cuota",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Actualizar",
       "upload_contacts_modal_pick_different_file": "Selecciona un archivo diferente",
       "upload_contacts_modal_preview": "Aquí tienes una vista previa de tus datos.",
-      "upload_contacts_modal_upload_btn": "Subir contactos"
+      "upload_contacts_modal_upload_btn": "Subir contactos",
+      "upload_contacts_success": "Contactos subidos correctamente"
     },
     "formbricks_logo": "Logo de Formbricks",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Sigue estos pasos para configurar el widget de Formbricks en tu aplicación.",
         "receiving_data": "Recibiendo datos 💃🕺",
         "recheck": "Volver a comprobar",
+        "sdk_connection_details": "Detalles de conexión del SDK",
+        "sdk_connection_details_description": "Tu ID de entorno único y URL de conexión del SDK para integrar Formbricks con tu aplicación.",
         "setup_alert_description": "Sigue este tutorial paso a paso para conectar tu aplicación o sitio web en menos de 5 minutos.",
-        "setup_alert_title": "Cómo conectar"
+        "setup_alert_title": "Cómo conectar",
+        "webapp_url": "URL de conexión del SDK"
       },
       "general": {
         "cannot_delete_only_project": "Este es tu único proyecto, no se puede eliminar. Crea un proyecto nuevo primero.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Error al guardar los cambios",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Permitir respuestas múltiples; seguir mostrando incluso después de una respuesta (p. ej., cuadro de comentarios).",
         "everyone": "Todos",
-        "external_urls_paywall_tooltip": "Por favor, actualiza para personalizar la URL externa. Prevención de phishing.",
+        "external_urls_paywall_tooltip": "Por favor, actualiza al plan Startup para personalizar URLs externos. Esto nos ayuda a prevenir el phishing.",
         "fallback_missing": "Falta respaldo",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} se usa en la lógica de la pregunta {questionIndex}. Por favor, elimínalo primero de la lógica.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "El campo oculto \"{fieldId}\" se está utilizando en la cuota \"{quotaName}\"",

apps/web/locales/fr-FR.json

@@ -331,7 +331,7 @@
     "project_not_found": "Projet non trouvé",
     "project_permission_not_found": "Autorisation de projet non trouvée",
     "projects": "Projets",
-    "question": "Question",
+    "question": "question",
     "question_id": "ID de la question",
     "questions": "Questions",
     "quota": "Quota",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Mettre à jour",
       "upload_contacts_modal_pick_different_file": "Choisissez un fichier différent",
       "upload_contacts_modal_preview": "Voici un aperçu de vos données.",
-      "upload_contacts_modal_upload_btn": "Importer des contacts"
+      "upload_contacts_modal_upload_btn": "Importer des contacts",
+      "upload_contacts_success": "Contacts téléchargés avec succès"
     },
     "formbricks_logo": "Logo Formbricks",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Suivez ces étapes pour configurer le widget Formbricks dans votre application.",
         "receiving_data": "Réception des données 💃🕺",
         "recheck": "Réessayer",
+        "sdk_connection_details": "Détails de connexion SDK",
+        "sdk_connection_details_description": "Votre ID d'environnement unique et votre URL de connexion SDK pour intégrer Formbricks à votre application.",
         "setup_alert_description": "Suivez les indications de ce tutoriel pour connecter votre application ou votre site Web en moins de cinq minutes.",
-        "setup_alert_title": "Connexion"
+        "setup_alert_title": "Connexion",
+        "webapp_url": "URL de connexion SDK"
       },
       "general": {
         "cannot_delete_only_project": "Comme il s'agit de votre seul projet, il ne peut pas être supprimé. Créez d'abord un nouveau projet.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Erreur lors de l'enregistrement des modifications",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Autoriser plusieurs réponses ; continuer à afficher même après une réponse (par exemple, boîte de commentaires).",
         "everyone": "Tout le monde",
-        "external_urls_paywall_tooltip": "Veuillez passer à la version supérieure pour personnaliser l'URL externe. Prévention contre l'hameçonnage.",
+        "external_urls_paywall_tooltip": "Veuillez passer au forfait Startup pour personnaliser les URL externes. Cela nous aide à prévenir le phishing.",
         "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.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Le champ masqué \"{fieldId}\" est utilisé dans le quota \"{quotaName}\"",

apps/web/locales/ja-JP.json

@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "更新",
       "upload_contacts_modal_pick_different_file": "別のファイルを選択",
       "upload_contacts_modal_preview": "データのプレビューです。",
-      "upload_contacts_modal_upload_btn": "連絡先をアップロード"
+      "upload_contacts_modal_upload_btn": "連絡先をアップロード",
+      "upload_contacts_success": "連絡先のアップロードに成功しました"
     },
     "formbricks_logo": "Formbricksのロゴ",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "アプリ内でFormbricksウィジェットを設定する手順に従ってください。",
         "receiving_data": "データ受信中 💃🕺",
         "recheck": "再チェック",
+        "sdk_connection_details": "SDK接続詳細",
+        "sdk_connection_details_description": "FormbricksをアプリケーションとAPI統合するためのEnvironmentIdとSDK接続URL。",
         "setup_alert_description": "5 分以内でアプリまたはウェブサイト を 接続する手順をステップバイステップ の チュートリアルに従ってください。",
-        "setup_alert_title": "接続方法"
+        "setup_alert_title": "接続方法",
+        "webapp_url": "SDK接続URL"
       },
       "general": {
         "cannot_delete_only_project": "これは唯一のプロジェクトのため削除できません。まず新しいプロジェクトを作成してください。",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "変更の保存中にエラーが発生しました",
         "even_after_they_submitted_a_response_e_g_feedback_box": "複数の回答を許可；回答後も表示を継続（例：フィードボックス）。",
         "everyone": "全員",
-        "external_urls_paywall_tooltip": "外部 URL をカスタマイズするにはアップグレードしてください 。 フィッシング防止 。",
+        "external_urls_paywall_tooltip": "外部URLをカスタマイズするには、スタートアッププランへのアップグレードが必要です。これによりフィッシング詐欺を防止することができます。",
         "fallback_missing": "フォールバックがありません",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} は質問 {questionIndex} のロジックで使用されています。まず、ロジックから削除してください。",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "隠しフィールド \"{fieldId}\" は \"{quotaName}\" クォータ で使用されています",

apps/web/locales/nl-NL.json

@@ -331,7 +331,7 @@
     "project_not_found": "Project niet gevonden",
     "project_permission_not_found": "Projecttoestemming niet gevonden",
     "projects": "Projecten",
-    "question": "Vraag",
+    "question": "vraag",
     "question_id": "Vraag-ID",
     "questions": "Vragen",
     "quota": "Quotum",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Update",
       "upload_contacts_modal_pick_different_file": "Kies een ander bestand",
       "upload_contacts_modal_preview": "Hier ziet u een voorbeeld van uw gegevens.",
-      "upload_contacts_modal_upload_btn": "Contacten uploaden"
+      "upload_contacts_modal_upload_btn": "Contacten uploaden",
+      "upload_contacts_success": "Contacten succesvol geüpload"
     },
     "formbricks_logo": "Formbricks-logo",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Volg deze stappen om de Formbricks-widget in uw app in te stellen.",
         "receiving_data": "Gegevens ontvangen 💃🕺",
         "recheck": "Controleer opnieuw",
+        "sdk_connection_details": "SDK-verbindingsdetails",
+        "sdk_connection_details_description": "Uw unieke Environment ID en SDK-verbindings-URL voor integratie van Formbricks met uw applicatie.",
         "setup_alert_description": "Volg deze stapsgewijze handleiding om uw app of website in minder dan 5 minuten te verbinden.",
-        "setup_alert_title": "Hoe te verbinden"
+        "setup_alert_title": "Hoe te verbinden",
+        "webapp_url": "SDK-verbindings-URL"
       },
       "general": {
         "cannot_delete_only_project": "Dit is uw enige project. Het kan niet worden verwijderd. Maak eerst een nieuw project aan.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Fout bij het opslaan van wijzigingen",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Meerdere reacties toestaan; blijf tonen, zelfs na een reactie (bijv. feedbackbox).",
         "everyone": "Iedereen",
-        "external_urls_paywall_tooltip": "Upgrade om de externe URL aan te passen. Phishing-preventie.",
+        "external_urls_paywall_tooltip": "Upgrade naar het Startup-abonnement om externe URL's aan te passen. Dit helpt ons phishing te voorkomen.",
         "fallback_missing": "Terugval ontbreekt",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} wordt gebruikt in de logica van vraag {questionIndex}. Verwijder het eerst uit de logica.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Verborgen veld \"{fieldId}\" wordt gebruikt in het \"{quotaName}\" quotum",

apps/web/locales/pt-BR.json

@@ -331,7 +331,7 @@
     "project_not_found": "Projeto não encontrado",
     "project_permission_not_found": "Permissão do projeto não encontrada",
     "projects": "Projetos",
-    "question": "Pergunta",
+    "question": "pergunta",
     "question_id": "ID da Pergunta",
     "questions": "Perguntas",
     "quota": "Cota",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Atualizar",
       "upload_contacts_modal_pick_different_file": "Escolha um arquivo diferente",
       "upload_contacts_modal_preview": "Aqui está uma prévia dos seus dados.",
-      "upload_contacts_modal_upload_btn": "Fazer upload de contatos"
+      "upload_contacts_modal_upload_btn": "Fazer upload de contatos",
+      "upload_contacts_success": "Contatos carregados com sucesso"
     },
     "formbricks_logo": "Logo da Formbricks",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Siga esses passos para configurar o widget do Formbricks no seu app.",
         "receiving_data": "Recebendo dados 💃🕺",
         "recheck": "Verificar novamente",
+        "sdk_connection_details": "Detalhes de Conexão do SDK",
+        "sdk_connection_details_description": "Seu ID de ambiente único e URL de conexão do SDK para integrar o Formbricks com seu aplicativo.",
         "setup_alert_description": "Siga este tutorial passo a passo para conectar seu app ou site em menos de 5 minutos.",
-        "setup_alert_title": "Como conectar"
+        "setup_alert_title": "Como conectar",
+        "webapp_url": "URL de conexão do SDK"
       },
       "general": {
         "cannot_delete_only_project": "Esse é seu único projeto, não pode ser deletado. Crie um novo projeto primeiro.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Erro ao salvar alterações",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Permitir múltiplas respostas; continuar mostrando mesmo após uma resposta (ex.: caixa de feedback).",
         "everyone": "Todo mundo",
-        "external_urls_paywall_tooltip": "Por favor, faça upgrade para personalizar o URL externo. Prevenção de phishing.",
+        "external_urls_paywall_tooltip": "Por favor, faça upgrade para o plano Startup para personalizar URLs externos. Isso nos ajuda a prevenir phishing.",
         "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.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Campo oculto \"{fieldId}\" está sendo usado na cota \"{quotaName}\"",

apps/web/locales/pt-PT.json

@@ -331,7 +331,7 @@
     "project_not_found": "Projeto não encontrado",
     "project_permission_not_found": "Permissão do projeto não encontrada",
     "projects": "Projetos",
-    "question": "Pergunta",
+    "question": "pergunta",
     "question_id": "ID da pergunta",
     "questions": "Perguntas",
     "quota": "Quota",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Atualizar",
       "upload_contacts_modal_pick_different_file": "Escolher um ficheiro diferente",
       "upload_contacts_modal_preview": "Aqui está uma pré-visualização dos seus dados.",
-      "upload_contacts_modal_upload_btn": "Carregar contactos"
+      "upload_contacts_modal_upload_btn": "Carregar contactos",
+      "upload_contacts_success": "Contactos carregados com sucesso"
     },
     "formbricks_logo": "Logotipo do Formbricks",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Siga estes passos para configurar o widget Formbricks na sua aplicação.",
         "receiving_data": "A receber dados 💃🕺",
         "recheck": "Verificar novamente",
+        "sdk_connection_details": "Detalhes de Conexão SDK",
+        "sdk_connection_details_description": "O seu ID de ambiente único e URL de conexão SDK para integrar o Formbricks com a sua aplicação.",
         "setup_alert_description": "Siga este tutorial passo a passo para conectar a sua app ou site em menos de 5 minutos",
-        "setup_alert_title": "Como conectar"
+        "setup_alert_title": "Como conectar",
+        "webapp_url": "URL de ligação do SDK"
       },
       "general": {
         "cannot_delete_only_project": "Este é o seu único projeto, não pode ser eliminado. Crie um novo projeto primeiro.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Erro ao guardar alterações",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Permitir múltiplas respostas; continuar a mostrar mesmo após uma resposta (por exemplo, Caixa de Feedback).",
         "everyone": "Todos",
-        "external_urls_paywall_tooltip": "Por favor, atualize para personalizar o URL externo. Prevenção contra phishing.",
+        "external_urls_paywall_tooltip": "Por favor, atualize para o plano Startup para personalizar URLs externos. Isto ajuda-nos a prevenir o phishing.",
         "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.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Campo oculto \"{fieldId}\" está a ser usado na quota \"{quotaName}\"",

apps/web/locales/ro-RO.json

@@ -331,7 +331,7 @@
     "project_not_found": "Proiectul nu a fost găsit",
     "project_permission_not_found": "Permisiunea proiectului nu a fost găsită",
     "projects": "Proiecte",
-    "question": "Întrebare",
+    "question": "întrebare",
     "question_id": "ID întrebare",
     "questions": "Întrebări",
     "quota": "Cotă",
@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "Actualizare",
       "upload_contacts_modal_pick_different_file": "Selectați un alt fișier",
       "upload_contacts_modal_preview": "Iată o previzualizare a datelor tale.",
-      "upload_contacts_modal_upload_btn": "Încărcați contacte"
+      "upload_contacts_modal_upload_btn": "Încărcați contacte",
+      "upload_contacts_success": "Contactele au fost încărcate cu succes"
     },
     "formbricks_logo": "Logo Formbricks",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "Urmează acești pași pentru a configura widget-ul Formbricks în aplicația ta.",
         "receiving_data": "Recepționare date 💃🕺",
         "recheck": "Re-verifică",
+        "sdk_connection_details": "Detalii de conexiune SDK",
+        "sdk_connection_details_description": "ID-ul mediului tău unic și URL-ul de conexiune SDK pentru a integra Formbricks cu aplicația ta.",
         "setup_alert_description": "Urmează acest tutorial pas cu pas pentru a-ți conecta aplicația sau site-ul în mai puțin de 5 minute.",
-        "setup_alert_title": "Cum să conectezi"
+        "setup_alert_title": "Cum să conectezi",
+        "webapp_url": "URL de conexiune SDK"
       },
       "general": {
         "cannot_delete_only_project": "Acesta este singurul tău proiect, nu poate fi șters. Creează mai întâi un proiect nou.",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "Eroare la salvarea modificărilor",
         "even_after_they_submitted_a_response_e_g_feedback_box": "Permite răspunsuri multiple; continuă afișarea chiar și după un răspuns (de exemplu, Caseta de Feedback).",
         "everyone": "Toată lumea",
-        "external_urls_paywall_tooltip": "Vă rugăm să faceți upgrade pentru a personaliza URL-ul extern. Prevenire phishing.",
+        "external_urls_paywall_tooltip": "Vă rugăm să treceți la planul Startup pentru a personaliza URL-urile externe. Acest lucru ne ajută să prevenim phishing-ul.",
         "fallback_missing": "Rezerva lipsă",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{fieldId} este folosit în logică întrebării {questionIndex}. Vă rugăm să-l eliminați din logică mai întâi.",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "Câmpul ascuns \"{fieldId}\" este folosit în cota \"{quotaName}\"",

apps/web/locales/zh-Hans-CN.json

@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "更新",
       "upload_contacts_modal_pick_different_file": "选择不同的文件",
       "upload_contacts_modal_preview": "这是 你 的 数据 预览。",
-      "upload_contacts_modal_upload_btn": "上传 联系人"
+      "upload_contacts_modal_upload_btn": "上传 联系人",
+      "upload_contacts_success": "联系人上传成功"
     },
     "formbricks_logo": "Formbricks Logo",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "遵循这些步骤在你的应用中设置 Formbricks 小部件。",
         "receiving_data": "接收 数据 💃🕺",
         "recheck": "重新检查",
+        "sdk_connection_details": "SDK 连接详情",
+        "sdk_connection_details_description": "您唯一的环境 ID 和 SDK 连接 URL，用于将 Formbricks 与您的应用程序集成。",
         "setup_alert_description": "按照 此 步骤教程 在 5 分钟 以内 连接 你的 应用 或 网站。",
-        "setup_alert_title": "如何 连接"
+        "setup_alert_title": "如何 连接",
+        "webapp_url": "SDK连接URL"
       },
       "general": {
         "cannot_delete_only_project": "这是 您 唯一的 项目，不可 删除。请 先 创建一个新的 项目。",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "保存 更改 时 出错",
         "even_after_they_submitted_a_response_e_g_feedback_box": "允许多次回应；即使已提交回应，仍会继续显示（例如，反馈框）。",
         "everyone": "所有 人",
-        "external_urls_paywall_tooltip": "请升级 以自定义 外部 URL 。 网络钓鱼 预防 。",
+        "external_urls_paywall_tooltip": "请升级到 Startup 计划以自定义外部 URL。这有助于我们防止网络钓鱼。",
         "fallback_missing": "备用 缺失",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "\"{fieldId} 在 问题 {questionIndex} 的 逻辑 中 使用。请 先 从 逻辑 中 删除 它。\"",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "隐藏 字段 \"{fieldId}\" 正在 被 \"{quotaName}\" 配额 使用",

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

@@ -631,7 +631,8 @@
       "upload_contacts_modal_duplicates_update_title": "更新",
       "upload_contacts_modal_pick_different_file": "選取不同的檔案",
       "upload_contacts_modal_preview": "這是您的資料預覽。",
-      "upload_contacts_modal_upload_btn": "上傳聯絡人"
+      "upload_contacts_modal_upload_btn": "上傳聯絡人",
+      "upload_contacts_success": "聯絡人已成功上傳"
     },
     "formbricks_logo": "Formbricks 標誌",
     "integrations": {
@@ -801,8 +802,11 @@
         "how_to_setup_description": "請按照這些步驟在您的應用程式中設定 Formbricks 小工具。",
         "receiving_data": "正在接收資料 💃🕺",
         "recheck": "重新檢查",
+        "sdk_connection_details": "SDK 連線詳細資訊",
+        "sdk_connection_details_description": "您的唯一環境 ID 和 SDK 連線 URL，用於將 Formbricks 與您的應用程式整合。",
         "setup_alert_description": "遵循 此 分步 教程 ，在 5 分鐘 內 將您的應用程式 或 網站 連線 。",
-        "setup_alert_title": "如何 連線"
+        "setup_alert_title": "如何 連線",
+        "webapp_url": "SDK 連接 URL"
       },
       "general": {
         "cannot_delete_only_project": "這是您唯一的專案，無法刪除。請先建立新專案。",
@@ -1352,7 +1356,7 @@
         "error_saving_changes": "儲存變更時發生錯誤",
         "even_after_they_submitted_a_response_e_g_feedback_box": "允許多次回應；即使已提交回應仍繼續顯示（例如：意見回饋框）。",
         "everyone": "所有人",
-        "external_urls_paywall_tooltip": "請升級以自訂 external URL 。 Phishing 預防。",
+        "external_urls_paywall_tooltip": "請升級至 Startup 計劃以自訂外部 URL。這有助於防止網路釣魚攻擊。",
         "fallback_missing": "遺失的回退",
         "fieldId_is_used_in_logic_of_question_please_remove_it_from_logic_first": "'{'fieldId'}' 用於問題 '{'questionIndex'}' 的邏輯中。請先從邏輯中移除。",
         "fieldId_is_used_in_quota_please_remove_it_from_quota_first": "隱藏欄位 \"{fieldId}\" 正被使用於 \"{quotaName}\" 配額中",

apps/web/modules/api/v2/management/responses/lib/response.ts

@@ -1,13 +1,10 @@
 import "server-only";
 import { Prisma, Response } from "@prisma/client";
 import { prisma } from "@formbricks/database";
-import { logger } from "@formbricks/logger";
 import { TContactAttributes } from "@formbricks/types/contact-attribute";
 import { Result, err, ok } from "@formbricks/types/error-handlers";
 import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
-import { sendPlanLimitsReachedEventToPosthogWeekly } from "@/lib/posthogServer";
 import { calculateTtcTotal } from "@/lib/response/utils";
-import { captureTelemetry } from "@/lib/telemetry";
 import { getContactByUserId } from "@/modules/api/v2/management/responses/lib/contact";
 import {
   getMonthlyOrganizationResponseCount,
@@ -51,8 +48,6 @@ export const createResponse = async (
   responseInput: TResponseInput,
   tx?: Prisma.TransactionClient
 ): Promise<Result<Response, ApiErrorResponseV2>> => {
-  captureTelemetry("response created");
-
   const {
     surveyId,
     displayId,
@@ -126,7 +121,6 @@ export const createResponse = async (
     if (!billing.ok) {
       return err(billing.error as ApiErrorResponseV2);
     }
-    const billingData = billing.data;
 
     const prismaClient = tx ?? prisma;
 
@@ -140,26 +134,7 @@ export const createResponse = async (
         return err(responsesCountResult.error as ApiErrorResponseV2);
       }
 
-      const responsesCount = responsesCountResult.data;
-      const responsesLimit = billingData.limits?.monthly.responses;
-
-      if (responsesLimit && responsesCount >= responsesLimit) {
-        try {
-          await sendPlanLimitsReachedEventToPosthogWeekly(environmentId, {
-            plan: billingData.plan,
-            limits: {
-              projects: null,
-              monthly: {
-                responses: responsesLimit,
-                miu: null,
-              },
-            },
-          });
-        } catch (err) {
-          // Log error but do not throw it
-          logger.error(err, "Error sending plan limits reached event to Posthog");
-        }
-      }
+      // Limit check completed
     }
 
     return ok(response);

apps/web/modules/api/v2/management/responses/lib/tests/response.test.ts

@@ -12,7 +12,6 @@ import {
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { err, ok } from "@formbricks/types/error-handlers";
-import { sendPlanLimitsReachedEventToPosthogWeekly } from "@/lib/posthogServer";
 import {
   getMonthlyOrganizationResponseCount,
   getOrganizationBilling,
@@ -20,10 +19,6 @@ import {
 } from "@/modules/api/v2/management/responses/lib/organization";
 import { createResponse, getResponses } from "../response";
 
-vi.mock("@/lib/posthogServer", () => ({
-  sendPlanLimitsReachedEventToPosthogWeekly: vi.fn().mockResolvedValue(undefined),
-}));
-
 vi.mock("@/modules/api/v2/management/responses/lib/organization", () => ({
   getOrganizationIdFromEnvironmentId: vi.fn(),
   getOrganizationBilling: vi.fn(),
@@ -150,11 +145,8 @@ describe("Response Lib", () => {
 
       vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(ok(100));
 
-      vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockImplementation(() => Promise.resolve(""));
-
       const result = await createResponse(environmentId, responseInput);
 
-      expect(sendPlanLimitsReachedEventToPosthogWeekly).toHaveBeenCalled();
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.data).toEqual(response);
@@ -191,10 +183,6 @@ describe("Response Lib", () => {
 
       vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(ok(100));
 
-      vi.mocked(sendPlanLimitsReachedEventToPosthogWeekly).mockRejectedValue(
-        new Error("Error sending plan limits")
-      );
-
       const result = await createResponse(environmentId, responseInput);
       expect(result.ok).toBe(true);
       if (result.ok) {

apps/web/modules/api/v2/management/webhooks/lib/tests/webhook.test.ts

@@ -1,7 +1,6 @@
 import { WebhookSource } from "@prisma/client";
 import { describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
-import { captureTelemetry } from "@/lib/telemetry";
 import { TGetWebhooksFilter, TWebhookInput } from "@/modules/api/v2/management/webhooks/types/webhooks";
 import { createWebhook, getWebhooks } from "../webhook";
 
@@ -16,10 +15,6 @@ vi.mock("@formbricks/database", () => ({
   },
 }));
 
-vi.mock("@/lib/telemetry", () => ({
-  captureTelemetry: vi.fn(),
-}));
-
 describe("getWebhooks", () => {
   const environmentId = "env1";
   const params = {
@@ -86,7 +81,6 @@ describe("createWebhook", () => {
     vi.mocked(prisma.webhook.create).mockResolvedValueOnce(createdWebhook);
 
     const result = await createWebhook(inputWebhook);
-    expect(captureTelemetry).toHaveBeenCalledWith("webhook_created");
     expect(prisma.webhook.create).toHaveBeenCalled();
     expect(result.ok).toBe(true);
 

apps/web/modules/api/v2/management/webhooks/lib/webhook.ts

@@ -1,7 +1,6 @@
 import { Prisma, Webhook } from "@prisma/client";
 import { prisma } from "@formbricks/database";
 import { Result, err, ok } from "@formbricks/types/error-handlers";
-import { captureTelemetry } from "@/lib/telemetry";
 import { getWebhooksQuery } from "@/modules/api/v2/management/webhooks/lib/utils";
 import { TGetWebhooksFilter, TWebhookInput } from "@/modules/api/v2/management/webhooks/types/webhooks";
 import { ApiErrorResponseV2 } from "@/modules/api/v2/types/api-error";
@@ -47,8 +46,6 @@ export const getWebhooks = async (
 };
 
 export const createWebhook = async (webhook: TWebhookInput): Promise<Result<Webhook, ApiErrorResponseV2>> => {
-  captureTelemetry("webhook_created");
-
   const { environmentId, name, url, source, triggers, surveyIds } = webhook;
 
   try {

apps/web/modules/api/v2/organizations/[organizationId]/project-teams/lib/project-teams.ts

@@ -2,7 +2,6 @@ import { ProjectTeam } from "@prisma/client";
 import { z } from "zod";
 import { prisma } from "@formbricks/database";
 import { Result, err, ok } from "@formbricks/types/error-handlers";
-import { captureTelemetry } from "@/lib/telemetry";
 import { getProjectTeamsQuery } from "@/modules/api/v2/organizations/[organizationId]/project-teams/lib/utils";
 import {
   TGetProjectTeamsFilter,
@@ -44,8 +43,6 @@ export const getProjectTeams = async (
 export const createProjectTeam = async (
   teamInput: TProjectTeamInput
 ): Promise<Result<ProjectTeam, ApiErrorResponseV2>> => {
-  captureTelemetry("project team created");
-
   const { teamId, projectId, permission } = teamInput;
 
   try {

apps/web/modules/api/v2/organizations/[organizationId]/teams/lib/teams.ts

@@ -2,7 +2,6 @@ import "server-only";
 import { Team } from "@prisma/client";
 import { prisma } from "@formbricks/database";
 import { Result, err, ok } from "@formbricks/types/error-handlers";
-import { captureTelemetry } from "@/lib/telemetry";
 import { getTeamsQuery } from "@/modules/api/v2/organizations/[organizationId]/teams/lib/utils";
 import {
   TGetTeamsFilter,
@@ -15,8 +14,6 @@ export const createTeam = async (
   teamInput: TTeamInput,
   organizationId: string
 ): Promise<Result<Team, ApiErrorResponseV2>> => {
-  captureTelemetry("team created");
-
   const { name } = teamInput;
 
   try {

apps/web/modules/api/v2/organizations/[organizationId]/users/lib/users.ts

@@ -2,7 +2,6 @@ import { OrganizationRole, Prisma, TeamUserRole } from "@prisma/client";
 import { prisma } from "@formbricks/database";
 import { TUser } from "@formbricks/database/zod/users";
 import { Result, err, ok } from "@formbricks/types/error-handlers";
-import { captureTelemetry } from "@/lib/telemetry";
 import { getUsersQuery } from "@/modules/api/v2/organizations/[organizationId]/users/lib/utils";
 import {
   TGetUsersFilter,
@@ -73,8 +72,6 @@ export const createUser = async (
   userInput: TUserInput,
   organizationId
 ): Promise<Result<TUser, ApiErrorResponseV2>> => {
-  captureTelemetry("user created");
-
   const { name, email, role, teams, isActive } = userInput;
 
   try {
@@ -150,8 +147,6 @@ export const updateUser = async (
   userInput: TUserInputPatch,
   organizationId: string
 ): Promise<Result<TUser, ApiErrorResponseV2>> => {
-  captureTelemetry("user updated");
-
   const { name, email, role, teams, isActive } = userInput;
   let existingTeams: string[] = [];
   let newTeams;

apps/web/modules/auth/signup/actions.ts

@@ -13,7 +13,7 @@ import { ActionClientCtx } from "@/lib/utils/action-client/types/context";
 import { createUser, updateUser } from "@/modules/auth/lib/user";
 import { deleteInvite, getInvite } from "@/modules/auth/signup/lib/invite";
 import { createTeamMembership } from "@/modules/auth/signup/lib/team";
-import { captureFailedSignup, verifyTurnstileToken } from "@/modules/auth/signup/lib/utils";
+import { verifyTurnstileToken } from "@/modules/auth/signup/lib/utils";
 import { applyIPRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
@@ -46,21 +46,15 @@ const ZCreateUserAction = z.object({
     ),
 });
 
-async function verifyTurnstileIfConfigured(
-  turnstileToken: string | undefined,
-  email: string,
-  name: string
-): Promise<void> {
+async function verifyTurnstileIfConfigured(turnstileToken: string | undefined): Promise<void> {
   if (!IS_TURNSTILE_CONFIGURED) return;
 
   if (!turnstileToken || !TURNSTILE_SECRET_KEY) {
-    captureFailedSignup(email, name);
     throw new UnknownError("Server configuration error");
   }
 
   const isHuman = await verifyTurnstileToken(TURNSTILE_SECRET_KEY, turnstileToken);
   if (!isHuman) {
-    captureFailedSignup(email, name);
     throw new UnknownError("reCAPTCHA verification failed");
   }
 }
@@ -180,7 +174,7 @@ export const createUserAction = actionClient.schema(ZCreateUserAction).action(
     "user",
     async ({ ctx, parsedInput }: { ctx: ActionClientCtx; parsedInput: Record<string, any> }) => {
       await applyIPRateLimit(rateLimitConfigs.auth.signup);
-      await verifyTurnstileIfConfigured(parsedInput.turnstileToken, parsedInput.email, parsedInput.name);
+      await verifyTurnstileIfConfigured(parsedInput.turnstileToken);
 
       const hashedPassword = await hashPassword(parsedInput.password);
       const { user, userAlreadyExisted } = await createUserSafely(

apps/web/modules/auth/signup/components/signup-form.tsx

@@ -13,7 +13,6 @@ import { TUserLocale, ZUserName, ZUserPassword } from "@formbricks/types/user";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { createUserAction } from "@/modules/auth/signup/actions";
 import { TermsPrivacyLinks } from "@/modules/auth/signup/components/terms-privacy-links";
-import { captureFailedSignup } from "@/modules/auth/signup/lib/utils";
 import { SSOOptions } from "@/modules/ee/sso/components/sso-options";
 import { Button } from "@/modules/ui/components/button";
 import { FormControl, FormError, FormField, FormItem } from "@/modules/ui/components/form";
@@ -236,7 +235,6 @@ export const SignupForm = ({
                 onError={() => {
                   setTurnstileToken(undefined);
                   toast.error(t("auth.signup.captcha_failed"));
-                  captureFailedSignup(form.getValues("email"), form.getValues("name"));
                 }}
               />
             )}

apps/web/modules/auth/signup/lib/utils.test.ts

@@ -1,6 +1,5 @@
-import posthog from "posthog-js";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { captureFailedSignup, verifyTurnstileToken } from "./utils";
+import { verifyTurnstileToken } from "./utils";
 
 beforeEach(() => {
   global.fetch = vi.fn();
@@ -62,18 +61,3 @@ describe("verifyTurnstileToken", () => {
     expect(result).toBe(false);
   });
 });
-
-describe("captureFailedSignup", () => {
-  test("should capture TELEMETRY_FAILED_SIGNUP event with email and name", () => {
-    const captureSpy = vi.spyOn(posthog, "capture");
-    const email = "test@example.com";
-    const name = "Test User";
-
-    captureFailedSignup(email, name);
-
-    expect(captureSpy).toHaveBeenCalledWith("TELEMETRY_FAILED_SIGNUP", {
-      email,
-      name,
-    });
-  });
-});

apps/web/modules/auth/signup/lib/utils.ts

@@ -1,5 +1,3 @@
-import posthog from "posthog-js";
-
 export const verifyTurnstileToken = async (secretKey: string, token: string): Promise<boolean> => {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), 5000);
@@ -29,10 +27,3 @@ export const verifyTurnstileToken = async (secretKey: string, token: string): Pr
     clearTimeout(timeoutId);
   }
 };
-
-export const captureFailedSignup = (email: string, name: string) => {
-  posthog.capture("TELEMETRY_FAILED_SIGNUP", {
-    email,
-    name,
-  });
-};

apps/web/modules/ee/contacts/[contactId]/components/attributes-section.tsx

@@ -19,7 +19,7 @@ export const AttributesSection = async ({ contactId }: { contactId: string }) =>
     <div className="space-y-6">
       <h2 className="text-lg font-bold text-slate-700">{t("common.attributes")}</h2>
       <div>
-        <dt className="text-sm font-medium text-slate-500">{t("common.email")}</dt>
+        <dt className="text-sm font-medium text-slate-500">email</dt>
         <dd className="ph-no-capture mt-1 text-sm text-slate-900">
           {attributes.email ? (
             <span>{attributes.email}</span>
@@ -29,7 +29,7 @@ export const AttributesSection = async ({ contactId }: { contactId: string }) =>
         </dd>
       </div>
       <div>
-        <dt className="text-sm font-medium text-slate-500">{t("common.language")}</dt>
+        <dt className="text-sm font-medium text-slate-500">language</dt>
         <dd className="ph-no-capture mt-1 text-sm text-slate-900">
           {attributes.language ? (
             <span>{attributes.language}</span>
@@ -39,7 +39,7 @@ export const AttributesSection = async ({ contactId }: { contactId: string }) =>
         </dd>
       </div>
       <div>
-        <dt className="text-sm font-medium text-slate-500">{t("common.user_id")}</dt>
+        <dt className="text-sm font-medium text-slate-500">userId</dt>
         <dd className="ph-no-capture mt-1 text-sm text-slate-900">
           {attributes.userId ? (
             <IdBadge id={attributes.userId} />
@@ -49,7 +49,7 @@ export const AttributesSection = async ({ contactId }: { contactId: string }) =>
         </dd>
       </div>
       <div>
-        <dt className="text-sm font-medium text-slate-500">ID</dt>
+        <dt className="text-sm font-medium text-slate-500">contactId</dt>
         <dd className="ph-no-capture mt-1 text-sm text-slate-900">{contact.id}</dd>
       </div>
 
@@ -58,7 +58,7 @@ export const AttributesSection = async ({ contactId }: { contactId: string }) =>
         .map(([key, attributeData]) => {
           return (
             <div key={key}>
-              <dt className="text-sm font-medium text-slate-500">{key.toString()}</dt>
+              <dt className="text-sm font-medium text-slate-500">{key}</dt>
               <dd className="mt-1 text-sm text-slate-900">{attributeData}</dd>
             </div>
           );

apps/web/modules/ee/contacts/[contactId]/page.tsx

@@ -8,6 +8,7 @@ import { getPublishedLinkSurveys } from "@/modules/ee/contacts/lib/surveys";
 import { getContactIdentifier } from "@/modules/ee/contacts/lib/utils";
 import { getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { GoBackButton } from "@/modules/ui/components/go-back-button";
 import { PageContentWrapper } from "@/modules/ui/components/page-content-wrapper";
 import { PageHeader } from "@/modules/ui/components/page-header";
 import { ResponseSection } from "./components/response-section";
@@ -47,6 +48,7 @@ export const SingleContactPage = async (props: {
 
   return (
     <PageContentWrapper>
+      <GoBackButton url={`/environments/${params.environmentId}/contacts`} />
       <PageHeader pageTitle={getContactIdentifier(contactAttributes)} cta={getContactControlBar()} />
       <section className="pb-24 pt-6">
         <div className="grid grid-cols-4 gap-x-8">

apps/web/modules/ee/contacts/components/contacts-table.tsx

@@ -274,7 +274,7 @@ export const ContactsTable = ({
                       }}
                       style={cell.column.id === "select" ? getCommonPinningStyles(cell.column) : {}}
                       className={cn(
-                        "border-slate-200 bg-white shadow-none group-hover:bg-slate-100",
+                        "px-4 py-2 border-slate-200 bg-white shadow-none group-hover:bg-slate-100",
                         row.getIsSelected() && "bg-slate-100",
                         {
                           "border-r": !cell.column.getIsLastColumn(),
@@ -282,7 +282,7 @@ export const ContactsTable = ({
                         }
                       )}>
                       <div
-                        className={cn("flex flex-1 items-center truncate", isExpanded ? "h-full" : "h-10")}>
+                        className={cn("flex flex-1 items-center truncate", isExpanded ? "h-10" : "h-full")}>
                         {flexRender(cell.column.columnDef.cell, cell.getContext())}
                       </div>
                     </TableCell>

apps/web/modules/ee/contacts/components/csv-table.tsx

@@ -12,14 +12,14 @@ export const CsvTable = ({ data }: CsvTableProps) => {
   const columns = Object.keys(data[0]);
 
   return (
-    <div className="w-full rounded-md hover:overflow-auto">
+    <div className="w-full overflow-x-auto rounded-md">
       <div
-        className="grid gap-4 border-b-2 border-slate-100 bg-slate-100 p-4 text-left"
-        style={{ gridTemplateColumns: `repeat(${columns.length}, minmax(0, 1fr))` }}>
+        className="sticky top-0 z-10 grid gap-2 border-b-2 border-slate-100 bg-slate-100 px-3 py-2 text-left"
+        style={{ gridTemplateColumns: `repeat(${columns.length}, minmax(100px, 1fr))` }}>
         {columns.map((header, index) => (
           <span
             key={index}
-            className="overflow-hidden text-ellipsis whitespace-nowrap text-sm font-semibold capitalize">
+            className="overflow-hidden text-ellipsis whitespace-nowrap text-xs font-semibold capitalize leading-tight">
             {header.replace(/_/g, " ")}
           </span>
         ))}
@@ -28,10 +28,10 @@ export const CsvTable = ({ data }: CsvTableProps) => {
       {data.map((row, rowIndex) => (
         <div
           key={rowIndex}
-          className="grid gap-4 border-b border-gray-200 bg-white p-4 text-left last:border-b-0"
-          style={{ gridTemplateColumns: `repeat(${columns.length}, minmax(0, 1fr))` }}>
+          className="grid gap-2 border-b border-gray-200 bg-white px-3 py-2 text-left leading-tight last:border-b-0"
+          style={{ gridTemplateColumns: `repeat(${columns.length}, minmax(100px, 1fr))` }}>
           {columns.map((header, colIndex) => (
-            <span key={colIndex} className="overflow-hidden text-ellipsis whitespace-nowrap text-sm">
+            <span key={colIndex} className="overflow-hidden text-ellipsis whitespace-nowrap text-xs">
               {row[header]}
             </span>
           ))}

apps/web/modules/ee/contacts/components/upload-contacts-attribute-combobox.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { ChevronDownIcon } from "lucide-react";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/modules/ui/components/button";
@@ -50,16 +51,26 @@ export const UploadContactsAttributeCombobox = ({
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
         {currentKey ? (
-          <Button variant="ghost" size="sm" className="border border-slate-300" aria-expanded={open}>
+          <Button
+            variant="ghost"
+            size="sm"
+            className="justify-between border border-slate-300"
+            aria-expanded={open}>
             {currentKey.label}
+            <ChevronDownIcon className="h-4 w-4 opacity-50" />
           </Button>
         ) : (
-          <Button variant="ghost" size="sm" className="border border-slate-300" aria-expanded={open}>
+          <Button
+            variant="ghost"
+            size="sm"
+            className="justify-between border border-slate-300"
+            aria-expanded={open}>
             {t("environments.contacts.select_attribute")}
+            <ChevronDownIcon className="h-4 w-4 opacity-50" />
           </Button>
         )}
       </PopoverTrigger>
-      <PopoverContent className="h-full w-[200px] overflow-y-auto p-0">
+      <PopoverContent className="h-full w-[200px] p-0">
         <Command
           filter={(value, search) => {
             if (value === "_create") {
@@ -92,7 +103,7 @@ export const UploadContactsAttributeCombobox = ({
               }}
             />
           </div>
-          <CommandList className="border-0">
+          <CommandList className="max-h-[300px] overflow-y-auto border-0">
             <CommandGroup>
               {keys.map((tag) => {
                 return (

apps/web/modules/ee/contacts/components/upload-contacts-button.tsx

@@ -4,6 +4,7 @@ import { parse } from "csv-parse/sync";
 import { ArrowUpFromLineIcon, FileUpIcon, PlusIcon } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect, useMemo, useRef, useState } from "react";
+import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
 import { cn } from "@/lib/cn";
@@ -44,7 +45,7 @@ export const UploadContactsCSVButton = ({
   );
   const [csvResponse, setCSVResponse] = useState<TContactCSVUploadResponse>([]);
   const [attributeMap, setAttributeMap] = useState<Record<string, string>>({});
-  const [error, setErrror] = useState("");
+  const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
 
   const processCSVFile = async (file: File) => {
@@ -52,25 +53,25 @@ export const UploadContactsCSVButton = ({
 
     // Check file type
     if (!file.type && !file.name.endsWith(".csv")) {
-      setErrror("Please upload a CSV file");
+      setError("Please upload a CSV file");
       return;
     }
 
     if (file.type && file.type !== "text/csv" && !file.type.includes("csv")) {
-      setErrror("Please upload a CSV file");
+      setError("Please upload a CSV file");
       return;
     }
 
     // Max file size check (800KB)
     const maxSizeInBytes = 800 * 1024;
     if (file.size > maxSizeInBytes) {
-      setErrror("File size exceeds the maximum limit of 800KB");
+      setError("File size exceeds the maximum limit of 800KB");
       return;
     }
 
     const reader = new FileReader();
     reader.onload = async (e) => {
-      setErrror("");
+      setError("");
       const csv = e.target?.result as string;
 
       try {
@@ -82,12 +83,12 @@ export const UploadContactsCSVButton = ({
         const parsedRecords = ZContactCSVUploadResponse.safeParse(records);
         if (!parsedRecords.success) {
           console.error("Error parsing CSV:", parsedRecords.error);
-          setErrror(parsedRecords.error.errors[0].message);
+          setError(parsedRecords.error.errors[0].message);
           return;
         }
 
         if (!parsedRecords.data.length) {
-          setErrror(
+          setError(
             "The uploaded CSV file does not contain any valid contacts, please see the sample CSV file for the correct format."
           );
           return;
@@ -123,7 +124,7 @@ export const UploadContactsCSVButton = ({
   const resetState = (closeModal?: boolean) => {
     setCSVResponse([]);
     setDuplicateContactsAction("skip");
-    setErrror("");
+    setError("");
     setAttributeMap({});
     setLoading(false);
 
@@ -138,7 +139,7 @@ export const UploadContactsCSVButton = ({
     }
 
     setLoading(true);
-    setErrror("");
+    setError("");
 
     const values = Object.values(attributeMap);
 
@@ -156,9 +157,7 @@ export const UploadContactsCSVButton = ({
         .filter(([_, value]) => duplicateValues.includes(value))
         .map(([key, _]) => key);
 
-      setErrror(
-        `Duplicate mappings found for the following attributes: ${duplicateAttributeKeys.join(", ")}`
-      );
+      setError(`Duplicate mappings found for the following attributes: ${duplicateAttributeKeys.join(", ")}`);
       errorContainerRef.current?.scrollIntoView({ behavior: "smooth", block: "center" });
       setLoading(false);
       return;
@@ -193,7 +192,8 @@ export const UploadContactsCSVButton = ({
     });
 
     if (result?.data) {
-      setErrror("");
+      setError("");
+      toast.success(t("environments.contacts.upload_contacts_success"));
       resetState(true);
 
       router.refresh();
@@ -201,7 +201,7 @@ export const UploadContactsCSVButton = ({
     }
 
     if (result?.serverError) {
-      setErrror(result.serverError);
+      setError(result.serverError);
     }
 
     if (result?.validationErrors) {
@@ -210,9 +210,9 @@ export const UploadContactsCSVButton = ({
         : result.validationErrors.csvData?._errors?.[0];
 
       if (csvDataErrors) {
-        setErrror(csvDataErrors);
+        setError(csvDataErrors);
       } else {
-        setErrror("An error occurred while uploading the contacts. Please try again later.");
+        setError("An error occurred while uploading the contacts. Please try again later.");
       }
     }
 
@@ -295,8 +295,18 @@ export const UploadContactsCSVButton = ({
         {t("common.upload")} CSV
         <PlusIcon />
       </Button>
-      <Dialog open={open} onOpenChange={setOpen}>
-        <DialogContent disableCloseOnOutsideClick={true} className="overflow-auto">
+      <Dialog
+        open={open}
+        onOpenChange={(newOpen) => {
+          setOpen(newOpen);
+          if (!newOpen) {
+            setError("");
+          }
+        }}>
+        <DialogContent
+          disableCloseOnOutsideClick={true}
+          unconstrained={true}
+          style={{ scrollbarGutter: "stable" }}>
           <DialogHeader>
             <FileUpIcon />
             <DialogTitle>{t("common.upload")} CSV</DialogTitle>
@@ -305,8 +315,8 @@ export const UploadContactsCSVButton = ({
             </DialogDescription>
           </DialogHeader>
 
-          <DialogBody>
-            <div className="flex flex-col gap-6">
+          <DialogBody unconstrained={false}>
+            <div className="flex flex-col gap-4">
               {error ? (
                 <Alert variant="error" size="small">
                   {error}
@@ -340,11 +350,11 @@ export const UploadContactsCSVButton = ({
                       </label>
                     </div>
                   ) : (
-                    <div className="flex flex-col items-center gap-8">
+                    <div className="flex flex-col items-center gap-4">
                       <h3 className="font-medium text-slate-500">
                         {t("environments.contacts.upload_contacts_modal_preview")}
                       </h3>
-                      <div className="h-[300px] w-full overflow-auto rounded-md border border-slate-300">
+                      <div className="max-h-[300px] w-full overflow-auto rounded-md border border-slate-300">
                         <CsvTable data={[...csvResponse.slice(0, 11)]} />
                       </div>
                     </div>
@@ -384,11 +394,11 @@ export const UploadContactsCSVButton = ({
                 </div>
               ) : null}
 
-              <div className="flex flex-col">
+              <div className="flex flex-col gap-2">
                 <h3 className="font-medium text-slate-900">
                   {t("environments.contacts.upload_contacts_modal_duplicates_title")}
                 </h3>
-                <p className="mb-2 text-slate-500">
+                <p className="text-slate-500">
                   {t("environments.contacts.upload_contacts_modal_duplicates_description")}
                 </p>
                 <StylingTabs
@@ -413,8 +423,8 @@ export const UploadContactsCSVButton = ({
                   tabsContainerClassName="p-1 rounded-lg"
                 />
 
-                <div className="mt-1">
-                  <p className="text-sm font-medium text-slate-500">
+                <div>
+                  <p className="text-xs font-medium text-slate-500">
                     {duplicateContactsAction === "skip" &&
                       t("environments.contacts.upload_contacts_modal_duplicates_skip_description")}
                     {duplicateContactsAction === "update" &&

apps/web/modules/ee/contacts/lib/contacts.ts

@@ -291,10 +291,10 @@ export const createContactsFromCSV = async (
       attributeKeyMap.set(attrKey.key, attrKey.id);
     });
 
-    // Identify missing attribute keys
+    // Identify missing attribute keys (normalize keys to lowercase)
     const csvKeys = new Set<string>();
     csvData.forEach((record) => {
-      Object.keys(record).forEach((key) => csvKeys.add(key));
+      Object.keys(record).forEach((key) => csvKeys.add(key.toLowerCase()));
     });
 
     const missingKeys = Array.from(csvKeys).filter((key) => !attributeKeyMap.has(key));
@@ -328,12 +328,18 @@ export const createContactsFromCSV = async (
 
     // Process contacts in parallel
     const contactPromises = csvData.map(async (record) => {
+      // Normalize record keys to lowercase
+      const normalizedRecord: Record<string, string> = {};
+      Object.entries(record).forEach(([key, value]) => {
+        normalizedRecord[key.toLowerCase()] = value;
+      });
+
       // Skip records without email
-      if (!record.email) {
+      if (!normalizedRecord.email) {
         throw new ValidationError("Email is required for all contacts");
       }
 
-      const existingContact = emailToContactMap.get(record.email);
+      const existingContact = emailToContactMap.get(normalizedRecord.email);
 
       if (existingContact) {
         // Handle duplicates based on duplicateContactsAction
@@ -344,11 +350,11 @@ export const createContactsFromCSV = async (
           case "update": {
             // if the record has a userId, check if it already exists
             const existingUserId = existingUserIds.find(
-              (attr) => attr.value === record.userId && attr.contactId !== existingContact.id
+              (attr) => attr.value === normalizedRecord.userid && attr.contactId !== existingContact.id
             );
-            let recordToProcess = { ...record };
+            let recordToProcess = { ...normalizedRecord };
             if (existingUserId) {
-              const { userId, ...rest } = recordToProcess;
+              const { userid, ...rest } = recordToProcess;
 
               const existingContactUserId = existingContact.attributes.find(
                 (attr) => attr.attributeKey.key === "userId"
@@ -401,11 +407,11 @@ export const createContactsFromCSV = async (
           case "overwrite": {
             // if the record has a userId, check if it already exists
             const existingUserId = existingUserIds.find(
-              (attr) => attr.value === record.userId && attr.contactId !== existingContact.id
+              (attr) => attr.value === normalizedRecord.userid && attr.contactId !== existingContact.id
             );
-            let recordToProcess = { ...record };
+            let recordToProcess = { ...normalizedRecord };
             if (existingUserId) {
-              const { userId, ...rest } = recordToProcess;
+              const { userid, ...rest } = recordToProcess;
               const existingContactUserId = existingContact.attributes.find(
                 (attr) => attr.attributeKey.key === "userId"
               )?.value;

apps/web/modules/ee/contacts/segments/components/create-segment-modal.tsx

@@ -5,6 +5,7 @@ import { useRouter } from "next/navigation";
 import { useMemo, useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
+import { logger } from "@formbricks/logger";
 import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
 import type { TBaseFilter, TSegment } from "@formbricks/types/segment";
 import { ZSegmentFilters } from "@formbricks/types/segment";
@@ -100,13 +101,14 @@ export function CreateSegmentModal({
         toast.error(errorMessage);
         setIsCreatingSegment(false);
       }
-    } catch (err: any) {
+    } catch (error_) {
+      logger.error("Error creating segment:", error_);
       // parse the segment filters to check if they are valid
       const parsedFilters = ZSegmentFilters.safeParse(segment.filters);
-      if (!parsedFilters.success) {
-        toast.error(t("environments.segments.invalid_segment_filters"));
-      } else {
+      if (parsedFilters.success) {
         toast.error(t("common.something_went_wrong_please_try_again"));
+      } else {
+        toast.error(t("environments.segments.invalid_segment_filters"));
       }
       setIsCreatingSegment(false);
       return;
@@ -115,11 +117,15 @@ export function CreateSegmentModal({
 
   const isSaveDisabled = useMemo(() => {
     // check if title is empty
-
     if (!segment.title || segment.title.trim() === "") {
       return true;
     }
 
+    // check if filters are empty
+    if (segment.filters.length === 0) {
+      return true;
+    }
+
     // parse the filters to check if they are valid
     const parsedFilters = ZSegmentFilters.safeParse(segment.filters);
     if (!parsedFilters.success) {

apps/web/modules/ee/contacts/segments/components/segment-filter.tsx

@@ -37,7 +37,6 @@ import {
 } from "@formbricks/types/segment";
 import { cn } from "@/lib/cn";
 import { structuredClone } from "@/lib/pollyfills/structuredClone";
-import { isCapitalized } from "@/lib/utils/strings";
 import {
   convertOperatorToText,
   convertOperatorToTitle,
@@ -149,8 +148,10 @@ function SegmentFilterItemContextMenu({
   return (
     <div className="flex items-center gap-2">
       <DropdownMenu>
-        <DropdownMenuTrigger disabled={viewOnly}>
-          <MoreVertical className="h-4 w-4" />
+        <DropdownMenuTrigger asChild disabled={viewOnly}>
+          <Button variant="outline" size="icon">
+            <MoreVertical className="h-4 w-4" />
+          </Button>
         </DropdownMenuTrigger>
 
         <DropdownMenuContent>
@@ -185,13 +186,13 @@ function SegmentFilterItemContextMenu({
       </DropdownMenu>
 
       <Button
-        className="mr-4 p-0"
+        size="icon"
         disabled={viewOnly}
         onClick={() => {
           if (viewOnly) return;
           onDeleteFilter(filterId);
         }}
-        variant="ghost">
+        variant="outline">
         <Trash2 className={cn("h-4 w-4 cursor-pointer", viewOnly && "cursor-not-allowed")} />
       </Button>
     </div>
@@ -317,7 +318,7 @@ function AttributeSegmentFilter({
           className="flex w-auto items-center justify-center whitespace-nowrap bg-white"
           hideArrow>
           <SelectValue>
-            <div className={cn("flex items-center gap-2", !isCapitalized(attrKeyValue ?? "") && "lowercase")}>
+            <div className="flex items-center gap-2">
               <TagIcon className="h-4 w-4 text-sm" />
               <p>{attrKeyValue}</p>
             </div>
@@ -357,7 +358,7 @@ function AttributeSegmentFilter({
       {!["isSet", "isNotSet"].includes(resource.qualifier.operator) && (
         <div className="relative flex flex-col gap-1">
           <Input
-            className={cn("w-auto bg-white", valueError && "border border-red-500 focus:border-red-500")}
+            className={cn("h-9 w-auto bg-white", valueError && "border border-red-500 focus:border-red-500")}
             disabled={viewOnly}
             onChange={(e) => {
               if (viewOnly) return;
@@ -537,7 +538,7 @@ function PersonSegmentFilter({
       {!["isSet", "isNotSet"].includes(resource.qualifier.operator) && (
         <div className="relative flex flex-col gap-1">
           <Input
-            className={cn("w-auto bg-white", valueError && "border border-red-500 focus:border-red-500")}
+            className={cn("h-8 w-auto bg-white", valueError && "border border-red-500 focus:border-red-500")}
             disabled={viewOnly}
             onChange={(e) => {
               if (viewOnly) return;

apps/web/modules/ee/quotas/components/quota-condition-builder.tsx

@@ -18,6 +18,7 @@ interface QuotaConditionBuilderProps {
   conditions: TSurveyQuotaLogic;
   onChange: (conditions: TSurveyQuotaLogic) => void;
   quotaErrors?: FieldErrors<TSurveyQuotaInput>;
+  isSubmitted?: boolean;
 }
 
 export const QuotaConditionBuilder = ({
@@ -25,6 +26,7 @@ export const QuotaConditionBuilder = ({
   conditions,
   onChange,
   quotaErrors,
+  isSubmitted,
 }: QuotaConditionBuilderProps) => {
   const { t } = useTranslation();
 
@@ -66,6 +68,7 @@ export const QuotaConditionBuilder = ({
         config={config}
         callbacks={callbacks}
         quotaErrors={quotaErrors}
+        isSubmitted={isSubmitted}
       />
     </div>
   );

apps/web/modules/ee/quotas/components/quota-modal.tsx

@@ -18,9 +18,13 @@ import {
 } from "@formbricks/types/quota";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
+import { replaceHeadlineRecall } from "@/lib/utils/recall";
 import { createQuotaAction, updateQuotaAction } from "@/modules/ee/quotas/actions";
 import { EndingCardSelector } from "@/modules/ee/quotas/components/ending-card-selector";
-import { getDefaultOperatorForQuestion } from "@/modules/survey/editor/lib/utils";
+import {
+  getDefaultOperatorForQuestion,
+  replaceEndingCardHeadlineRecall,
+} from "@/modules/survey/editor/lib/utils";
 import { Button } from "@/modules/ui/components/button";
 import { ConfirmationModal } from "@/modules/ui/components/confirmation-modal";
 import {
@@ -80,6 +84,15 @@ export const QuotaModal = ({
   const { t } = useTranslation();
   const [openConfirmationModal, setOpenConfirmationModal] = useState(false);
   const [openConfirmChangesInInclusionCriteria, setOpenConfirmChangesInInclusionCriteria] = useState(false);
+
+  // Transform survey to replace recall: with actual question headlines
+  const transformedSurvey = useMemo(() => {
+    let modifiedSurvey = replaceHeadlineRecall(survey, "default");
+    modifiedSurvey = replaceEndingCardHeadlineRecall(modifiedSurvey, "default");
+
+    return modifiedSurvey;
+  }, [survey]);
+
   const defaultValues = useMemo(() => {
     return {
       name: quota?.name || "",
@@ -124,7 +137,7 @@ export const QuotaModal = ({
     reset,
     watch,
     control,
-    formState: { isSubmitting, isDirty, errors, isValid },
+    formState: { isSubmitting, isDirty, errors, isValid, isSubmitted },
   } = form;
 
   // Watch form values for conditional logic
@@ -312,14 +325,17 @@ export const QuotaModal = ({
                 render={({ field }) => (
                   <FormItem>
                     <div className="space-y-4 rounded-lg bg-slate-50 p-3">
-                      <FormLabel>{t("environments.surveys.edit.quotas.inclusion_criteria")}</FormLabel>
+                      <label className="text-sm font-medium text-slate-800">
+                        {t("environments.surveys.edit.quotas.inclusion_criteria")}
+                      </label>
                       <FormControl>
                         {field.value && (
                           <QuotaConditionBuilder
-                            survey={survey}
+                            survey={transformedSurvey}
                             conditions={field.value}
                             onChange={handleConditionsChange}
                             quotaErrors={errors}
+                            isSubmitted={isSubmitted}
                           />
                         )}
                       </FormControl>

apps/web/modules/projects/settings/(setup)/app-connection/page.tsx

@@ -4,6 +4,7 @@ import Link from "next/link";
 import { WidgetStatusIndicator } from "@/app/(app)/environments/[environmentId]/components/WidgetStatusIndicator";
 import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
 import { getActionClasses } from "@/lib/actionClass/service";
+import { WEBAPP_URL } from "@/lib/constants";
 import { getEnvironments } from "@/lib/environment/service";
 import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
@@ -40,9 +41,12 @@ export const AppConnectionPage = async ({ params }: { params: Promise<{ environm
       <div className="space-y-4">
         <EnvironmentNotice environmentId={environmentId} subPageUrl="/project/app-connection" />
         <SettingsCard
-          title={t("environments.project.app-connection.environment_id")}
-          description={t("environments.project.app-connection.environment_id_description")}>
-          <IdBadge id={environmentId} />
+          title={t("environments.project.app-connection.sdk_connection_details")}
+          description={t("environments.project.app-connection.sdk_connection_details_description")}>
+          <div className="space-y-3">
+            <IdBadge id={environmentId} label={t("environments.project.app-connection.environment_id")} />
+            <IdBadge id={WEBAPP_URL} label={t("environments.project.app-connection.webapp_url")} />
+          </div>
         </SettingsCard>
         <SettingsCard
           title={t("environments.project.app-connection.app_connection")}

apps/web/modules/survey/components/template-list/lib/survey.test.ts

@@ -9,16 +9,11 @@ import {
   getOrganizationByEnvironmentId,
   subscribeOrganizationMembersToSurveyResponses,
 } from "@/lib/organization/service";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { getActionClasses } from "@/modules/survey/lib/action-class";
 import { selectSurvey } from "@/modules/survey/lib/survey";
 import { createSurvey, handleTriggerUpdates } from "./survey";
 
 // Mock dependencies
-vi.mock("@/lib/posthogServer", () => ({
-  capturePosthogEnvironmentEvent: vi.fn(),
-}));
-
 vi.mock("@/lib/survey/utils", () => ({
   checkForInvalidImagesInQuestions: vi.fn(),
 }));
@@ -121,11 +116,6 @@ describe("survey module", () => {
         "user-123",
         "org-123"
       );
-      expect(capturePosthogEnvironmentEvent).toHaveBeenCalledWith(
-        environmentId,
-        "survey created",
-        expect.objectContaining({ surveyId: "survey-123" })
-      );
       expect(result).toBeDefined();
       expect(result.id).toBe("survey-123");
     });

apps/web/modules/survey/components/template-list/lib/survey.ts

@@ -7,7 +7,6 @@ import {
   getOrganizationByEnvironmentId,
   subscribeOrganizationMembersToSurveyResponses,
 } from "@/lib/organization/service";
-import { capturePosthogEnvironmentEvent } from "@/lib/posthogServer";
 import { checkForInvalidImagesInQuestions } from "@/lib/survey/utils";
 import { TriggerUpdate } from "@/modules/survey/editor/types/survey-trigger";
 import { getActionClasses } from "@/modules/survey/lib/action-class";
@@ -122,11 +121,6 @@ export const createSurvey = async (
       await subscribeOrganizationMembersToSurveyResponses(survey.id, createdBy, organization.id);
     }
 
-    await capturePosthogEnvironmentEvent(survey.environmentId, "survey created", {
-      surveyId: survey.id,
-      surveyType: survey.type,
-    });
-
     return transformedSurvey;
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {

apps/web/modules/survey/editor/components/survey-variables-card-item.tsx

@@ -225,7 +225,7 @@ export const SurveyVariablesCardItem = ({
                       form.setValue("value", value === "number" ? 0 : "");
                       field.onChange(value);
                     }}>
-                    <SelectTrigger className="w-24">
+                    <SelectTrigger className="h-10 w-24">
                       <SelectValue placeholder={t("environments.surveys.edit.select_type")} />
                     </SelectTrigger>
                     <SelectContent>

apps/web/modules/survey/editor/components/update-question-id.tsx

@@ -74,7 +74,7 @@ export const UpdateQuestionId = ({
           disabled={localSurvey.status !== "draft" && !question.isDraft}
           className={`h-10 ${isInputInvalid ? "border-red-300 focus:border-red-300" : ""}`}
         />
-        <Button size="sm" onClick={saveAction} disabled={isButtonDisabled()}>
+        <Button size="sm" onClick={saveAction} disabled={isButtonDisabled()} className="h-10">
           {t("common.save")}
         </Button>
       </div>

apps/web/modules/survey/follow-ups/components/follow-up-email.tsx

@@ -18,6 +18,7 @@ import { TResponse } from "@formbricks/types/responses";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { FB_LOGO_URL, IMPRINT_ADDRESS, IMPRINT_URL, PRIVACY_URL } from "@/lib/constants";
 import { getQuestionResponseMapping } from "@/lib/responses";
+import { parseRecallInfo } from "@/lib/utils/recall";
 import { getTranslate } from "@/lingodotdev/server";
 import { renderEmailResponseValue } from "@/modules/email/emails/lib/utils";
 
@@ -34,7 +35,10 @@ interface FollowUpEmailProps {
 
 export async function FollowUpEmail(props: FollowUpEmailProps): Promise<React.JSX.Element> {
   const { properties } = props.followUp.action;
-  const { body } = properties;
+  let { body } = properties;
+
+  // Parse recall tags and replace with actual response values
+  body = parseRecallInfo(body, props.response.data, props.response.variables);
 
   const questions = props.attachResponseData ? getQuestionResponseMapping(props.survey, props.response) : [];
   const t = await getTranslate();

apps/web/modules/survey/follow-ups/components/follow-up-modal.tsx

@@ -801,6 +801,9 @@ export const FollowUpModal = ({
                                     }
                                   }}
                                   isInvalid={!!formErrors.body}
+                                  localSurvey={localSurvey}
+                                  questionId="follow-up"
+                                  selectedLanguageCode={selectedLanguageCode}
                                 />
                               </FormControl>
 

apps/web/modules/survey/list/components/survey-filters.tsx

@@ -31,9 +31,10 @@ const getCreatorOptions = (t: TFunction): TFilterOption[] => [
 ];
 
 const getStatusOptions = (t: TFunction): TFilterOption[] => [
+  { label: t("common.draft"), value: "draft" },
+  { label: t("common.in_progress"), value: "inProgress" },
   { label: t("common.paused"), value: "paused" },
   { label: t("common.completed"), value: "completed" },
-  { label: t("common.draft"), value: "draft" },
 ];
 
 const getSortOptions = (t: TFunction): TSortOption[] => [