chore: align river implementation

Co-authored-by: Cursor Agent <cursoragent@cursor.com>

.env.example

@@ -231,4 +231,4 @@ REDIS_URL=redis://localhost:6379
 
 
 # Lingo.dev API key for translation generation
-LINGODOTDEV_API_KEY=your_api_key_here
+LINGO_API_KEY=your_api_key_here

.gitignore

@@ -66,3 +66,6 @@ i18n.cache
 stats.html
 # next-agents-md
 .next-docs/
+
+# Golang
+.cache

AGENTS.md

@@ -52,6 +52,14 @@ We are using SonarQube to identify code smells and security hotspots.
 - Translations are in `apps/web/locales/`. Default is `en-US.json`.
 - Lingo.dev is automatically translating strings from en-US into other languages on commit. Run `pnpm i18n` to generate missing translations and validate keys.
 
+## Date and Time Rendering
+
+- All user-facing dates and times must use shared formatting helpers instead of ad hoc `date-fns`, `Intl`, or `toLocale*` calls in components.
+- Locale for display must come from the app language source of truth (`user.locale`, `getLocale()`, or `i18n.resolvedLanguage`), not browser defaults or implicit `undefined` locale behavior.
+- Locale and time zone are different concerns: locale controls formatting, time zone controls the represented clock/calendar moment.
+- Never infer a time zone from locale. If a product-level time zone source of truth exists, use it explicitly; otherwise preserve the existing semantic meaning of the stored value and avoid introducing browser-dependent conversions.
+- Machine-facing values for storage, APIs, exports, integrations, and logs must remain stable and non-localized (`ISO 8601` / UTC where applicable).
+
 ## Database & Prisma Performance
 
 - Multi-tenancy: All data must be scoped by Organization or Environment.

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

@@ -1,5 +1,6 @@
 import { XIcon } from "lucide-react";
 import Link from "next/link";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ConnectWithFormbricks } from "@/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks";
 import { getEnvironment } from "@/lib/environment/service";
 import { getPublicDomain } from "@/lib/getPublicUrl";
@@ -20,12 +21,12 @@ const Page = async (props: ConnectPageProps) => {
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
-    throw new Error(t("common.environment_not_found"));
+    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
   }
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   const channel = project.config.channel || null;

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

@@ -1,6 +1,7 @@
 import { XIcon } from "lucide-react";
 import { getServerSession } from "next-auth";
 import Link from "next/link";
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { XMTemplateList } from "@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList";
 import { getEnvironment } from "@/lib/environment/service";
 import { getProjectByEnvironmentId, getUserProjects } from "@/lib/project/service";
@@ -23,22 +24,22 @@ const Page = async (props: XMTemplatePageProps) => {
   const environment = await getEnvironment(params.environmentId);
   const t = await getTranslate();
   if (!session) {
-    throw new Error(t("common.session_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
   if (!environment) {
-    throw new Error(t("common.environment_not_found"));
+    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
   }
 
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   const projects = await getUserProjects(session.user.id, organizationId);

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

@@ -1,6 +1,6 @@
 import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
-import { AuthorizationError } from "@formbricks/types/errors";
+import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { canUserAccessOrganization } from "@/lib/organization/auth";
 import { getOrganization } from "@/lib/organization/service";
 import { getUser } from "@/lib/user/service";
@@ -25,7 +25,7 @@ const ProjectOnboardingLayout = async (props: {
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   const isAuthorized = await canUserAccessOrganization(session.user.id, params.organizationId);
@@ -36,7 +36,7 @@ const ProjectOnboardingLayout = async (props: {
 
   const organization = await getOrganization(params.organizationId);
   if (!organization) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
   }
 
   return (

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

@@ -1,5 +1,6 @@
 import { getServerSession } from "next-auth";
 import { notFound, redirect } from "next/navigation";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getOrganization } from "@/lib/organization/service";
@@ -28,7 +29,7 @@ const OnboardingLayout = async (props: {
 
   const organization = await getOrganization(params.organizationId);
   if (!organization) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
   }
 
   const [organizationProjectsLimit, organizationProjectsCount] = await Promise.all([

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

@@ -1,6 +1,7 @@
 import { XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { TProjectConfigChannel, TProjectConfigIndustry, TProjectMode } from "@formbricks/types/project";
 import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
 import { ProjectSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/ProjectSettings";
@@ -45,7 +46,7 @@ const Page = async (props: ProjectSettingsPageProps) => {
   const isAccessControlAllowed = await getAccessControlPermission(organization.id);
 
   if (!organizationTeams) {
-    throw new Error(t("common.organization_teams_not_found"));
+    throw new ResourceNotFoundError(t("common.team"), null);
   }
 
   const publicDomain = getPublicDomain();

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

@@ -1,4 +1,5 @@
 import { redirect } from "next/navigation";
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getEnvironment } from "@/lib/environment/service";
 import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
 
@@ -17,13 +18,13 @@ const SurveyEditorEnvironmentLayout = async (props: {
   }
 
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
-    throw new Error(t("common.environment_not_found"));
+    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
   }
 
   return (

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

@@ -2,7 +2,11 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { AuthorizationError, OperationNotAllowedError } from "@formbricks/types/errors";
+import {
+  AuthorizationError,
+  OperationNotAllowedError,
+  ResourceNotFoundError,
+} from "@formbricks/types/errors";
 import { ZProjectUpdateInput } from "@formbricks/types/project";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getOrganization } from "@/lib/organization/service";
@@ -46,7 +50,7 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
     const organization = await getOrganization(organizationId);
 
     if (!organization) {
-      throw new Error("Organization not found");
+      throw new ResourceNotFoundError("Organization", organizationId);
     }
 
     const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);

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

@@ -1,3 +1,4 @@
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { MainNavigation } from "@/app/(app)/environments/[environmentId]/components/MainNavigation";
 import { TopControlBar } from "@/app/(app)/environments/[environmentId]/components/TopControlBar";
 import { IS_DEVELOPMENT, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
@@ -42,7 +43,7 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
 
   // Validate that project permission exists for members
   if (isMember && !projectPermission) {
-    throw new Error(t("common.workspace_permission_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   return (

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

@@ -1,4 +1,5 @@
 import { getServerSession } from "next-auth";
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -20,15 +21,15 @@ const AccountSettingsLayout = async (props: {
   ]);
 
   if (!organization) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
   if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   if (!session) {
-    throw new Error(t("common.session_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   return <>{children}</>;

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

@@ -1,5 +1,6 @@
 import { getServerSession } from "next-auth";
 import { prisma } from "@formbricks/database";
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TUserNotificationSettings } from "@formbricks/types/user";
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
@@ -146,18 +147,18 @@ const Page = async (props: {
   const t = await getTranslate();
   const session = await getServerSession(authOptions);
   if (!session) {
-    throw new Error(t("common.session_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
   const autoDisableNotificationType = searchParams["type"];
   const autoDisableNotificationElementId = searchParams["elementId"];
 
   const [user, memberships] = await Promise.all([getUser(session.user.id), getMemberships(session.user.id)]);
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   if (!memberships) {
-    throw new Error(t("common.membership_not_found"));
+    throw new ResourceNotFoundError(t("common.membership"), null);
   }
 
   if (user?.notificationSettings) {

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

@@ -1,3 +1,4 @@
+import { AuthenticationError } from "@formbricks/types/errors";
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { AccountSecurity } from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity";
 import { EMAIL_VERIFICATION_DISABLED, IS_FORMBRICKS_CLOUD, PASSWORD_RESET_DISABLED } from "@/lib/constants";
@@ -28,7 +29,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const user = session?.user ? await getUser(session.user.id) : null;
 
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   const isPasswordResetEnabled = !PASSWORD_RESET_DISABLED && user.identityProvider === "email";

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/domain/page.tsx

@@ -1,4 +1,5 @@
 import { notFound } from "next/navigation";
+import { AuthenticationError } from "@formbricks/types/errors";
 import { IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED } from "@/lib/constants";
 import { getTranslate } from "@/lingodotdev/server";
 import { getWhiteLabelPermission } from "@/modules/ee/license-check/lib/utils";
@@ -25,7 +26,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   );
 
   if (!session) {
-    throw new Error(t("common.session_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   const hasWhiteLabelPermission = await getWhiteLabelPermission(organization.id);

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/enterprise/components/EnterpriseLicenseStatus.tsx

@@ -6,6 +6,7 @@ import { useRouter } from "next/navigation";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
+import { formatDateForDisplay, formatDateTimeForDisplay } from "@/lib/utils/datetime";
 import { recheckLicenseAction } from "@/modules/ee/license-check/actions";
 import type { TLicenseStatus } from "@/modules/ee/license-check/types/enterprise-license";
 import { Alert, AlertDescription } from "@/modules/ui/components/alert";
@@ -49,7 +50,8 @@ export const EnterpriseLicenseStatus = ({
   gracePeriodEnd,
   environmentId,
 }: EnterpriseLicenseStatusProps) => {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
+  const locale = i18n.resolvedLanguage ?? i18n.language ?? "en-US";
   const router = useRouter();
   const [isRechecking, setIsRechecking] = useState(false);
 
@@ -97,14 +99,7 @@ export const EnterpriseLicenseStatus = ({
             <div className="flex flex-wrap items-center gap-3">
               <Badge type={badgeConfig.type} text={badgeConfig.label} size="normal" className="w-fit" />
               <span className="text-sm text-slate-500">
-                {t("common.updated_at")}{" "}
-                {new Date(lastChecked).toLocaleString(undefined, {
-                  year: "numeric",
-                  month: "short",
-                  day: "numeric",
-                  hour: "numeric",
-                  minute: "2-digit",
-                })}
+                {t("common.updated_at")} {formatDateTimeForDisplay(new Date(lastChecked), locale)}
               </span>
             </div>
           </div>
@@ -132,7 +127,7 @@ export const EnterpriseLicenseStatus = ({
           <Alert variant="warning" size="small">
             <AlertDescription className="overflow-visible whitespace-normal">
               {t("environments.settings.enterprise.license_unreachable_grace_period", {
-                gracePeriodEnd: new Date(gracePeriodEnd).toLocaleDateString(undefined, {
+                gracePeriodEnd: formatDateForDisplay(new Date(gracePeriodEnd), locale, {
                   year: "numeric",
                   month: "short",
                   day: "numeric",

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

@@ -1,4 +1,5 @@
 import { getServerSession } from "next-auth";
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -17,15 +18,15 @@ const Layout = async (props: { params: Promise<{ environmentId: string }>; child
   ]);
 
   if (!organization) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
   if (!project) {
-    throw new Error(t("common.workspace_not_found"));
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   if (!session) {
-    throw new Error(t("common.session_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   return <>{children}</>;

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

@@ -1,7 +1,6 @@
 "use client";
 
 import {
-  type CollisionDetection,
   DndContext,
   type DragEndEvent,
   KeyboardSensor,
@@ -46,42 +45,6 @@ const SkeletonCell = () => (
   </Skeleton>
 );
 
-/**
- * Safari-safe collision detection that validates getBoundingClientRect() properties
- * before using them. Safari can sometimes return DOMRect objects with undefined
- * properties (particularly 'top'), which causes dnd-kit to throw TypeErrors.
- */
-const safariSafeClosestCenter: CollisionDetection = (args) => {
-  const { droppableContainers } = args;
-
-  // Filter droppable containers to only include those with valid bounding rects
-  const validDroppableContainers = droppableContainers.filter((container) => {
-    const rect = container.rect.current;
-    if (!rect) return false;
-
-    // Check if all required properties exist and are numbers
-    return (
-      typeof rect.top === "number" &&
-      typeof rect.left === "number" &&
-      typeof rect.right === "number" &&
-      typeof rect.bottom === "number" &&
-      typeof rect.width === "number" &&
-      typeof rect.height === "number"
-    );
-  });
-
-  // If all containers were filtered out, return empty array (no collision)
-  if (validDroppableContainers.length === 0) {
-    return [];
-  }
-
-  // Call the original closestCenter with validated containers
-  return closestCenter({
-    ...args,
-    droppableContainers: validDroppableContainers,
-  });
-};
-
 interface ResponseTableProps {
   data: TResponseTableData[];
   survey: TSurvey;
@@ -133,8 +96,8 @@ export const ResponseTable = ({
   const showQuotasColumn = isQuotasAllowed && quotas.length > 0;
   // Generate columns
   const columns = useMemo(
-    () => generateResponseTableColumns(survey, isExpanded ?? false, isReadOnly, t, showQuotasColumn),
-    [survey, isExpanded, isReadOnly, t, showQuotasColumn]
+    () => generateResponseTableColumns(survey, isExpanded ?? false, isReadOnly, locale, t, showQuotasColumn),
+    [survey, isExpanded, isReadOnly, locale, t, showQuotasColumn]
   );
 
   // Save settings to localStorage when they change
@@ -265,7 +228,7 @@ export const ResponseTable = ({
     <div>
       <DndContext
         id="response-table"
-        collisionDetection={safariSafeClosestCenter}
+        collisionDetection={closestCenter}
         modifiers={[restrictToHorizontalAxis]}
         onDragEnd={handleDragEnd}
         sensors={sensors}>
@@ -337,7 +300,6 @@ export const ResponseTable = ({
         <DataTableSettingsModal
           open={isTableSettingsModalOpen}
           setOpen={setIsTableSettingsModalOpen}
-          survey={survey}
           table={table}
           columnOrder={columnOrder}
           handleDragEnd={handleDragEnd}

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

@@ -8,10 +8,11 @@ import { TResponseTableData } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getTextContent } from "@formbricks/types/surveys/validation";
+import { TUserLocale } from "@formbricks/types/user";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { extractChoiceIdsFromResponse } from "@/lib/response/utils";
 import { getContactIdentifier } from "@/lib/utils/contact";
-import { getFormattedDateTimeString } from "@/lib/utils/datetime";
+import { formatDateTimeForDisplay } from "@/lib/utils/datetime";
 import { recallToHeadline } from "@/lib/utils/recall";
 import { RenderResponse } from "@/modules/analysis/components/SingleResponseCard/components/RenderResponse";
 import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
@@ -34,6 +35,7 @@ const getElementColumnsData = (
   element: TSurveyElement,
   survey: TSurvey,
   isExpanded: boolean,
+  locale: TUserLocale,
   t: TFunction
 ): ColumnDef<TResponseTableData>[] => {
   const ELEMENTS_ICON_MAP = getElementIconMap(t);
@@ -167,6 +169,7 @@ const getElementColumnsData = (
                 survey={survey}
                 responseData={responseValue}
                 language={language}
+                locale={locale}
                 isExpanded={isExpanded}
                 showId={false}
               />
@@ -218,6 +221,7 @@ const getElementColumnsData = (
                 survey={survey}
                 responseData={responseValue}
                 language={language}
+                locale={locale}
                 isExpanded={isExpanded}
                 showId={false}
               />
@@ -259,11 +263,14 @@ export const generateResponseTableColumns = (
   survey: TSurvey,
   isExpanded: boolean,
   isReadOnly: boolean,
+  locale: TUserLocale,
   t: TFunction,
   showQuotasColumn: boolean
 ): ColumnDef<TResponseTableData>[] => {
   const elements = getElementsFromBlocks(survey.blocks);
-  const elementColumns = elements.flatMap((element) => getElementColumnsData(element, survey, isExpanded, t));
+  const elementColumns = elements.flatMap((element) =>
+    getElementColumnsData(element, survey, isExpanded, locale, t)
+  );
 
   const dateColumn: ColumnDef<TResponseTableData> = {
     accessorKey: "createdAt",
@@ -271,7 +278,7 @@ export const generateResponseTableColumns = (
     size: 200,
     cell: ({ row }) => {
       const date = new Date(row.original.createdAt);
-      return <p className="text-slate-900">{getFormattedDateTimeString(date)}</p>;
+      return <p className="text-slate-900">{formatDateTimeForDisplay(date, locale)}</p>;
     },
   };
 

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

@@ -1,3 +1,4 @@
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { ResponsePage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
@@ -7,7 +8,6 @@ import { getResponseCountBySurveyId, getResponses } from "@/lib/response/service
 import { getSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { getUser } from "@/lib/user/service";
-import { findMatchingLocale } from "@/lib/utils/locale";
 import { getTranslate } from "@/lingodotdev/server";
 import { getSegments } from "@/modules/ee/contacts/segments/lib/segments";
 import { getIsContactsEnabled, getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
@@ -23,25 +23,24 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
 
   const { session, environment, organization, isReadOnly } = await getEnvironmentAuth(params.environmentId);
 
-  const [survey, user, tags, isContactsEnabled, responseCount, locale] = await Promise.all([
+  const [survey, user, tags, isContactsEnabled, responseCount] = await Promise.all([
     getSurvey(params.surveyId),
     getUser(session.user.id),
     getTagsByEnvironmentId(params.environmentId),
     getIsContactsEnabled(organization.id),
     getResponseCountBySurveyId(params.surveyId),
-    findMatchingLocale(),
   ]);
 
   if (!survey) {
-    throw new Error(t("common.survey_not_found"));
+    throw new ResourceNotFoundError(t("common.survey"), params.surveyId);
   }
 
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
 
   if (!organization) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), null);
   }
 
   const segments = isContactsEnabled ? await getSegments(params.environmentId) : [];
@@ -50,7 +49,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
 
   const organizationBilling = await getOrganizationBilling(organization.id);
   if (!organizationBilling) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), organization.id);
   }
 
   const isQuotasAllowed = await getIsQuotasEnabled(organization.id);
@@ -86,7 +85,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
         environmentTags={tags}
         user={user}
         responsesPerPage={RESPONSES_PER_PAGE}
-        locale={locale}
+        locale={user.locale}
         isReadOnly={isReadOnly}
         isQuotasAllowed={isQuotasAllowed}
         quotas={quotas}

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

@@ -7,7 +7,7 @@ import { TSurvey, TSurveyElementSummaryDate } from "@formbricks/types/surveys/ty
 import { TUserLocale } from "@formbricks/types/user";
 import { timeSince } from "@/lib/time";
 import { getContactIdentifier } from "@/lib/utils/contact";
-import { formatDateWithOrdinal } from "@/lib/utils/datetime";
+import { formatStoredDateForDisplay } from "@/lib/utils/date-display";
 import { PersonAvatar } from "@/modules/ui/components/avatars";
 import { Button } from "@/modules/ui/components/button";
 import { EmptyState } from "@/modules/ui/components/empty-state";
@@ -32,13 +32,14 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
   };
 
   const renderResponseValue = (value: string) => {
-    const parsedDate = new Date(value);
+    const formattedDate = formatStoredDateForDisplay(value, elementSummary.element.format, locale);
 
-    const formattedDate = isNaN(parsedDate.getTime())
-      ? `${t("common.invalid_date")}(${value})`
-      : formatDateWithOrdinal(parsedDate);
-
-    return formattedDate;
+    return (
+      formattedDate ??
+      t("common.invalid_date_with_value", {
+        value,
+      })
+    );
   };
 
   return (
@@ -59,7 +60,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
             elementSummary.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">
+                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent">
                 <div className="pl-4 md:pl-6">
                   {response.contact ? (
                     <Link
@@ -84,7 +85,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
                 <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">
+                <div className="px-4 md:px-6">
                   {timeSince(new Date(response.updatedAt).toISOString(), locale)}
                 </div>
               </div>

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

@@ -1,3 +1,4 @@
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getSurvey } from "@/lib/survey/service";
@@ -9,11 +10,11 @@ export const getEmailTemplateHtml = async (surveyId: string, locale: string) =>
   const t = await getTranslate();
   const survey = await getSurvey(surveyId);
   if (!survey) {
-    throw new Error("Survey not found");
+    throw new ResourceNotFoundError(t("common.survey"), surveyId);
   }
   const project = await getProjectByEnvironmentId(survey.environmentId);
   if (!project) {
-    throw new Error("Workspace not found");
+    throw new ResourceNotFoundError(t("common.workspace"), null);
   }
 
   const styling = getStyling(project, survey);

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

@@ -11,8 +11,7 @@ import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
-import { evaluateLogic, performActions } from "@/lib/surveyLogic/utils";
-import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
+import { getElementsFromBlocks } from "@/lib/survey/utils";
 import {
   getElementSummary,
   getResponsesForSummary,
@@ -44,7 +43,7 @@ vi.mock("@/lib/survey/service", () => ({
 }));
 vi.mock("@/lib/surveyLogic/utils", () => ({
   evaluateLogic: vi.fn(),
-  performActions: vi.fn(() => ({ jumpTarget: undefined, requiredQuestionIds: [], calculations: {} })),
+  performActions: vi.fn(() => ({ jumpTarget: undefined, requiredElementIds: [], calculations: {} })),
 }));
 vi.mock("@/lib/utils/validate", () => ({
   validateInputs: vi.fn(),
@@ -229,12 +228,6 @@ describe("getSurveySummaryDropOff", () => {
     vi.mocked(convertFloatTo2Decimal).mockImplementation((num) =>
       num !== undefined && num !== null ? parseFloat(num.toFixed(2)) : 0
     );
-    vi.mocked(evaluateLogic).mockReturnValue(false); // Default: no logic triggers
-    vi.mocked(performActions).mockReturnValue({
-      jumpTarget: undefined,
-      requiredElementIds: [],
-      calculations: {},
-    });
   });
 
   test("calculates dropOff correctly with welcome card disabled", () => {
@@ -246,7 +239,7 @@ describe("getSurveySummaryDropOff", () => {
         contact: null,
         contactAttributes: {},
         language: "en",
-        ttc: { q1: 10 },
+        ttc: { q1: 10, q2: 5 }, // Saw q2 but didn't answer it
         finished: false,
       }, // Dropped at q2
       {
@@ -269,22 +262,55 @@ describe("getSurveySummaryDropOff", () => {
     );
 
     expect(dropOff.length).toBe(2);
-    // Q1
+    // Q1: welcome card disabled so impressions = displayCount
     expect(dropOff[0].elementId).toBe("q1");
-    expect(dropOff[0].impressions).toBe(displayCount); // Welcome card disabled, so first question impressions = displayCount
+    expect(dropOff[0].impressions).toBe(displayCount);
     expect(dropOff[0].dropOffCount).toBe(displayCount - responses.length); // 5 displays - 2 started = 3 dropped before q1
     expect(dropOff[0].dropOffPercentage).toBe(60); // (3/5)*100
     expect(dropOff[0].ttc).toBe(10);
 
-    // Q2
+    // Q2: both responses saw q2 (r1 has ttc for q2, r2 answered q2)
     expect(dropOff[1].elementId).toBe("q2");
-    expect(dropOff[1].impressions).toBe(responses.length); // 2 responses reached q1, so 2 impressions for q2
-    expect(dropOff[1].dropOffCount).toBe(1); // 1 response dropped at q2
+    expect(dropOff[1].impressions).toBe(2);
+    expect(dropOff[1].dropOffCount).toBe(1); // r1 dropped at q2 (last seen element)
     expect(dropOff[1].dropOffPercentage).toBe(50); // (1/2)*100
-    expect(dropOff[1].ttc).toBe(10);
+    expect(dropOff[1].ttc).toBe(7.5); // avg of r1(5ms) and r2(10ms)
   });
 
-  test("handles logic jumps", () => {
+  test("drop-off attributed to last seen element when user doesn't reach next question", () => {
+    // Welcome card enabled so first element drop-off is NOT overridden by displayCount
+    const surveyWithWelcome: TSurvey = {
+      ...surveyWithBlocks,
+      welcomeCard: { enabled: true, headline: { default: "Welcome" } } as unknown as TSurvey["welcomeCard"],
+    };
+    const responses = [
+      {
+        id: "r1",
+        data: { q1: "a" },
+        updatedAt: new Date(),
+        contact: null,
+        contactAttributes: {},
+        language: "en",
+        ttc: { q1: 10 }, // Only saw q1, never reached q2
+        finished: false,
+      },
+    ] as any;
+    const displayCount = 1;
+    const dropOff = getSurveySummaryDropOff(
+      surveyWithWelcome,
+      getElementsFromBlocks(surveyWithWelcome.blocks),
+      responses,
+      displayCount
+    );
+
+    expect(dropOff[0].impressions).toBe(1); // Saw q1
+    expect(dropOff[0].dropOffCount).toBe(1); // Dropped at q1 (last seen element)
+    expect(dropOff[1].impressions).toBe(0); // Never saw q2
+    expect(dropOff[1].dropOffCount).toBe(0);
+  });
+
+  test("handles logic jumps — impressions based on actual ttc/data, not logic replay", () => {
+    // Survey with 4 questions across 4 blocks, logic on block2 jumps q2->q4 (skipping q3)
     const surveyWithLogic: TSurvey = {
       ...mockBaseSurvey,
       blocks: [
@@ -315,36 +341,6 @@ describe("getSurveySummaryDropOff", () => {
               charLimit: { enabled: false },
             },
           ] as TSurveyElement[],
-          logic: [
-            {
-              id: "logic1",
-              conditions: {
-                id: "condition1",
-                connector: "and" as const,
-                conditions: [
-                  {
-                    id: "c1",
-                    leftOperand: {
-                      type: "element" as const,
-                      value: "q2",
-                    },
-                    operator: "equals" as const,
-                    rightOperand: {
-                      type: "static" as const,
-                      value: "b",
-                    },
-                  },
-                ],
-              },
-              actions: [
-                {
-                  id: "action1",
-                  objective: "jumpToBlock" as const,
-                  target: "q4",
-                },
-              ],
-            },
-          ],
         },
         {
           id: "block3",
@@ -377,28 +373,21 @@ describe("getSurveySummaryDropOff", () => {
       ],
       questions: [],
     };
+
+    // Response where user answered q1, q2, then logic jumped to q4 (skipping q3).
+    // The ttc/data reflects exactly what elements were shown — no logic replay needed.
     const responses = [
       {
         id: "r1",
-        data: { q1: "a", q2: "b" },
+        data: { q1: "a", q2: "b", q4: "d" },
         updatedAt: new Date(),
         contact: null,
         contactAttributes: {},
         language: "en",
-        ttc: { q1: 10, q2: 10 },
+        ttc: { q1: 10, q2: 10, q4: 10 }, // q3 has no ttc entry — was skipped by logic
         finished: false,
-      }, // Jumps from q2 to q4, drops at q4
+      },
     ];
-    vi.mocked(evaluateLogic).mockImplementation((_s, data, _v, _, _l) => {
-      // Simulate logic on q2 triggering
-      return data.q2 === "b";
-    });
-    vi.mocked(performActions).mockImplementation((_s, actions, _d, _v) => {
-      if (actions[0] && "objective" in actions[0] && actions[0].objective === "jumpToBlock") {
-        return { jumpTarget: actions[0].target, requiredElementIds: [], calculations: {} };
-      }
-      return { jumpTarget: undefined, requiredElementIds: [], calculations: {} };
-    });
 
     const dropOff = getSurveySummaryDropOff(
       surveyWithLogic,
@@ -407,11 +396,11 @@ describe("getSurveySummaryDropOff", () => {
       1
     );
 
-    expect(dropOff[0].impressions).toBe(1); // q1
-    expect(dropOff[1].impressions).toBe(1); // q2
-    expect(dropOff[2].impressions).toBe(0); // q3 (skipped)
-    expect(dropOff[3].impressions).toBe(1); // q4 (jumped to)
-    expect(dropOff[3].dropOffCount).toBe(1); // Dropped at q4
+    expect(dropOff[0].impressions).toBe(1); // q1: seen
+    expect(dropOff[1].impressions).toBe(1); // q2: seen
+    expect(dropOff[2].impressions).toBe(0); // q3: skipped by logic (no ttc, no data)
+    expect(dropOff[3].impressions).toBe(1); // q4: jumped to, seen
+    expect(dropOff[3].dropOffCount).toBe(1); // Dropped at q4 (last seen element, not finished)
   });
 });
 

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

@@ -11,7 +11,6 @@ import {
   TResponseData,
   TResponseFilterCriteria,
   TResponseTtc,
-  TResponseVariables,
   ZResponseFilterCriteria,
 } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
@@ -37,8 +36,7 @@ import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { buildWhereClause } from "@/lib/response/utils";
 import { getSurvey } from "@/lib/survey/service";
-import { findElementLocation, getElementsFromBlocks } from "@/lib/survey/utils";
-import { evaluateLogic, performActions } from "@/lib/surveyLogic/utils";
+import { getElementsFromBlocks } from "@/lib/survey/utils";
 import { validateInputs } from "@/lib/utils/validate";
 import { convertFloatTo2Decimal } from "./utils";
 
@@ -93,63 +91,13 @@ export const getSurveySummaryMeta = (
   };
 };
 
-const evaluateLogicAndGetNextElementId = (
-  localSurvey: TSurvey,
-  elements: TSurveyElement[],
-  data: TResponseData,
-  localVariables: TResponseVariables,
-  currentElementIndex: number,
-  currElementTemp: TSurveyElement,
-  selectedLanguage: string | null
-): {
-  nextElementId: string | undefined;
-  updatedSurvey: TSurvey;
-  updatedVariables: TResponseVariables;
-} => {
-  let updatedSurvey = { ...localSurvey };
-  let updatedVariables = { ...localVariables };
-
-  let firstJumpTarget: string | undefined;
-
-  const { block: currentBlock } = findElementLocation(localSurvey, currElementTemp.id);
-
-  if (currentBlock?.logic && currentBlock.logic.length > 0) {
-    for (const logic of currentBlock.logic) {
-      if (evaluateLogic(localSurvey, data, localVariables, logic.conditions, selectedLanguage ?? "default")) {
-        const { jumpTarget, requiredElementIds, calculations } = performActions(
-          updatedSurvey,
-          logic.actions,
-          data,
-          updatedVariables
-        );
-
-        if (requiredElementIds.length > 0) {
-          // Update blocks to mark elements as required
-          updatedSurvey.blocks = updatedSurvey.blocks.map((block) => ({
-            ...block,
-            elements: block.elements.map((e) =>
-              requiredElementIds.includes(e.id) ? { ...e, required: true } : e
-            ),
-          }));
-        }
-        updatedVariables = { ...updatedVariables, ...calculations };
-
-        if (jumpTarget && !firstJumpTarget) {
-          firstJumpTarget = jumpTarget;
-        }
-      }
-    }
-  }
-
-  // If no jump target was set, check for a fallback logic
-  if (!firstJumpTarget && currentBlock?.logicFallback) {
-    firstJumpTarget = currentBlock.logicFallback;
-  }
-
-  // Return the first jump target if found, otherwise go to the next element
-  const nextElementId = firstJumpTarget || elements[currentElementIndex + 1]?.id || undefined;
-
-  return { nextElementId, updatedSurvey, updatedVariables };
+// Determine whether a response interacted with a given element.
+// An element was "seen" if the respondent has a ttc entry for it OR provided an answer.
+// This is more reliable than replaying survey logic, which can misattribute impressions
+// when branching logic skips elements or when partial response data is insufficient
+// to evaluate conditions correctly.
+const wasElementSeen = (response: TSurveySummaryResponse, elementId: string): boolean => {
+  return (response.ttc != null && response.ttc[elementId] > 0) || response.data[elementId] !== undefined;
 };
 
 export const getSurveySummaryDropOff = (
@@ -170,16 +118,8 @@ export const getSurveySummaryDropOff = (
   let impressionsArr = new Array(elements.length).fill(0) as number[];
   let dropOffPercentageArr = new Array(elements.length).fill(0) as number[];
 
-  const surveyVariablesData = survey.variables?.reduce(
-    (acc, variable) => {
-      acc[variable.id] = variable.value;
-      return acc;
-    },
-    {} as Record<string, string | number>
-  );
-
   responses.forEach((response) => {
-    // Calculate total time-to-completion
+    // Calculate total time-to-completion per element
     Object.keys(totalTtc).forEach((elementId) => {
       if (response.ttc && response.ttc[elementId]) {
         totalTtc[elementId] += response.ttc[elementId];
@@ -187,51 +127,21 @@ export const getSurveySummaryDropOff = (
       }
     });
 
-    let localSurvey = structuredClone(survey);
-    let localResponseData: TResponseData = { ...response.data };
-    let localVariables: TResponseVariables = {
-      ...surveyVariablesData,
-    };
+    // Count impressions based on actual interaction data (ttc + response data)
+    // instead of replaying survey logic which is unreliable with branching
+    let lastSeenIdx = -1;
 
-    let currQuesIdx = 0;
-
-    while (currQuesIdx < elements.length) {
-      const currQues = elements[currQuesIdx];
-      if (!currQues) break;
-
-      // element is not answered and required
-      if (response.data[currQues.id] === undefined && currQues.required) {
-        dropOffArr[currQuesIdx]++;
-        impressionsArr[currQuesIdx]++;
-        break;
+    for (let i = 0; i < elements.length; i++) {
+      const element = elements[i];
+      if (wasElementSeen(response, element.id)) {
+        impressionsArr[i]++;
+        lastSeenIdx = i;
       }
+    }
 
-      impressionsArr[currQuesIdx]++;
-
-      const { nextElementId, updatedSurvey, updatedVariables } = evaluateLogicAndGetNextElementId(
-        localSurvey,
-        elements,
-        localResponseData,
-        localVariables,
-        currQuesIdx,
-        currQues,
-        response.language
-      );
-
-      localSurvey = updatedSurvey;
-      localVariables = updatedVariables;
-
-      if (nextElementId) {
-        const nextQuesIdx = elements.findIndex((q) => q.id === nextElementId);
-        if (!response.data[nextElementId] && !response.finished) {
-          dropOffArr[nextQuesIdx]++;
-          impressionsArr[nextQuesIdx]++;
-          break;
-        }
-        currQuesIdx = nextQuesIdx;
-      } else {
-        currQuesIdx++;
-      }
+    // Attribute drop-off to the last element the respondent interacted with
+    if (!response.finished && lastSeenIdx >= 0) {
+      dropOffArr[lastSeenIdx]++;
     }
   });
 
@@ -240,6 +150,8 @@ export const getSurveySummaryDropOff = (
     totalTtc[elementId] = responseCounts[elementId] > 0 ? totalTtc[elementId] / responseCounts[elementId] : 0;
   });
 
+  // When the welcome card is disabled, the first element's impressions should equal displayCount
+  // because every survey display is an impression of the first element
   if (!survey.welcomeCard.enabled) {
     dropOffArr[0] = displayCount - impressionsArr[0];
     if (impressionsArr[0] > displayCount) dropOffPercentageArr[0] = 0;
@@ -251,7 +163,7 @@ export const getSurveySummaryDropOff = (
 
     impressionsArr[0] = displayCount;
   } else {
-    dropOffPercentageArr[0] = (dropOffArr[0] / impressionsArr[0]) * 100;
+    dropOffPercentageArr[0] = impressionsArr[0] > 0 ? (dropOffArr[0] / impressionsArr[0]) * 100 : 0;
   }
 
   for (let i = 1; i < elements.length; i++) {

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

@@ -1,4 +1,5 @@
 import { notFound } from "next/navigation";
+import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { SummaryPage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
@@ -32,13 +33,13 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const survey = await getSurvey(params.surveyId);
 
   if (!survey) {
-    throw new Error(t("common.survey_not_found"));
+    throw new ResourceNotFoundError(t("common.survey"), params.surveyId);
   }
 
   const user = await getUser(session.user.id);
 
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    throw new AuthenticationError(t("common.not_authenticated"));
   }
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
@@ -46,11 +47,11 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const segments = isContactsEnabled ? await getSegments(environment.id) : [];
 
   if (!organizationId) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), null);
   }
   const organizationBilling = await getOrganizationBilling(organizationId);
   if (!organizationBilling) {
-    throw new Error(t("common.organization_not_found"));
+    throw new ResourceNotFoundError(t("common.organization"), organizationId);
   }
   const isQuotasAllowed = await getIsQuotasEnabled(organizationId);
 

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

@@ -2,21 +2,16 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ZResponseFilterCriteria } from "@formbricks/types/responses";
-import { ZSurvey } from "@formbricks/types/surveys/types";
-import { getOrganization } from "@/lib/organization/service";
 import { getResponseDownloadFile, getResponseFilteringValues } from "@/lib/response/service";
-import { getSurvey, updateSurvey } from "@/lib/survey/service";
+import { getSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
-import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getQuotas } from "@/modules/ee/quotas/lib/quotas";
-import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
-import { checkSpamProtectionPermission } from "@/modules/survey/lib/permission";
 import { getOrganizationBilling } from "@/modules/survey/lib/survey";
 
 const ZGetResponsesDownloadUrlAction = z.object({
@@ -97,68 +92,3 @@ export const getSurveyFilterDataAction = authenticatedActionClient
 
     return { environmentTags: tags, attributes, meta, hiddenFields, quotas };
   });
-
-/**
- * Checks if survey follow-ups are enabled for the given organization.
- *
- * @param {string} organizationId  The ID of the organization to check.
- * @returns {Promise<void>}  A promise that resolves if the permission is granted.
- * @throws {ResourceNotFoundError}  If the organization is not found.
- * @throws {OperationNotAllowedError}  If survey follow-ups are not enabled for the organization.
- */
-const checkSurveyFollowUpsPermission = async (organizationId: string): Promise<void> => {
-  const organization = await getOrganization(organizationId);
-
-  if (!organization) {
-    throw new ResourceNotFoundError("Organization not found", organizationId);
-  }
-
-  const isSurveyFollowUpsEnabled = await getSurveyFollowUpsPermission(organizationId);
-  if (!isSurveyFollowUpsEnabled) {
-    throw new OperationNotAllowedError("Survey follow ups are not enabled for this organization");
-  }
-};
-
-export const updateSurveyAction = authenticatedActionClient.inputSchema(ZSurvey).action(
-  withAuditLogging("updated", "survey", async ({ ctx, parsedInput }) => {
-    const organizationId = await getOrganizationIdFromSurveyId(parsedInput.id);
-    await checkAuthorizationUpdated({
-      userId: ctx.user?.id ?? "",
-      organizationId,
-      access: [
-        {
-          type: "organization",
-          roles: ["owner", "manager"],
-        },
-        {
-          type: "projectTeam",
-          projectId: await getProjectIdFromSurveyId(parsedInput.id),
-          minPermission: "readWrite",
-        },
-      ],
-    });
-
-    const { followUps } = parsedInput;
-
-    const oldSurvey = await getSurvey(parsedInput.id);
-
-    if (parsedInput.recaptcha?.enabled) {
-      await checkSpamProtectionPermission(organizationId);
-    }
-
-    if (followUps?.length) {
-      await checkSurveyFollowUpsPermission(organizationId);
-    }
-
-    // Context for audit log
-    ctx.auditLoggingCtx.surveyId = parsedInput.id;
-    ctx.auditLoggingCtx.organizationId = organizationId;
-    ctx.auditLoggingCtx.oldObject = oldSurvey;
-
-    const newSurvey = await updateSurvey(parsedInput);
-
-    ctx.auditLoggingCtx.newObject = newSurvey;
-
-    return newSurvey;
-  })
-);

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

@@ -1,6 +1,7 @@
 "use client";
 
 import clsx from "clsx";
+import { TFunction } from "i18next";
 import {
   AirplayIcon,
   ArrowUpFromDotIcon,
@@ -54,6 +55,25 @@ export enum OptionsType {
   QUOTAS = "Quotas",
 }
 
+const getOptionsTypeTranslationKey = (type: OptionsType, t: TFunction): string => {
+  switch (type) {
+    case OptionsType.ELEMENTS:
+      return t("common.elements");
+    case OptionsType.TAGS:
+      return t("common.tags");
+    case OptionsType.ATTRIBUTES:
+      return t("common.attributes");
+    case OptionsType.OTHERS:
+      return t("common.other_filters");
+    case OptionsType.META:
+      return t("common.meta");
+    case OptionsType.HIDDEN_FIELDS:
+      return t("common.hidden_fields");
+    case OptionsType.QUOTAS:
+      return t("common.quotas");
+  }
+};
+
 export type ElementOption = {
   label: string;
   elementType?: TSurveyElementTypeEnum;
@@ -218,7 +238,12 @@ export const ElementsComboBox = ({ options, selected, onChangeValue }: ElementCo
             {options?.map((data) => (
               <Fragment key={data.header}>
                 {data?.option.length > 0 && (
-                  <CommandGroup heading={<p className="text-sm font-medium text-slate-600">{data.header}</p>}>
+                  <CommandGroup
+                    heading={
+                      <p className="text-sm font-medium text-slate-600">
+                        {getOptionsTypeTranslationKey(data.header, t)}
+                      </p>
+                    }>
                     {data?.option?.map((o) => (
                       <CommandItem
                         key={o.id}

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

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
+import { updateSurveyAction } from "@/modules/survey/editor/actions";
 import {
   Select,
   SelectContent,
@@ -14,7 +15,6 @@ import {
   SelectValue,
 } from "@/modules/ui/components/select";
 import { SurveyStatusIndicator } from "@/modules/ui/components/survey-status-indicator";
-import { updateSurveyAction } from "../actions";
 
 interface SurveyStatusDropdownProps {
   environment: TEnvironment;

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

@@ -1,4 +1,6 @@
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getSurvey } from "@/lib/survey/service";
+import { getTranslate } from "@/lingodotdev/server";
 import { SurveyContextWrapper } from "./context/survey-context";
 
 interface SurveyLayoutProps {
@@ -10,9 +12,10 @@ const SurveyLayout = async ({ params, children }: SurveyLayoutProps) => {
   const resolvedParams = await params;
 
   const survey = await getSurvey(resolvedParams.surveyId);
+  const t = await getTranslate();
 
   if (!survey) {
-    throw new Error("Survey not found");
+    throw new ResourceNotFoundError(t("common.survey"), resolvedParams.surveyId);
   }
 
   return <SurveyContextWrapper survey={survey}>{children}</SurveyContextWrapper>;

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

@@ -4,9 +4,9 @@ import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
 import { AirtableWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/airtable/components/AirtableWrapper";
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import { getAirtableTables } from "@/lib/airtable/service";
-import { AIRTABLE_CLIENT_ID, WEBAPP_URL } from "@/lib/constants";
+import { AIRTABLE_CLIENT_ID, DEFAULT_LOCALE, WEBAPP_URL } from "@/lib/constants";
 import { getIntegrations } from "@/lib/integration/service";
-import { findMatchingLocale } from "@/lib/utils/locale";
+import { getUserLocale } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -18,11 +18,12 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const t = await getTranslate();
   const isEnabled = !!AIRTABLE_CLIENT_ID;
 
-  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, integrations] = await Promise.all([
+  const [surveys, integrations, locale] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrations(params.environmentId),
+    getUserLocale(session.user.id),
   ]);
 
   const airtableIntegration: TIntegrationAirtable | undefined = integrations?.find(
@@ -33,9 +34,6 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   if (airtableIntegration?.config.key) {
     airtableArray = await getAirtableTables(params.environmentId);
   }
-
-  const locale = await findMatchingLocale();
-
   if (isReadOnly) {
     return redirect("./");
   }
@@ -52,7 +50,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           environmentId={environment.id}
           surveys={surveys}
           webAppUrl={WEBAPP_URL}
-          locale={locale}
+          locale={locale ?? DEFAULT_LOCALE}
         />
       </div>
     </PageContentWrapper>

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

@@ -3,13 +3,14 @@ import { TIntegrationGoogleSheets } from "@formbricks/types/integration/google-s
 import { GoogleSheetWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/GoogleSheetWrapper";
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import {
+  DEFAULT_LOCALE,
   GOOGLE_SHEETS_CLIENT_ID,
   GOOGLE_SHEETS_CLIENT_SECRET,
   GOOGLE_SHEETS_REDIRECT_URL,
   WEBAPP_URL,
 } from "@/lib/constants";
 import { getIntegrations } from "@/lib/integration/service";
-import { findMatchingLocale } from "@/lib/utils/locale";
+import { getUserLocale } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -21,19 +22,17 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const t = await getTranslate();
   const isEnabled = !!(GOOGLE_SHEETS_CLIENT_ID && GOOGLE_SHEETS_CLIENT_SECRET && GOOGLE_SHEETS_REDIRECT_URL);
 
-  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, integrations] = await Promise.all([
+  const [surveys, integrations, locale] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrations(params.environmentId),
+    getUserLocale(session.user.id),
   ]);
 
   const googleSheetIntegration: TIntegrationGoogleSheets | undefined = integrations?.find(
     (integration): integration is TIntegrationGoogleSheets => integration.type === "googleSheets"
   );
-
-  const locale = await findMatchingLocale();
-
   if (isReadOnly) {
     return redirect("./");
   }
@@ -49,7 +48,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           surveys={surveys}
           googleSheetIntegration={googleSheetIntegration}
           webAppUrl={WEBAPP_URL}
-          locale={locale}
+          locale={locale ?? DEFAULT_LOCALE}
         />
       </div>
     </PageContentWrapper>

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

@@ -3,6 +3,7 @@ import { TIntegrationNotion, TIntegrationNotionDatabase } from "@formbricks/type
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import { NotionWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/notion/components/NotionWrapper";
 import {
+  DEFAULT_LOCALE,
   NOTION_AUTH_URL,
   NOTION_OAUTH_CLIENT_ID,
   NOTION_OAUTH_CLIENT_SECRET,
@@ -11,7 +12,7 @@ import {
 } from "@/lib/constants";
 import { getIntegrationByType } from "@/lib/integration/service";
 import { getNotionDatabases } from "@/lib/notion/service";
-import { findMatchingLocale } from "@/lib/utils/locale";
+import { getUserLocale } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -28,18 +29,18 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
     NOTION_REDIRECT_URI
   );
 
-  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, notionIntegration] = await Promise.all([
+  const [surveys, notionIntegration, locale] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrationByType(params.environmentId, "notion"),
+    getUserLocale(session.user.id),
   ]);
 
   let databasesArray: TIntegrationNotionDatabase[] = [];
   if (notionIntegration && (notionIntegration as TIntegrationNotion).config.key?.bot_id) {
     databasesArray = (await getNotionDatabases(environment.id)) ?? [];
   }
-  const locale = await findMatchingLocale();
 
   if (isReadOnly) {
     return redirect("./");
@@ -56,7 +57,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
         notionIntegration={notionIntegration as TIntegrationNotion}
         webAppUrl={WEBAPP_URL}
         databasesArray={databasesArray}
-        locale={locale}
+        locale={locale ?? DEFAULT_LOCALE}
       />
     </PageContentWrapper>
   );

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

@@ -2,9 +2,9 @@ import { redirect } from "next/navigation";
 import { TIntegrationSlack } from "@formbricks/types/integration/slack";
 import { getSurveys } from "@/app/(app)/environments/[environmentId]/workspace/integrations/lib/surveys";
 import { SlackWrapper } from "@/app/(app)/environments/[environmentId]/workspace/integrations/slack/components/SlackWrapper";
-import { SLACK_CLIENT_ID, SLACK_CLIENT_SECRET, WEBAPP_URL } from "@/lib/constants";
+import { DEFAULT_LOCALE, SLACK_CLIENT_ID, SLACK_CLIENT_SECRET, WEBAPP_URL } from "@/lib/constants";
 import { getIntegrationByType } from "@/lib/integration/service";
-import { findMatchingLocale } from "@/lib/utils/locale";
+import { getUserLocale } from "@/lib/user/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { GoBackButton } from "@/modules/ui/components/go-back-button";
@@ -17,15 +17,14 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
 
   const t = await getTranslate();
 
-  const { isReadOnly, environment } = await getEnvironmentAuth(params.environmentId);
+  const { isReadOnly, environment, session } = await getEnvironmentAuth(params.environmentId);
 
-  const [surveys, slackIntegration] = await Promise.all([
+  const [surveys, slackIntegration, locale] = await Promise.all([
     getSurveys(params.environmentId),
     getIntegrationByType(params.environmentId, "slack"),
+    getUserLocale(session.user.id),
   ]);
 
-  const locale = await findMatchingLocale();
-
   if (isReadOnly) {
     return redirect("./");
   }
@@ -41,7 +40,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
           surveys={surveys}
           slackIntegration={slackIntegration as TIntegrationSlack}
           webAppUrl={WEBAPP_URL}
-          locale={locale}
+          locale={locale ?? DEFAULT_LOCALE}
         />
       </div>
     </PageContentWrapper>

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

@@ -6,8 +6,10 @@ import {
   CHATWOOT_WEBSITE_TOKEN,
   IS_CHATWOOT_CONFIGURED,
   POSTHOG_KEY,
+  SESSION_MAX_AGE,
 } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
+import { NextAuthProvider } from "@/modules/auth/components/next-auth-provider";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { ClientLogout } from "@/modules/ui/components/client-logout";
 import { NoMobileOverlay } from "@/modules/ui/components/no-mobile-overlay";
@@ -23,7 +25,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
   }
 
   return (
-    <>
+    <NextAuthProvider sessionMaxAge={SESSION_MAX_AGE}>
       <NoMobileOverlay />
       {POSTHOG_KEY && user && (
         <PostHogIdentify posthogKey={POSTHOG_KEY} userId={user.id} email={user.email} name={user.name} />
@@ -39,7 +41,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
       )}
       <ToasterClient />
       {children}
-    </>
+    </NextAuthProvider>
   );
 };
 

apps/web/app/api/v1/management/surveys/[surveyId]/lib/surveys.ts

@@ -3,33 +3,40 @@ import { z } from "zod";
 import { prisma } from "@formbricks/database";
 import { logger } from "@formbricks/logger";
 import { DatabaseError } from "@formbricks/types/errors";
+import { deleteSurveyLifecycleJobs } from "@/lib/river/survey-lifecycle";
 import { validateInputs } from "@/lib/utils/validate";
 
 export const deleteSurvey = async (surveyId: string) => {
   validateInputs([surveyId, z.cuid2()]);
 
   try {
-    const deletedSurvey = await prisma.survey.delete({
-      where: {
-        id: surveyId,
-      },
-      include: {
-        segment: true,
-        triggers: {
-          include: {
-            actionClass: true,
+    const deletedSurvey = await prisma.$transaction(async (tx) => {
+      await deleteSurveyLifecycleJobs({ tx, surveyId });
+
+      const removedSurvey = await tx.survey.delete({
+        where: {
+          id: surveyId,
+        },
+        include: {
+          segment: true,
+          triggers: {
+            include: {
+              actionClass: true,
+            },
           },
         },
-      },
-    });
-
-    if (deletedSurvey.type === "app" && deletedSurvey.segment?.isPrivate) {
-      await prisma.segment.delete({
-        where: {
-          id: deletedSurvey.segment.id,
-        },
       });
-    }
+
+      if (removedSurvey.type === "app" && removedSurvey.segment?.isPrivate) {
+        await tx.segment.delete({
+          where: {
+            id: removedSurvey.segment.id,
+          },
+        });
+      }
+
+      return removedSurvey;
+    });
 
     return deletedSurvey;
   } catch (error) {

apps/web/app/api/v3/lib/api-wrapper.test.ts

@@ -0,0 +1,324 @@
+import { NextRequest } from "next/server";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { z } from "zod";
+import { TooManyRequestsError } from "@formbricks/types/errors";
+import { withV3ApiWrapper } from "./api-wrapper";
+
+const { mockAuthenticateRequest, mockGetServerSession } = vi.hoisted(() => ({
+  mockAuthenticateRequest: vi.fn(),
+  mockGetServerSession: vi.fn(),
+}));
+
+vi.mock("next-auth", () => ({
+  getServerSession: mockGetServerSession,
+}));
+
+vi.mock("@/app/api/v1/auth", () => ({
+  authenticateRequest: mockAuthenticateRequest,
+}));
+
+vi.mock("@/modules/auth/lib/authOptions", () => ({
+  authOptions: {},
+}));
+
+vi.mock("@/modules/core/rate-limit/helpers", () => ({
+  applyRateLimit: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    withContext: vi.fn(() => ({
+      error: vi.fn(),
+      warn: vi.fn(),
+    })),
+  },
+}));
+
+describe("withV3ApiWrapper", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    mockGetServerSession.mockResolvedValue(null);
+    mockAuthenticateRequest.mockResolvedValue(null);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("uses session auth first in both mode and injects request id into plain responses", async () => {
+    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
+    mockGetServerSession.mockResolvedValue({
+      user: { id: "user_1", name: "Test", email: "t@example.com" },
+      expires: "2026-01-01",
+    });
+
+    const handler = vi.fn(async ({ authentication, requestId, instance }) => {
+      expect(authentication).toMatchObject({ user: { id: "user_1" } });
+      expect(requestId).toBe("req-1");
+      expect(instance).toBe("/api/v3/surveys");
+      return Response.json({ ok: true });
+    });
+
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      handler,
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys?limit=10", {
+        headers: { "x-request-id": "req-1" },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(200);
+    expect(response.headers.get("X-Request-Id")).toBe("req-1");
+    expect(handler).toHaveBeenCalledOnce();
+    expect(vi.mocked(applyRateLimit)).toHaveBeenCalledWith(
+      expect.objectContaining({ namespace: "api:v3" }),
+      "user_1"
+    );
+    expect(mockAuthenticateRequest).not.toHaveBeenCalled();
+  });
+
+  test("falls back to api key auth in both mode", async () => {
+    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
+    mockAuthenticateRequest.mockResolvedValue({
+      type: "apiKey",
+      apiKeyId: "key_1",
+      organizationId: "org_1",
+      organizationAccess: { accessControl: { read: true, write: false } },
+      environmentPermissions: [],
+    });
+
+    const handler = vi.fn(async ({ authentication }) => {
+      expect(authentication).toMatchObject({ apiKeyId: "key_1" });
+      return Response.json({ ok: true });
+    });
+
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      handler,
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys", {
+        headers: { "x-api-key": "fbk_test" },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(200);
+    expect(vi.mocked(applyRateLimit)).toHaveBeenCalledWith(
+      expect.objectContaining({ namespace: "api:v3" }),
+      "key_1"
+    );
+    expect(mockGetServerSession).not.toHaveBeenCalled();
+  });
+
+  test("returns 401 problem response when authentication is required but missing", async () => {
+    const handler = vi.fn(async () => Response.json({ ok: true }));
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      handler,
+    });
+
+    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {} as never);
+
+    expect(response.status).toBe(401);
+    expect(handler).not.toHaveBeenCalled();
+    expect(response.headers.get("Content-Type")).toBe("application/problem+json");
+  });
+
+  test("returns 400 problem response for invalid query input", async () => {
+    mockGetServerSession.mockResolvedValue({
+      user: { id: "user_1" },
+      expires: "2026-01-01",
+    });
+
+    const handler = vi.fn(async () => Response.json({ ok: true }));
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      schemas: {
+        query: z.object({
+          limit: z.coerce.number().int().positive(),
+        }),
+      },
+      handler,
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys?limit=oops", {
+        headers: { "x-request-id": "req-invalid" },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(400);
+    expect(handler).not.toHaveBeenCalled();
+    const body = await response.json();
+    expect(body.invalid_params).toEqual(expect.arrayContaining([expect.objectContaining({ name: "limit" })]));
+    expect(body.requestId).toBe("req-invalid");
+  });
+
+  test("parses body, repeated query params, and async route params", async () => {
+    const handler = vi.fn(async ({ parsedInput }) => {
+      expect(parsedInput).toEqual({
+        body: { name: "Survey API" },
+        query: { tag: ["a", "b"] },
+        params: { workspaceId: "ws_123" },
+      });
+
+      return Response.json(
+        { ok: true },
+        {
+          headers: {
+            "X-Request-Id": "handler-request-id",
+          },
+        }
+      );
+    });
+
+    const wrapped = withV3ApiWrapper({
+      auth: "none",
+      schemas: {
+        body: z.object({
+          name: z.string(),
+        }),
+        query: z.object({
+          tag: z.array(z.string()),
+        }),
+        params: z.object({
+          workspaceId: z.string(),
+        }),
+      },
+      handler,
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys?tag=a&tag=b", {
+        method: "POST",
+        body: JSON.stringify({ name: "Survey API" }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }),
+      {
+        params: Promise.resolve({
+          workspaceId: "ws_123",
+        }),
+      } as never
+    );
+
+    expect(response.status).toBe(200);
+    expect(response.headers.get("X-Request-Id")).toBe("handler-request-id");
+    expect(handler).toHaveBeenCalledOnce();
+  });
+
+  test("returns 400 problem response for malformed JSON input", async () => {
+    const handler = vi.fn(async () => Response.json({ ok: true }));
+    const wrapped = withV3ApiWrapper({
+      auth: "none",
+      schemas: {
+        body: z.object({
+          name: z.string(),
+        }),
+      },
+      handler,
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys", {
+        method: "POST",
+        body: "{",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(400);
+    expect(handler).not.toHaveBeenCalled();
+    const body = await response.json();
+    expect(body.invalid_params).toEqual([
+      {
+        name: "body",
+        reason: "Malformed JSON input, please check your request body",
+      },
+    ]);
+  });
+
+  test("returns 400 problem response for invalid route params", async () => {
+    const handler = vi.fn(async () => Response.json({ ok: true }));
+    const wrapped = withV3ApiWrapper({
+      auth: "none",
+      schemas: {
+        params: z.object({
+          workspaceId: z.string().min(3),
+        }),
+      },
+      handler,
+    });
+
+    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {
+      params: Promise.resolve({
+        workspaceId: "x",
+      }),
+    } as never);
+
+    expect(response.status).toBe(400);
+    expect(handler).not.toHaveBeenCalled();
+    const body = await response.json();
+    expect(body.invalid_params).toEqual(
+      expect.arrayContaining([expect.objectContaining({ name: "workspaceId" })])
+    );
+  });
+
+  test("returns 429 problem response when rate limited", async () => {
+    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
+    mockGetServerSession.mockResolvedValue({
+      user: { id: "user_1" },
+      expires: "2026-01-01",
+    });
+    vi.mocked(applyRateLimit).mockRejectedValueOnce(new TooManyRequestsError("Too many requests", 60));
+
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      handler: async () => Response.json({ ok: true }),
+    });
+
+    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {} as never);
+
+    expect(response.status).toBe(429);
+    expect(response.headers.get("Retry-After")).toBe("60");
+    const body = await response.json();
+    expect(body.code).toBe("too_many_requests");
+  });
+
+  test("returns 500 problem response when the handler throws unexpectedly", async () => {
+    mockGetServerSession.mockResolvedValue({
+      user: { id: "user_1" },
+      expires: "2026-01-01",
+    });
+
+    const wrapped = withV3ApiWrapper({
+      auth: "both",
+      handler: async () => {
+        throw new Error("boom");
+      },
+    });
+
+    const response = await wrapped(
+      new NextRequest("http://localhost/api/v3/surveys", {
+        headers: { "x-request-id": "req-boom" },
+      }),
+      {} as never
+    );
+
+    expect(response.status).toBe(500);
+    const body = await response.json();
+    expect(body.code).toBe("internal_server_error");
+    expect(body.requestId).toBe("req-boom");
+  });
+});

apps/web/app/api/v3/lib/api-wrapper.ts

@@ -0,0 +1,349 @@
+import { getServerSession } from "next-auth";
+import { type NextRequest } from "next/server";
+import { z } from "zod";
+import { logger } from "@formbricks/logger";
+import { TooManyRequestsError } from "@formbricks/types/errors";
+import { authenticateRequest } from "@/app/api/v1/auth";
+import { authOptions } from "@/modules/auth/lib/authOptions";
+import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
+import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
+import type { TRateLimitConfig } from "@/modules/core/rate-limit/types/rate-limit";
+import {
+  type InvalidParam,
+  problemBadRequest,
+  problemInternalError,
+  problemTooManyRequests,
+  problemUnauthorized,
+} from "./response";
+import type { TV3Authentication } from "./types";
+
+type TV3Schema = z.ZodTypeAny;
+type MaybePromise<T> = T | Promise<T>;
+
+export type TV3AuthMode = "none" | "session" | "apiKey" | "both";
+
+export type TV3Schemas = {
+  body?: TV3Schema;
+  query?: TV3Schema;
+  params?: TV3Schema;
+};
+
+export type TV3ParsedInput<S extends TV3Schemas | undefined> = S extends object
+  ? {
+      [K in keyof S as NonNullable<S[K]> extends TV3Schema ? K : never]: z.infer<NonNullable<S[K]>>;
+    }
+  : Record<string, never>;
+
+export type TV3HandlerParams<TParsedInput = Record<string, never>, TProps = unknown> = {
+  req: NextRequest;
+  props: TProps;
+  authentication: TV3Authentication;
+  parsedInput: TParsedInput;
+  requestId: string;
+  instance: string;
+};
+
+export type TWithV3ApiWrapperParams<S extends TV3Schemas | undefined, TProps = unknown> = {
+  auth?: TV3AuthMode;
+  schemas?: S;
+  rateLimit?: boolean;
+  customRateLimitConfig?: TRateLimitConfig;
+  handler: (params: TV3HandlerParams<TV3ParsedInput<S>, TProps>) => MaybePromise<Response>;
+};
+
+function getUnauthenticatedDetail(authMode: TV3AuthMode): string {
+  if (authMode === "session") {
+    return "Session required";
+  }
+
+  if (authMode === "apiKey") {
+    return "API key required";
+  }
+
+  return "Not authenticated";
+}
+
+function formatZodIssues(error: z.ZodError, fallbackName: "body" | "query" | "params"): InvalidParam[] {
+  return error.issues.map((issue) => ({
+    name: issue.path.length > 0 ? issue.path.join(".") : fallbackName,
+    reason: issue.message,
+  }));
+}
+
+function searchParamsToObject(searchParams: URLSearchParams): Record<string, string | string[]> {
+  const query: Record<string, string | string[]> = {};
+
+  for (const key of new Set(searchParams.keys())) {
+    const values = searchParams.getAll(key);
+    query[key] = values.length > 1 ? values : (values[0] ?? "");
+  }
+
+  return query;
+}
+
+function getRateLimitIdentifier(authentication: TV3Authentication): string | null {
+  if (!authentication) {
+    return null;
+  }
+
+  if ("user" in authentication && authentication.user?.id) {
+    return authentication.user.id;
+  }
+
+  if ("apiKeyId" in authentication) {
+    return authentication.apiKeyId;
+  }
+
+  return null;
+}
+
+function isPromiseLike<T>(value: unknown): value is Promise<T> {
+  return typeof value === "object" && value !== null && "then" in value;
+}
+
+async function getRouteParams<TProps>(props: TProps): Promise<Record<string, unknown>> {
+  if (!props || typeof props !== "object" || !("params" in props)) {
+    return {};
+  }
+
+  const params = (props as { params?: unknown }).params;
+  if (!params) {
+    return {};
+  }
+
+  const resolvedParams = isPromiseLike<Record<string, unknown>>(params) ? await params : params;
+  return typeof resolvedParams === "object" && resolvedParams !== null
+    ? (resolvedParams as Record<string, unknown>)
+    : {};
+}
+
+async function authenticateV3Request(req: NextRequest, authMode: TV3AuthMode): Promise<TV3Authentication> {
+  if (authMode === "none") {
+    return null;
+  }
+
+  if (authMode === "both" && req.headers.has("x-api-key")) {
+    const apiKeyAuth = await authenticateRequest(req);
+    if (apiKeyAuth) {
+      return apiKeyAuth;
+    }
+  }
+
+  if (authMode === "session" || authMode === "both") {
+    const session = await getServerSession(authOptions);
+    if (session?.user?.id) {
+      return session;
+    }
+
+    if (authMode === "session") {
+      return null;
+    }
+  }
+
+  if (authMode === "apiKey" || authMode === "both") {
+    return await authenticateRequest(req);
+  }
+
+  return null;
+}
+
+async function parseV3Input<S extends TV3Schemas | undefined, TProps>(
+  req: NextRequest,
+  props: TProps,
+  schemas: S | undefined,
+  requestId: string,
+  instance: string
+): Promise<
+  | { ok: true; parsedInput: TV3ParsedInput<S> }
+  | {
+      ok: false;
+      response: Response;
+    }
+> {
+  const parsedInput = {} as TV3ParsedInput<S>;
+
+  if (schemas?.body) {
+    let bodyData: unknown;
+
+    try {
+      bodyData = await req.json();
+    } catch {
+      return {
+        ok: false,
+        response: problemBadRequest(requestId, "Invalid request body", {
+          instance,
+          invalid_params: [{ name: "body", reason: "Malformed JSON input, please check your request body" }],
+        }),
+      };
+    }
+
+    const bodyResult = schemas.body.safeParse(bodyData);
+    if (!bodyResult.success) {
+      return {
+        ok: false,
+        response: problemBadRequest(requestId, "Invalid request body", {
+          instance,
+          invalid_params: formatZodIssues(bodyResult.error, "body"),
+        }),
+      };
+    }
+
+    parsedInput.body = bodyResult.data as TV3ParsedInput<S>["body"];
+  }
+
+  if (schemas?.query) {
+    const queryResult = schemas.query.safeParse(searchParamsToObject(req.nextUrl.searchParams));
+    if (!queryResult.success) {
+      return {
+        ok: false,
+        response: problemBadRequest(requestId, "Invalid query parameters", {
+          instance,
+          invalid_params: formatZodIssues(queryResult.error, "query"),
+        }),
+      };
+    }
+
+    parsedInput.query = queryResult.data as TV3ParsedInput<S>["query"];
+  }
+
+  if (schemas?.params) {
+    const paramsResult = schemas.params.safeParse(await getRouteParams(props));
+    if (!paramsResult.success) {
+      return {
+        ok: false,
+        response: problemBadRequest(requestId, "Invalid route parameters", {
+          instance,
+          invalid_params: formatZodIssues(paramsResult.error, "params"),
+        }),
+      };
+    }
+
+    parsedInput.params = paramsResult.data as TV3ParsedInput<S>["params"];
+  }
+
+  return { ok: true, parsedInput };
+}
+
+function ensureRequestIdHeader(response: Response, requestId: string): Response {
+  if (response.headers.get("X-Request-Id")) {
+    return response;
+  }
+
+  const headers = new Headers(response.headers);
+  headers.set("X-Request-Id", requestId);
+
+  return new Response(response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers,
+  });
+}
+
+async function authenticateV3RequestOrRespond(
+  req: NextRequest,
+  authMode: TV3AuthMode,
+  requestId: string,
+  instance: string
+): Promise<
+  { authentication: TV3Authentication; response: null } | { authentication: null; response: Response }
+> {
+  const authentication = await authenticateV3Request(req, authMode);
+
+  if (!authentication && authMode !== "none") {
+    return {
+      authentication: null,
+      response: problemUnauthorized(requestId, getUnauthenticatedDetail(authMode), instance),
+    };
+  }
+
+  return {
+    authentication,
+    response: null,
+  };
+}
+
+async function applyV3RateLimitOrRespond(params: {
+  authentication: TV3Authentication;
+  enabled: boolean;
+  config: TRateLimitConfig;
+  requestId: string;
+  log: ReturnType<typeof logger.withContext>;
+}): Promise<Response | null> {
+  const { authentication, enabled, config, requestId, log } = params;
+  if (!enabled) {
+    return null;
+  }
+
+  const identifier = getRateLimitIdentifier(authentication);
+  if (!identifier) {
+    return null;
+  }
+
+  try {
+    await applyRateLimit(config, identifier);
+  } catch (error) {
+    log.warn({ error, statusCode: 429 }, "V3 API rate limit exceeded");
+    return problemTooManyRequests(
+      requestId,
+      error instanceof Error ? error.message : "Rate limit exceeded",
+      error instanceof TooManyRequestsError ? error.retryAfter : undefined
+    );
+  }
+
+  return null;
+}
+
+export const withV3ApiWrapper = <S extends TV3Schemas | undefined, TProps = unknown>(
+  params: TWithV3ApiWrapperParams<S, TProps>
+): ((req: NextRequest, props: TProps) => Promise<Response>) => {
+  const { auth = "both", schemas, rateLimit = true, customRateLimitConfig, handler } = params;
+
+  return async (req: NextRequest, props: TProps): Promise<Response> => {
+    const requestId = req.headers.get("x-request-id") ?? crypto.randomUUID();
+    const instance = req.nextUrl.pathname;
+    const log = logger.withContext({
+      requestId,
+      method: req.method,
+      path: instance,
+    });
+
+    try {
+      const authResult = await authenticateV3RequestOrRespond(req, auth, requestId, instance);
+      if (authResult.response) {
+        log.warn({ statusCode: authResult.response.status }, "V3 API authentication failed");
+        return authResult.response;
+      }
+
+      const parsedInputResult = await parseV3Input(req, props, schemas, requestId, instance);
+      if (!parsedInputResult.ok) {
+        log.warn({ statusCode: parsedInputResult.response.status }, "V3 API request validation failed");
+        return parsedInputResult.response;
+      }
+
+      const rateLimitResponse = await applyV3RateLimitOrRespond({
+        authentication: authResult.authentication,
+        enabled: rateLimit,
+        config: customRateLimitConfig ?? rateLimitConfigs.api.v3,
+        requestId,
+        log,
+      });
+      if (rateLimitResponse) {
+        return rateLimitResponse;
+      }
+
+      const response = await handler({
+        req,
+        props,
+        authentication: authResult.authentication,
+        parsedInput: parsedInputResult.parsedInput,
+        requestId,
+        instance,
+      });
+
+      return ensureRequestIdHeader(response, requestId);
+    } catch (error) {
+      log.error({ error, statusCode: 500 }, "V3 API unexpected error");
+      return problemInternalError(requestId, "An unexpected error occurred.", instance);
+    }
+  };
+};

apps/web/app/api/v3/lib/auth.test.ts

@@ -0,0 +1,274 @@
+import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
+import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
+import { getEnvironment } from "@/lib/utils/services";
+import { requireSessionWorkspaceAccess, requireV3WorkspaceAccess } from "./auth";
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    withContext: vi.fn(() => ({
+      warn: vi.fn(),
+      error: vi.fn(),
+    })),
+  },
+}));
+
+vi.mock("@/lib/utils/helper", () => ({
+  getOrganizationIdFromProjectId: vi.fn(),
+}));
+
+vi.mock("@/lib/utils/services", () => ({
+  getEnvironment: vi.fn(),
+}));
+
+vi.mock("@/lib/utils/action-client/action-client-middleware", () => ({
+  checkAuthorizationUpdated: vi.fn(),
+}));
+
+const requestId = "req-123";
+
+describe("requireSessionWorkspaceAccess", () => {
+  test("returns 401 when authentication is null", async () => {
+    const result = await requireSessionWorkspaceAccess(null, "proj_abc", "read", requestId);
+    expect(result).toBeInstanceOf(Response);
+    expect((result as Response).status).toBe(401);
+    expect((result as Response).headers.get("Content-Type")).toBe("application/problem+json");
+    const body = await (result as Response).json();
+    expect(body.requestId).toBe(requestId);
+    expect(body.status).toBe(401);
+    expect(body.code).toBe("not_authenticated");
+    expect(getEnvironment).not.toHaveBeenCalled();
+    expect(checkAuthorizationUpdated).not.toHaveBeenCalled();
+  });
+
+  test("returns 401 when authentication is API key (no user)", async () => {
+    const result = await requireSessionWorkspaceAccess(
+      { apiKeyId: "key_1", organizationId: "org_1", environmentPermissions: [] } as any,
+      "proj_abc",
+      "read",
+      requestId
+    );
+    expect(result).toBeInstanceOf(Response);
+    expect((result as Response).status).toBe(401);
+    const body = await (result as Response).json();
+    expect(body.requestId).toBe(requestId);
+    expect(body.code).toBe("not_authenticated");
+    expect(getEnvironment).not.toHaveBeenCalled();
+  });
+
+  test("returns 403 when workspace (environment) is not found (avoid leaking existence)", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
+    const result = await requireSessionWorkspaceAccess(
+      { user: { id: "user_1" }, expires: "" } as any,
+      "env_nonexistent",
+      "read",
+      requestId
+    );
+    expect(result).toBeInstanceOf(Response);
+    expect((result as Response).status).toBe(403);
+    expect((result as Response).headers.get("Content-Type")).toBe("application/problem+json");
+    const body = await (result as Response).json();
+    expect(body.requestId).toBe(requestId);
+    expect(body.code).toBe("forbidden");
+    expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
+    expect(checkAuthorizationUpdated).not.toHaveBeenCalled();
+  });
+
+  test("returns 403 when user has no access to workspace", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce({
+      id: "env_abc",
+      projectId: "proj_abc",
+    } as any);
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
+    vi.mocked(checkAuthorizationUpdated).mockRejectedValueOnce(new AuthorizationError("Not authorized"));
+    const result = await requireSessionWorkspaceAccess(
+      { user: { id: "user_1" }, expires: "" } as any,
+      "env_abc",
+      "read",
+      requestId
+    );
+    expect(result).toBeInstanceOf(Response);
+    expect((result as Response).status).toBe(403);
+    const body = await (result as Response).json();
+    expect(body.requestId).toBe(requestId);
+    expect(body.code).toBe("forbidden");
+    expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
+      userId: "user_1",
+      organizationId: "org_1",
+      access: [
+        { type: "organization", roles: ["owner", "manager"] },
+        { type: "projectTeam", projectId: "proj_abc", minPermission: "read" },
+      ],
+    });
+  });
+
+  test("returns workspace context when session is valid and user has access", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce({
+      id: "env_abc",
+      projectId: "proj_abc",
+    } as any);
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
+    vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
+    const result = await requireSessionWorkspaceAccess(
+      { user: { id: "user_1" }, expires: "" } as any,
+      "env_abc",
+      "readWrite",
+      requestId
+    );
+    expect(result).not.toBeInstanceOf(Response);
+    expect(result).toEqual({
+      environmentId: "env_abc",
+      projectId: "proj_abc",
+      organizationId: "org_1",
+    });
+    expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
+      userId: "user_1",
+      organizationId: "org_1",
+      access: [
+        { type: "organization", roles: ["owner", "manager"] },
+        { type: "projectTeam", projectId: "proj_abc", minPermission: "readWrite" },
+      ],
+    });
+  });
+});
+
+const keyBase = {
+  type: "apiKey" as const,
+  apiKeyId: "key_1",
+  organizationId: "org_k",
+  organizationAccess: { accessControl: { read: true, write: false } },
+};
+
+function envPerm(environmentId: string, permission: ApiKeyPermission = ApiKeyPermission.read) {
+  return {
+    environmentId,
+    environmentType: EnvironmentType.development,
+    projectId: "proj_k",
+    projectName: "K",
+    permission,
+  };
+}
+
+describe("requireV3WorkspaceAccess", () => {
+  beforeEach(() => {
+    vi.mocked(getEnvironment).mockResolvedValue({
+      id: "env_k",
+      projectId: "proj_k",
+    } as any);
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValue("org_k");
+  });
+
+  test("401 when authentication is null", async () => {
+    const r = await requireV3WorkspaceAccess(null, "env_x", "read", requestId);
+    expect((r as Response).status).toBe(401);
+  });
+
+  test("delegates to session flow when user is present", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce({
+      id: "env_s",
+      projectId: "proj_s",
+    } as any);
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_s");
+    vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
+    const r = await requireV3WorkspaceAccess(
+      { user: { id: "user_1" }, expires: "" } as any,
+      "env_s",
+      "read",
+      requestId
+    );
+    expect(r).toEqual({
+      environmentId: "env_s",
+      projectId: "proj_s",
+      organizationId: "org_s",
+    });
+  });
+
+  test("returns context for API key with read on workspace", async () => {
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [envPerm("ws_a", ApiKeyPermission.read)],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "ws_a", "read", requestId);
+    expect(r).toEqual({
+      environmentId: "ws_a",
+      projectId: "proj_k",
+      organizationId: "org_k",
+    });
+    expect(getEnvironment).toHaveBeenCalledWith("ws_a");
+  });
+
+  test("returns context for API key with write on workspace", async () => {
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [envPerm("ws_b", ApiKeyPermission.write)],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "ws_b", "read", requestId);
+    expect(r).toEqual({
+      environmentId: "ws_b",
+      projectId: "proj_k",
+      organizationId: "org_k",
+    });
+  });
+
+  test("returns 403 when API key permission is lower than the required permission", async () => {
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [envPerm("ws_write", ApiKeyPermission.read)],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "ws_write", "readWrite", requestId);
+    expect((r as Response).status).toBe(403);
+  });
+
+  test("403 when API key has no matching environment", async () => {
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [envPerm("other_env")],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "wanted", "read", requestId);
+    expect((r as Response).status).toBe(403);
+  });
+
+  test("403 when API key permission is not list-eligible (runtime value)", async () => {
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [
+        {
+          ...envPerm("ws_c"),
+          permission: "invalid" as unknown as ApiKeyPermission,
+        },
+      ],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "ws_c", "read", requestId);
+    expect((r as Response).status).toBe(403);
+  });
+
+  test("returns context for API key with manage on workspace", async () => {
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [envPerm("ws_m", ApiKeyPermission.manage)],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "ws_m", "manage", requestId);
+    expect(r).toEqual({
+      environmentId: "ws_m",
+      projectId: "proj_k",
+      organizationId: "org_k",
+    });
+  });
+
+  test("returns 403 when the workspace cannot be resolved for an API key", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
+    const auth = {
+      ...keyBase,
+      environmentPermissions: [envPerm("ws_missing", ApiKeyPermission.manage)],
+    };
+    const r = await requireV3WorkspaceAccess(auth as any, "ws_missing", "read", requestId);
+    expect((r as Response).status).toBe(403);
+  });
+
+  test("401 when auth is neither session nor valid API key payload", async () => {
+    const r = await requireV3WorkspaceAccess({ user: {} } as any, "env", "read", requestId);
+    expect((r as Response).status).toBe(401);
+  });
+});

apps/web/app/api/v3/lib/auth.ts

@@ -0,0 +1,122 @@
+/**
+ * V3 API auth — session (browser) or API key with environment-scoped access.
+ */
+import { ApiKeyPermission } from "@prisma/client";
+import { logger } from "@formbricks/logger";
+import type { TAuthenticationApiKey } from "@formbricks/types/auth";
+import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
+import type { TTeamPermission } from "@/modules/ee/teams/project-teams/types/team";
+import { problemForbidden, problemUnauthorized } from "./response";
+import type { TV3Authentication } from "./types";
+import { type V3WorkspaceContext, resolveV3WorkspaceContext } from "./workspace-context";
+
+function apiKeyPermissionAllows(permission: ApiKeyPermission, minPermission: TTeamPermission): boolean {
+  const grantedRank = {
+    [ApiKeyPermission.read]: 1,
+    [ApiKeyPermission.write]: 2,
+    [ApiKeyPermission.manage]: 3,
+  }[permission];
+
+  const requiredRank = {
+    read: 1,
+    readWrite: 2,
+    manage: 3,
+  }[minPermission];
+
+  return grantedRank >= requiredRank;
+}
+
+/**
+ * Require session and workspace access. workspaceId is resolved via the V3 workspace-context layer.
+ * Returns a Response (401 or 403) on failure, or the resolved workspace context on success so callers
+ * use internal IDs (environmentId, projectId, organizationId) without resolving again.
+ * We use 403 (not 404) when the workspace is not found to avoid leaking resource existence.
+ */
+export async function requireSessionWorkspaceAccess(
+  authentication: TV3Authentication,
+  workspaceId: string,
+  minPermission: TTeamPermission,
+  requestId: string,
+  instance?: string
+): Promise<Response | V3WorkspaceContext> {
+  // --- Session checks ---
+  if (!authentication) {
+    return problemUnauthorized(requestId, "Not authenticated", instance);
+  }
+  if (!("user" in authentication) || !authentication.user?.id) {
+    return problemUnauthorized(requestId, "Session required", instance);
+  }
+
+  const userId = authentication.user.id;
+  const log = logger.withContext({ requestId, workspaceId });
+
+  try {
+    // Resolve workspaceId → environmentId, projectId, organizationId (single place to change when Workspace exists).
+    const context = await resolveV3WorkspaceContext(workspaceId);
+
+    // Org + project-team access; we use internal IDs from context.
+    await checkAuthorizationUpdated({
+      userId,
+      organizationId: context.organizationId,
+      access: [
+        { type: "organization", roles: ["owner", "manager"] },
+        { type: "projectTeam", projectId: context.projectId, minPermission },
+      ],
+    });
+
+    return context;
+  } catch (err) {
+    if (err instanceof ResourceNotFoundError || err instanceof AuthorizationError) {
+      const message = err instanceof ResourceNotFoundError ? "Workspace not found" : "Forbidden";
+      log.warn({ statusCode: 403, errorCode: err.name }, message);
+      return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+    }
+    throw err;
+  }
+}
+
+/** Session or API key: authorize `workspaceId` against the resolved V3 workspace context. */
+export async function requireV3WorkspaceAccess(
+  authentication: TV3Authentication,
+  workspaceId: string,
+  minPermission: TTeamPermission,
+  requestId: string,
+  instance?: string
+): Promise<Response | V3WorkspaceContext> {
+  if (!authentication) {
+    return problemUnauthorized(requestId, "Not authenticated", instance);
+  }
+
+  if ("user" in authentication && authentication.user?.id) {
+    return requireSessionWorkspaceAccess(authentication, workspaceId, minPermission, requestId, instance);
+  }
+
+  const keyAuth = authentication as TAuthenticationApiKey;
+  if (keyAuth.apiKeyId && Array.isArray(keyAuth.environmentPermissions)) {
+    const log = logger.withContext({ requestId, workspaceId, apiKeyId: keyAuth.apiKeyId });
+
+    try {
+      const context = await resolveV3WorkspaceContext(workspaceId);
+      const permission = keyAuth.environmentPermissions.find(
+        (environmentPermission) => environmentPermission.environmentId === context.environmentId
+      );
+
+      if (!permission || !apiKeyPermissionAllows(permission.permission, minPermission)) {
+        log.warn({ statusCode: 403 }, "API key not allowed for workspace");
+        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+      }
+
+      return context;
+    } catch (error) {
+      if (error instanceof ResourceNotFoundError) {
+        log.warn({ statusCode: 403, errorCode: error.name }, "Workspace not found");
+        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+      }
+
+      throw error;
+    }
+  }
+
+  return problemUnauthorized(requestId, "Not authenticated", instance);
+}

apps/web/app/api/v3/lib/response.test.ts

@@ -0,0 +1,95 @@
+import { describe, expect, test } from "vitest";
+import {
+  problemBadRequest,
+  problemForbidden,
+  problemInternalError,
+  problemNotFound,
+  problemTooManyRequests,
+  problemUnauthorized,
+  successListResponse,
+} from "./response";
+
+describe("v3 problem responses", () => {
+  test("problemBadRequest includes invalid_params", async () => {
+    const res = problemBadRequest("rid", "bad", {
+      invalid_params: [{ name: "x", reason: "y" }],
+      instance: "/p",
+    });
+    expect(res.status).toBe(400);
+    expect(res.headers.get("X-Request-Id")).toBe("rid");
+    const body = await res.json();
+    expect(body.code).toBe("bad_request");
+    expect(body.requestId).toBe("rid");
+    expect(body.invalid_params).toEqual([{ name: "x", reason: "y" }]);
+    expect(body.instance).toBe("/p");
+  });
+
+  test("problemUnauthorized default detail", async () => {
+    const res = problemUnauthorized("r1");
+    expect(res.status).toBe(401);
+    const body = await res.json();
+    expect(body.detail).toBe("Not authenticated");
+    expect(body.code).toBe("not_authenticated");
+  });
+
+  test("problemForbidden", async () => {
+    const res = problemForbidden("r2", undefined, "/api/x");
+    expect(res.status).toBe(403);
+    const body = await res.json();
+    expect(body.code).toBe("forbidden");
+    expect(body.instance).toBe("/api/x");
+  });
+
+  test("problemInternalError", async () => {
+    const res = problemInternalError("r3", "oops", "/i");
+    expect(res.status).toBe(500);
+    const body = await res.json();
+    expect(body.code).toBe("internal_server_error");
+    expect(body.detail).toBe("oops");
+  });
+
+  test("problemNotFound includes details", async () => {
+    const res = problemNotFound("r4", "Survey", "s1", "/s");
+    expect(res.status).toBe(404);
+    const body = await res.json();
+    expect(body.code).toBe("not_found");
+    expect(body.details).toEqual({ resource_type: "Survey", resource_id: "s1" });
+  });
+
+  test("problemTooManyRequests with Retry-After", async () => {
+    const res = problemTooManyRequests("r5", "slow down", 60);
+    expect(res.status).toBe(429);
+    expect(res.headers.get("Retry-After")).toBe("60");
+    const body = await res.json();
+    expect(body.code).toBe("too_many_requests");
+  });
+
+  test("problemTooManyRequests without Retry-After", async () => {
+    const res = problemTooManyRequests("r6", "nope");
+    expect(res.headers.get("Retry-After")).toBeNull();
+  });
+});
+
+describe("successListResponse", () => {
+  test("sets X-Request-Id and default cache", async () => {
+    const res = successListResponse(
+      [{ a: 1 }],
+      { limit: 10, nextCursor: "cursor-1" },
+      {
+        requestId: "req-x",
+      }
+    );
+    expect(res.status).toBe(200);
+    expect(res.headers.get("X-Request-Id")).toBe("req-x");
+    expect(res.headers.get("Cache-Control")).toContain("no-store");
+    expect(await res.json()).toEqual({
+      data: [{ a: 1 }],
+      meta: { limit: 10, nextCursor: "cursor-1" },
+    });
+  });
+
+  test("custom Cache-Control", async () => {
+    const res = successListResponse([], { limit: 5, nextCursor: null }, { cache: "private, max-age=0" });
+    expect(res.headers.get("Cache-Control")).toBe("private, max-age=0");
+  });
+});

apps/web/app/api/v3/lib/response.ts

@@ -0,0 +1,149 @@
+/**
+ * V3 API response helpers — RFC 9457 Problem Details (application/problem+json)
+ * and list envelope for success responses.
+ */
+
+const PROBLEM_JSON = "application/problem+json" as const;
+const CACHE_NO_STORE = "private, no-store" as const;
+
+export type InvalidParam = { name: string; reason: string };
+
+export type ProblemExtension = {
+  code?: string;
+  requestId: string;
+  details?: Record<string, unknown>;
+  invalid_params?: InvalidParam[];
+};
+
+export type ProblemBody = {
+  type?: string;
+  title: string;
+  status: number;
+  detail: string;
+  instance?: string;
+} & ProblemExtension;
+
+function problemResponse(
+  status: number,
+  title: string,
+  detail: string,
+  requestId: string,
+  options?: {
+    type?: string;
+    instance?: string;
+    code?: string;
+    details?: Record<string, unknown>;
+    invalid_params?: InvalidParam[];
+    headers?: Record<string, string>;
+  }
+): Response {
+  const body: ProblemBody = {
+    title,
+    status,
+    detail,
+    requestId,
+    ...(options?.type && { type: options.type }),
+    ...(options?.instance && { instance: options.instance }),
+    ...(options?.code && { code: options.code }),
+    ...(options?.details && { details: options.details }),
+    ...(options?.invalid_params && { invalid_params: options.invalid_params }),
+  };
+
+  const headers: Record<string, string> = {
+    "Content-Type": PROBLEM_JSON,
+    "Cache-Control": CACHE_NO_STORE,
+    "X-Request-Id": requestId,
+    ...options?.headers,
+  };
+
+  return Response.json(body, { status, headers });
+}
+
+export function problemBadRequest(
+  requestId: string,
+  detail: string,
+  options?: { invalid_params?: InvalidParam[]; instance?: string }
+): Response {
+  return problemResponse(400, "Bad Request", detail, requestId, {
+    code: "bad_request",
+    instance: options?.instance,
+    invalid_params: options?.invalid_params,
+  });
+}
+
+export function problemUnauthorized(
+  requestId: string,
+  detail: string = "Not authenticated",
+  instance?: string
+): Response {
+  return problemResponse(401, "Unauthorized", detail, requestId, {
+    code: "not_authenticated",
+    instance,
+  });
+}
+
+export function problemForbidden(
+  requestId: string,
+  detail: string = "You are not authorized to access this resource",
+  instance?: string
+): Response {
+  return problemResponse(403, "Forbidden", detail, requestId, {
+    code: "forbidden",
+    instance,
+  });
+}
+
+/**
+ * 404 with resource details. Do not use for auth-sensitive or existence-sensitive resources:
+ * the body includes resource_type and resource_id, which can leak existence to unauthenticated or unauthorized callers.
+ * Prefer problemForbidden with a generic message for those cases.
+ */
+export function problemNotFound(
+  requestId: string,
+  resourceType: string,
+  resourceId: string | null,
+  instance?: string
+): Response {
+  return problemResponse(404, "Not Found", `${resourceType} not found`, requestId, {
+    code: "not_found",
+    details: { resource_type: resourceType, resource_id: resourceId },
+    instance,
+  });
+}
+
+export function problemInternalError(
+  requestId: string,
+  detail: string = "An unexpected error occurred.",
+  instance?: string
+): Response {
+  return problemResponse(500, "Internal Server Error", detail, requestId, {
+    code: "internal_server_error",
+    instance,
+  });
+}
+
+export function problemTooManyRequests(requestId: string, detail: string, retryAfter?: number): Response {
+  const headers: Record<string, string> = {};
+  if (retryAfter !== undefined) {
+    headers["Retry-After"] = String(retryAfter);
+  }
+  return problemResponse(429, "Too Many Requests", detail, requestId, {
+    code: "too_many_requests",
+    headers,
+  });
+}
+
+export function successListResponse<T, TMeta extends Record<string, unknown>>(
+  data: T[],
+  meta: TMeta,
+  options?: { requestId?: string; cache?: string }
+): Response {
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+    "Cache-Control": options?.cache ?? CACHE_NO_STORE,
+  };
+  if (options?.requestId) {
+    headers["X-Request-Id"] = options.requestId;
+  }
+  return Response.json({ data, meta }, { status: 200, headers });
+}

apps/web/app/api/v3/lib/types.ts

@@ -0,0 +1,4 @@
+import type { Session } from "next-auth";
+import type { TAuthenticationApiKey } from "@formbricks/types/auth";
+
+export type TV3Authentication = TAuthenticationApiKey | Session | null;

apps/web/app/api/v3/lib/workspace-context.test.ts

@@ -0,0 +1,38 @@
+import { describe, expect, test, vi } from "vitest";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
+import { getEnvironment } from "@/lib/utils/services";
+import { resolveV3WorkspaceContext } from "./workspace-context";
+
+vi.mock("@/lib/utils/helper", () => ({
+  getOrganizationIdFromProjectId: vi.fn(),
+}));
+
+vi.mock("@/lib/utils/services", () => ({
+  getEnvironment: vi.fn(),
+}));
+
+describe("resolveV3WorkspaceContext", () => {
+  test("returns environmentId, projectId and organizationId when workspace exists (today: workspaceId === environmentId)", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce({
+      id: "env_abc",
+      projectId: "proj_xyz",
+    } as any);
+    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_123");
+    const result = await resolveV3WorkspaceContext("env_abc");
+    expect(result).toEqual({
+      environmentId: "env_abc",
+      projectId: "proj_xyz",
+      organizationId: "org_123",
+    });
+    expect(getEnvironment).toHaveBeenCalledWith("env_abc");
+    expect(getOrganizationIdFromProjectId).toHaveBeenCalledWith("proj_xyz");
+  });
+
+  test("throws when workspace (environment) does not exist", async () => {
+    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
+    await expect(resolveV3WorkspaceContext("env_nonexistent")).rejects.toThrow(ResourceNotFoundError);
+    expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
+    expect(getOrganizationIdFromProjectId).not.toHaveBeenCalled();
+  });
+});

apps/web/app/api/v3/lib/workspace-context.ts

@@ -0,0 +1,50 @@
+/**
+ * V3 API workspace → internal IDs translation layer (retro-compatibility / future-proofing).
+ *
+ * Workspace is the default container for surveys. We are deprecating Environment and making
+ * Workspace that container. In the API, workspaceId refers to that container.
+ *
+ * Today: workspaceId is mapped to environmentId (Environment is the current container for surveys).
+ * When Environment is deprecated and Workspace exists: resolve workspaceId to the Workspace entity
+ * (and derive environmentId or equivalent from it). Change only this file.
+ */
+import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
+import { getEnvironment } from "@/lib/utils/services";
+
+/**
+ * Internal IDs derived from a V3 workspace identifier.
+ * Today: environmentId is the workspace (Environment = container for surveys until Workspace exists).
+ */
+export type V3WorkspaceContext = {
+  /** Environment ID — the container for surveys today. Replaced by workspace when Environment is deprecated. */
+  environmentId: string;
+  /** Project ID used for projectTeam auth. */
+  projectId: string;
+  /** Organization ID used for org-level auth. */
+  organizationId: string;
+};
+
+/**
+ * Resolves a V3 API workspaceId to internal environmentId, projectId, and organizationId.
+ * Today: workspaceId is treated as environmentId (workspace = container for surveys = Environment).
+ *
+ * @throws ResourceNotFoundError if the workspace (environment) does not exist.
+ */
+export async function resolveV3WorkspaceContext(workspaceId: string): Promise<V3WorkspaceContext> {
+  // Today: workspaceId is the environment id (survey container). Look it up.
+  const environment = await getEnvironment(workspaceId);
+  if (!environment) {
+    throw new ResourceNotFoundError("environment", workspaceId);
+  }
+
+  // Derive org for auth; project comes from the environment.
+  const organizationId = await getOrganizationIdFromProjectId(environment.projectId);
+
+  // We looked up by workspaceId (as environment id), so the resolved environment id is workspaceId.
+  return {
+    environmentId: workspaceId,
+    projectId: environment.projectId,
+    organizationId,
+  };
+}

apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts

@@ -0,0 +1,122 @@
+import { describe, expect, test } from "vitest";
+import { collectMultiValueQueryParam, parseV3SurveysListQuery } from "./parse-v3-surveys-list-query";
+
+const wid = "clxx1234567890123456789012";
+
+function params(qs: string): URLSearchParams {
+  return new URLSearchParams(qs);
+}
+
+describe("collectMultiValueQueryParam", () => {
+  test("merges repeated keys and comma-separated values", () => {
+    const sp = params("status=draft&status=inProgress&type=link,app");
+    expect(collectMultiValueQueryParam(sp, "status")).toEqual(["draft", "inProgress"]);
+    expect(collectMultiValueQueryParam(sp, "type")).toEqual(["link", "app"]);
+  });
+
+  test("dedupes", () => {
+    const sp = params("status=draft&status=draft");
+    expect(collectMultiValueQueryParam(sp, "status")).toEqual(["draft"]);
+  });
+});
+
+describe("parseV3SurveysListQuery", () => {
+  test("rejects unsupported query parameters like filterCriteria", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filterCriteria={}`));
+    expect(r.ok).toBe(false);
+    if (!r.ok) expect(r.invalid_params[0].name).toBe("filterCriteria");
+  });
+
+  test("rejects unknown query parameters", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&foo=bar`));
+    expect(r.ok).toBe(false);
+    if (!r.ok)
+      expect(r.invalid_params[0]).toEqual({
+        name: "foo",
+        reason:
+          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
+      });
+  });
+
+  test("rejects the legacy after query parameter", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&after=legacy-cursor`));
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.invalid_params[0]).toEqual({
+        name: "after",
+        reason:
+          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
+      });
+    }
+  });
+
+  test("rejects the legacy flat name query parameter", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&name=Foo`));
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.invalid_params[0]).toEqual({
+        name: "name",
+        reason:
+          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
+      });
+    }
+  });
+
+  test("parses minimal query", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}`));
+    expect(r.ok).toBe(true);
+    if (r.ok) {
+      expect(r.limit).toBe(20);
+      expect(r.cursor).toBeNull();
+      expect(r.sortBy).toBe("updatedAt");
+      expect(r.filterCriteria).toBeUndefined();
+    }
+  });
+
+  test("builds filter from explicit operator params", () => {
+    const r = parseV3SurveysListQuery(
+      params(
+        `workspaceId=${wid}&filter[name][contains]=Foo&filter[status][in]=inProgress&filter[status][in]=draft&filter[type][in]=link&sortBy=updatedAt`
+      )
+    );
+    expect(r.ok).toBe(true);
+    if (r.ok) {
+      expect(r.filterCriteria).toEqual({
+        name: "Foo",
+        status: ["inProgress", "draft"],
+        type: ["link"],
+      });
+      expect(r.sortBy).toBe("updatedAt");
+    }
+  });
+
+  test("invalid status", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[status][in]=notastatus`));
+    expect(r.ok).toBe(false);
+  });
+
+  test("rejects the createdBy filter", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[createdBy][in]=you`));
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.invalid_params[0]).toEqual({
+        name: "filter[createdBy][in]",
+        reason:
+          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
+      });
+    }
+  });
+
+  test("rejects an invalid cursor", () => {
+    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&cursor=not-a-real-cursor`));
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.invalid_params).toEqual([
+        {
+          name: "cursor",
+          reason: "The cursor is invalid.",
+        },
+      ]);
+    }
+  });
+});

apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts

@@ -0,0 +1,159 @@
+/**
+ * Validates GET /api/v3/surveys query string and builds {@link TSurveyFilterCriteria} for list/count.
+ * Keeps HTTP parsing separate from the route handler and shared survey list service.
+ */
+import { z } from "zod";
+import { ZId } from "@formbricks/types/common";
+import {
+  type TSurveyFilterCriteria,
+  ZSurveyFilters,
+  ZSurveyStatus,
+  ZSurveyType,
+} from "@formbricks/types/surveys/types";
+import {
+  type TSurveyListPageCursor,
+  type TSurveyListSort,
+  decodeSurveyListPageCursor,
+  normalizeSurveyListSort,
+} from "@/modules/survey/list/lib/survey-page";
+
+const V3_SURVEYS_DEFAULT_LIMIT = 20;
+const V3_SURVEYS_MAX_LIMIT = 100;
+
+const FILTER_NAME_CONTAINS_QUERY_PARAM = "filter[name][contains]" as const;
+const FILTER_STATUS_IN_QUERY_PARAM = "filter[status][in]" as const;
+const FILTER_TYPE_IN_QUERY_PARAM = "filter[type][in]" as const;
+
+const SUPPORTED_QUERY_PARAMS = [
+  "workspaceId",
+  "limit",
+  "cursor",
+  FILTER_NAME_CONTAINS_QUERY_PARAM,
+  FILTER_STATUS_IN_QUERY_PARAM,
+  FILTER_TYPE_IN_QUERY_PARAM,
+  "sortBy",
+] as const;
+const SUPPORTED_QUERY_PARAM_SET = new Set<string>(SUPPORTED_QUERY_PARAMS);
+
+type InvalidParam = { name: string; reason: string };
+
+/** Collect repeated query keys and comma-separated values for operator-style filters. */
+export function collectMultiValueQueryParam(searchParams: URLSearchParams, key: string): string[] {
+  const acc: string[] = [];
+  for (const raw of searchParams.getAll(key)) {
+    for (const part of raw.split(",")) {
+      const t = part.trim();
+      if (t) acc.push(t);
+    }
+  }
+  return [...new Set(acc)];
+}
+
+const ZV3SurveysListQuery = z.object({
+  workspaceId: ZId,
+  limit: z.coerce.number().int().min(1).max(V3_SURVEYS_MAX_LIMIT).default(V3_SURVEYS_DEFAULT_LIMIT),
+  cursor: z.string().min(1).optional(),
+  [FILTER_NAME_CONTAINS_QUERY_PARAM]: z
+    .string()
+    .max(512)
+    .optional()
+    .transform((s) => (s === undefined || s.trim() === "" ? undefined : s.trim())),
+  [FILTER_STATUS_IN_QUERY_PARAM]: z.array(ZSurveyStatus).optional(),
+  [FILTER_TYPE_IN_QUERY_PARAM]: z.array(ZSurveyType).optional(),
+  sortBy: ZSurveyFilters.shape.sortBy.optional(),
+});
+
+export type TV3SurveysListQuery = z.infer<typeof ZV3SurveysListQuery>;
+
+export type TV3SurveysListQueryParseResult =
+  | {
+      ok: true;
+      workspaceId: string;
+      limit: number;
+      cursor: TSurveyListPageCursor | null;
+      sortBy: TSurveyListSort;
+      filterCriteria: TSurveyFilterCriteria | undefined;
+    }
+  | { ok: false; invalid_params: InvalidParam[] };
+
+function getUnsupportedQueryParams(searchParams: URLSearchParams): InvalidParam[] {
+  const unsupportedParams = [
+    ...new Set(Array.from(searchParams.keys()).filter((key) => !SUPPORTED_QUERY_PARAM_SET.has(key))),
+  ];
+
+  return unsupportedParams.map((name) => ({
+    name,
+    reason: `Unsupported query parameter. Use only ${SUPPORTED_QUERY_PARAMS.join(", ")}.`,
+  }));
+}
+
+function buildFilterCriteria(q: TV3SurveysListQuery): TSurveyFilterCriteria | undefined {
+  const f: TSurveyFilterCriteria = {};
+  if (q[FILTER_NAME_CONTAINS_QUERY_PARAM]) f.name = q[FILTER_NAME_CONTAINS_QUERY_PARAM];
+  if (q[FILTER_STATUS_IN_QUERY_PARAM]?.length) f.status = q[FILTER_STATUS_IN_QUERY_PARAM];
+  if (q[FILTER_TYPE_IN_QUERY_PARAM]?.length) f.type = q[FILTER_TYPE_IN_QUERY_PARAM];
+  return Object.keys(f).length > 0 ? f : undefined;
+}
+
+export function parseV3SurveysListQuery(searchParams: URLSearchParams): TV3SurveysListQueryParseResult {
+  const unsupportedQueryParams = getUnsupportedQueryParams(searchParams);
+  if (unsupportedQueryParams.length > 0) {
+    return {
+      ok: false,
+      invalid_params: unsupportedQueryParams,
+    };
+  }
+
+  const statusVals = collectMultiValueQueryParam(searchParams, FILTER_STATUS_IN_QUERY_PARAM);
+  const typeVals = collectMultiValueQueryParam(searchParams, FILTER_TYPE_IN_QUERY_PARAM);
+
+  const raw = {
+    workspaceId: searchParams.get("workspaceId"),
+    limit: searchParams.get("limit") ?? undefined,
+    cursor: searchParams.get("cursor")?.trim() || undefined,
+    [FILTER_NAME_CONTAINS_QUERY_PARAM]: searchParams.get(FILTER_NAME_CONTAINS_QUERY_PARAM) ?? undefined,
+    [FILTER_STATUS_IN_QUERY_PARAM]: statusVals.length > 0 ? statusVals : undefined,
+    [FILTER_TYPE_IN_QUERY_PARAM]: typeVals.length > 0 ? typeVals : undefined,
+    sortBy: searchParams.get("sortBy")?.trim() || undefined,
+  };
+
+  const result = ZV3SurveysListQuery.safeParse(raw);
+  if (!result.success) {
+    return {
+      ok: false,
+      invalid_params: result.error.issues.map((issue) => ({
+        name: issue.path.join(".") || "query",
+        reason: issue.message,
+      })),
+    };
+  }
+
+  const q = result.data;
+  const sortBy = normalizeSurveyListSort(q.sortBy);
+  let cursor: TSurveyListPageCursor | null = null;
+
+  if (q.cursor) {
+    try {
+      cursor = decodeSurveyListPageCursor(q.cursor, sortBy);
+    } catch (error) {
+      return {
+        ok: false,
+        invalid_params: [
+          {
+            name: "cursor",
+            reason: error instanceof Error ? error.message : "The cursor is invalid.",
+          },
+        ],
+      };
+    }
+  }
+
+  return {
+    ok: true,
+    workspaceId: q.workspaceId,
+    limit: q.limit,
+    cursor,
+    sortBy,
+    filterCriteria: buildFilterCriteria(q),
+  };
+}

apps/web/app/api/v3/surveys/route.test.ts

@@ -0,0 +1,357 @@
+import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
+import { NextRequest } from "next/server";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
+import { getSurveyCount } from "@/modules/survey/list/lib/survey";
+import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
+import { GET } from "./route";
+
+const { mockAuthenticateRequest } = vi.hoisted(() => ({
+  mockAuthenticateRequest: vi.fn(),
+}));
+
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+
+vi.mock("@/app/api/v1/auth", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/app/api/v1/auth")>();
+  return { ...actual, authenticateRequest: mockAuthenticateRequest };
+});
+
+vi.mock("@/modules/core/rate-limit/helpers", () => ({
+  applyRateLimit: vi.fn().mockResolvedValue(undefined),
+  applyIPRateLimit: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock("@/lib/constants", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/constants")>();
+  return { ...actual, AUDIT_LOG_ENABLED: false };
+});
+
+vi.mock("@/app/api/v3/lib/auth", () => ({
+  requireV3WorkspaceAccess: vi.fn(),
+}));
+
+vi.mock("@/modules/survey/list/lib/survey-page", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/modules/survey/list/lib/survey-page")>();
+  return {
+    ...actual,
+    getSurveyListPage: vi.fn(),
+  };
+});
+
+vi.mock("@/modules/survey/list/lib/survey", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/modules/survey/list/lib/survey")>();
+  return {
+    ...actual,
+    getSurveyCount: vi.fn(),
+  };
+});
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    withContext: vi.fn(() => ({
+      warn: vi.fn(),
+      error: vi.fn(),
+    })),
+  },
+}));
+
+const getServerSession = vi.mocked((await import("next-auth")).getServerSession);
+
+const validWorkspaceId = "clxx1234567890123456789012";
+const resolvedEnvironmentId = "clzz9876543210987654321098";
+
+function createRequest(url: string, requestId?: string, extraHeaders?: Record<string, string>): NextRequest {
+  const headers: Record<string, string> = { ...extraHeaders };
+  if (requestId) headers["x-request-id"] = requestId;
+  return new NextRequest(url, { headers });
+}
+
+const apiKeyAuth = {
+  type: "apiKey" as const,
+  apiKeyId: "key_1",
+  organizationId: "org_1",
+  organizationAccess: {
+    accessControl: { read: true, write: false },
+  },
+  environmentPermissions: [
+    {
+      environmentId: validWorkspaceId,
+      environmentType: EnvironmentType.development,
+      projectId: "proj_1",
+      projectName: "P",
+      permission: ApiKeyPermission.read,
+    },
+  ],
+};
+
+describe("GET /api/v3/surveys", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    getServerSession.mockResolvedValue({
+      user: { id: "user_1", name: "User", email: "u@example.com" },
+      expires: "2026-01-01",
+    } as any);
+    mockAuthenticateRequest.mockResolvedValue(null);
+    vi.mocked(requireV3WorkspaceAccess).mockImplementation(async (auth, workspaceId) => {
+      if (auth && "apiKeyId" in auth) {
+        const p = auth.environmentPermissions.find((e) => e.environmentId === workspaceId);
+        if (!p) {
+          return new Response(
+            JSON.stringify({
+              title: "Forbidden",
+              status: 403,
+              detail: "You are not authorized to access this resource",
+              requestId: "req",
+            }),
+            { status: 403, headers: { "Content-Type": "application/problem+json" } }
+          );
+        }
+        return {
+          environmentId: workspaceId,
+          projectId: p.projectId,
+          organizationId: auth.organizationId,
+        };
+      }
+      return {
+        environmentId: resolvedEnvironmentId,
+        projectId: "proj_1",
+        organizationId: "org_1",
+      };
+    });
+    vi.mocked(getSurveyListPage).mockResolvedValue({ surveys: [], nextCursor: null });
+    vi.mocked(getSurveyCount).mockResolvedValue(0);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns 401 when no session and no API key", async () => {
+    getServerSession.mockResolvedValue(null);
+    mockAuthenticateRequest.mockResolvedValue(null);
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(401);
+    expect(res.headers.get("Content-Type")).toBe("application/problem+json");
+    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
+  });
+
+  test("returns 200 with session and valid workspaceId", async () => {
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-456");
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(200);
+    expect(res.headers.get("Content-Type")).toBe("application/json");
+    expect(res.headers.get("X-Request-Id")).toBe("req-456");
+    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
+      expect.objectContaining({ user: expect.any(Object) }),
+      validWorkspaceId,
+      "read",
+      "req-456",
+      "/api/v3/surveys"
+    );
+    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
+      limit: 20,
+      cursor: null,
+      sortBy: "updatedAt",
+      filterCriteria: undefined,
+    });
+    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, undefined);
+  });
+
+  test("returns 200 with x-api-key when workspace is on the key", async () => {
+    getServerSession.mockResolvedValue(null);
+    mockAuthenticateRequest.mockResolvedValue(apiKeyAuth as any);
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-k", {
+      "x-api-key": "fbk_test",
+    });
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(200);
+    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
+      expect.objectContaining({ apiKeyId: "key_1" }),
+      validWorkspaceId,
+      "read",
+      "req-k",
+      "/api/v3/surveys"
+    );
+    expect(getSurveyListPage).toHaveBeenCalledWith(validWorkspaceId, {
+      limit: 20,
+      cursor: null,
+      sortBy: "updatedAt",
+      filterCriteria: undefined,
+    });
+    expect(getSurveyCount).toHaveBeenCalledWith(validWorkspaceId, undefined);
+  });
+
+  test("returns 403 when API key does not include workspace", async () => {
+    getServerSession.mockResolvedValue(null);
+    mockAuthenticateRequest.mockResolvedValue({
+      ...apiKeyAuth,
+      environmentPermissions: [
+        {
+          environmentId: "claa1111111111111111111111",
+          environmentType: EnvironmentType.development,
+          projectId: "proj_x",
+          projectName: "X",
+          permission: ApiKeyPermission.read,
+        },
+      ],
+    } as any);
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, undefined, {
+      "x-api-key": "fbk_test",
+    });
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(403);
+  });
+
+  test("returns 400 when the createdBy filter is used", async () => {
+    const req = createRequest(
+      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filter[createdBy][in]=you`
+    );
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(400);
+    const body = await res.json();
+    expect(body.invalid_params?.some((p: { name: string }) => p.name === "filter[createdBy][in]")).toBe(true);
+    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
+  });
+
+  test("returns 400 when workspaceId is missing", async () => {
+    const req = createRequest("http://localhost/api/v3/surveys");
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(400);
+    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
+  });
+
+  test("returns 400 when workspaceId is not cuid2", async () => {
+    const req = createRequest("http://localhost/api/v3/surveys?workspaceId=not-a-cuid");
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(400);
+  });
+
+  test("returns 400 when limit exceeds max", async () => {
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&limit=101`);
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(400);
+  });
+
+  test("reflects limit, nextCursor, and totalCount in meta", async () => {
+    vi.mocked(getSurveyListPage).mockResolvedValue({
+      surveys: [],
+      nextCursor: "cursor-123",
+    });
+    vi.mocked(getSurveyCount).mockResolvedValue(42);
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&limit=10`);
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(200);
+    const body = await res.json();
+    expect(body.meta).toEqual({ limit: 10, nextCursor: "cursor-123", totalCount: 42 });
+    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
+      limit: 10,
+      cursor: null,
+      sortBy: "updatedAt",
+      filterCriteria: undefined,
+    });
+    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, undefined);
+  });
+
+  test("passes filter query to getSurveyListPage", async () => {
+    const filterCriteria = { status: ["inProgress"] };
+    const req = createRequest(
+      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filter[status][in]=inProgress&sortBy=updatedAt`
+    );
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(200);
+    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
+      limit: 20,
+      cursor: null,
+      sortBy: "updatedAt",
+      filterCriteria,
+    });
+    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, filterCriteria);
+  });
+
+  test("returns 400 when filterCriteria is used", async () => {
+    const req = createRequest(
+      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filterCriteria=${encodeURIComponent("{}")}`
+    );
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(400);
+    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
+  });
+
+  test("returns 403 when auth returns 403", async () => {
+    vi.mocked(requireV3WorkspaceAccess).mockResolvedValueOnce(
+      new Response(
+        JSON.stringify({
+          title: "Forbidden",
+          status: 403,
+          detail: "You are not authorized to access this resource",
+          requestId: "req-789",
+        }),
+        { status: 403, headers: { "Content-Type": "application/problem+json" } }
+      )
+    );
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(403);
+  });
+
+  test("list items expose workspaceId instead of environmentId and omit internal fields", async () => {
+    vi.mocked(getSurveyListPage).mockResolvedValue({
+      surveys: [
+        {
+          id: "s1",
+          name: "Survey 1",
+          environmentId: "env_1",
+          type: "link",
+          status: "draft",
+          createdAt: new Date(),
+          updatedAt: new Date(),
+          responseCount: 0,
+          creator: { name: "Test" },
+          singleUse: null,
+        } as any,
+      ],
+      nextCursor: null,
+    });
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
+    const res = await GET(req, {} as any);
+    const body = await res.json();
+    expect(body.data[0]).not.toHaveProperty("blocks");
+    expect(body.data[0]).not.toHaveProperty("singleUse");
+    expect(body.data[0]).not.toHaveProperty("_count");
+    expect(body.data[0]).not.toHaveProperty("environmentId");
+    expect(body.data[0].id).toBe("s1");
+    expect(body.data[0].workspaceId).toBe("env_1");
+  });
+
+  test("returns 403 when getSurveyListPage throws ResourceNotFoundError", async () => {
+    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new ResourceNotFoundError("survey", "s1"));
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-nf");
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(403);
+    const body = await res.json();
+    expect(body.code).toBe("forbidden");
+  });
+
+  test("returns 500 when getSurveyListPage throws DatabaseError", async () => {
+    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new DatabaseError("db down"));
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-db");
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(500);
+    const body = await res.json();
+    expect(body.code).toBe("internal_server_error");
+  });
+
+  test("returns 500 on unexpected error from getSurveyListPage", async () => {
+    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new Error("boom"));
+    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-err");
+    const res = await GET(req, {} as any);
+    expect(res.status).toBe(500);
+    const body = await res.json();
+    expect(body.code).toBe("internal_server_error");
+  });
+});

apps/web/app/api/v3/surveys/route.ts

@@ -0,0 +1,81 @@
+/**
+ * GET /api/v3/surveys — list surveys for a workspace.
+ * Session cookie or x-api-key; scope by workspaceId only.
+ */
+import { logger } from "@formbricks/logger";
+import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { withV3ApiWrapper } from "@/app/api/v3/lib/api-wrapper";
+import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
+import {
+  problemBadRequest,
+  problemForbidden,
+  problemInternalError,
+  successListResponse,
+} from "@/app/api/v3/lib/response";
+import { getSurveyCount } from "@/modules/survey/list/lib/survey";
+import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
+import { parseV3SurveysListQuery } from "./parse-v3-surveys-list-query";
+import { serializeV3SurveyListItem } from "./serializers";
+
+export const GET = withV3ApiWrapper({
+  auth: "both",
+  handler: async ({ req, authentication, requestId, instance }) => {
+    const log = logger.withContext({ requestId });
+
+    try {
+      const searchParams = new URL(req.url).searchParams;
+      const parsed = parseV3SurveysListQuery(searchParams);
+      if (!parsed.ok) {
+        log.warn({ statusCode: 400, invalidParams: parsed.invalid_params }, "Validation failed");
+        return problemBadRequest(requestId, "Invalid query parameters", {
+          invalid_params: parsed.invalid_params,
+          instance,
+        });
+      }
+
+      const authResult = await requireV3WorkspaceAccess(
+        authentication,
+        parsed.workspaceId,
+        "read",
+        requestId,
+        instance
+      );
+      if (authResult instanceof Response) {
+        return authResult;
+      }
+
+      const { environmentId } = authResult;
+
+      const [{ surveys, nextCursor }, totalCount] = await Promise.all([
+        getSurveyListPage(environmentId, {
+          limit: parsed.limit,
+          cursor: parsed.cursor,
+          sortBy: parsed.sortBy,
+          filterCriteria: parsed.filterCriteria,
+        }),
+        getSurveyCount(environmentId, parsed.filterCriteria),
+      ]);
+
+      return successListResponse(
+        surveys.map(serializeV3SurveyListItem),
+        {
+          limit: parsed.limit,
+          nextCursor,
+          totalCount,
+        },
+        { requestId, cache: "private, no-store" }
+      );
+    } catch (err) {
+      if (err instanceof ResourceNotFoundError) {
+        log.warn({ statusCode: 403, errorCode: err.name }, "Resource not found");
+        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
+      }
+      if (err instanceof DatabaseError) {
+        log.error({ error: err, statusCode: 500 }, "Database error");
+        return problemInternalError(requestId, "An unexpected error occurred.", instance);
+      }
+      log.error({ error: err, statusCode: 500 }, "V3 surveys list unexpected error");
+      return problemInternalError(requestId, "An unexpected error occurred.", instance);
+    }
+  },
+});

apps/web/app/api/v3/surveys/serializers.ts

@@ -0,0 +1,18 @@
+import type { TSurvey } from "@/modules/survey/list/types/surveys";
+
+export type TV3SurveyListItem = Omit<TSurvey, "environmentId" | "singleUse"> & {
+  workspaceId: string;
+};
+
+/**
+ * Keep the v3 API contract isolated from internal persistence naming.
+ * Internally surveys are still scoped by environmentId; externally v3 exposes workspaceId.
+ */
+export function serializeV3SurveyListItem(survey: TSurvey): TV3SurveyListItem {
+  const { environmentId, singleUse: _omitSingleUse, ...rest } = survey;
+
+  return {
+    ...rest,
+    workspaceId: environmentId,
+  };
+}

apps/web/app/chatwoot/ChatwootWidget.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { useCallback, useEffect, useRef } from "react";
+import { getIsActiveCustomerAction } from "./actions";
 
 interface ChatwootWidgetProps {
   chatwootBaseUrl: string;
@@ -12,6 +13,18 @@ interface ChatwootWidgetProps {
 
 const CHATWOOT_SCRIPT_ID = "chatwoot-script";
 
+interface ChatwootInstance {
+  setUser: (
+    userId: string,
+    userInfo: {
+      email?: string | null;
+      name?: string | null;
+    }
+  ) => void;
+  setCustomAttributes: (attributes: Record<string, unknown>) => void;
+  reset: () => void;
+}
+
 export const ChatwootWidget = ({
   userEmail,
   userName,
@@ -20,15 +33,14 @@ export const ChatwootWidget = ({
   chatwootBaseUrl,
 }: ChatwootWidgetProps) => {
   const userSetRef = useRef(false);
+  const customerStatusSetRef = useRef(false);
+
+  const getChatwoot = useCallback((): ChatwootInstance | null => {
+    return (globalThis as unknown as { $chatwoot: ChatwootInstance }).$chatwoot ?? null;
+  }, []);
 
   const setUserInfo = useCallback(() => {
-    const $chatwoot = (
-      globalThis as unknown as {
-        $chatwoot: {
-          setUser: (userId: string, userInfo: { email?: string | null; name?: string | null }) => void;
-        };
-      }
-    ).$chatwoot;
+    const $chatwoot = getChatwoot();
     if (userId && $chatwoot && !userSetRef.current) {
       $chatwoot.setUser(userId, {
         email: userEmail,
@@ -36,7 +48,19 @@ export const ChatwootWidget = ({
       });
       userSetRef.current = true;
     }
-  }, [userId, userEmail, userName]);
+  }, [userId, userEmail, userName, getChatwoot]);
+
+  const setCustomerStatus = useCallback(async () => {
+    if (customerStatusSetRef.current) return;
+    const $chatwoot = getChatwoot();
+    if (!$chatwoot) return;
+
+    const response = await getIsActiveCustomerAction();
+    if (response?.data !== undefined) {
+      $chatwoot.setCustomAttributes({ isActiveCustomer: response.data });
+    }
+    customerStatusSetRef.current = true;
+  }, [getChatwoot]);
 
   useEffect(() => {
     if (!chatwootWebsiteToken) return;
@@ -65,23 +89,19 @@ export const ChatwootWidget = ({
     const handleChatwootReady = () => setUserInfo();
     globalThis.addEventListener("chatwoot:ready", handleChatwootReady);
 
+    const handleChatwootOpen = () => setCustomerStatus();
+    globalThis.addEventListener("chatwoot:open", handleChatwootOpen);
+
     // Check if Chatwoot is already ready
-    if (
-      (
-        globalThis as unknown as {
-          $chatwoot: {
-            setUser: (userId: string, userInfo: { email?: string | null; name?: string | null }) => void;
-          };
-        }
-      ).$chatwoot
-    ) {
+    if (getChatwoot()) {
       setUserInfo();
     }
 
     return () => {
       globalThis.removeEventListener("chatwoot:ready", handleChatwootReady);
+      globalThis.removeEventListener("chatwoot:open", handleChatwootOpen);
 
-      const $chatwoot = (globalThis as unknown as { $chatwoot: { reset: () => void } }).$chatwoot;
+      const $chatwoot = getChatwoot();
       if ($chatwoot) {
         $chatwoot.reset();
       }
@@ -90,8 +110,18 @@ export const ChatwootWidget = ({
       scriptElement?.remove();
 
       userSetRef.current = false;
+      customerStatusSetRef.current = false;
     };
-  }, [chatwootBaseUrl, chatwootWebsiteToken, userId, userEmail, userName, setUserInfo]);
+  }, [
+    chatwootBaseUrl,
+    chatwootWebsiteToken,
+    userId,
+    userEmail,
+    userName,
+    setUserInfo,
+    setCustomerStatus,
+    getChatwoot,
+  ]);
 
   return null;
 };

apps/web/app/chatwoot/actions.ts

@@ -0,0 +1,18 @@
+"use server";
+
+import { TCloudBillingPlan } from "@formbricks/types/organizations";
+import { getOrganizationsByUserId } from "@/lib/organization/service";
+import { authenticatedActionClient } from "@/lib/utils/action-client";
+
+export const getIsActiveCustomerAction = authenticatedActionClient.action(async ({ ctx }) => {
+  const paidBillingPlans = new Set<TCloudBillingPlan>(["pro", "scale", "custom"]);
+
+  const organizations = await getOrganizationsByUserId(ctx.user.id);
+  return organizations.some((organization) => {
+    const stripe = organization.billing.stripe;
+    const isPaidPlan = stripe?.plan ? paidBillingPlans.has(stripe.plan) : false;
+    const isActiveSubscription =
+      stripe?.subscriptionStatus === "active" || stripe?.subscriptionStatus === "trialing";
+    return isPaidPlan && isActiveSubscription;
+  });
+});

apps/web/app/components/NoScriptWarning.tsx

@@ -0,0 +1,21 @@
+import type { TUserLocale } from "@formbricks/types/user";
+import { getTranslate } from "@/lingodotdev/server";
+
+interface NoScriptWarningProps {
+  locale: TUserLocale;
+}
+
+export const NoScriptWarning = async ({ locale }: NoScriptWarningProps) => {
+  const t = await getTranslate(locale);
+
+  return (
+    <noscript>
+      <div className="fixed inset-0 z-[9999] flex h-dvh w-full items-center justify-center bg-slate-50">
+        <div className="rounded-xl border border-slate-200 bg-white p-8 text-center shadow-lg">
+          <h1 className="mb-4 text-2xl font-bold text-slate-800">{t("common.javascript_required")}</h1>
+          <p className="text-slate-600">{t("common.javascript_required_description")}</p>
+        </div>
+      </div>
+    </noscript>
+  );
+};

apps/web/app/layout.tsx

@@ -1,5 +1,6 @@
 import { Metadata } from "next";
 import React from "react";
+import { NoScriptWarning } from "@/app/components/NoScriptWarning";
 import { SentryProvider } from "@/app/sentry/SentryProvider";
 import {
   DEFAULT_LOCALE,
@@ -26,6 +27,7 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => {
   return (
     <html lang={locale} translate="no">
       <body className="flex h-dvh flex-col transition-all ease-in-out">
+        <NoScriptWarning locale={locale} />
         <SentryProvider
           sentryDsn={SENTRY_DSN}
           sentryRelease={SENTRY_RELEASE}

apps/web/app/lib/api/with-api-logging.test.ts

@@ -421,6 +421,38 @@ describe("withV1ApiWrapper", () => {
     expect(handler).not.toHaveBeenCalled();
   });
 
+  test("uses unauthenticatedResponse when provided instead of default 401", async () => {
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
+    const { getServerSession } = await import("next-auth");
+
+    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
+    vi.mocked(isManagementApiRoute).mockReturnValue({
+      isManagementApi: true,
+      authenticationMethod: AuthenticationMethod.Session,
+    });
+    vi.mocked(isIntegrationRoute).mockReturnValue(false);
+    vi.mocked(getServerSession).mockResolvedValue(null);
+
+    const custom401 = new Response(JSON.stringify({ title: "Custom", status: 401 }), {
+      status: 401,
+      headers: { "Content-Type": "application/problem+json" },
+    });
+
+    const handler = vi.fn();
+    const req = createMockRequest({ url: "https://api.test/api/v3/surveys" });
+    const { withV1ApiWrapper } = await import("./with-api-logging");
+    const wrapped = withV1ApiWrapper({
+      handler,
+      unauthenticatedResponse: () => custom401,
+    });
+    const res = await wrapped(req, undefined);
+
+    expect(res).toBe(custom401);
+    expect(handler).not.toHaveBeenCalled();
+    expect(mockContextualLoggerError).toHaveBeenCalled();
+  });
+
   test("handles rate limiting errors", async () => {
     const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
     const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =

apps/web/app/lib/api/with-api-logging.ts

@@ -38,6 +38,11 @@ export interface TWithV1ApiWrapperParams<TResult extends { response: Response },
   action?: TAuditAction;
   targetType?: TAuditTarget;
   customRateLimitConfig?: TRateLimitConfig;
+  /**
+   * When the route requires auth but the client is unauthenticated, the wrapper normally returns
+   * the legacy JSON 401. Use this to return a custom response (e.g. RFC 9457 problem+json for V3).
+   */
+  unauthenticatedResponse?: (req: NextRequest) => Response;
 }
 
 enum ApiV1RouteTypeEnum {
@@ -265,7 +270,7 @@ const getRouteType = (
 export const withV1ApiWrapper = <TResult extends { response: Response }, TProps = unknown>(
   params: TWithV1ApiWrapperParams<TResult, TProps>
 ): ((req: NextRequest, props: TProps) => Promise<Response>) => {
-  const { handler, action, targetType, customRateLimitConfig } = params;
+  const { handler, action, targetType, customRateLimitConfig, unauthenticatedResponse } = params;
   return async (req: NextRequest, props: TProps): Promise<Response> => {
     // === Audit Log Setup ===
     const saveAuditLog = action && targetType;
@@ -287,6 +292,11 @@ export const withV1ApiWrapper = <TResult extends { response: Response }, TProps
     const authentication = await handleAuthentication(authenticationMethod, req);
 
     if (!authentication && routeType !== ApiV1RouteTypeEnum.Client) {
+      if (unauthenticatedResponse) {
+        const res = unauthenticatedResponse(req);
+        await processResponse(res, req, auditLog);
+        return res;
+      }
       return responses.notAuthenticatedResponse();
     }
 

apps/web/app/middleware/endpoint-validator.test.ts

@@ -90,6 +90,17 @@ describe("endpoint-validator", () => {
   });
 
   describe("isManagementApiRoute", () => {
+    test("should return Both for v3 surveys routes", () => {
+      expect(isManagementApiRoute("/api/v3/surveys")).toEqual({
+        isManagementApi: true,
+        authenticationMethod: AuthenticationMethod.Both,
+      });
+      expect(isManagementApiRoute("/api/v3/surveys/clxxxxxxxxxxxxxxxxxxxxxxxx")).toEqual({
+        isManagementApi: true,
+        authenticationMethod: AuthenticationMethod.Both,
+      });
+    });
+
     test("should return correct object for management API routes with API key authentication", () => {
       expect(isManagementApiRoute("/api/v1/management/something")).toEqual({
         isManagementApi: true,

apps/web/app/middleware/endpoint-validator.ts

@@ -22,6 +22,9 @@ export const isClientSideApiRoute = (url: string): { isClientSideApi: boolean; i
 export const isManagementApiRoute = (
   url: string
 ): { isManagementApi: boolean; authenticationMethod: AuthenticationMethod } => {
+  // V3 surveys: session cookie or x-api-key (same pattern as management storage)
+  if (/^\/api\/v3\/surveys(?:\/|$)/.test(url))
+    return { isManagementApi: true, authenticationMethod: AuthenticationMethod.Both };
   if (url.includes("/api/v1/management/storage"))
     return { isManagementApi: true, authenticationMethod: AuthenticationMethod.Both };
   if (url.includes("/api/v1/webhooks"))

apps/web/i18n.lock

@@ -140,6 +140,7 @@ checksums:
     common/connect: 8778ee245078a8be4a2ce855c8c56edc
     common/connect_formbricks: a9dd747575e7e035da69251366df6f95
     common/connected: aa0ceca574641de34c74b9e590664230
+    common/contact: 9afa39bc47019ee6dec6c74b6273967c
     common/contacts: d5b6c3f890b3904eaf5754081945c03d
     common/continue: 3cfba90b4600131e82fc4260c568d044
     common/copied: 29208e06d704c4fc4b8b534dc7acc4ef
@@ -147,6 +148,7 @@ checksums:
     common/copy: 627c00d2c850b9b45f7341a6ac01b6bb
     common/copy_code: 704c13d9bc01caad29a1cf3179baa111
     common/copy_link: 57a37acfe6d7ed71d00fbbc8079fbb35
+    common/copy_to_environment: c482d26b8fd4962af6542bbf49e49a32
     common/count_attributes: 48805e836a9b50f9635ad00fed953058
     common/count_contacts: 9f71d503455264f1eec1ae58894cf143
     common/count_members: 31ce64ca63fdf95e02ab5543b6e2f717
@@ -186,12 +188,12 @@ checksums:
     common/duplicate_copy_number: 083cfffd294672043dcbcc4c3dfeac6a
     common/e_commerce: b9584e7d0449a6d1b0c182d7ff14061e
     common/edit: eee7f39ff90b18852afc1671f21fbaa9
+    common/elements: 8cb054d952b341e5965284860d532bc7
     common/email: e7f34943a0c2fb849db1839ff6ef5cb5
     common/ending_card: 16d30d3a36472159da8c2dbd374dfe22
     common/enter_url: 468c2276d0f2cb971ff5a47a20fa4b97
     common/enterprise_license: e81bf506f47968870c7bd07245648a0d
     common/environment: 0844e8dc1485339c8de066dc0a9bb6a1
-    common/environment_not_found: 4d7610bdb55a8b5e6131bb5b08ce04c5
     common/environment_notice: 228a8668be1812e031f438d166861729
     common/error: 3c95bcb32c2104b99a46f5b3dd015248
     common/error_component_description: fa9eee04f864c3fe6e6681f716caa015
@@ -228,11 +230,13 @@ checksums:
     common/inactive_surveys: 324b8e1844739cdc2a3bc71aef143a76
     common/integration: 40d02f65c4356003e0e90ffb944907d2
     common/integrations: 0ccce343287704cd90150c32e2fcad36
-    common/invalid_date: 4c18c82f7317d4a02f8d5fef611e82b7
+    common/invalid_date_with_value: f7f9dbe99f25f1724367ee57572b52bf
     common/invalid_file_name: 8243c91b898110fb15ebb24aa6a7d313
     common/invalid_file_type: f0c83e7d61dbad8250abb59869af4b9e
     common/invite: 181884cea804cbde665f160811ee7ad0
     common/invite_them: d4b7aadbd3c924b04ad4fce419709f10
+    common/javascript_required: d7988e5934af4d0df54fda369c0e4fb6
+    common/javascript_required_description: 4b65f456db79af4898888a3dd034fe2f
     common/key: 3d1065ab98a1c2f1210507fd5c7bf515
     common/label: a5c71bf158481233f8215dbd38cc196b
     common/language: 277fd1a41cc237a437cd1d5e4a80463b
@@ -253,7 +257,9 @@ checksums:
     common/marketing: fcf0f06f8b64b458c7ca6d95541a3cc8
     common/members: 0932e80cba1e3e0a7f52bb67ff31da32
     common/members_and_teams: bf5c3fadcb9fc23533ec1532b805ac08
+    common/membership: 83c856bbc2af99d8c3d860959d1d2a85
     common/membership_not_found: 7ac63584af23396aace9992ad919ffd4
+    common/meta: 842eac888f134f3525f8ea613d933687
     common/metadata: 695d4f7da261ba76e3be4de495491028
     common/mobile_overlay_app_works_best_on_desktop: 4509f7bfbb4edbd42e534042d6cb7e72
     common/mobile_overlay_surveys_look_good: d85169e86077738b9837647bf6d1c7d2
@@ -293,10 +299,9 @@ checksums:
     common/or: 7b133c38bec0d5ee23cc6bcf9a8de50b
     common/organization: 3dc8489af7e74121f65ce6d9677bc94d
     common/organization_id: ef09b71c84a25b5da02a23c77e68a335
-    common/organization_not_found: 4cb8c07ec2c599b6f48750e06ffa182b
     common/organization_settings: 11528aa89ae9935e55dcb54478058775
-    common/organization_teams_not_found: ce29fcb7a4e8b4582f92b65dea9b7d4e
     common/other: 79acaa6cd481262bea4e743a422529d2
+    common/other_filters: 20b09213c131db47eb8b23e72d0c4bea
     common/others: 39160224ce0e35eb4eb252c997edf4d8
     common/overlay_color: 4b72073285d13fff93d094aabffe05ac
     common/overview: 30c54e4dc4ce599b87d94be34a8617f5
@@ -355,6 +360,7 @@ checksums:
     common/select: 5ac04c47a98deb85906bc02e0de91ab0
     common/select_all: eedc7cdb02de467c15dc418a066a77f2
     common/select_filter: c50082c3981f1161022f9787a19aed71
+    common/select_language: d75cf5fbce8a4c7a9055e2210af74480
     common/select_survey: bac52e59c7847417bef6fe7b7096b475
     common/select_teams: ae5d451929846ae6367562bc671a1af9
     common/selected: 9f09e059ba20c88ed34e2b4e8e032d56
@@ -387,7 +393,6 @@ checksums:
     common/survey_id: 08303e98b3d4134947256e494b0c829e
     common/survey_languages: 93e4a10ab190e6b1e1f7fe5f702df249
     common/survey_live: d1f370505c67509e7b2759952daba20d
-    common/survey_not_found: 0485ea98d13a414eeefc8f1118b9c293
     common/survey_paused: c770d174d6b57e8425a54906a09c8b39
     common/survey_type: 417fcfecf8eaedefc4f11172426811f9
     common/surveys: 33f68ad4111b32a6361beb9d5c184533
@@ -402,7 +407,6 @@ checksums:
     common/team_name: 549d949de4b9adad4afd6427a60a329e
     common/team_role: 66db395781aef64ef3791417b3b67c0b
     common/teams: b63448c05270497973ac4407047dae02
-    common/teams_not_found: 02f333a64a83c1c014d8900ec9666345
     common/text: 4ddccc1974775ed7357f9beaf9361cec
     common/time: b504a03d52e8001bfdc5cb6205364f42
     common/time_to_finish: c8f6abdb886bee3619bb50b08fada5fa
@@ -426,7 +430,6 @@ checksums:
     common/url: ca97457614226960d41dd18c3c29c86b
     common/user: 61073457a5c3901084b557d065f876be
     common/user_id: 37f5ba37f71cb50607af32a6a203b1d4
-    common/user_not_found: 5903581136ac6c1c1351a482a6d8fdf7
     common/variable: c13db5775ba9791b1522cc55c9c7acce
     common/variable_ids: 44bf93b70703b7699fa9f21bc6c8eed4
     common/variables: ffd3eec5497af36d7b4e4185bad1313a
@@ -442,14 +445,13 @@ checksums:
     common/weeks: 545de30df4f44d3f6d1d344af6a10815
     common/welcome_card: 76081ebd5b2e35da9b0f080323704ae7
     common/workflows: b0c9c8615a9ba7d9cb73e767290a7f72
+    common/workspace: b63ef0e99ee6f7fef6cbe4971ca6cf0f
     common/workspace_configuration: d0a5812d6a97d7724d565b1017c34387
     common/workspace_created_successfully: bf401ae83da954f1db48724e2a8e40f1
     common/workspace_creation_description: aea2f480ba0c54c5cabac72c9c900ddf
     common/workspace_id: bafef925e1b57b52a69844fdf47aac3c
     common/workspace_name: 14c04a902a874ab5ddbe9cf369ef0414
     common/workspace_name_placeholder: 8a9e30ab01666af13c44a73b82c37ec1
-    common/workspace_not_found: 038fb0aaf3570610f4377b9eaed13752
-    common/workspace_permission_not_found: e94bdff8af51175c5767714f82bb4833
     common/workspaces: 8ba082a84aa35cf851af1cf874b853e2
     common/years: eb4f5fdd2b320bf13e200fd6a6c1abff
     common/you: db2a4a796b70cc1430d1b21f6ffb6dcb
@@ -625,7 +627,6 @@ checksums:
     environments/contacts/attributes_msg_new_attribute_created: 5cba6158c4305c05104814ec1479267c
     environments/contacts/attributes_msg_userid_already_exists: 9c695538befc152806c460f52a73821a
     environments/contacts/contact_deleted_successfully: c5b64a42a50e055f9e27ec49e20e03fa
-    environments/contacts/contact_not_found: 045396f0b13fafd43612a286263737c0
     environments/contacts/contacts_table_refresh: 6a959475991dd4ab28ad881bae569a09
     environments/contacts/contacts_table_refresh_success: 40951396e88e5c8fdafa0b3bb4fadca8
     environments/contacts/create_attribute: 87320615901f95b4f35ee83c290a3a6c
@@ -805,9 +806,16 @@ checksums:
     environments/integrations/webhooks/created_by_third_party: b40197eabbbce500b80b44268b8b1ee9
     environments/integrations/webhooks/discord_webhook_not_supported: 23432534f908b2ba63a517fb1f9bbe0e
     environments/integrations/webhooks/empty_webhook_message: 4c4d8709576a38cb8eb59866331d2405
+    environments/integrations/webhooks/endpoint_bad_gateway_error: 48ab17e9a77030b289ec22f497f50b63
+    environments/integrations/webhooks/endpoint_gateway_timeout_error: 5da45e2f6933927d1f8b0aaa9566e6a6
+    environments/integrations/webhooks/endpoint_internal_server_error: 6773fc34349febf95475cde88d8ee072
+    environments/integrations/webhooks/endpoint_method_not_allowed_error: 9963b503311393f4d7bffae9df46d422
+    environments/integrations/webhooks/endpoint_not_found_error: 607b75b7b7aa92ca81fe44e466f7c318
     environments/integrations/webhooks/endpoint_pinged: 3b1fce00e61d4b9d2bdca390649c58b6
     environments/integrations/webhooks/endpoint_pinged_error: 96c312fe8214757c4a934cdfbe177027
+    environments/integrations/webhooks/endpoint_service_unavailable_error: f9d4874c322f2963f5afaede354c9416
     environments/integrations/webhooks/learn_to_verify: 25b2a035e2109170b28f4e16db76ad39
+    environments/integrations/webhooks/no_triggers: 6b68cddfc45b3f7e20644a24a1bbea69
     environments/integrations/webhooks/please_check_console: 7b1787e82a0d762df02c011ebb1650ea
     environments/integrations/webhooks/please_enter_a_url: c24c74d0ce7ed3a6b858aadbc82108fe
     environments/integrations/webhooks/response_created: 8c43b1b6d748f6096f6f8d9232a3c469
@@ -1342,7 +1350,6 @@ checksums:
     environments/surveys/edit/custom_hostname: bc2b1c8de3f9b8ef145b45aeba6ab429
     environments/surveys/edit/customize_survey_logo: 7f7e26026c88a727228f2d7a00d914e2
     environments/surveys/edit/darken_or_lighten_background_of_your_choice: 304a64a8050ebf501d195e948cd25b6f
-    environments/surveys/edit/date_format: e95dfc41ac944874868487457ddc057a
     environments/surveys/edit/days_before_showing_this_survey_again: 9ee757e5c3a07844b12ceb406dc65b04
     environments/surveys/edit/delete_anyways: cc8683ab625280eefc9776bd381dc2e8
     environments/surveys/edit/delete_block: c00617cb0724557e486304276063807a
@@ -1604,6 +1611,8 @@ checksums:
     environments/surveys/edit/response_limit_needs_to_exceed_number_of_received_responses: 9a9c223c0918ded716ddfaa84fbaa8d9
     environments/surveys/edit/response_limits_redirections_and_more: e4f1cf94e56ad0e1b08701158d688802
     environments/surveys/edit/response_options: 2988136d5248d7726583108992dcbaee
+    environments/surveys/edit/reverse_order_occasionally: 170fd50de940f382fa2e605228e4e088
+    environments/surveys/edit/reverse_order_occasionally_except_last: 1c833001b940f1419dd7534b199a0b4a
     environments/surveys/edit/roundness: 5a161c8f5f258defb57ed1d551737cc4
     environments/surveys/edit/roundness_description: 03940a6871ae43efa4810cba7cadb74b
     environments/surveys/edit/row_used_in_logic_error: f89453ff1b6db77ad84af840fedd9813
@@ -1632,13 +1641,13 @@ checksums:
     environments/surveys/edit/show_survey_maximum_of: 721ed61b01a9fc8ce4becb72823bb72e
     environments/surveys/edit/show_survey_to_users: d5e90fd17babfea978fce826e9df89b0
     environments/surveys/edit/show_to_x_percentage_of_targeted_users: b745169011fa7e8ca475baa5500c5197
+    environments/surveys/edit/shrink_preview: 42567389520b226f211f94f052197ad8
     environments/surveys/edit/simple: 65575bd903091299bc4a94b7517a6288
     environments/surveys/edit/six_points: c6c09b3f07171dc388cb5a610ea79af7
     environments/surveys/edit/smiley: e68e3b28fc3c04255e236c6a0feb662b
     environments/surveys/edit/spam_protection_note: 94059310d07c30f6704e216297036d05
     environments/surveys/edit/spam_protection_threshold_description: ed8b8c9c583077a88bf5dd3ec8b59e60
     environments/surveys/edit/spam_protection_threshold_heading: 29f9a8b00c5bcbb43aedc48138a5cf9c
-    environments/surveys/edit/shrink_preview: 42567389520b226f211f94f052197ad8
     environments/surveys/edit/star: 0586c1c76e8a0367c0a7b93adf598cb7
     environments/surveys/edit/starts_with: f6673c17475708313c6a0f245b561781
     environments/surveys/edit/state: 118de561d4525b14f9bb29ac9e86161d

apps/web/instrumentation.ts

@@ -1,7 +1,19 @@
 import * as Sentry from "@sentry/nextjs";
+import { type Instrumentation } from "next";
+import { isExpectedError } from "@formbricks/types/errors";
 import { IS_PRODUCTION, PROMETHEUS_ENABLED, SENTRY_DSN } from "@/lib/constants";
 
-export const onRequestError = Sentry.captureRequestError;
+export const onRequestError: Instrumentation.onRequestError = (...args) => {
+  const [error] = args;
+
+  // Skip expected business-logic errors (AuthorizationError, ResourceNotFoundError, etc.)
+  // These are handled gracefully in the UI and don't need server-side Sentry reporting
+  if (error instanceof Error && isExpectedError(error)) {
+    return;
+  }
+
+  Sentry.captureRequestError(...args);
+};
 
 export const register = async () => {
   if (process.env.NEXT_RUNTIME === "nodejs") {

apps/web/lib/membership/hooks/actions.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import "server-only";
-import { AuthorizationError } from "@formbricks/types/errors";
+import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "../../organization/service";
 import { getMembershipByUserIdOrganizationId } from "../service";
 
@@ -9,7 +9,7 @@ export const getMembershipByUserIdOrganizationIdAction = async (environmentId: s
   const organization = await getOrganizationByEnvironmentId(environmentId);
 
   if (!organization) {
-    throw new Error("Organization not found");
+    throw new ResourceNotFoundError("Organization", null);
   }
 
   const currentUserMembership = await getMembershipRole(userId, organization.id);

apps/web/lib/response/service.ts

@@ -378,7 +378,7 @@ export const getResponseDownloadFile = async (
 
     const organizationId = await getOrganizationIdFromEnvironmentId(survey.environmentId);
     if (!organizationId) {
-      throw new Error("Organization ID not found");
+      throw new ResourceNotFoundError("Organization", null);
     }
 
     const organizationBilling = await getOrganizationBilling(organizationId);

apps/web/lib/river/constants.ts

@@ -0,0 +1,10 @@
+import "server-only";
+
+export const RIVER_SCHEMA = "river";
+export const RIVER_SURVEY_LIFECYCLE_QUEUE = "survey_lifecycle";
+export const RIVER_SURVEY_START_KIND = "survey.start";
+export const RIVER_SURVEY_END_KIND = "survey.end";
+export const RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS = 3;
+export const RIVER_INSERT_NOTIFICATION_CHANNEL = "river_insert";
+
+export const RIVER_PENDING_JOB_STATES = ["available", "scheduled", "retryable"] as const;

apps/web/lib/river/survey-lifecycle.test.ts

@@ -0,0 +1,502 @@
+import { Prisma } from "@prisma/client";
+import type { PrismaClient } from "@prisma/client";
+import { randomUUID } from "crypto";
+import { Socket } from "net";
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest";
+import { logger } from "@formbricks/logger";
+import {
+  RIVER_INSERT_NOTIFICATION_CHANNEL,
+  RIVER_PENDING_JOB_STATES,
+  RIVER_SURVEY_END_KIND,
+  RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS,
+  RIVER_SURVEY_LIFECYCLE_QUEUE,
+  RIVER_SURVEY_START_KIND,
+} from "./constants";
+import { deleteSurveyLifecycleJobs, enqueueSurveyLifecycleJobs } from "./survey-lifecycle";
+
+vi.mock("server-only", () => ({}));
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+
+const createMockTx = () =>
+  ({
+    $executeRaw: vi.fn(),
+  }) as unknown as Prisma.TransactionClient;
+
+const getQueryValues = (callIndex: number, tx: Prisma.TransactionClient) => {
+  const query = vi.mocked(tx.$executeRaw).mock.calls[callIndex][0] as Prisma.Sql;
+  return query.values;
+};
+
+describe("enqueueSurveyLifecycleJobs", () => {
+  beforeEach(() => {
+    vi.mocked(logger.error).mockReset();
+  });
+
+  test("enqueues a start job when startsAt is set on create", async () => {
+    const tx = createMockTx();
+    const startsAt = new Date("2026-04-01T12:00:00.000Z");
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      now: new Date("2026-03-31T12:00:00.000Z"),
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt,
+        endsAt: null,
+      },
+    });
+
+    expect(tx.$executeRaw).toHaveBeenCalledTimes(2);
+    expect(getQueryValues(0, tx)).toEqual([
+      JSON.stringify({
+        surveyId: "survey_1",
+        environmentId: "env_1",
+        scheduledFor: startsAt.toISOString(),
+      }),
+      RIVER_SURVEY_START_KIND,
+      RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS,
+      RIVER_SURVEY_LIFECYCLE_QUEUE,
+      startsAt,
+    ]);
+    expect(getQueryValues(1, tx)).toEqual([
+      `river.${RIVER_INSERT_NOTIFICATION_CHANNEL}`,
+      JSON.stringify({ queue: RIVER_SURVEY_LIFECYCLE_QUEUE }),
+    ]);
+  });
+
+  test("enqueues an end job when endsAt is set on create", async () => {
+    const tx = createMockTx();
+    const endsAt = new Date("2026-04-02T12:00:00.000Z");
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      now: new Date("2026-03-31T12:00:00.000Z"),
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt: null,
+        endsAt,
+      },
+    });
+
+    expect(tx.$executeRaw).toHaveBeenCalledTimes(2);
+    expect(getQueryValues(0, tx)).toEqual([
+      JSON.stringify({
+        surveyId: "survey_1",
+        environmentId: "env_1",
+        scheduledFor: endsAt.toISOString(),
+      }),
+      RIVER_SURVEY_END_KIND,
+      RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS,
+      RIVER_SURVEY_LIFECYCLE_QUEUE,
+      endsAt,
+    ]);
+  });
+
+  test("enqueues both lifecycle jobs when both dates are set on create", async () => {
+    const tx = createMockTx();
+    const startsAt = new Date("2026-04-01T12:00:00.000Z");
+    const endsAt = new Date("2026-04-02T12:00:00.000Z");
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      now: new Date("2026-03-31T12:00:00.000Z"),
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt,
+        endsAt,
+      },
+    });
+
+    expect(tx.$executeRaw).toHaveBeenCalledTimes(3);
+    expect(getQueryValues(0, tx)[1]).toBe(RIVER_SURVEY_START_KIND);
+    expect(getQueryValues(1, tx)[1]).toBe(RIVER_SURVEY_END_KIND);
+  });
+
+  test("does nothing when neither lifecycle date is set", async () => {
+    const tx = createMockTx();
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt: null,
+        endsAt: null,
+      },
+    });
+
+    expect(tx.$executeRaw).not.toHaveBeenCalled();
+  });
+
+  test("enqueues a lifecycle job when a date transitions from null to a value", async () => {
+    const tx = createMockTx();
+    const startsAt = new Date("2026-04-01T12:00:00.000Z");
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      now: new Date("2026-03-31T12:00:00.000Z"),
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt,
+        endsAt: null,
+      },
+      previousSurvey: {
+        startsAt: null,
+        endsAt: null,
+      },
+    });
+
+    expect(tx.$executeRaw).toHaveBeenCalledTimes(2);
+  });
+
+  test("does not enqueue when a lifecycle date changes after already being set", async () => {
+    const tx = createMockTx();
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt: new Date("2026-04-02T12:00:00.000Z"),
+        endsAt: null,
+      },
+      previousSurvey: {
+        startsAt: new Date("2026-04-01T12:00:00.000Z"),
+        endsAt: null,
+      },
+    });
+
+    expect(tx.$executeRaw).not.toHaveBeenCalled();
+  });
+
+  test("does not enqueue when a lifecycle date is cleared", async () => {
+    const tx = createMockTx();
+
+    await enqueueSurveyLifecycleJobs({
+      tx,
+      survey: {
+        id: "survey_1",
+        environmentId: "env_1",
+        startsAt: null,
+        endsAt: null,
+      },
+      previousSurvey: {
+        startsAt: new Date("2026-04-01T12:00:00.000Z"),
+        endsAt: null,
+      },
+    });
+
+    expect(tx.$executeRaw).not.toHaveBeenCalled();
+  });
+
+  test("logs and rethrows SQL errors", async () => {
+    const tx = createMockTx();
+    const queryError = new Error("insert failed");
+    vi.mocked(tx.$executeRaw).mockRejectedValueOnce(queryError);
+
+    await expect(
+      enqueueSurveyLifecycleJobs({
+        tx,
+        survey: {
+          id: "survey_1",
+          environmentId: "env_1",
+          startsAt: new Date("2026-04-01T12:00:00.000Z"),
+          endsAt: null,
+        },
+      })
+    ).rejects.toThrow(queryError);
+
+    expect(logger.error).toHaveBeenCalledWith(
+      { error: queryError, surveyId: "survey_1" },
+      "Failed to enqueue survey lifecycle jobs"
+    );
+  });
+});
+
+describe("deleteSurveyLifecycleJobs", () => {
+  beforeEach(() => {
+    vi.mocked(logger.error).mockReset();
+  });
+
+  test("deletes pending lifecycle jobs for the survey", async () => {
+    const tx = createMockTx();
+
+    await deleteSurveyLifecycleJobs({
+      tx,
+      surveyId: "survey_1",
+    });
+
+    expect(tx.$executeRaw).toHaveBeenCalledTimes(1);
+    expect(getQueryValues(0, tx)).toEqual([
+      RIVER_SURVEY_START_KIND,
+      RIVER_SURVEY_END_KIND,
+      "survey_1",
+      ...RIVER_PENDING_JOB_STATES,
+    ]);
+  });
+
+  test("logs and rethrows delete failures", async () => {
+    const tx = createMockTx();
+    const queryError = new Error("delete failed");
+    vi.mocked(tx.$executeRaw).mockRejectedValueOnce(queryError);
+
+    await expect(
+      deleteSurveyLifecycleJobs({
+        tx,
+        surveyId: "survey_1",
+      })
+    ).rejects.toThrow(queryError);
+
+    expect(logger.error).toHaveBeenCalledWith(
+      { error: queryError, surveyId: "survey_1" },
+      "Failed to delete pending survey lifecycle jobs"
+    );
+  });
+});
+
+const canReachPostgres = async (databaseURL?: string): Promise<boolean> => {
+  if (!databaseURL) {
+    return false;
+  }
+
+  try {
+    const parsedURL = new URL(databaseURL);
+    const port = Number(parsedURL.port || "5432");
+
+    await new Promise<void>((resolve, reject) => {
+      const socket = new Socket();
+
+      socket.setTimeout(500);
+      socket.once("connect", () => {
+        socket.destroy();
+        resolve();
+      });
+      socket.once("timeout", () => {
+        socket.destroy();
+        reject(new Error("timeout"));
+      });
+      socket.once("error", (error) => {
+        socket.destroy();
+        reject(error);
+      });
+
+      socket.connect(port, parsedURL.hostname);
+    });
+
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const describeIfDatabase = (await canReachPostgres(process.env.DATABASE_URL)) ? describe : describe.skip;
+
+describeIfDatabase("survey lifecycle integration", () => {
+  let integrationPrisma: PrismaClient;
+  let schema: string;
+
+  const quoteIdentifier = (identifier: string) => `"${identifier}"`;
+
+  beforeAll(() => {
+    return vi
+      .importActual<typeof import("@prisma/client")>("@prisma/client")
+      .then(({ PrismaClient: ActualPrismaClient }) => {
+        integrationPrisma = new ActualPrismaClient({
+          datasources: {
+            db: {
+              url: process.env.DATABASE_URL,
+            },
+          },
+        });
+      });
+  });
+
+  beforeEach(async () => {
+    schema = `river_test_${randomUUID().replace(/-/g, "_")}`;
+
+    await integrationPrisma.$executeRaw(Prisma.raw(`CREATE SCHEMA ${quoteIdentifier(schema)}`));
+    await integrationPrisma.$executeRaw(
+      Prisma.raw(`
+      CREATE TYPE ${quoteIdentifier(schema)}.${quoteIdentifier("river_job_state")} AS ENUM (
+        'available',
+        'scheduled',
+        'retryable',
+        'completed'
+      )
+    `)
+    );
+    await integrationPrisma.$executeRaw(
+      Prisma.raw(`
+      CREATE TABLE ${quoteIdentifier(schema)}.${quoteIdentifier("river_job")} (
+        id BIGSERIAL PRIMARY KEY,
+        state ${quoteIdentifier(schema)}.${quoteIdentifier("river_job_state")} NOT NULL DEFAULT 'available',
+        args JSONB NOT NULL,
+        kind TEXT NOT NULL,
+        max_attempts SMALLINT NOT NULL,
+        queue TEXT NOT NULL,
+        scheduled_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+        created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+      )
+    `)
+    );
+  });
+
+  afterEach(async () => {
+    await integrationPrisma.$executeRaw(
+      Prisma.raw(`DROP SCHEMA IF EXISTS ${quoteIdentifier(schema)} CASCADE`)
+    );
+  });
+
+  afterAll(async () => {
+    await integrationPrisma.$disconnect();
+  });
+
+  test("persists scheduled and immediate lifecycle jobs with the expected payload", async () => {
+    const surveyId = "survey_1";
+    const environmentId = "env_1";
+    const startsAt = new Date("2026-05-01T12:00:00.000Z");
+    const endsAt = new Date("2026-03-01T12:00:00.000Z");
+    const beforeInsert = new Date();
+
+    await integrationPrisma.$transaction(async (tx) => {
+      await enqueueSurveyLifecycleJobs({
+        tx,
+        schema,
+        now: new Date("2026-04-01T12:00:00.000Z"),
+        survey: {
+          id: surveyId,
+          environmentId,
+          startsAt,
+          endsAt: null,
+        },
+      });
+
+      await enqueueSurveyLifecycleJobs({
+        tx,
+        schema,
+        now: new Date("2026-04-01T12:00:00.000Z"),
+        survey: {
+          id: surveyId,
+          environmentId,
+          startsAt,
+          endsAt,
+        },
+        previousSurvey: {
+          startsAt,
+          endsAt: null,
+        },
+      });
+    });
+    const afterInsert = new Date();
+
+    const jobs = await integrationPrisma.$queryRaw<
+      Array<{
+        kind: string;
+        queue: string;
+        args: Record<string, string>;
+        scheduled_at: Date;
+        max_attempts: number;
+      }>
+    >(
+      Prisma.raw(
+        `SELECT kind, queue, args, scheduled_at, max_attempts
+         FROM ${quoteIdentifier(schema)}.${quoteIdentifier("river_job")}
+         ORDER BY kind ASC`
+      )
+    );
+
+    expect(jobs).toHaveLength(2);
+    expect(jobs).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          kind: RIVER_SURVEY_END_KIND,
+          queue: RIVER_SURVEY_LIFECYCLE_QUEUE,
+          args: {
+            surveyId,
+            environmentId,
+            scheduledFor: endsAt.toISOString(),
+          },
+          max_attempts: RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS,
+        }),
+        expect.objectContaining({
+          kind: RIVER_SURVEY_START_KIND,
+          queue: RIVER_SURVEY_LIFECYCLE_QUEUE,
+          args: {
+            surveyId,
+            environmentId,
+            scheduledFor: startsAt.toISOString(),
+          },
+          scheduled_at: startsAt,
+          max_attempts: RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS,
+        }),
+      ])
+    );
+
+    const immediateJob = jobs.find((job) => job.kind === RIVER_SURVEY_END_KIND);
+    expect(immediateJob?.scheduled_at.getTime()).toBeGreaterThanOrEqual(beforeInsert.getTime() - 1000);
+    expect(immediateJob?.scheduled_at.getTime()).toBeLessThanOrEqual(afterInsert.getTime() + 1000);
+  });
+
+  test("removes only pending lifecycle jobs for the target survey", async () => {
+    const surveyId = "survey_1";
+
+    await integrationPrisma.$executeRaw(
+      Prisma.raw(`
+      INSERT INTO ${quoteIdentifier(schema)}.${quoteIdentifier("river_job")}
+        (state, args, kind, max_attempts, queue)
+      VALUES
+        ('available', '{"surveyId":"survey_1","environmentId":"env_1","scheduledFor":"2026-04-01T12:00:00.000Z"}', '${RIVER_SURVEY_START_KIND}', 3, '${RIVER_SURVEY_LIFECYCLE_QUEUE}'),
+        ('completed', '{"surveyId":"survey_1","environmentId":"env_1","scheduledFor":"2026-04-02T12:00:00.000Z"}', '${RIVER_SURVEY_END_KIND}', 3, '${RIVER_SURVEY_LIFECYCLE_QUEUE}'),
+        ('retryable', '{"surveyId":"survey_2","environmentId":"env_1","scheduledFor":"2026-04-03T12:00:00.000Z"}', '${RIVER_SURVEY_START_KIND}', 3, '${RIVER_SURVEY_LIFECYCLE_QUEUE}')
+    `)
+    );
+
+    await integrationPrisma.$transaction(async (tx) => {
+      await deleteSurveyLifecycleJobs({
+        tx,
+        surveyId,
+        schema,
+      });
+    });
+
+    const remainingJobs = await integrationPrisma.$queryRaw<
+      Array<{ state: string; kind: string; args: { surveyId: string } }>
+    >(
+      Prisma.raw(
+        `SELECT state, kind, args
+         FROM ${quoteIdentifier(schema)}.${quoteIdentifier("river_job")}
+         ORDER BY state ASC, kind ASC`
+      )
+    );
+
+    expect(remainingJobs).toEqual([
+      {
+        state: "completed",
+        kind: RIVER_SURVEY_END_KIND,
+        args: {
+          surveyId: "survey_1",
+          environmentId: "env_1",
+          scheduledFor: "2026-04-02T12:00:00.000Z",
+        },
+      },
+      {
+        state: "retryable",
+        kind: RIVER_SURVEY_START_KIND,
+        args: {
+          surveyId: "survey_2",
+          environmentId: "env_1",
+          scheduledFor: "2026-04-03T12:00:00.000Z",
+        },
+      },
+    ]);
+  });
+});

apps/web/lib/river/survey-lifecycle.ts

@@ -0,0 +1,181 @@
+import "server-only";
+import { Prisma } from "@prisma/client";
+import { logger } from "@formbricks/logger";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import {
+  RIVER_INSERT_NOTIFICATION_CHANNEL,
+  RIVER_PENDING_JOB_STATES,
+  RIVER_SCHEMA,
+  RIVER_SURVEY_END_KIND,
+  RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS,
+  RIVER_SURVEY_LIFECYCLE_QUEUE,
+  RIVER_SURVEY_START_KIND,
+} from "./constants";
+
+export type SurveyLifecycleJobKind = typeof RIVER_SURVEY_START_KIND | typeof RIVER_SURVEY_END_KIND;
+
+export interface SurveyLifecycleJobArgs {
+  surveyId: string;
+  environmentId: string;
+  scheduledFor: string;
+}
+
+export interface SurveyLifecycleSurvey {
+  id: TSurvey["id"];
+  environmentId: TSurvey["environmentId"];
+  startsAt?: TSurvey["startsAt"];
+  endsAt?: TSurvey["endsAt"];
+}
+
+interface EnqueueSurveyLifecycleJobsOptions {
+  tx: Prisma.TransactionClient;
+  survey: SurveyLifecycleSurvey;
+  previousSurvey?: Pick<SurveyLifecycleSurvey, "startsAt" | "endsAt"> | null;
+  now?: Date;
+  schema?: string;
+}
+
+interface DeleteSurveyLifecycleJobsOptions {
+  tx: Prisma.TransactionClient;
+  surveyId: string;
+  schema?: string;
+  kinds?: SurveyLifecycleJobKind[];
+}
+
+const identifierPattern = /^[A-Za-z_][A-Za-z0-9_]*$/;
+
+const quoteIdentifier = (identifier: string): string => {
+  if (!identifierPattern.test(identifier)) {
+    throw new Error(`Invalid SQL identifier: ${identifier}`);
+  }
+
+  return `"${identifier}"`;
+};
+
+const getQualifiedRiverJobTable = (schema: string): Prisma.Sql =>
+  Prisma.raw(`${quoteIdentifier(schema)}.${quoteIdentifier("river_job")}`);
+
+const getQualifiedInsertNotificationChannel = (schema: string): string => {
+  if (!identifierPattern.test(schema)) {
+    throw new Error(`Invalid SQL identifier: ${schema}`);
+  }
+
+  return `${schema}.${RIVER_INSERT_NOTIFICATION_CHANNEL}`;
+};
+
+const shouldEnqueueTransition = (previousValue?: Date | null, nextValue?: Date | null): nextValue is Date =>
+  previousValue == null && nextValue != null;
+
+const buildJobArgs = (survey: SurveyLifecycleSurvey, scheduledFor: Date): SurveyLifecycleJobArgs => ({
+  surveyId: survey.id,
+  environmentId: survey.environmentId,
+  scheduledFor: scheduledFor.toISOString(),
+});
+
+const enqueueLifecycleJob = async (
+  tx: Prisma.TransactionClient,
+  {
+    kind,
+    survey,
+    scheduledFor,
+    schema,
+    now,
+  }: {
+    kind: SurveyLifecycleJobKind;
+    survey: SurveyLifecycleSurvey;
+    scheduledFor: Date;
+    schema: string;
+    now: Date;
+  }
+): Promise<void> => {
+  const args = JSON.stringify(buildJobArgs(survey, scheduledFor));
+  const riverJobTable = getQualifiedRiverJobTable(schema);
+
+  if (scheduledFor.getTime() > now.getTime()) {
+    await tx.$executeRaw(
+      Prisma.sql`
+        INSERT INTO ${riverJobTable} (args, kind, max_attempts, queue, scheduled_at)
+        VALUES (
+          ${args}::jsonb,
+          ${kind},
+          ${RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS},
+          ${RIVER_SURVEY_LIFECYCLE_QUEUE},
+          ${scheduledFor}
+        )
+      `
+    );
+  } else {
+    await tx.$executeRaw(
+      Prisma.sql`
+        INSERT INTO ${riverJobTable} (args, kind, max_attempts, queue)
+        VALUES (
+          ${args}::jsonb,
+          ${kind},
+          ${RIVER_SURVEY_LIFECYCLE_MAX_ATTEMPTS},
+          ${RIVER_SURVEY_LIFECYCLE_QUEUE}
+        )
+      `
+    );
+  }
+};
+
+const notifyLifecycleQueue = async (tx: Prisma.TransactionClient, schema: string): Promise<void> => {
+  const payload = JSON.stringify({ queue: RIVER_SURVEY_LIFECYCLE_QUEUE });
+  await tx.$executeRaw(
+    Prisma.sql`SELECT pg_notify(${getQualifiedInsertNotificationChannel(schema)}, ${payload})`
+  );
+};
+
+export const enqueueSurveyLifecycleJobs = async ({
+  tx,
+  survey,
+  previousSurvey,
+  now = new Date(),
+  schema = RIVER_SCHEMA,
+}: EnqueueSurveyLifecycleJobsOptions): Promise<void> => {
+  const pendingJobs: Array<{ kind: SurveyLifecycleJobKind; scheduledFor: Date }> = [];
+
+  if (shouldEnqueueTransition(previousSurvey?.startsAt ?? null, survey.startsAt ?? null)) {
+    pendingJobs.push({ kind: RIVER_SURVEY_START_KIND, scheduledFor: survey.startsAt as Date });
+  }
+
+  if (shouldEnqueueTransition(previousSurvey?.endsAt ?? null, survey.endsAt ?? null)) {
+    pendingJobs.push({ kind: RIVER_SURVEY_END_KIND, scheduledFor: survey.endsAt as Date });
+  }
+
+  if (pendingJobs.length === 0) {
+    return;
+  }
+
+  try {
+    for (const job of pendingJobs) {
+      await enqueueLifecycleJob(tx, { ...job, survey, schema, now });
+    }
+
+    await notifyLifecycleQueue(tx, schema);
+  } catch (error) {
+    logger.error({ error, surveyId: survey.id }, "Failed to enqueue survey lifecycle jobs");
+    throw error;
+  }
+};
+
+export const deleteSurveyLifecycleJobs = async ({
+  tx,
+  surveyId,
+  schema = RIVER_SCHEMA,
+  kinds = [RIVER_SURVEY_START_KIND, RIVER_SURVEY_END_KIND],
+}: DeleteSurveyLifecycleJobsOptions): Promise<void> => {
+  try {
+    await tx.$executeRaw(
+      Prisma.sql`
+        DELETE FROM ${getQualifiedRiverJobTable(schema)}
+        WHERE kind IN (${Prisma.join(kinds)})
+          AND args->>'surveyId' = ${surveyId}
+          AND state IN (${Prisma.join(RIVER_PENDING_JOB_STATES)})
+      `
+    );
+  } catch (error) {
+    logger.error({ error, surveyId }, "Failed to delete pending survey lifecycle jobs");
+    throw error;
+  }
+};

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

@@ -193,6 +193,8 @@ const mockWelcomeCard: TSurveyWelcomeCard = {
 const baseSurveyProperties = {
   id: mockId,
   name: "Mock Survey",
+  startsAt: null,
+  endsAt: null,
   autoClose: 10,
   delay: 0,
   autoComplete: 7,

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

@@ -1,11 +1,17 @@
-import { prisma } from "@/lib/__mocks__/database";
+import { prisma } from "../__mocks__/database";
 import { ActionClass, Prisma, Survey } from "@prisma/client";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import { testInputValidation } from "vitestSetup";
 import { PrismaErrorType } from "@formbricks/database/types/error";
 import { TSurveyFollowUp } from "@formbricks/database/types/survey-follow-up";
+import { logger } from "@formbricks/logger";
 import { TActionClass } from "@formbricks/types/action-classes";
-import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors";
+import {
+  DatabaseError,
+  InvalidInputError,
+  ResourceNotFoundError,
+  ValidationError,
+} from "@formbricks/types/errors";
 import { TSegment } from "@formbricks/types/segment";
 import { TSurvey, TSurveyCreateInput, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
 import { getActionClasses } from "@/lib/actionClass/service";
@@ -13,6 +19,7 @@ import {
   getOrganizationByEnvironmentId,
   subscribeOrganizationMembersToSurveyResponses,
 } from "@/lib/organization/service";
+import { enqueueSurveyLifecycleJobs } from "@/lib/river/survey-lifecycle";
 import { evaluateLogic } from "@/lib/surveyLogic/utils";
 import {
   mockActionClass,
@@ -36,6 +43,8 @@ import {
   updateSurveyInternal,
 } from "./service";
 
+vi.mock("server-only", () => ({}));
+
 // Mock organization service
 vi.mock("@/lib/organization/service", () => ({
   getOrganizationByEnvironmentId: vi.fn().mockResolvedValue({
@@ -49,8 +58,21 @@ vi.mock("@/lib/actionClass/service", () => ({
   getActionClasses: vi.fn(),
 }));
 
+vi.mock("@/lib/river/survey-lifecycle", () => ({
+  enqueueSurveyLifecycleJobs: vi.fn(),
+}));
+
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+
 beforeEach(() => {
   prisma.survey.count.mockResolvedValue(1);
+  prisma.$transaction.mockImplementation(async (callback: any) => callback(prisma));
+  vi.mocked(enqueueSurveyLifecycleJobs).mockReset();
+  vi.mocked(logger.error).mockReset();
 });
 
 describe("evaluateLogic with mockSurveyWithLogic", () => {
@@ -309,6 +331,35 @@ describe("Tests for updateSurvey", () => {
       expect(updatedSurvey).toEqual(mockTransformedSurveyOutput);
     });
 
+    test("enqueues lifecycle jobs when a date is assigned for the first time", async () => {
+      const startsAt = new Date("2026-04-01T12:00:00.000Z");
+      const currentSurvey = { ...mockSurveyOutput, startsAt: null, endsAt: null };
+      const persistedSurvey = { ...mockSurveyOutput, startsAt, endsAt: null };
+
+      prisma.survey.findUnique.mockResolvedValueOnce(currentSurvey);
+      prisma.survey.update.mockResolvedValueOnce(persistedSurvey);
+
+      await updateSurvey({
+        ...updateSurveyInput,
+        startsAt,
+        endsAt: null,
+      });
+
+      expect(enqueueSurveyLifecycleJobs).toHaveBeenCalledWith({
+        tx: prisma,
+        survey: {
+          id: persistedSurvey.id,
+          environmentId: persistedSurvey.environmentId,
+          startsAt,
+          endsAt: null,
+        },
+        previousSurvey: {
+          startsAt: null,
+          endsAt: null,
+        },
+      });
+    });
+
     // Note: Language handling tests (for languages.length > 0 fix) are covered in
     // apps/web/modules/survey/editor/lib/survey.test.ts where we have better control
     // over the test mocks. The key fix ensures languages.length > 0 (not > 1) is used.
@@ -341,6 +392,31 @@ describe("Tests for updateSurvey", () => {
       prisma.survey.update.mockRejectedValue(new Error(mockErrorMessage));
       await expect(updateSurvey(updateSurveyInput)).rejects.toThrow(Error);
     });
+
+    test("logs and rethrows lifecycle enqueue failures", async () => {
+      const enqueueError = new Error("enqueue failed");
+
+      prisma.survey.findUnique.mockResolvedValueOnce({
+        ...mockSurveyOutput,
+        startsAt: null,
+        endsAt: null,
+      });
+      prisma.survey.update.mockResolvedValueOnce({
+        ...mockSurveyOutput,
+        startsAt: new Date("2026-04-01T12:00:00.000Z"),
+        endsAt: null,
+      });
+      vi.mocked(enqueueSurveyLifecycleJobs).mockRejectedValueOnce(enqueueError);
+
+      await expect(
+        updateSurvey({
+          ...updateSurveyInput,
+          startsAt: new Date("2026-04-01T12:00:00.000Z"),
+        })
+      ).rejects.toThrow(enqueueError);
+
+      expect(logger.error).toHaveBeenCalledWith(enqueueError, "Error updating survey");
+    });
   });
 });
 
@@ -647,6 +723,36 @@ describe("Tests for createSurvey", () => {
       expect(subscribeOrganizationMembersToSurveyResponses).toHaveBeenCalled();
     });
 
+    test("passes start and end dates to the lifecycle scheduler", async () => {
+      const startsAt = new Date("2026-04-02T08:00:00.000Z");
+      const endsAt = new Date("2026-04-03T08:00:00.000Z");
+
+      vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce(mockOrganizationOutput);
+      prisma.survey.create.mockResolvedValueOnce({
+        ...mockSurveyOutput,
+        startsAt,
+        endsAt,
+        type: "link",
+      });
+
+      await createSurvey(mockEnvironmentId, {
+        ...mockCreateSurveyInput,
+        type: "link",
+        startsAt,
+        endsAt,
+      });
+
+      expect(enqueueSurveyLifecycleJobs).toHaveBeenCalledWith({
+        tx: prisma,
+        survey: {
+          id: mockSurveyOutput.id,
+          environmentId: mockSurveyOutput.environmentId,
+          startsAt,
+          endsAt,
+        },
+      });
+    });
+
     test("creates a private segment for app surveys", async () => {
       vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce(mockOrganizationOutput);
       prisma.survey.create.mockResolvedValueOnce({
@@ -663,6 +769,10 @@ describe("Tests for createSurvey", () => {
         createdAt: new Date(),
         updatedAt: new Date(),
       } as unknown as TSegment);
+      prisma.survey.update.mockResolvedValueOnce({
+        ...mockSurveyOutput,
+        type: "app",
+      });
 
       await createSurvey(mockEnvironmentId, {
         ...mockCreateSurveyInput,
@@ -725,6 +835,20 @@ describe("Tests for createSurvey", () => {
   describe("Sad Path", () => {
     testInputValidation(createSurvey, "123#", mockCreateSurveyInput);
 
+    test("rejects surveys whose start date is not before the end date", async () => {
+      const startsAt = new Date("2026-04-03T08:00:00.000Z");
+      const endsAt = new Date("2026-04-02T08:00:00.000Z");
+
+      await expect(
+        createSurvey(mockEnvironmentId, {
+          ...mockCreateSurveyInput,
+          type: "link",
+          startsAt,
+          endsAt,
+        })
+      ).rejects.toThrow(ValidationError);
+    });
+
     test("throws ResourceNotFoundError if organization not found", async () => {
       vi.mocked(getOrganizationByEnvironmentId).mockResolvedValueOnce(null);
       await expect(createSurvey(mockEnvironmentId, mockCreateSurveyInput)).rejects.toThrow(

apps/web/lib/survey/service.ts

@@ -11,6 +11,7 @@ import {
   getOrganizationByEnvironmentId,
   subscribeOrganizationMembersToSurveyResponses,
 } from "@/lib/organization/service";
+import { enqueueSurveyLifecycleJobs } from "@/lib/river/survey-lifecycle";
 import { TriggerUpdate } from "@/modules/survey/editor/types/survey-trigger";
 import { getActionClasses } from "../actionClass/service";
 import { ITEMS_PER_PAGE } from "../constants";
@@ -32,6 +33,8 @@ export const selectSurvey = {
   environmentId: true,
   createdBy: true,
   status: true,
+  startsAt: true,
+  endsAt: true,
   welcomeCard: true,
   questions: true,
   blocks: true,
@@ -300,8 +303,6 @@ export const updateSurveyInternal = async (
 
   try {
     const surveyId = updatedSurvey.id;
-    let data: any = {};
-
     const actionClasses = await getActionClasses(updatedSurvey.environmentId);
     const currentSurvey = await getSurvey(surveyId);
 
@@ -324,132 +325,139 @@ export const updateSurveyInternal = async (
       }
     }
 
-    if (languages) {
-      // Process languages update logic here
-      // Extract currentLanguageIds and updatedLanguageIds
-      const currentLanguageIds = currentSurvey.languages
-        ? currentSurvey.languages.map((l) => l.language.id)
-        : [];
-      const updatedLanguageIds =
-        languages.length > 0 ? updatedSurvey.languages.map((l) => l.language.id) : [];
-      const enabledLanguageIds = languages.map((language) => {
-        if (language.enabled) return language.language.id;
-      });
-
-      // Determine languages to add and remove
-      const languagesToAdd = updatedLanguageIds.filter((id) => !currentLanguageIds.includes(id));
-      const languagesToRemove = currentLanguageIds.filter((id) => !updatedLanguageIds.includes(id));
-
-      const defaultLanguageId = updatedSurvey.languages.find((l) => l.default)?.language.id;
-
-      // Prepare data for Prisma update
-      data.languages = {};
-
-      // Update existing languages for default value changes
-      data.languages.updateMany = currentSurvey.languages.map((surveyLanguage) => ({
-        where: { languageId: surveyLanguage.language.id },
-        data: {
-          default: surveyLanguage.language.id === defaultLanguageId,
-          enabled: enabledLanguageIds.includes(surveyLanguage.language.id),
-        },
-      }));
-
-      // Add new languages
-      if (languagesToAdd.length > 0) {
-        data.languages.create = languagesToAdd.map((languageId) => ({
-          languageId: languageId,
-          default: languageId === defaultLanguageId,
-          enabled: enabledLanguageIds.includes(languageId),
-        }));
-      }
-
-      // Remove languages no longer associated with the survey
-      if (languagesToRemove.length > 0) {
-        data.languages.deleteMany = languagesToRemove.map((languageId) => ({
-          languageId: languageId,
-          enabled: enabledLanguageIds.includes(languageId),
-        }));
-      }
+    const organization = await getOrganizationByEnvironmentId(environmentId);
+    if (!organization) {
+      throw new ResourceNotFoundError("Organization", null);
     }
 
-    if (triggers) {
-      data.triggers = handleTriggerUpdates(triggers, currentSurvey.triggers, actionClasses);
-    }
+    const prismaSurvey = await prisma.$transaction(async (tx) => {
+      let data: any = {};
 
-    // if the survey body has type other than "app" but has a private segment, we delete that segment, and if it has a public segment, we disconnect from to the survey
-    if (segment) {
-      if (type === "app") {
-        // parse the segment filters:
-        const parsedFilters = ZSegmentFilters.safeParse(segment.filters);
-        if (!skipValidation && !parsedFilters.success) {
-          throw new InvalidInputError("Invalid user segment filters");
+      if (languages) {
+        // Process languages update logic here
+        // Extract currentLanguageIds and updatedLanguageIds
+        const currentLanguageIds = currentSurvey.languages
+          ? currentSurvey.languages.map((l) => l.language.id)
+          : [];
+        const updatedLanguageIds =
+          languages.length > 0 ? updatedSurvey.languages.map((l) => l.language.id) : [];
+        const enabledLanguageIds = languages.map((language) => {
+          if (language.enabled) return language.language.id;
+        });
+
+        // Determine languages to add and remove
+        const languagesToAdd = updatedLanguageIds.filter((id) => !currentLanguageIds.includes(id));
+        const languagesToRemove = currentLanguageIds.filter((id) => !updatedLanguageIds.includes(id));
+
+        const defaultLanguageId = updatedSurvey.languages.find((l) => l.default)?.language.id;
+
+        // Prepare data for Prisma update
+        data.languages = {};
+
+        // Update existing languages for default value changes
+        data.languages.updateMany = currentSurvey.languages.map((surveyLanguage) => ({
+          where: { languageId: surveyLanguage.language.id },
+          data: {
+            default: surveyLanguage.language.id === defaultLanguageId,
+            enabled: enabledLanguageIds.includes(surveyLanguage.language.id),
+          },
+        }));
+
+        // Add new languages
+        if (languagesToAdd.length > 0) {
+          data.languages.create = languagesToAdd.map((languageId) => ({
+            languageId: languageId,
+            default: languageId === defaultLanguageId,
+            enabled: enabledLanguageIds.includes(languageId),
+          }));
         }
 
-        try {
-          // update the segment:
-          let updatedInput: Prisma.SegmentUpdateInput = {
-            ...segment,
-            surveys: undefined,
-          };
+        // Remove languages no longer associated with the survey
+        if (languagesToRemove.length > 0) {
+          data.languages.deleteMany = languagesToRemove.map((languageId) => ({
+            languageId: languageId,
+            enabled: enabledLanguageIds.includes(languageId),
+          }));
+        }
+      }
 
-          if (segment.surveys) {
-            updatedInput = {
-              ...segment,
-              surveys: {
-                connect: segment.surveys.map((surveyId) => ({ id: surveyId })),
-              },
-            };
+      if (triggers) {
+        data.triggers = handleTriggerUpdates(triggers, currentSurvey.triggers, actionClasses);
+      }
+
+      // if the survey body has type other than "app" but has a private segment, we delete that segment, and if it has a public segment, we disconnect from to the survey
+      if (segment) {
+        if (type === "app") {
+          // parse the segment filters:
+          const parsedFilters = ZSegmentFilters.safeParse(segment.filters);
+          if (!skipValidation && !parsedFilters.success) {
+            throw new InvalidInputError("Invalid user segment filters");
           }
 
-          await prisma.segment.update({
-            where: { id: segment.id },
-            data: updatedInput,
-            select: {
-              surveys: { select: { id: true } },
-              environmentId: true,
-              id: true,
-            },
-          });
-        } catch (error) {
-          logger.error(error, "Error updating survey");
-          throw new Error("Error updating survey");
-        }
-      } else {
-        if (segment.isPrivate) {
-          // disconnect the private segment first and then delete:
-          await prisma.segment.update({
-            where: { id: segment.id },
-            data: {
-              surveys: {
-                disconnect: {
-                  id: surveyId,
+          try {
+            // update the segment:
+            let updatedInput: Prisma.SegmentUpdateInput = {
+              ...segment,
+              surveys: undefined,
+            };
+
+            if (segment.surveys) {
+              updatedInput = {
+                ...segment,
+                surveys: {
+                  connect: segment.surveys.map((segmentSurveyId) => ({ id: segmentSurveyId })),
+                },
+              };
+            }
+
+            await tx.segment.update({
+              where: { id: segment.id },
+              data: updatedInput,
+              select: {
+                surveys: { select: { id: true } },
+                environmentId: true,
+                id: true,
+              },
+            });
+          } catch (error) {
+            logger.error(error, "Error updating survey");
+            throw new Error("Error updating survey");
+          }
+        } else {
+          if (segment.isPrivate) {
+            // disconnect the private segment first and then delete:
+            await tx.segment.update({
+              where: { id: segment.id },
+              data: {
+                surveys: {
+                  disconnect: {
+                    id: surveyId,
+                  },
                 },
               },
-            },
-          });
+            });
 
-          // delete the private segment:
-          await prisma.segment.delete({
-            where: {
-              id: segment.id,
-            },
-          });
-        } else {
-          await prisma.survey.update({
-            where: {
-              id: surveyId,
-            },
-            data: {
-              segment: {
-                disconnect: true,
+            // delete the private segment:
+            await tx.segment.delete({
+              where: {
+                id: segment.id,
               },
-            },
-          });
+            });
+          } else {
+            await tx.survey.update({
+              where: {
+                id: surveyId,
+              },
+              data: {
+                segment: {
+                  disconnect: true,
+                },
+              },
+            });
+          }
         }
-      }
-    } else if (type === "app") {
-      if (!currentSurvey.segment) {
-        await prisma.survey.update({
+      } else if (type === "app" && !currentSurvey.segment) {
+        await tx.survey.update({
           where: {
             id: surveyId,
           },
@@ -477,102 +485,98 @@ export const updateSurveyInternal = async (
           },
         });
       }
-    }
 
-    if (followUps) {
-      // Separate follow-ups into categories based on deletion flag
-      const deletedFollowUps = followUps.filter((followUp) => followUp.deleted);
-      const nonDeletedFollowUps = followUps.filter((followUp) => !followUp.deleted);
+      if (followUps) {
+        // Separate follow-ups into categories based on deletion flag
+        const deletedFollowUps = followUps.filter((followUp) => followUp.deleted);
+        const nonDeletedFollowUps = followUps.filter((followUp) => !followUp.deleted);
 
-      // Get set of existing follow-up IDs from currentSurvey
-      const existingFollowUpIds = new Set(currentSurvey.followUps.map((f) => f.id));
+        // Get set of existing follow-up IDs from currentSurvey
+        const existingFollowUpIds = new Set(currentSurvey.followUps.map((f) => f.id));
 
-      // Separate non-deleted follow-ups into new and existing
-      const existingFollowUps = nonDeletedFollowUps.filter((followUp) =>
-        existingFollowUpIds.has(followUp.id)
-      );
-      const newFollowUps = nonDeletedFollowUps.filter((followUp) => !existingFollowUpIds.has(followUp.id));
+        // Separate non-deleted follow-ups into new and existing
+        const existingFollowUps = nonDeletedFollowUps.filter((followUp) =>
+          existingFollowUpIds.has(followUp.id)
+        );
+        const newFollowUps = nonDeletedFollowUps.filter((followUp) => !existingFollowUpIds.has(followUp.id));
 
-      data.followUps = {
-        // Update existing follow-ups
-        updateMany: existingFollowUps.map((followUp) => ({
-          where: {
-            id: followUp.id,
-          },
-          data: {
-            name: followUp.name,
-            trigger: followUp.trigger,
-            action: followUp.action,
-          },
-        })),
-        // Create new follow-ups
-        createMany:
-          newFollowUps.length > 0
-            ? {
-                data: newFollowUps.map((followUp) => ({
+        data.followUps = {
+          // Update existing follow-ups
+          updateMany: existingFollowUps.map((followUp) => ({
+            where: {
+              id: followUp.id,
+            },
+            data: {
+              name: followUp.name,
+              trigger: followUp.trigger,
+              action: followUp.action,
+            },
+          })),
+          // Create new follow-ups
+          createMany:
+            newFollowUps.length > 0
+              ? {
+                  data: newFollowUps.map((followUp) => ({
+                    id: followUp.id,
+                    name: followUp.name,
+                    trigger: followUp.trigger,
+                    action: followUp.action,
+                  })),
+                }
+              : undefined,
+          // Delete follow-ups marked as deleted, regardless of whether they exist in DB
+          deleteMany:
+            deletedFollowUps.length > 0
+              ? deletedFollowUps.map((followUp) => ({
                   id: followUp.id,
-                  name: followUp.name,
-                  trigger: followUp.trigger,
-                  action: followUp.action,
-                })),
-              }
-            : undefined,
-        // Delete follow-ups marked as deleted, regardless of whether they exist in DB
-        deleteMany:
-          deletedFollowUps.length > 0
-            ? deletedFollowUps.map((followUp) => ({
-                id: followUp.id,
-              }))
-            : undefined,
-      };
-    }
+                }))
+              : undefined,
+        };
+      }
 
-    data.questions = questions.map((question) => {
-      const { isDraft, ...rest } = question;
-      return rest;
+      data.questions = questions.map((question) => {
+        const { isDraft, ...rest } = question;
+        return rest;
+      });
+
+      // Strip isDraft from elements before saving
+      if (updatedSurvey.blocks && updatedSurvey.blocks.length > 0) {
+        data.blocks = stripIsDraftFromBlocks(updatedSurvey.blocks);
+      }
+
+      surveyData.updatedAt = new Date();
+
+      data = {
+        ...surveyData,
+        ...data,
+        type,
+      };
+
+      delete data.createdBy;
+      const prismaSurvey = await tx.survey.update({
+        where: { id: surveyId },
+        data,
+        select: selectSurvey,
+      });
+
+      await enqueueSurveyLifecycleJobs({
+        tx,
+        survey: {
+          id: prismaSurvey.id,
+          environmentId: prismaSurvey.environmentId,
+          startsAt: prismaSurvey.startsAt,
+          endsAt: prismaSurvey.endsAt,
+        },
+        previousSurvey: {
+          startsAt: currentSurvey.startsAt ?? null,
+          endsAt: currentSurvey.endsAt ?? null,
+        },
+      });
+
+      return prismaSurvey;
     });
 
-    // Strip isDraft from elements before saving
-    if (updatedSurvey.blocks && updatedSurvey.blocks.length > 0) {
-      data.blocks = stripIsDraftFromBlocks(updatedSurvey.blocks);
-    }
-
-    const organization = await getOrganizationByEnvironmentId(environmentId);
-    if (!organization) {
-      throw new ResourceNotFoundError("Organization", null);
-    }
-
-    surveyData.updatedAt = new Date();
-
-    data = {
-      ...surveyData,
-      ...data,
-      type,
-    };
-
-    delete data.createdBy;
-    const prismaSurvey = await prisma.survey.update({
-      where: { id: surveyId },
-      data,
-      select: selectSurvey,
-    });
-
-    let surveySegment: TSegment | null = null;
-    if (prismaSurvey.segment) {
-      surveySegment = {
-        ...prismaSurvey.segment,
-        surveys: prismaSurvey.segment.surveys.map((survey) => survey.id),
-      };
-    }
-
-    const modifiedSurvey: TSurvey = {
-      ...prismaSurvey, // Properties from prismaSurvey
-      displayPercentage: Number(prismaSurvey.displayPercentage) || null,
-      segment: surveySegment,
-      customHeadScriptsMode: prismaSurvey.customHeadScriptsMode,
-    };
-
-    return modifiedSurvey;
+    return transformPrismaSurvey<TSurvey>(prismaSurvey);
   } catch (error) {
     logger.error(error, "Error updating survey");
     if (error instanceof Prisma.PrismaClientKnownRequestError) {
@@ -651,64 +655,69 @@ export const createSurvey = async (
       data.blocks = validateMediaAndPrepareBlocks(data.blocks);
     }
 
-    const survey = await prisma.survey.create({
-      data: {
-        ...data,
-        environment: {
-          connect: {
-            id: parsedEnvironmentId,
-          },
-        },
-      },
-      select: selectSurvey,
-    });
-
-    // if the survey created is an "app" survey, we also create a private segment for it.
-    if (survey.type === "app") {
-      const newSegment = await prisma.segment.create({
+    const survey = await prisma.$transaction(async (tx) => {
+      const createdSurvey = await tx.survey.create({
         data: {
-          title: survey.id,
-          filters: [],
-          isPrivate: true,
+          ...data,
           environment: {
             connect: {
               id: parsedEnvironmentId,
             },
           },
         },
+        select: selectSurvey,
       });
 
-      await prisma.survey.update({
-        where: {
-          id: survey.id,
-        },
-        data: {
-          segment: {
-            connect: {
-              id: newSegment.id,
+      let createdOrUpdatedSurvey = createdSurvey;
+
+      // if the survey created is an "app" survey, we also create a private segment for it.
+      if (createdSurvey.type === "app") {
+        const newSegment = await tx.segment.create({
+          data: {
+            title: createdSurvey.id,
+            filters: [],
+            isPrivate: true,
+            environment: {
+              connect: {
+                id: parsedEnvironmentId,
+              },
             },
           },
+        });
+
+        createdOrUpdatedSurvey = await tx.survey.update({
+          where: {
+            id: createdSurvey.id,
+          },
+          data: {
+            segment: {
+              connect: {
+                id: newSegment.id,
+              },
+            },
+          },
+          select: selectSurvey,
+        });
+      }
+
+      await enqueueSurveyLifecycleJobs({
+        tx,
+        survey: {
+          id: createdOrUpdatedSurvey.id,
+          environmentId: createdOrUpdatedSurvey.environmentId,
+          startsAt: createdOrUpdatedSurvey.startsAt,
+          endsAt: createdOrUpdatedSurvey.endsAt,
         },
       });
-    }
 
-    // TODO: Fix this, this happens because the survey type "web" is no longer in the zod types but its required in the schema for migration
-    // @ts-expect-error
-    const transformedSurvey: TSurvey = {
-      ...survey,
-      ...(survey.segment && {
-        segment: {
-          ...survey.segment,
-          surveys: survey.segment.surveys.map((survey) => survey.id),
-        },
-      }),
-    };
+      return createdOrUpdatedSurvey;
+    });
 
     if (createdBy) {
       await subscribeOrganizationMembersToSurveyResponses(survey.id, createdBy, organization.id);
     }
 
-    return transformedSurvey;
+    return transformPrismaSurvey<TSurvey>(survey);
   } catch (error) {
     if (error instanceof Prisma.PrismaClientKnownRequestError) {
       logger.error(error, "Error creating survey");

apps/web/lib/time.test.ts

@@ -1,62 +1,13 @@
 import { describe, expect, test } from "vitest";
 import {
-  convertDateString,
-  convertDateTimeString,
-  convertDateTimeStringShort,
   convertDatesInObject,
-  convertTimeString,
   formatDate,
-  getTodaysDateFormatted,
   getTodaysDateTimeFormatted,
   timeSince,
   timeSinceDate,
 } from "./time";
 
 describe("Time Utilities", () => {
-  describe("convertDateString", () => {
-    test("should format date string correctly", () => {
-      expect(convertDateString("2024-03-20:12:30:00")).toBe("Mar 20, 2024");
-    });
-
-    test("should return empty string for empty input", () => {
-      expect(convertDateString("")).toBe("");
-    });
-
-    test("should return null for null input", () => {
-      expect(convertDateString(null as any)).toBe(null);
-    });
-
-    test("should handle invalid date strings", () => {
-      expect(convertDateString("not-a-date")).toBe("Invalid Date");
-    });
-  });
-
-  describe("convertDateTimeString", () => {
-    test("should format date and time string correctly", () => {
-      expect(convertDateTimeString("2024-03-20T15:30:00")).toBe("Wednesday, March 20, 2024 at 3:30 PM");
-    });
-
-    test("should return empty string for empty input", () => {
-      expect(convertDateTimeString("")).toBe("");
-    });
-  });
-
-  describe("convertDateTimeStringShort", () => {
-    test("should format date and time string in short format", () => {
-      expect(convertDateTimeStringShort("2024-03-20T15:30:00")).toBe("March 20, 2024 at 3:30 PM");
-    });
-
-    test("should return empty string for empty input", () => {
-      expect(convertDateTimeStringShort("")).toBe("");
-    });
-  });
-
-  describe("convertTimeString", () => {
-    test("should format time string correctly", () => {
-      expect(convertTimeString("2024-03-20T15:30:45")).toBe("3:30:45 PM");
-    });
-  });
-
   describe("timeSince", () => {
     test("should format time since in English", () => {
       const now = new Date();
@@ -75,6 +26,18 @@ describe("Time Utilities", () => {
       const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
       expect(timeSince(oneHourAgo.toISOString(), "sv-SE")).toBe("ungefär en timme sedan");
     });
+
+    test("should format time since in Brazilian Portuguese", () => {
+      const now = new Date();
+      const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+      expect(timeSince(oneHourAgo.toISOString(), "pt-BR")).toBe("há cerca de 1 hora");
+    });
+
+    test("should format time since in European Portuguese", () => {
+      const now = new Date();
+      const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+      expect(timeSince(oneHourAgo.toISOString(), "pt-PT")).toBe("há aproximadamente 1 hora");
+    });
   });
 
   describe("timeSinceDate", () => {
@@ -83,6 +46,12 @@ describe("Time Utilities", () => {
       const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
       expect(timeSinceDate(oneHourAgo)).toBe("about 1 hour ago");
     });
+
+    test("should format time since from Date object in the provided locale", () => {
+      const now = new Date();
+      const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
+      expect(timeSinceDate(oneHourAgo, "de-DE")).toBe("vor etwa 1 Stunde");
+    });
   });
 
   describe("formatDate", () => {
@@ -90,13 +59,17 @@ describe("Time Utilities", () => {
       const date = new Date(2024, 2, 20); // March is month 2 (0-based)
       expect(formatDate(date)).toBe("March 20, 2024");
     });
-  });
 
-  describe("getTodaysDateFormatted", () => {
-    test("should format today's date with specified separator", () => {
-      const today = new Date();
-      const expected = today.toISOString().split("T")[0].split("-").join(".");
-      expect(getTodaysDateFormatted(".")).toBe(expected);
+    test("should format date with the provided locale", () => {
+      const date = new Date(2024, 2, 20);
+
+      expect(formatDate(date, "de-DE")).toBe(
+        new Intl.DateTimeFormat("de-DE", {
+          year: "numeric",
+          month: "long",
+          day: "numeric",
+        }).format(date)
+      );
     });
   });
 

apps/web/lib/time.ts

@@ -1,120 +1,33 @@
-import { formatDistance, intlFormat } from "date-fns";
+import { type Locale, formatDistance } from "date-fns";
 import { de, enUS, es, fr, hu, ja, nl, pt, ptBR, ro, ru, sv, zhCN, zhTW } from "date-fns/locale";
 import { TUserLocale } from "@formbricks/types/user";
+import { formatDateForDisplay } from "./utils/datetime";
 
-export const convertDateString = (dateString: string | null) => {
-  if (dateString === null) return null;
-  if (!dateString) {
-    return dateString;
-  }
-
-  const date = new Date(dateString);
-  if (isNaN(date.getTime())) {
-    return "Invalid Date";
-  }
-  return intlFormat(
-    date,
-    {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-    },
-    {
-      locale: "en",
-    }
-  );
+const DEFAULT_LOCALE: TUserLocale = "en-US";
+const TIME_SINCE_LOCALES: Record<TUserLocale, Locale> = {
+  "de-DE": de,
+  "en-US": enUS,
+  "es-ES": es,
+  "fr-FR": fr,
+  "hu-HU": hu,
+  "ja-JP": ja,
+  "nl-NL": nl,
+  "pt-BR": ptBR,
+  "pt-PT": pt,
+  "ro-RO": ro,
+  "ru-RU": ru,
+  "sv-SE": sv,
+  "zh-Hans-CN": zhCN,
+  "zh-Hant-TW": zhTW,
 };
 
-export const convertDateTimeString = (dateString: string) => {
-  if (!dateString) {
-    return dateString;
-  }
-  const date = new Date(dateString);
-  return intlFormat(
-    date,
-    {
-      weekday: "long",
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-      hour: "numeric",
-      minute: "2-digit",
-    },
-    {
-      locale: "en",
-    }
-  );
-};
+const isUserLocale = (locale: string): locale is TUserLocale => Object.hasOwn(TIME_SINCE_LOCALES, locale);
 
-export const convertDateTimeStringShort = (dateString: string) => {
-  if (!dateString) {
-    return dateString;
-  }
-  const date = new Date(dateString);
-  return intlFormat(
-    date,
-    {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-      hour: "numeric",
-      minute: "2-digit",
-    },
-    {
-      locale: "en",
-    }
-  );
-};
+/** Maps locale strings to date-fns locales and falls back to English for unsupported inputs. */
+const getLocaleForTimeSince = (locale: string): Locale =>
+  isUserLocale(locale) ? TIME_SINCE_LOCALES[locale] : enUS;
 
-export const convertTimeString = (dateString: string) => {
-  const date = new Date(dateString);
-  return intlFormat(
-    date,
-    {
-      hour: "numeric",
-      minute: "2-digit",
-      second: "2-digit",
-    },
-    {
-      locale: "en",
-    }
-  );
-};
-
-const getLocaleForTimeSince = (locale: TUserLocale) => {
-  switch (locale) {
-    case "de-DE":
-      return de;
-    case "en-US":
-      return enUS;
-    case "es-ES":
-      return es;
-    case "fr-FR":
-      return fr;
-    case "hu-HU":
-      return hu;
-    case "ja-JP":
-      return ja;
-    case "nl-NL":
-      return nl;
-    case "pt-BR":
-      return ptBR;
-    case "pt-PT":
-      return pt;
-    case "ro-RO":
-      return ro;
-    case "ru-RU":
-      return ru;
-    case "sv-SE":
-      return sv;
-    case "zh-Hans-CN":
-      return zhCN;
-    case "zh-Hant-TW":
-      return zhTW;
-  }
-};
-
-export const timeSince = (dateString: string, locale: TUserLocale) => {
+export const timeSince = (dateString: string, locale: string = DEFAULT_LOCALE) => {
   const date = new Date(dateString);
   return formatDistance(date, new Date(), {
     addSuffix: true,
@@ -122,27 +35,21 @@ export const timeSince = (dateString: string, locale: TUserLocale) => {
   });
 };
 
-export const timeSinceDate = (date: Date) => {
+export const timeSinceDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
   return formatDistance(date, new Date(), {
     addSuffix: true,
+    locale: getLocaleForTimeSince(locale),
   });
 };
 
-export const formatDate = (date: Date) => {
-  return intlFormat(date, {
+export const formatDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
+  return formatDateForDisplay(date, locale, {
     year: "numeric",
     month: "long",
     day: "numeric",
   });
 };
 
-export const getTodaysDateFormatted = (seperator: string) => {
-  const date = new Date();
-  const formattedDate = date.toISOString().split("T")[0].split("-").join(seperator);
-
-  return formattedDate;
-};
-
 export const getTodaysDateTimeFormatted = (seperator: string) => {
   const date = new Date();
   const formattedDate = date.toISOString().split("T")[0].split("-").join(seperator);

apps/web/lib/utils/date-display.test.ts

@@ -0,0 +1,67 @@
+import { describe, expect, test } from "vitest";
+import { type TSurveyElement } from "@formbricks/types/surveys/elements";
+import { formatStoredDateForDisplay, getSurveyDateFormatMap, parseStoredDateValue } from "./date-display";
+
+describe("date display utils", () => {
+  test("parses ISO stored dates", () => {
+    const parsedDate = parseStoredDateValue("2025-05-06");
+
+    expect(parsedDate).not.toBeNull();
+    expect(parsedDate?.getFullYear()).toBe(2025);
+    expect(parsedDate?.getMonth()).toBe(4);
+    expect(parsedDate?.getDate()).toBe(6);
+  });
+
+  test("parses legacy stored dates using the element format", () => {
+    const parsedDate = parseStoredDateValue("5-6-2025", "M-d-y");
+
+    expect(parsedDate).not.toBeNull();
+    expect(parsedDate?.getFullYear()).toBe(2025);
+    expect(parsedDate?.getMonth()).toBe(4);
+    expect(parsedDate?.getDate()).toBe(6);
+  });
+
+  test("parses day-first stored dates when no format is provided", () => {
+    const parsedDate = parseStoredDateValue("06-05-2025");
+
+    expect(parsedDate).not.toBeNull();
+    expect(parsedDate?.getFullYear()).toBe(2025);
+    expect(parsedDate?.getMonth()).toBe(4);
+    expect(parsedDate?.getDate()).toBe(6);
+  });
+
+  test("formats stored dates using the selected locale", () => {
+    const date = new Date(2025, 4, 6);
+
+    expect(formatStoredDateForDisplay("2025-05-06", undefined, "de-DE")).toBe(
+      new Intl.DateTimeFormat("de-DE", {
+        weekday: "long",
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+      }).format(date)
+    );
+  });
+
+  test("returns null for invalid stored dates", () => {
+    expect(formatStoredDateForDisplay("2025-02-30", "y-M-d")).toBeNull();
+  });
+
+  test("builds a date format map for survey date elements", () => {
+    const elements = [
+      {
+        id: "dateQuestion",
+        type: "date",
+        format: "d-M-y",
+      },
+      {
+        id: "textQuestion",
+        type: "openText",
+      },
+    ] as TSurveyElement[];
+
+    expect(getSurveyDateFormatMap(elements)).toEqual({
+      dateQuestion: "d-M-y",
+    });
+  });
+});

apps/web/lib/utils/date-display.ts

@@ -0,0 +1,85 @@
+import type { TSurveyDateElement, TSurveyElement } from "@formbricks/types/surveys/elements";
+import { formatDateWithOrdinal } from "./datetime";
+
+export type TSurveyDateFormatMap = Partial<Record<string, TSurveyDateElement["format"]>>;
+
+const ISO_STORED_DATE_PATTERN = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
+
+const buildDate = (year: number, month: number, day: number): Date | null => {
+  if ([year, month, day].some((value) => Number.isNaN(value))) {
+    return null;
+  }
+
+  const parsedDate = new Date(year, month - 1, day);
+
+  if (
+    parsedDate.getFullYear() !== year ||
+    parsedDate.getMonth() !== month - 1 ||
+    parsedDate.getDate() !== day
+  ) {
+    return null;
+  }
+
+  return parsedDate;
+};
+
+const parseLegacyStoredDateValue = (value: string, format: TSurveyDateElement["format"]): Date | null => {
+  const parts = value.split("-");
+
+  if (parts.length !== 3 || parts.some((part) => !/^\d{1,4}$/.test(part))) {
+    return null;
+  }
+
+  const [first, second, third] = parts.map(Number);
+
+  switch (format) {
+    case "M-d-y":
+      return buildDate(third, first, second);
+    case "d-M-y":
+      return buildDate(third, second, first);
+    case "y-M-d":
+      return buildDate(first, second, third);
+  }
+};
+
+export const parseStoredDateValue = (value: string, format?: TSurveyDateElement["format"]): Date | null => {
+  const isoMatch = ISO_STORED_DATE_PATTERN.exec(value);
+
+  if (isoMatch) {
+    return buildDate(Number(isoMatch[1]), Number(isoMatch[2]), Number(isoMatch[3]));
+  }
+
+  if (format) {
+    return parseLegacyStoredDateValue(value, format);
+  }
+
+  if (/^\d{1,2}-\d{1,2}-\d{4}$/.test(value)) {
+    return parseLegacyStoredDateValue(value, "d-M-y");
+  }
+
+  return null;
+};
+
+export const formatStoredDateForDisplay = (
+  value: string,
+  format: TSurveyDateElement["format"] | undefined,
+  locale: string = "en-US"
+): string | null => {
+  const parsedDate = parseStoredDateValue(value, format);
+
+  if (!parsedDate) {
+    return null;
+  }
+
+  return formatDateWithOrdinal(parsedDate, locale);
+};
+
+export const getSurveyDateFormatMap = (elements: TSurveyElement[]): TSurveyDateFormatMap => {
+  return elements.reduce<TSurveyDateFormatMap>((dateFormats, element) => {
+    if (element.type === "date") {
+      dateFormats[element.id] = element.format;
+    }
+
+    return dateFormats;
+  }, {});
+};

apps/web/lib/utils/datetime.test.ts

@@ -1,5 +1,12 @@
 import { describe, expect, test } from "vitest";
-import { diffInDays, formatDateWithOrdinal, getFormattedDateTimeString, isValidDateString } from "./datetime";
+import {
+  diffInDays,
+  formatDateForDisplay,
+  formatDateTimeForDisplay,
+  formatDateWithOrdinal,
+  getFormattedDateTimeString,
+  isValidDateString,
+} from "./datetime";
 
 describe("datetime utils", () => {
   test("diffInDays calculates the difference in days between two dates", () => {
@@ -8,13 +15,45 @@ describe("datetime utils", () => {
     expect(diffInDays(date1, date2)).toBe(5);
   });
 
-  test("formatDateWithOrdinal formats a date with ordinal suffix", () => {
+  test("formatDateWithOrdinal formats a date using the provided locale", () => {
     // Create a date that's fixed to May 6, 2025 at noon UTC
     // Using noon ensures the date won't change in most timezones
     const date = new Date(Date.UTC(2025, 4, 6, 12, 0, 0));
 
-    // Test the function
-    expect(formatDateWithOrdinal(date)).toBe("Tuesday, May 6th, 2025");
+    expect(formatDateWithOrdinal(date)).toBe(
+      new Intl.DateTimeFormat("en-US", {
+        weekday: "long",
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+      }).format(date)
+    );
+  });
+
+  test("formatDateForDisplay uses the provided locale", () => {
+    const date = new Date(Date.UTC(2025, 4, 6, 12, 0, 0));
+
+    expect(formatDateForDisplay(date, "de-DE")).toBe(
+      new Intl.DateTimeFormat("de-DE", {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+      }).format(date)
+    );
+  });
+
+  test("formatDateTimeForDisplay uses the provided locale", () => {
+    const date = new Date(Date.UTC(2025, 4, 6, 12, 30, 0));
+
+    expect(formatDateTimeForDisplay(date, "fr-FR")).toBe(
+      new Intl.DateTimeFormat("fr-FR", {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+        hour: "numeric",
+        minute: "2-digit",
+      }).format(date)
+    );
   });
 
   test("isValidDateString validates correct date strings", () => {

apps/web/lib/utils/datetime.ts

@@ -1,7 +1,17 @@
-const getOrdinalSuffix = (day: number) => {
-  const suffixes = ["th", "st", "nd", "rd"];
-  const relevantDigits = day < 30 ? day % 20 : day % 30;
-  return suffixes[relevantDigits <= 3 ? relevantDigits : 0];
+const DEFAULT_LOCALE = "en-US";
+
+const DEFAULT_DATE_DISPLAY_OPTIONS: Intl.DateTimeFormatOptions = {
+  year: "numeric",
+  month: "short",
+  day: "numeric",
+};
+
+const DEFAULT_DATE_TIME_DISPLAY_OPTIONS: Intl.DateTimeFormatOptions = {
+  year: "numeric",
+  month: "long",
+  day: "numeric",
+  hour: "numeric",
+  minute: "2-digit",
 };
 
 // Helper function to calculate difference in days between two dates
@@ -10,23 +20,44 @@ export const diffInDays = (date1: Date, date2: Date) => {
   return Math.floor(diffTime / (1000 * 60 * 60 * 24));
 };
 
-export const formatDateWithOrdinal = (date: Date, locale: string = "en-US"): string => {
-  const dayOfWeek = new Intl.DateTimeFormat(locale, { weekday: "long" }).format(date);
-  const day = date.getDate();
-  const month = new Intl.DateTimeFormat(locale, { month: "long" }).format(date);
-  const year = date.getFullYear();
-  return `${dayOfWeek}, ${month} ${day}${getOrdinalSuffix(day)}, ${year}`;
+export const formatDateForDisplay = (
+  date: Date,
+  locale: string = DEFAULT_LOCALE,
+  options: Intl.DateTimeFormatOptions = DEFAULT_DATE_DISPLAY_OPTIONS
+): string => {
+  return new Intl.DateTimeFormat(locale, options).format(date);
+};
+
+export const formatDateTimeForDisplay = (
+  date: Date,
+  locale: string = DEFAULT_LOCALE,
+  options: Intl.DateTimeFormatOptions = DEFAULT_DATE_TIME_DISPLAY_OPTIONS
+): string => {
+  return new Intl.DateTimeFormat(locale, options).format(date);
+};
+
+export const formatDateWithOrdinal = (date: Date, locale: string = DEFAULT_LOCALE): string => {
+  return formatDateForDisplay(date, locale, {
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
+  });
 };
 
 export const isValidDateString = (value: string) => {
-  const regex = /^(?:\d{4}-\d{2}-\d{2}|\d{2}-\d{2}-\d{4})$/;
+  const regex = /^(?:\d{4}-\d{1,2}-\d{1,2}|\d{1,2}-\d{1,2}-\d{4})$/;
 
   if (!regex.test(value)) {
     return false;
   }
 
-  const date = new Date(value);
-  return date;
+  const normalizedValue = /^\d{1,2}-\d{1,2}-\d{4}$/.test(value)
+    ? value.replace(/(\d{1,2})-(\d{1,2})-(\d{4})/, "$3-$2-$1")
+    : value;
+
+  const date = new Date(normalizedValue);
+  return !Number.isNaN(date.getTime());
 };
 
 export const getFormattedDateTimeString = (date: Date): string => {

apps/web/lib/utils/recall.test.ts

@@ -32,16 +32,17 @@ vi.mock("@/lib/pollyfills/structuredClone", () => ({
   structuredClone: vi.fn((obj) => JSON.parse(JSON.stringify(obj))),
 }));
 
-vi.mock("@/lib/utils/datetime", () => ({
-  isValidDateString: vi.fn((value) => {
-    try {
-      return !isNaN(new Date(value as string).getTime());
-    } catch {
-      return false;
+vi.mock("@/lib/utils/date-display", () => ({
+  formatStoredDateForDisplay: vi.fn((value: string, format: string | undefined, locale: string) => {
+    if (value === "2023-01-01") {
+      return `formatted-${locale}-${format ?? "iso"}`;
     }
-  }),
-  formatDateWithOrdinal: vi.fn(() => {
-    return "January 1st, 2023";
+
+    if (value === "01-02-2023" && format === "M-d-y") {
+      return `legacy-${locale}-${format}`;
+    }
+
+    return null;
   }),
 }));
 
@@ -477,7 +478,20 @@ describe("recall utility functions", () => {
       };
 
       const result = parseRecallInfo(text, responseData);
-      expect(result).toBe("You joined on January 1st, 2023");
+      expect(result).toBe("You joined on formatted-en-US-iso");
+    });
+
+    test("formats legacy date values using the provided locale and stored format", () => {
+      const text = "You joined on #recall:joinDate/fallback:an-unknown-date#";
+      const responseData: TResponseData = {
+        joinDate: "01-02-2023",
+      };
+
+      const result = parseRecallInfo(text, responseData, undefined, false, "fr-FR", {
+        joinDate: "M-d-y",
+      });
+
+      expect(result).toBe("You joined on legacy-fr-FR-M-d-y");
     });
 
     test("formats array values as comma-separated list", () => {

apps/web/lib/utils/recall.ts

@@ -6,7 +6,7 @@ import { getTextContent } from "@formbricks/types/surveys/validation";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { structuredClone } from "@/lib/pollyfills/structuredClone";
 import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
-import { formatDateWithOrdinal, isValidDateString } from "./datetime";
+import { type TSurveyDateFormatMap, formatStoredDateForDisplay } from "./date-display";
 
 export interface fallbacks {
   [id: string]: string;
@@ -224,7 +224,9 @@ export const parseRecallInfo = (
   text: string,
   responseData?: TResponseData,
   variables?: TResponseVariables,
-  withSlash: boolean = false
+  withSlash: boolean = false,
+  locale: string = "en-US",
+  dateFormats?: TSurveyDateFormatMap
 ) => {
   let modifiedText = text;
   const questionIds = responseData ? Object.keys(responseData) : [];
@@ -254,12 +256,14 @@ export const parseRecallInfo = (
       value = responseData[recallItemId];
 
       // Apply formatting for special value types
-      if (value) {
-        if (isValidDateString(value as string)) {
-          value = formatDateWithOrdinal(new Date(value as string));
-        } else if (Array.isArray(value)) {
-          value = value.filter((item) => item).join(", ");
+      if (typeof value === "string") {
+        const formattedDate = formatStoredDateForDisplay(value, dateFormats?.[recallItemId], locale);
+
+        if (formattedDate) {
+          value = formattedDate;
         }
+      } else if (Array.isArray(value)) {
+        value = value.filter((item) => item).join(", ");
       }
     }
 

apps/web/locales/de-DE.json

@@ -167,6 +167,7 @@
     "connect": "Verbinden",
     "connect_formbricks": "Formbricks verbinden",
     "connected": "Verbunden",
+    "contact": "Kontakt",
     "contacts": "Kontakte",
     "continue": "Weitermachen",
     "copied": "Kopiert",
@@ -174,6 +175,7 @@
     "copy": "Kopieren",
     "copy_code": "Code kopieren",
     "copy_link": "Link kopieren",
+    "copy_to_environment": "In {{environment}} kopieren",
     "count_attributes": "{count, plural, one {{count} Attribut} other {{count} Attribute}}",
     "count_contacts": "{count, plural, one {{count} Kontakt} other {{count} Kontakte}}",
     "count_members": "{count, plural, one {{count} Mitglied} other {{count} Mitglieder}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(Kopie {copyNumber})",
     "e_commerce": "E-Commerce",
     "edit": "Bearbeiten",
+    "elements": "Elemente",
     "email": "E-Mail",
     "ending_card": "Abschluss-Karte",
     "enter_url": "URL eingeben",
     "enterprise_license": "Enterprise Lizenz",
     "environment": "Umgebung",
-    "environment_not_found": "Umgebung nicht gefunden",
     "environment_notice": "Du befindest dich derzeit in der {environment}-Umgebung.",
     "error": "Fehler",
     "error_component_description": "Diese Ressource existiert nicht oder Du hast nicht die notwendigen Rechte, um darauf zuzugreifen.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Inaktive Umfragen",
     "integration": "Integration",
     "integrations": "Integrationen",
-    "invalid_date": "Ungültiges Datum",
+    "invalid_date_with_value": "Ungültiges Datum: {value}",
     "invalid_file_name": "Ungültiger Dateiname, bitte benennen Sie Ihre Datei um und versuchen Sie es erneut",
     "invalid_file_type": "Ungültiger Dateityp",
     "invite": "Einladen",
     "invite_them": "Lade sie ein",
+    "javascript_required": "JavaScript erforderlich",
+    "javascript_required_description": "Formbricks benötigt JavaScript, um ordnungsgemäß zu funktionieren. Bitte aktiviere JavaScript in deinen Browsereinstellungen, um fortzufahren.",
     "key": "Schlüssel",
     "label": "Bezeichnung",
     "language": "Sprache",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Mitglieder",
     "members_and_teams": "Mitglieder & Teams",
+    "membership": "Mitgliedschaft",
     "membership_not_found": "Mitgliedschaft nicht gefunden",
+    "meta": "Meta",
     "metadata": "Metadaten",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funktioniert am besten auf einem größeren Bildschirm. Um Umfragen zu verwalten oder zu erstellen, wechsle zu einem anderen Gerät.",
     "mobile_overlay_surveys_look_good": "Keine Sorge – deine Umfragen sehen auf jedem Gerät und jeder Bildschirmgröße großartig aus!",
@@ -320,10 +326,9 @@
     "or": "oder",
     "organization": "Organisation",
     "organization_id": "Organisations-ID",
-    "organization_not_found": "Organisation nicht gefunden",
     "organization_settings": "Organisationseinstellungen",
-    "organization_teams_not_found": "Organisations-Teams nicht gefunden",
     "other": "Andere",
+    "other_filters": "Weitere Filter",
     "others": "Andere",
     "overlay_color": "Overlay-Farbe",
     "overview": "Überblick",
@@ -382,6 +387,7 @@
     "select": "Auswählen",
     "select_all": "Alles auswählen",
     "select_filter": "Filter auswählen",
+    "select_language": "Sprache auswählen",
     "select_survey": "Umfrage auswählen",
     "select_teams": "Teams auswählen",
     "selected": "Ausgewählt",
@@ -414,7 +420,6 @@
     "survey_id": "Umfrage-ID",
     "survey_languages": "Umfragesprachen",
     "survey_live": "Umfrage live",
-    "survey_not_found": "Umfrage nicht gefunden",
     "survey_paused": "Umfrage pausiert.",
     "survey_type": "Umfragetyp",
     "surveys": "Umfragen",
@@ -429,7 +434,6 @@
     "team_name": "Teamname",
     "team_role": "Team-Rolle",
     "teams": "Teams",
-    "teams_not_found": "Teams nicht gefunden",
     "text": "Text",
     "time": "Zeit",
     "time_to_finish": "Zeit zum Fertigstellen",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Benutzer",
     "user_id": "Benutzer-ID",
-    "user_not_found": "Benutzer nicht gefunden",
     "variable": "Variable",
     "variable_ids": "Variablen-IDs",
     "variables": "Variablen",
@@ -469,14 +472,13 @@
     "weeks": "Wochen",
     "welcome_card": "Willkommenskarte",
     "workflows": "Workflows",
+    "workspace": "Arbeitsbereich",
     "workspace_configuration": "Projektkonfiguration",
     "workspace_created_successfully": "Projekt erfolgreich erstellt",
     "workspace_creation_description": "Organisieren Sie Umfragen in Projekten für eine bessere Zugriffskontrolle.",
     "workspace_id": "Projekt-ID",
     "workspace_name": "Projektname",
     "workspace_name_placeholder": "z. B. Formbricks",
-    "workspace_not_found": "Projekt nicht gefunden",
-    "workspace_permission_not_found": "Projektberechtigung nicht gefunden",
     "workspaces": "Projekte",
     "years": "Jahre",
     "you": "Du",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Neues Attribut “{key}” mit Typ “{dataType}” erstellt",
       "attributes_msg_userid_already_exists": "Die Benutzer-ID existiert bereits für diese Umgebung und wurde nicht aktualisiert.",
       "contact_deleted_successfully": "Kontakt erfolgreich gelöscht",
-      "contact_not_found": "Kein solcher Kontakt gefunden",
       "contacts_table_refresh": "Kontakte aktualisieren",
       "contacts_table_refresh_success": "Kontakte erfolgreich aktualisiert",
       "create_attribute": "Attribut erstellen",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Erstellt von einer dritten Partei",
         "discord_webhook_not_supported": "Discord-Webhooks werden derzeit nicht unterstützt.",
         "empty_webhook_message": "Deine Webhooks werden hier angezeigt, sobald Du sie hinzufügst ⏲️",
+        "endpoint_bad_gateway_error": "Ungültiges Gateway (502): Proxy-/Gateway-Fehler, Dienst nicht erreichbar",
+        "endpoint_gateway_timeout_error": "Gateway-Zeitüberschreitung (504): Gateway-Zeitüberschreitung, Dienst nicht erreichbar",
+        "endpoint_internal_server_error": "Interner Serverfehler (500): Der Dienst ist auf einen unerwarteten Fehler gestoßen",
+        "endpoint_method_not_allowed_error": "Methode nicht erlaubt (405): Der Endpoint existiert, akzeptiert aber keine POST-Anfragen",
+        "endpoint_not_found_error": "Nicht gefunden (404): Der Endpoint existiert nicht",
         "endpoint_pinged": "Juhu! Wir können den Webhook anpingen!",
         "endpoint_pinged_error": "Kann den Webhook nicht anpingen!",
+        "endpoint_service_unavailable_error": "Dienst nicht verfügbar (503): Dienst ist vorübergehend nicht verfügbar",
         "learn_to_verify": "Erfahren Sie, wie Sie Webhook-Signaturen verifizieren",
+        "no_triggers": "Keine Trigger",
         "please_check_console": "Bitte überprüfe die Konsole für weitere Details",
         "please_enter_a_url": "Bitte gib eine URL ein",
         "response_created": "Antwort erstellt",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Benutzerdefinierter Hostname",
         "customize_survey_logo": "Umfragelogo anpassen",
         "darken_or_lighten_background_of_your_choice": "Hintergrund deiner Wahl abdunkeln oder aufhellen.",
-        "date_format": "Datumsformat",
         "days_before_showing_this_survey_again": "oder mehr Tage müssen zwischen der zuletzt angezeigten Umfrage und der Anzeige dieser Umfrage vergehen.",
         "delete_anyways": "Trotzdem löschen",
         "delete_block": "Block löschen",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Antwortlimit muss die Anzahl der erhaltenen Antworten ({responseCount}) überschreiten.",
         "response_limits_redirections_and_more": "Antwort Limits, Weiterleitungen und mehr.",
         "response_options": "Antwortoptionen",
+        "reverse_order_occasionally": "Reihenfolge gelegentlich umkehren",
+        "reverse_order_occasionally_except_last": "Reihenfolge gelegentlich umkehren, außer letzter",
         "roundness": "Rundheit",
         "roundness_description": "Steuert, wie abgerundet die Ecken sind.",
         "row_used_in_logic_error": "Diese Zeile wird in der Logik der Frage {questionIndex} verwendet. Bitte entferne sie zuerst aus der Logik.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Umfrage maximal anzeigen von",
         "show_survey_to_users": "Umfrage % der Nutzer anzeigen",
         "show_to_x_percentage_of_targeted_users": "Zeige {percentage}% der Zielbenutzer",
+        "shrink_preview": "Vorschau verkleinern",
         "simple": "Einfach",
         "six_points": "6 Punkte",
         "smiley": "Smiley",
         "spam_protection_note": "Spamschutz funktioniert nicht für Umfragen, die mit den iOS-, React Native- und Android-SDKs angezeigt werden. Es wird die Umfrage unterbrechen.",
         "spam_protection_threshold_description": "Wert zwischen 0 und 1 festlegen, Antworten unter diesem Wert werden abgelehnt.",
         "spam_protection_threshold_heading": "Antwortschwelle",
-        "shrink_preview": "Vorschau verkleinern",
         "star": "Stern",
         "starts_with": "Fängt an mit",
         "state": "Bundesland",

apps/web/locales/en-US.json

@@ -167,6 +167,7 @@
     "connect": "Connect",
     "connect_formbricks": "Connect Formbricks",
     "connected": "Connected",
+    "contact": "Contact",
     "contacts": "Contacts",
     "continue": "Continue",
     "copied": "Copied",
@@ -174,6 +175,7 @@
     "copy": "Copy",
     "copy_code": "Copy code",
     "copy_link": "Copy Link",
+    "copy_to_environment": "Copy to {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribute} other {{count} attributes}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacts}}",
     "count_members": "{count, plural, one {{count} member} other {{count} members}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(copy {copyNumber})",
     "e_commerce": "E-Commerce",
     "edit": "Edit",
+    "elements": "Elements",
     "email": "Email",
     "ending_card": "Ending card",
     "enter_url": "Enter URL",
     "enterprise_license": "Enterprise License",
     "environment": "Environment",
-    "environment_not_found": "Environment not found",
     "environment_notice": "You are currently in the {environment} environment.",
     "error": "Error",
     "error_component_description": "This resource does not exist or you do not have the necessary rights to access it.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Inactive surveys",
     "integration": "integration",
     "integrations": "Integrations",
-    "invalid_date": "Invalid date",
+    "invalid_date_with_value": "Invalid date: {value}",
     "invalid_file_name": "Invalid file name, please rename your file and try again",
     "invalid_file_type": "Invalid file type",
     "invite": "Invite",
     "invite_them": "Invite them",
+    "javascript_required": "JavaScript Required",
+    "javascript_required_description": "Formbricks requires JavaScript to function properly. Please enable JavaScript in your browser settings to continue.",
     "key": "Key",
     "label": "Label",
     "language": "Language",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Members",
     "members_and_teams": "Members & Teams",
+    "membership": "Membership",
     "membership_not_found": "Membership not found",
+    "meta": "Meta",
     "metadata": "Metadata",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks works best on a bigger screen. To manage or build surveys, switch to another device.",
     "mobile_overlay_surveys_look_good": "Do not worry – your surveys look great on every device and screen size!",
@@ -320,10 +326,9 @@
     "or": "or",
     "organization": "Organization",
     "organization_id": "Organization ID",
-    "organization_not_found": "Organization not found",
     "organization_settings": "Organization settings",
-    "organization_teams_not_found": "Organization teams not found",
     "other": "Other",
+    "other_filters": "Other Filters",
     "others": "Others",
     "overlay_color": "Overlay color",
     "overview": "Overview",
@@ -382,6 +387,7 @@
     "select": "Select",
     "select_all": "Select all",
     "select_filter": "Select filter",
+    "select_language": "Select Language",
     "select_survey": "Select Survey",
     "select_teams": "Select teams",
     "selected": "Selected",
@@ -414,7 +420,6 @@
     "survey_id": "Survey ID",
     "survey_languages": "Survey Languages",
     "survey_live": "Survey live",
-    "survey_not_found": "Survey not found",
     "survey_paused": "Survey paused.",
     "survey_type": "Survey Type",
     "surveys": "Surveys",
@@ -429,7 +434,6 @@
     "team_name": "Team name",
     "team_role": "Team role",
     "teams": "Teams",
-    "teams_not_found": "Teams not found",
     "text": "Text",
     "time": "Time",
     "time_to_finish": "Time to finish",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "User",
     "user_id": "User ID",
-    "user_not_found": "User not found",
     "variable": "Variable",
     "variable_ids": "Variable IDs",
     "variables": "Variables",
@@ -469,14 +472,13 @@
     "weeks": "weeks",
     "welcome_card": "Welcome card",
     "workflows": "Workflows",
+    "workspace": "Workspace",
     "workspace_configuration": "Workspace Configuration",
     "workspace_created_successfully": "Workspace created successfully",
     "workspace_creation_description": "Organize surveys in workspaces for better access control.",
     "workspace_id": "Workspace ID",
     "workspace_name": "Workspace Name",
     "workspace_name_placeholder": "e.g. Formbricks",
-    "workspace_not_found": "Workspace not found",
-    "workspace_permission_not_found": "Workspace permission not found",
     "workspaces": "Workspaces",
     "years": "years",
     "you": "You",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Created new attribute “{key}” with type “{dataType}”",
       "attributes_msg_userid_already_exists": "The user ID already exists for this environment and was not updated.",
       "contact_deleted_successfully": "Contact deleted successfully",
-      "contact_not_found": "No such contact found",
       "contacts_table_refresh": "Refresh contacts",
       "contacts_table_refresh_success": "Contacts refreshed successfully",
       "create_attribute": "Create attribute",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Created by a Third Party",
         "discord_webhook_not_supported": "Discord webhooks are currently not supported.",
         "empty_webhook_message": "Your webhooks will appear here as soon as you add them. ⏲️",
+        "endpoint_bad_gateway_error": "Bad Gateway (502): Proxy/gateway error, service not reachable",
+        "endpoint_gateway_timeout_error": "Gateway Timeout (504): Gateway timeout, service not reachable",
+        "endpoint_internal_server_error": "Internal Server Error (500): The service encountered an unexpected error",
+        "endpoint_method_not_allowed_error": "Method Not Allowed (405): The endpoint exists, but doesn't accept POST requests",
+        "endpoint_not_found_error": "Not Found (404): The endpoint doesn't exist",
         "endpoint_pinged": "Yay! We are able to ping the webhook!",
         "endpoint_pinged_error": "Unable to ping the webhook!",
+        "endpoint_service_unavailable_error": "Service Unavailable (503): Service is temporarily down",
         "learn_to_verify": "Learn how to verify webhook signatures",
+        "no_triggers": "No Triggers",
         "please_check_console": "Please check the console for more details",
         "please_enter_a_url": "Please enter a URL",
         "response_created": "Response Created",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Custom hostname",
         "customize_survey_logo": "Customize the survey logo",
         "darken_or_lighten_background_of_your_choice": "Darken or lighten background of your choice.",
-        "date_format": "Date format",
         "days_before_showing_this_survey_again": "or more days to pass between the last shown survey and showing this survey.",
         "delete_anyways": "Delete anyways",
         "delete_block": "Delete block",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Response limit needs to exceed number of received responses ({responseCount}).",
         "response_limits_redirections_and_more": "Response limits, redirections and more.",
         "response_options": "Response Options",
+        "reverse_order_occasionally": "Reverse order occasionally",
+        "reverse_order_occasionally_except_last": "Reverse order occasionally except last",
         "roundness": "Roundness",
         "roundness_description": "Controls how rounded corners are.",
         "row_used_in_logic_error": "This row is used in logic of question {questionIndex}. Please remove it from logic first.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Show survey maximum of",
         "show_survey_to_users": "Show survey to % of users",
         "show_to_x_percentage_of_targeted_users": "Show to {percentage}% of targeted users",
+        "shrink_preview": "Shrink Preview",
         "simple": "Simple",
         "six_points": "6 points",
         "smiley": "Smiley",
         "spam_protection_note": "Spam protection does not work for surveys displayed with the iOS, React Native, and Android SDKs. It will break the survey.",
         "spam_protection_threshold_description": "Set value between 0 and 1, responses below this value will be rejected.",
         "spam_protection_threshold_heading": "Response threshold",
-        "shrink_preview": "Shrink Preview",
         "star": "Star",
         "starts_with": "Starts with",
         "state": "State",

apps/web/locales/es-ES.json

@@ -167,6 +167,7 @@
     "connect": "Conectar",
     "connect_formbricks": "Conectar Formbricks",
     "connected": "Conectado",
+    "contact": "Contacto",
     "contacts": "Contactos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -174,6 +175,7 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar enlace",
+    "copy_to_environment": "Copiar a {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contacto} other {{count} contactos}}",
     "count_members": "{count, plural, one {{count} miembro} other {{count} miembros}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(copia {copyNumber})",
     "e_commerce": "Comercio electrónico",
     "edit": "Editar",
+    "elements": "Elementos",
     "email": "Email",
     "ending_card": "Tarjeta final",
     "enter_url": "Introducir URL",
     "enterprise_license": "Licencia empresarial",
     "environment": "Entorno",
-    "environment_not_found": "Entorno no encontrado",
     "environment_notice": "Actualmente estás en el entorno {environment}.",
     "error": "Error",
     "error_component_description": "Este recurso no existe o no tienes los derechos necesarios para acceder a él.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Encuestas inactivas",
     "integration": "integración",
     "integrations": "Integraciones",
-    "invalid_date": "Fecha no válida",
+    "invalid_date_with_value": "Fecha no válida: {value}",
     "invalid_file_name": "Nombre de archivo no válido, por favor renombre su archivo e inténtelo de nuevo",
     "invalid_file_type": "Tipo de archivo no válido",
     "invite": "Invitar",
     "invite_them": "Invítales",
+    "javascript_required": "Se requiere JavaScript",
+    "javascript_required_description": "Formbricks requiere JavaScript para funcionar correctamente. Por favor, activa JavaScript en la configuración de tu navegador para continuar.",
     "key": "Clave",
     "label": "Etiqueta",
     "language": "Idioma",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Miembros",
     "members_and_teams": "Miembros y equipos",
+    "membership": "Membresía",
     "membership_not_found": "Membresía no encontrada",
+    "meta": "Meta",
     "metadata": "Metadatos",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona mejor en una pantalla más grande. Para gestionar o crear encuestas, cambia a otro dispositivo.",
     "mobile_overlay_surveys_look_good": "No te preocupes – ¡tus encuestas se ven geniales en todos los dispositivos y tamaños de pantalla!",
@@ -320,10 +326,9 @@
     "or": "o",
     "organization": "Organización",
     "organization_id": "ID de organización",
-    "organization_not_found": "Organización no encontrada",
     "organization_settings": "Ajustes de la organización",
-    "organization_teams_not_found": "Equipos de la organización no encontrados",
     "other": "Otro",
+    "other_filters": "Otros Filtros",
     "others": "Otros",
     "overlay_color": "Color de superposición",
     "overview": "Resumen",
@@ -382,6 +387,7 @@
     "select": "Seleccionar",
     "select_all": "Seleccionar todo",
     "select_filter": "Seleccionar filtro",
+    "select_language": "Seleccionar idioma",
     "select_survey": "Seleccionar encuesta",
     "select_teams": "Seleccionar equipos",
     "selected": "Seleccionado",
@@ -414,7 +420,6 @@
     "survey_id": "ID de encuesta",
     "survey_languages": "Idiomas de la encuesta",
     "survey_live": "Encuesta activa",
-    "survey_not_found": "Encuesta no encontrada",
     "survey_paused": "Encuesta pausada.",
     "survey_type": "Tipo de encuesta",
     "surveys": "Encuestas",
@@ -429,7 +434,6 @@
     "team_name": "Nombre del equipo",
     "team_role": "Rol del equipo",
     "teams": "Equipos",
-    "teams_not_found": "Equipos no encontrados",
     "text": "Texto",
     "time": "Hora",
     "time_to_finish": "Tiempo para finalizar",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Usuario",
     "user_id": "ID de usuario",
-    "user_not_found": "Usuario no encontrado",
     "variable": "Variable",
     "variable_ids": "IDs de variables",
     "variables": "Variables",
@@ -469,14 +472,13 @@
     "weeks": "semanas",
     "welcome_card": "Tarjeta de bienvenida",
     "workflows": "Flujos de trabajo",
+    "workspace": "Espacio de trabajo",
     "workspace_configuration": "Configuración del proyecto",
     "workspace_created_successfully": "Proyecto creado correctamente",
     "workspace_creation_description": "Organiza las encuestas en proyectos para un mejor control de acceso.",
     "workspace_id": "ID del proyecto",
     "workspace_name": "Nombre del proyecto",
     "workspace_name_placeholder": "p. ej. Formbricks",
-    "workspace_not_found": "Proyecto no encontrado",
-    "workspace_permission_not_found": "Permiso del proyecto no encontrado",
     "workspaces": "Proyectos",
     "years": "años",
     "you": "Tú",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Se creó el atributo nuevo “{key}” con el tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "El ID de usuario ya existe para este entorno y no se actualizó.",
       "contact_deleted_successfully": "Contacto eliminado correctamente",
-      "contact_not_found": "No se ha encontrado dicho contacto",
       "contacts_table_refresh": "Actualizar contactos",
       "contacts_table_refresh_success": "Contactos actualizados correctamente",
       "create_attribute": "Crear atributo",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Creado por un tercero",
         "discord_webhook_not_supported": "Los webhooks de Discord no son compatibles actualmente.",
         "empty_webhook_message": "Tus webhooks aparecerán aquí tan pronto como los añadas. ⏲️",
+        "endpoint_bad_gateway_error": "Puerta de enlace incorrecta (502): Error de proxy o puerta de enlace, servicio no accesible",
+        "endpoint_gateway_timeout_error": "Tiempo de espera de la puerta de enlace agotado (504): Tiempo de espera de la puerta de enlace agotado, servicio no accesible",
+        "endpoint_internal_server_error": "Error interno del servidor (500): El servicio encontró un error inesperado",
+        "endpoint_method_not_allowed_error": "Método no permitido (405): El endpoint existe, pero no acepta solicitudes POST",
+        "endpoint_not_found_error": "No encontrado (404): El endpoint no existe",
         "endpoint_pinged": "¡Genial! ¡Podemos hacer ping al webhook!",
         "endpoint_pinged_error": "¡No se puede hacer ping al webhook!",
+        "endpoint_service_unavailable_error": "Servicio no disponible (503): El servicio está temporalmente caído",
         "learn_to_verify": "Aprende a verificar las firmas de webhook",
+        "no_triggers": "Sin activadores",
         "please_check_console": "Por favor, consulta la consola para más detalles",
         "please_enter_a_url": "Por favor, introduce una URL",
         "response_created": "Respuesta creada",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Nombre de host personalizado",
         "customize_survey_logo": "Personalizar el logotipo de la encuesta",
         "darken_or_lighten_background_of_your_choice": "Oscurece o aclara el fondo de tu elección.",
-        "date_format": "Formato de fecha",
         "days_before_showing_this_survey_again": "o más días deben transcurrir entre la última encuesta mostrada y la visualización de esta encuesta.",
         "delete_anyways": "Eliminar de todos modos",
         "delete_block": "Eliminar bloque",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "El límite de respuestas debe superar el número de respuestas recibidas ({responseCount}).",
         "response_limits_redirections_and_more": "Límites de respuestas, redirecciones y más.",
         "response_options": "Opciones de respuesta",
+        "reverse_order_occasionally": "Invertir orden ocasionalmente",
+        "reverse_order_occasionally_except_last": "Invertir orden ocasionalmente excepto el último",
         "roundness": "Redondez",
         "roundness_description": "Controla qué tan redondeadas están las esquinas.",
         "row_used_in_logic_error": "Esta fila se utiliza en la lógica de la pregunta {questionIndex}. Por favor, elimínala de la lógica primero.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Mostrar encuesta un máximo de",
         "show_survey_to_users": "Mostrar encuesta al % de usuarios",
         "show_to_x_percentage_of_targeted_users": "Mostrar al {percentage} % de usuarios objetivo",
+        "shrink_preview": "Contraer vista previa",
         "simple": "Simple",
         "six_points": "6 puntos",
         "smiley": "Emoticono",
         "spam_protection_note": "La protección contra spam no funciona para encuestas mostradas con los SDK de iOS, React Native y Android. Romperá la encuesta.",
         "spam_protection_threshold_description": "Establece un valor entre 0 y 1, las respuestas por debajo de este valor serán rechazadas.",
         "spam_protection_threshold_heading": "Umbral de respuesta",
-        "shrink_preview": "Contraer vista previa",
         "star": "Estrella",
         "starts_with": "Comienza con",
         "state": "Estado",

apps/web/locales/fr-FR.json

@@ -167,6 +167,7 @@
     "connect": "Connecter",
     "connect_formbricks": "Connecter Formbricks",
     "connected": "Connecté",
+    "contact": "Contact",
     "contacts": "Contacts",
     "continue": "Continuer",
     "copied": "Copié",
@@ -174,6 +175,7 @@
     "copy": "Copier",
     "copy_code": "Copier le code",
     "copy_link": "Copier le lien",
+    "copy_to_environment": "Copier vers {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribut} other {{count} attributs}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacts}}",
     "count_members": "{count, plural, one {{count} membre} other {{count} membres}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(copie {copyNumber})",
     "e_commerce": "E-commerce",
     "edit": "Modifier",
+    "elements": "Éléments",
     "email": "Email",
     "ending_card": "Carte de fin",
     "enter_url": "Saisir l'URL",
     "enterprise_license": "Licence d'entreprise",
     "environment": "Environnement",
-    "environment_not_found": "Environnement non trouvé",
     "environment_notice": "Vous êtes actuellement dans l'environnement {environment}.",
     "error": "Erreur",
     "error_component_description": "Cette ressource n'existe pas ou vous n'avez pas les droits nécessaires pour y accéder.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Sondages inactifs",
     "integration": "intégration",
     "integrations": "Intégrations",
-    "invalid_date": "Date invalide",
+    "invalid_date_with_value": "Date invalide: {value}",
     "invalid_file_name": "Nom de fichier invalide, veuillez renommer votre fichier et réessayer",
     "invalid_file_type": "Type de fichier invalide",
     "invite": "Inviter",
     "invite_them": "Invitez-les",
+    "javascript_required": "JavaScript requis",
+    "javascript_required_description": "Formbricks nécessite JavaScript pour fonctionner correctement. Veuillez activer JavaScript dans les paramètres de votre navigateur pour continuer.",
     "key": "Clé",
     "label": "Étiquette",
     "language": "Langue",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Membres",
     "members_and_teams": "Membres & Équipes",
+    "membership": "Adhésion",
     "membership_not_found": "Abonnement non trouvé",
+    "meta": "Méta",
     "metadata": "Métadonnées",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks fonctionne mieux sur un écran plus grand. Pour gérer ou créer des sondages, passez à un autre appareil.",
     "mobile_overlay_surveys_look_good": "Ne t'inquiète pas – tes enquêtes sont superbes sur tous les appareils et tailles d'écran!",
@@ -320,10 +326,9 @@
     "or": "ou",
     "organization": "Organisation",
     "organization_id": "Identifiant de l'organisation",
-    "organization_not_found": "Organisation non trouvée",
     "organization_settings": "Paramètres de l'organisation",
-    "organization_teams_not_found": "Équipes d'organisation non trouvées",
     "other": "Autre",
+    "other_filters": "Autres filtres",
     "others": "Autres",
     "overlay_color": "Couleur de superposition",
     "overview": "Aperçu",
@@ -382,6 +387,7 @@
     "select": "Sélectionner",
     "select_all": "Sélectionner tout",
     "select_filter": "Sélectionner un filtre",
+    "select_language": "Sélectionner la langue",
     "select_survey": "Sélectionner l'enquête",
     "select_teams": "Sélectionner les équipes",
     "selected": "Sélectionné",
@@ -414,7 +420,6 @@
     "survey_id": "ID de l'enquête",
     "survey_languages": "Langues de l'enquête",
     "survey_live": "Sondage en direct",
-    "survey_not_found": "Sondage non trouvé",
     "survey_paused": "Sondage en pause.",
     "survey_type": "Type de sondage",
     "surveys": "Enquêtes",
@@ -429,7 +434,6 @@
     "team_name": "Nom de l'équipe",
     "team_role": "Rôle dans l'équipe",
     "teams": "Équipes",
-    "teams_not_found": "Équipes non trouvées",
     "text": "Texte",
     "time": "Temps",
     "time_to_finish": "Temps de finir",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Utilisateur",
     "user_id": "Identifiant d'utilisateur",
-    "user_not_found": "Utilisateur non trouvé",
     "variable": "Variable",
     "variable_ids": "Identifiants variables",
     "variables": "Variables",
@@ -469,14 +472,13 @@
     "weeks": "semaines",
     "welcome_card": "Carte de bienvenue",
     "workflows": "Workflows",
+    "workspace": "Espace de travail",
     "workspace_configuration": "Configuration du projet",
     "workspace_created_successfully": "Projet créé avec succès",
     "workspace_creation_description": "Organisez les enquêtes dans des projets pour un meilleur contrôle d'accès.",
     "workspace_id": "ID du projet",
     "workspace_name": "Nom du projet",
     "workspace_name_placeholder": "par ex. Formbricks",
-    "workspace_not_found": "Projet introuvable",
-    "workspace_permission_not_found": "Permission du projet introuvable",
     "workspaces": "Projets",
     "years": "années",
     "you": "Vous",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Nouvel attribut “{key}” créé avec le type “{dataType}”",
       "attributes_msg_userid_already_exists": "L'identifiant utilisateur existe déjà pour cet environnement et n'a pas été mis à jour.",
       "contact_deleted_successfully": "Contact supprimé avec succès",
-      "contact_not_found": "Aucun contact trouvé",
       "contacts_table_refresh": "Actualiser les contacts",
       "contacts_table_refresh_success": "Contacts rafraîchis avec succès",
       "create_attribute": "Créer un attribut",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Créé par un tiers",
         "discord_webhook_not_supported": "Les webhooks Discord ne sont actuellement pas pris en charge.",
         "empty_webhook_message": "Vos webhooks apparaîtront ici dès que vous les ajouterez. ⏲️",
+        "endpoint_bad_gateway_error": "Mauvaise passerelle (502) : Erreur de proxy/passerelle, service inaccessible",
+        "endpoint_gateway_timeout_error": "Délai d'attente de la passerelle dépassé (504) : Le délai d'attente de la passerelle a expiré, service inaccessible",
+        "endpoint_internal_server_error": "Erreur interne du serveur (500) : Le service a rencontré une erreur inattendue",
+        "endpoint_method_not_allowed_error": "Méthode non autorisée (405) : Le point de terminaison existe, mais n'accepte pas les requêtes POST",
+        "endpoint_not_found_error": "Introuvable (404) : Le point de terminaison n'existe pas",
         "endpoint_pinged": "Yay ! Nous pouvons pinger le webhook !",
         "endpoint_pinged_error": "Impossible de pinger le webhook !",
+        "endpoint_service_unavailable_error": "Service indisponible (503) : Le service est temporairement indisponible",
         "learn_to_verify": "Découvrez comment vérifier les signatures de webhook",
+        "no_triggers": "Aucun déclencheur",
         "please_check_console": "Veuillez vérifier la console pour plus de détails.",
         "please_enter_a_url": "Veuillez entrer une URL.",
         "response_created": "Réponse créée",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Nom d'hôte personnalisé",
         "customize_survey_logo": "Personnaliser le logo de l'enquête",
         "darken_or_lighten_background_of_your_choice": "Assombrir ou éclaircir l'arrière-plan de votre choix.",
-        "date_format": "Format de date",
         "days_before_showing_this_survey_again": "ou plus de jours doivent s'écouler entre le dernier sondage affiché et l'affichage de ce sondage.",
         "delete_anyways": "Supprimer quand même",
         "delete_block": "Supprimer le bloc",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "La limite de réponses doit dépasser le nombre de réponses reçues ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de réponse, redirections et plus.",
         "response_options": "Options de réponse",
+        "reverse_order_occasionally": "Inverser l'ordre occasionnellement",
+        "reverse_order_occasionally_except_last": "Inverser l'ordre occasionnellement sauf le dernier",
         "roundness": "Rondeur",
         "roundness_description": "Contrôle l'arrondi des coins.",
         "row_used_in_logic_error": "Cette ligne est utilisée dans la logique de la question {questionIndex}. Veuillez d'abord la supprimer de la logique.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Afficher le maximum du sondage de",
         "show_survey_to_users": "Afficher l'enquête à % des utilisateurs",
         "show_to_x_percentage_of_targeted_users": "Afficher à {percentage}% des utilisateurs ciblés",
+        "shrink_preview": "Réduire l'aperçu",
         "simple": "Simple",
         "six_points": "6 points",
         "smiley": "Sourire",
         "spam_protection_note": "La protection contre le spam ne fonctionne pas pour les enquêtes affichées avec les SDK iOS, React Native et Android. Cela cassera l'enquête.",
         "spam_protection_threshold_description": "Définir une valeur entre 0 et 1, les réponses en dessous de cette valeur seront rejetées.",
         "spam_protection_threshold_heading": "Seuil de réponse",
-        "shrink_preview": "Réduire l'aperçu",
         "star": "Étoile",
         "starts_with": "Commence par",
         "state": "État",

apps/web/locales/hu-HU.json

@@ -167,6 +167,7 @@
     "connect": "Kapcsolódás",
     "connect_formbricks": "Kapcsolódás a Formbrickshez",
     "connected": "Kapcsolódva",
+    "contact": "Kapcsolat",
     "contacts": "Partnerek",
     "continue": "Folytatás",
     "copied": "Másolva",
@@ -174,6 +175,7 @@
     "copy": "Másolás",
     "copy_code": "Kód másolása",
     "copy_link": "Hivatkozás másolása",
+    "copy_to_environment": "Másolás ide: {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribútum} other {{count} attribútum}}",
     "count_contacts": "{count, plural, one {{count} partner} other {{count} partner}}",
     "count_members": "{count, plural, one {{count} tag} other {{count} tag}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "({copyNumber}. másolat)",
     "e_commerce": "E-kereskedelem",
     "edit": "Szerkesztés",
+    "elements": "Elemek",
     "email": "E-mail",
     "ending_card": "Befejező kártya",
     "enter_url": "URL megadása",
     "enterprise_license": "Vállalati licenc",
     "environment": "Környezet",
-    "environment_not_found": "A környezet nem található",
     "environment_notice": "Ön jelenleg a(z) {environment} környezetben van.",
     "error": "Hiba",
     "error_component_description": "Ez az erőforrás nem létezik, vagy nem rendelkezik a hozzáféréshez szükséges jogosultságokkal.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Inaktív kérdőívek",
     "integration": "integráció",
     "integrations": "Integrációk",
-    "invalid_date": "Érvénytelen dátum",
+    "invalid_date_with_value": "Érvénytelen dátum: {value}",
     "invalid_file_name": "Érvénytelen fájlnév, nevezze át a fájlt, és próbálja újra",
     "invalid_file_type": "Érvénytelen fájltípus",
     "invite": "Meghívás",
     "invite_them": "Meghívó nekik",
+    "javascript_required": "JavaScript szükséges",
+    "javascript_required_description": "A Formbricks használatához JavaScript szükséges. Kérjük, engedélyezze a JavaScriptet a böngésző beállításaiban a folytatáshoz.",
     "key": "Kulcs",
     "label": "Címke",
     "language": "Nyelv",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Tagok",
     "members_and_teams": "Tagok és csapatok",
+    "membership": "Tagság",
     "membership_not_found": "A tagság nem található",
+    "meta": "Meta",
     "metadata": "Metaadatok",
     "mobile_overlay_app_works_best_on_desktop": "A Formbricks nagyobb képernyőn működik a legjobban. A kérdőívek kezeléséhez vagy összeállításához váltson másik eszközre.",
     "mobile_overlay_surveys_look_good": "Ne aggódjon – a kérdőívei minden eszközön és képernyőméretnél remekül néznek ki!",
@@ -320,10 +326,9 @@
     "or": "vagy",
     "organization": "Szervezet",
     "organization_id": "Szervezetazonosító",
-    "organization_not_found": "A szervezet nem található",
     "organization_settings": "Szervezet beállításai",
-    "organization_teams_not_found": "A szervezeti csapatok nem találhatók",
     "other": "Egyéb",
+    "other_filters": "Egyéb szűrők",
     "others": "Mások",
     "overlay_color": "Rávetítés színe",
     "overview": "Áttekintés",
@@ -382,6 +387,7 @@
     "select": "Kiválasztás",
     "select_all": "Összes kiválasztása",
     "select_filter": "Szűrő kiválasztása",
+    "select_language": "Nyelv kiválasztása",
     "select_survey": "Kérdőív kiválasztása",
     "select_teams": "Csapatok kiválasztása",
     "selected": "Kiválasztva",
@@ -414,7 +420,6 @@
     "survey_id": "Kérdőív-azonosító",
     "survey_languages": "Kérdőív nyelvei",
     "survey_live": "A kérdőív élő",
-    "survey_not_found": "A kérdőív nem található",
     "survey_paused": "A kérdőív szüneteltetve.",
     "survey_type": "Kérdőív típusa",
     "surveys": "Kérdőívek",
@@ -429,7 +434,6 @@
     "team_name": "Csapat neve",
     "team_role": "Csapatszerep",
     "teams": "Csapatok",
-    "teams_not_found": "A csapatok nem találhatók",
     "text": "Szöveg",
     "time": "Idő",
     "time_to_finish": "Idő a befejezésig",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Felhasználó",
     "user_id": "Felhasználó-azonosító",
-    "user_not_found": "A felhasználó nem található",
     "variable": "Változó",
     "variable_ids": "Változóazonosítók",
     "variables": "Változók",
@@ -469,14 +472,13 @@
     "weeks": "hét",
     "welcome_card": "Üdvözlő kártya",
     "workflows": "Munkafolyamatok",
+    "workspace": "Munkaterület",
     "workspace_configuration": "Munkaterület beállítása",
     "workspace_created_successfully": "A munkaterület sikeresen létrehozva",
     "workspace_creation_description": "Kérdőívek munkaterületekre szervezése a jobb hozzáférés-vezérlés érdekében.",
     "workspace_id": "Munkaterület-azonosító",
     "workspace_name": "Munkaterület neve",
     "workspace_name_placeholder": "például Formbricks",
-    "workspace_not_found": "A munkaterület nem található",
-    "workspace_permission_not_found": "A munkaterület-jogosultság nem található",
     "workspaces": "Munkaterületek",
     "years": "év",
     "you": "Ön",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Az új „{dataType}” típusú „{key}” attribútum létrehozva",
       "attributes_msg_userid_already_exists": "A felhasználó-azonosító már létezik ennél a környezetnél, és nem lett frissítve.",
       "contact_deleted_successfully": "A partner sikeresen törölve",
-      "contact_not_found": "Nem található ilyen partner",
       "contacts_table_refresh": "Partnerek frissítése",
       "contacts_table_refresh_success": "A partnerek sikeresen frissítve",
       "create_attribute": "Attribútum létrehozása",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Harmadik fél által létrehozva",
         "discord_webhook_not_supported": "A Discord webhorgok jelenleg nem támogatottak.",
         "empty_webhook_message": "A webhorgai itt fognak megjelenni, amint hozzáadja azokat. ⏲️",
+        "endpoint_bad_gateway_error": "Hibás átjáró (502): Proxy-/átjáróhiba, a szolgáltatás nem érhető el",
+        "endpoint_gateway_timeout_error": "Átjáró időtúllépés (504): Átjáró időtúllépés, a szolgáltatás nem érhető el",
+        "endpoint_internal_server_error": "Belső szerverhiba (500): A szolgáltatás váratlan hibába ütközött",
+        "endpoint_method_not_allowed_error": "A metódus nem engedélyezett (405): A végpont létezik, de nem fogad POST kéréseket",
+        "endpoint_not_found_error": "Nem található (404): A végpont nem létezik",
         "endpoint_pinged": "Hurrá! Képesek vagyunk pingelni a webhorgot!",
         "endpoint_pinged_error": "Nem lehet pingelni a webhorgot!",
+        "endpoint_service_unavailable_error": "A szolgáltatás nem érhető el (503): A szolgáltatás átmenetileg nem elérhető",
         "learn_to_verify": "Tudja meg, hogy kell ellenőrizni a webhorog aláírásait",
+        "no_triggers": "Nincsenek Triggerek",
         "please_check_console": "További részletekért nézze meg a konzolt",
         "please_enter_a_url": "Adjon meg egy URL-t",
         "response_created": "Válasz létrehozva",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Egyéni gépnév",
         "customize_survey_logo": "A kérdőív logójának személyre szabása",
         "darken_or_lighten_background_of_your_choice": "A választási lehetőség hátterének sötétítése vagy világosítása.",
-        "date_format": "Dátumformátum",
         "days_before_showing_this_survey_again": "vagy több napnak kell eltelnie az utolsó megjelenített kérdőív és ezen kérdőív megjelenése között.",
         "delete_anyways": "Törlés mindenképp",
         "delete_block": "Blokk törlése",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "A válaszkorlátnak meg kell haladnia a kapott válaszok számát ({responseCount}).",
         "response_limits_redirections_and_more": "Válaszkorlátok, átirányítások és egyebek.",
         "response_options": "Válasz beállításai",
+        "reverse_order_occasionally": "Sorrend alkalmi megfordítása",
+        "reverse_order_occasionally_except_last": "Sorrend alkalmi megfordítása az utolsó kivételével",
         "roundness": "Kerekesség",
         "roundness_description": "Annak vezérlése, hogy a sarkok mennyire legyenek lekerekítve.",
         "row_used_in_logic_error": "Ez a sor használatban van a(z) {questionIndex}. kérdés logikájában. Először távolítsa el a logikából.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Kérdőív megjelenítése legfeljebb:",
         "show_survey_to_users": "Kérdőív megjelenítése a felhasználók ennyi százalékának",
         "show_to_x_percentage_of_targeted_users": "Megjelenítés a célzott felhasználók {percentage}%-ának",
+        "shrink_preview": "Előnézet összecsukása",
         "simple": "Egyszerű",
         "six_points": "6 pont",
         "smiley": "Hangulatjel",
         "spam_protection_note": "A szemét elleni védekezés nem működik az iOS, React Native és Android SDK-kkal megjelenített kérdőíveknél. El fogja rontani a kérdőívet.",
         "spam_protection_threshold_description": "Állítsa az értéket 0 és 1 közé, az ezen érték alatt lévő válaszok elutasításra kerülnek.",
         "spam_protection_threshold_heading": "Válasz küszöbszintje",
-        "shrink_preview": "Előnézet összecsukása",
         "star": "Csillag",
         "starts_with": "Ezzel kezdődik",
         "state": "Állapot",

apps/web/locales/ja-JP.json

@@ -167,6 +167,7 @@
     "connect": "接続",
     "connect_formbricks": "Formbricksを接続",
     "connected": "接続済み",
+    "contact": "連絡先",
     "contacts": "連絡先",
     "continue": "続行",
     "copied": "コピーしました",
@@ -174,6 +175,7 @@
     "copy": "コピー",
     "copy_code": "コードをコピー",
     "copy_link": "リンクをコピー",
+    "copy_to_environment": "{{environment}} にコピー",
     "count_attributes": "{count, plural, other {{count} 個の属性}}",
     "count_contacts": "{count, plural, other {{count} 件の連絡先}}",
     "count_members": "{count, plural, other {{count} 名のメンバー}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(コピー {copyNumber})",
     "e_commerce": "Eコマース",
     "edit": "編集",
+    "elements": "要素",
     "email": "メールアドレス",
     "ending_card": "終了カード",
     "enter_url": "URLを入力",
     "enterprise_license": "エンタープライズライセンス",
     "environment": "環境",
-    "environment_not_found": "環境が見つかりません",
     "environment_notice": "現在、{environment} 環境にいます。",
     "error": "エラー",
     "error_component_description": "この リソース は 存在 しない か、アクセス する ための 必要な 権限 が ありません。",
@@ -255,11 +257,13 @@
     "inactive_surveys": "非アクティブなフォーム",
     "integration": "連携",
     "integrations": "連携",
-    "invalid_date": "無効な日付です",
+    "invalid_date_with_value": "無効な日付です: {value}",
     "invalid_file_name": "ファイル名が無効です。ファイル名を変更して再試行してください",
     "invalid_file_type": "無効なファイルタイプです",
     "invite": "招待",
     "invite_them": "招待する",
+    "javascript_required": "JavaScriptが必要です",
+    "javascript_required_description": "Formbricksを正常に動作させるには、JavaScriptが必要です。続行するには、ブラウザの設定でJavaScriptを有効にしてください。",
     "key": "キー",
     "label": "ラベル",
     "language": "言語",
@@ -280,7 +284,9 @@
     "marketing": "マーケティング",
     "members": "メンバー",
     "members_and_teams": "メンバー＆チーム",
+    "membership": "メンバーシップ",
     "membership_not_found": "メンバーシップが見つかりません",
+    "meta": "メタ",
     "metadata": "メタデータ",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks は より 大きな 画面 で最適に 作動します。 フォーム を 管理または 構築する には、 別の デバイス に 切り替える 必要が あります。",
     "mobile_overlay_surveys_look_good": "ご安心ください - お使い の デバイス や 画面 サイズ に 関係なく、 フォーム は 素晴らしく 見えます！",
@@ -320,10 +326,9 @@
     "or": "または",
     "organization": "組織",
     "organization_id": "組織ID",
-    "organization_not_found": "組織が見つかりません",
     "organization_settings": "組織設定",
-    "organization_teams_not_found": "組織のチームが見つかりません",
     "other": "その他",
+    "other_filters": "その他のフィルター",
     "others": "その他",
     "overlay_color": "オーバーレイの色",
     "overview": "概要",
@@ -382,6 +387,7 @@
     "select": "選択",
     "select_all": "すべて選択",
     "select_filter": "フィルターを選択",
+    "select_language": "言語を選択",
     "select_survey": "フォームを選択",
     "select_teams": "チームを選択",
     "selected": "選択済み",
@@ -414,7 +420,6 @@
     "survey_id": "フォームID",
     "survey_languages": "フォームの言語",
     "survey_live": "フォーム公開中",
-    "survey_not_found": "フォームが見つかりません",
     "survey_paused": "フォームは一時停止中です。",
     "survey_type": "フォームの種類",
     "surveys": "フォーム",
@@ -429,7 +434,6 @@
     "team_name": "チーム名",
     "team_role": "チームの役割",
     "teams": "チーム",
-    "teams_not_found": "チームが見つかりません",
     "text": "テキスト",
     "time": "時間",
     "time_to_finish": "所要時間",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "ユーザー",
     "user_id": "ユーザーID",
-    "user_not_found": "ユーザーが見つかりません",
     "variable": "変数",
     "variable_ids": "変数ID",
     "variables": "変数",
@@ -469,14 +472,13 @@
     "weeks": "週間",
     "welcome_card": "ウェルカムカード",
     "workflows": "ワークフロー",
+    "workspace": "ワークスペース",
     "workspace_configuration": "ワークスペース設定",
     "workspace_created_successfully": "ワークスペースが正常に作成されました",
     "workspace_creation_description": "アクセス制御を改善するために、フォームをワークスペースで整理します。",
     "workspace_id": "ワークスペースID",
     "workspace_name": "ワークスペース名",
     "workspace_name_placeholder": "例: Formbricks",
-    "workspace_not_found": "ワークスペースが見つかりません",
-    "workspace_permission_not_found": "ワークスペースの権限が見つかりません",
     "workspaces": "ワークスペース",
     "years": "年",
     "you": "あなた",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "新しい属性“{key}”を型“{dataType}”で作成しました",
       "attributes_msg_userid_already_exists": "この環境にはすでにユーザーIDが存在するため、更新されませんでした。",
       "contact_deleted_successfully": "連絡先を正常に削除しました",
-      "contact_not_found": "そのような連絡先は見つかりません",
       "contacts_table_refresh": "連絡先を更新",
       "contacts_table_refresh_success": "連絡先を正常に更新しました",
       "create_attribute": "属性を作成",
@@ -852,9 +853,16 @@
         "created_by_third_party": "サードパーティによって作成",
         "discord_webhook_not_supported": "現在、Discord Webhook はサポートしていません。",
         "empty_webhook_message": "Webhook は追加するとここに表示されます。⏲️",
+        "endpoint_bad_gateway_error": "不正なゲートウェイ (502): プロキシまたはゲートウェイのエラーにより、サービスに到達できません",
+        "endpoint_gateway_timeout_error": "ゲートウェイタイムアウト (504): ゲートウェイのタイムアウトにより、サービスに到達できません",
+        "endpoint_internal_server_error": "内部サーバーエラー (500): サービスで予期しないエラーが発生しました",
+        "endpoint_method_not_allowed_error": "許可されていないメソッド (405): エンドポイントは存在しますが、POST リクエストを受け付けません",
+        "endpoint_not_found_error": "見つかりません (404): エンドポイントが存在しません",
         "endpoint_pinged": "成功！Webhook に ping できました。",
         "endpoint_pinged_error": "Webhook への ping に失敗しました。",
+        "endpoint_service_unavailable_error": "サービス利用不可 (503): サービスは一時的に停止しています",
         "learn_to_verify": "Webhook署名の検証方法を学ぶ",
+        "no_triggers": "トリガーなし",
         "please_check_console": "詳細はコンソールを確認してください",
         "please_enter_a_url": "URL を入力してください",
         "response_created": "回答作成",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "カスタムホスト名",
         "customize_survey_logo": "アンケートのロゴをカスタマイズする",
         "darken_or_lighten_background_of_your_choice": "お好みの背景を暗くしたり明るくしたりします。",
-        "date_format": "日付形式",
         "days_before_showing_this_survey_again": "最後に表示されたアンケートとこのアンケートを表示するまでに、この日数以上の期間を空ける必要があります。",
         "delete_anyways": "削除する",
         "delete_block": "ブロックを削除",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "回答数の上限は、受信済みの回答数 ({responseCount}) を超える必要があります。",
         "response_limits_redirections_and_more": "回答数の上限、リダイレクトなど。",
         "response_options": "回答オプション",
+        "reverse_order_occasionally": "順序をランダムに逆転",
+        "reverse_order_occasionally_except_last": "最後以外の順序をランダムに逆転",
         "roundness": "丸み",
         "roundness_description": "角の丸みを調整します。",
         "row_used_in_logic_error": "この行は質問 {questionIndex} のロジックで使用されています。まず、ロジックから削除してください。",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "フォームの最大表示回数",
         "show_survey_to_users": "ユーザーの {percentage}% にフォームを表示",
         "show_to_x_percentage_of_targeted_users": "ターゲットユーザーの {percentage}% に表示",
+        "shrink_preview": "プレビューを縮小",
         "simple": "シンプル",
         "six_points": "6点",
         "smiley": "スマイリー",
         "spam_protection_note": "スパム対策は、iOS、React Native、およびAndroid SDKで表示されるフォームでは機能しません。フォームが壊れます。",
         "spam_protection_threshold_description": "値を0から1の間で設定してください。この値より低い回答は拒否されます。",
         "spam_protection_threshold_heading": "回答のしきい値",
-        "shrink_preview": "プレビューを縮小",
         "star": "星",
         "starts_with": "で始まる",
         "state": "都道府県",

apps/web/locales/nl-NL.json

@@ -167,6 +167,7 @@
     "connect": "Verbinden",
     "connect_formbricks": "Sluit Formbricks aan",
     "connected": "Aangesloten",
+    "contact": "Contact",
     "contacts": "Contacten",
     "continue": "Doorgaan",
     "copied": "Gekopieerd",
@@ -174,6 +175,7 @@
     "copy": "Kopiëren",
     "copy_code": "Kopieer code",
     "copy_link": "Kopieer link",
+    "copy_to_environment": "Kopiëren naar {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribuut} other {{count} attributen}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacten}}",
     "count_members": "{count, plural, one {{count} lid} other {{count} leden}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(kopie {copyNumber})",
     "e_commerce": "E-commerce",
     "edit": "Bewerking",
+    "elements": "Elementen",
     "email": "E-mail",
     "ending_card": "Einde kaart",
     "enter_url": "URL invoeren",
     "enterprise_license": "Enterprise-licentie",
     "environment": "Omgeving",
-    "environment_not_found": "Omgeving niet gevonden",
     "environment_notice": "U bevindt zich momenteel in de {environment}-omgeving.",
     "error": "Fout",
     "error_component_description": "Deze bron bestaat niet of u beschikt niet over de benodigde toegangsrechten.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Inactieve enquêtes",
     "integration": "integratie",
     "integrations": "Integraties",
-    "invalid_date": "Ongeldige datum",
+    "invalid_date_with_value": "Ongeldige datum: {value}",
     "invalid_file_name": "Ongeldige bestandsnaam. Hernoem uw bestand en probeer het opnieuw",
     "invalid_file_type": "Ongeldig bestandstype",
     "invite": "Uitnodiging",
     "invite_them": "Nodig ze uit",
+    "javascript_required": "JavaScript vereist",
+    "javascript_required_description": "Formbricks heeft JavaScript nodig om correct te functioneren. Schakel JavaScript in je browserinstellingen in om door te gaan.",
     "key": "Sleutel",
     "label": "Label",
     "language": "Taal",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Leden",
     "members_and_teams": "Leden & teams",
+    "membership": "Lidmaatschap",
     "membership_not_found": "Lidmaatschap niet gevonden",
+    "meta": "Meta",
     "metadata": "Metagegevens",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks werkt het beste op een groter scherm. Schakel over naar een ander apparaat om enquêtes te beheren of samen te stellen.",
     "mobile_overlay_surveys_look_good": "Maakt u zich geen zorgen: uw enquêtes zien er geweldig uit op elk apparaat en schermformaat!",
@@ -320,10 +326,9 @@
     "or": "of",
     "organization": "Organisatie",
     "organization_id": "Organisatie-ID",
-    "organization_not_found": "Organisatie niet gevonden",
     "organization_settings": "Organisatie-instellingen",
-    "organization_teams_not_found": "Organisatieteams niet gevonden",
     "other": "Ander",
+    "other_filters": "Overige filters",
     "others": "Anderen",
     "overlay_color": "Overlaykleur",
     "overview": "Overzicht",
@@ -382,6 +387,7 @@
     "select": "Selecteer",
     "select_all": "Selecteer alles",
     "select_filter": "Filter selecteren",
+    "select_language": "Selecteer taal",
     "select_survey": "Selecteer Enquête",
     "select_teams": "Selecteer teams",
     "selected": "Gekozen",
@@ -414,7 +420,6 @@
     "survey_id": "Enquête-ID",
     "survey_languages": "Enquêtetalen",
     "survey_live": "Enquête live",
-    "survey_not_found": "Enquête niet gevonden",
     "survey_paused": "Enquête onderbroken.",
     "survey_type": "Enquêtetype",
     "surveys": "Enquêtes",
@@ -429,7 +434,6 @@
     "team_name": "Teamnaam",
     "team_role": "Teamrol",
     "teams": "Teams",
-    "teams_not_found": "Teams niet gevonden",
     "text": "Tekst",
     "time": "Tijd",
     "time_to_finish": "Tijd om af te ronden",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Gebruiker",
     "user_id": "Gebruikers-ID",
-    "user_not_found": "Gebruiker niet gevonden",
     "variable": "Variabel",
     "variable_ids": "Variabele ID's",
     "variables": "Variabelen",
@@ -469,14 +472,13 @@
     "weeks": "weken",
     "welcome_card": "Welkomstkaart",
     "workflows": "Workflows",
+    "workspace": "Werkruimte",
     "workspace_configuration": "Werkruimte-configuratie",
     "workspace_created_successfully": "Project succesvol aangemaakt",
     "workspace_creation_description": "Organiseer enquêtes in werkruimtes voor beter toegangsbeheer.",
     "workspace_id": "Werkruimte-ID",
     "workspace_name": "Werkruimtenaam",
     "workspace_name_placeholder": "bijv. Formbricks",
-    "workspace_not_found": "Werkruimte niet gevonden",
-    "workspace_permission_not_found": "Werkruimte-machtiging niet gevonden",
     "workspaces": "Werkruimtes",
     "years": "jaren",
     "you": "Jij",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Nieuw attribuut “{key}” aangemaakt met type “{dataType}”",
       "attributes_msg_userid_already_exists": "De gebruikers-ID bestaat al voor deze omgeving en is niet bijgewerkt.",
       "contact_deleted_successfully": "Contact succesvol verwijderd",
-      "contact_not_found": "Er is geen dergelijk contact gevonden",
       "contacts_table_refresh": "Vernieuw contacten",
       "contacts_table_refresh_success": "Contacten zijn vernieuwd",
       "create_attribute": "Attribuut aanmaken",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Gemaakt door een derde partij",
         "discord_webhook_not_supported": "Discord-webhooks worden momenteel niet ondersteund.",
         "empty_webhook_message": "Uw webhooks verschijnen hier zodra u ze toevoegt. ⏲️",
+        "endpoint_bad_gateway_error": "Ongeldige gateway (502): Proxy-/gatewayfout, service niet bereikbaar",
+        "endpoint_gateway_timeout_error": "Gateway-time-out (504): Gateway-time-out, service niet bereikbaar",
+        "endpoint_internal_server_error": "Interne serverfout (500): De service is een onverwachte fout tegengekomen",
+        "endpoint_method_not_allowed_error": "Methode niet toegestaan (405): Het endpoint bestaat, maar accepteert geen POST-verzoeken",
+        "endpoint_not_found_error": "Niet gevonden (404): Het endpoint bestaat niet",
         "endpoint_pinged": "Jawel! We kunnen de webhook pingen!",
         "endpoint_pinged_error": "Kan de webhook niet pingen!",
+        "endpoint_service_unavailable_error": "Service niet beschikbaar (503): De service is tijdelijk niet beschikbaar",
         "learn_to_verify": "Leer hoe je webhook-handtekeningen kunt verifiëren",
+        "no_triggers": "Geen triggers",
         "please_check_console": "Controleer de console voor meer details",
         "please_enter_a_url": "Voer een URL in",
         "response_created": "Reactie gemaakt",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Aangepaste hostnaam",
         "customize_survey_logo": "Pas het enquêtelogo aan",
         "darken_or_lighten_background_of_your_choice": "Maak de achtergrond naar keuze donkerder of lichter.",
-        "date_format": "Datumformaat",
         "days_before_showing_this_survey_again": "of meer dagen moeten verstrijken tussen de laatst getoonde enquête en het tonen van deze enquête.",
         "delete_anyways": "Toch verwijderen",
         "delete_block": "Blok verwijderen",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "De responslimiet moet groter zijn dan het aantal ontvangen reacties ({responseCount}).",
         "response_limits_redirections_and_more": "Reactielimieten, omleidingen en meer.",
         "response_options": "Reactieopties",
+        "reverse_order_occasionally": "Volgorde af en toe omkeren",
+        "reverse_order_occasionally_except_last": "Volgorde af en toe omkeren behalve laatste",
         "roundness": "Rondheid",
         "roundness_description": "Bepaalt hoe afgerond de hoeken zijn.",
         "row_used_in_logic_error": "Deze rij wordt gebruikt in de logica van vraag {questionIndex}. Verwijder het eerst uit de logica.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Toon onderzoek maximaal",
         "show_survey_to_users": "Enquête tonen aan % van de gebruikers",
         "show_to_x_percentage_of_targeted_users": "Toon aan {percentage}% van de getargete gebruikers",
+        "shrink_preview": "Voorbeeld invouwen",
         "simple": "Eenvoudig",
         "six_points": "6 punten",
         "smiley": "Smiley",
         "spam_protection_note": "Spambeveiliging werkt niet voor enquêtes die worden weergegeven met de iOS-, React Native- en Android SDK's. Het zal de enquête breken.",
         "spam_protection_threshold_description": "Stel een waarde in tussen 0 en 1, reacties onder deze waarde worden afgewezen.",
         "spam_protection_threshold_heading": "Reactiedrempel",
-        "shrink_preview": "Voorbeeld invouwen",
         "star": "Ster",
         "starts_with": "Begint met",
         "state": "Staat",

apps/web/locales/pt-BR.json

@@ -167,6 +167,7 @@
     "connect": "Conectar",
     "connect_formbricks": "Conectar Formbricks",
     "connected": "conectado",
+    "contact": "Contato",
     "contacts": "Contatos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -174,6 +175,7 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar Link",
+    "copy_to_environment": "Copiar para {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contato} other {{count} contatos}}",
     "count_members": "{count, plural, one {{count} membro} other {{count} membros}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(cópia {copyNumber})",
     "e_commerce": "comércio eletrônico",
     "edit": "Editar",
+    "elements": "Elementos",
     "email": "Email",
     "ending_card": "Cartão de encerramento",
     "enter_url": "Inserir URL",
     "enterprise_license": "Licença Empresarial",
     "environment": "Ambiente",
-    "environment_not_found": "Ambiente não encontrado",
     "environment_notice": "Você está atualmente no ambiente {environment}.",
     "error": "Erro",
     "error_component_description": "Esse recurso não existe ou você não tem permissão para acessá-lo.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Pesquisas inativas",
     "integration": "integração",
     "integrations": "Integrações",
-    "invalid_date": "Data inválida",
+    "invalid_date_with_value": "Data inválida: {value}",
     "invalid_file_name": "Nome de arquivo inválido, por favor renomeie seu arquivo e tente novamente",
     "invalid_file_type": "Tipo de arquivo inválido",
     "invite": "convidar",
     "invite_them": "Convida eles",
+    "javascript_required": "JavaScript Necessário",
+    "javascript_required_description": "O Formbricks precisa do JavaScript para funcionar corretamente. Por favor, ative o JavaScript nas configurações do seu navegador para continuar.",
     "key": "Chave",
     "label": "Etiqueta",
     "language": "Língua",
@@ -280,7 +284,9 @@
     "marketing": "marketing",
     "members": "Membros",
     "members_and_teams": "Membros e equipes",
+    "membership": "Associação",
     "membership_not_found": "Assinatura não encontrada",
+    "meta": "Meta",
     "metadata": "metadados",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona melhor em uma tela maior. Para gerenciar ou criar pesquisas, mude para outro dispositivo.",
     "mobile_overlay_surveys_look_good": "Não se preocupe – suas pesquisas ficam ótimas em qualquer dispositivo e tamanho de tela!",
@@ -320,10 +326,9 @@
     "or": "ou",
     "organization": "organização",
     "organization_id": "ID da Organização",
-    "organization_not_found": "Organização não encontrada",
     "organization_settings": "Configurações da Organização",
-    "organization_teams_not_found": "Equipes da organização não encontradas",
     "other": "outro",
+    "other_filters": "Outros Filtros",
     "others": "Outros",
     "overlay_color": "Cor da sobreposição",
     "overview": "Visão Geral",
@@ -382,6 +387,7 @@
     "select": "Selecionar",
     "select_all": "Selecionar tudo",
     "select_filter": "Selecionar filtro",
+    "select_language": "Selecionar Idioma",
     "select_survey": "Selecionar Pesquisa",
     "select_teams": "Selecionar times",
     "selected": "Selecionado",
@@ -414,7 +420,6 @@
     "survey_id": "ID da Pesquisa",
     "survey_languages": "Idiomas da Pesquisa",
     "survey_live": "Pesquisa ao vivo",
-    "survey_not_found": "Pesquisa não encontrada",
     "survey_paused": "Pesquisa pausada.",
     "survey_type": "Tipo de Pesquisa",
     "surveys": "Pesquisas",
@@ -429,7 +434,6 @@
     "team_name": "Nome da equipe",
     "team_role": "Função na equipe",
     "teams": "Equipes",
-    "teams_not_found": "Equipes não encontradas",
     "text": "Texto",
     "time": "tempo",
     "time_to_finish": "Hora de terminar",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Usuário",
     "user_id": "ID do usuário",
-    "user_not_found": "Usuário não encontrado",
     "variable": "variável",
     "variable_ids": "IDs de variáveis",
     "variables": "Variáveis",
@@ -469,14 +472,13 @@
     "weeks": "semanas",
     "welcome_card": "Cartão de boas-vindas",
     "workflows": "Fluxos de trabalho",
+    "workspace": "Espaço de trabalho",
     "workspace_configuration": "Configuração do projeto",
     "workspace_created_successfully": "Projeto criado com sucesso",
     "workspace_creation_description": "Organize pesquisas em projetos para melhor controle de acesso.",
     "workspace_id": "ID do projeto",
     "workspace_name": "Nome do projeto",
     "workspace_name_placeholder": "ex: Formbricks",
-    "workspace_not_found": "Projeto não encontrado",
-    "workspace_permission_not_found": "Permissão do projeto não encontrada",
     "workspaces": "Projetos",
     "years": "anos",
     "you": "Você",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Novo atributo “{key}” criado com tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "O ID de usuário já existe para este ambiente e não foi atualizado.",
       "contact_deleted_successfully": "Contato excluído com sucesso",
-      "contact_not_found": "Nenhum contato encontrado",
       "contacts_table_refresh": "Atualizar contatos",
       "contacts_table_refresh_success": "Contatos atualizados com sucesso",
       "create_attribute": "Criar atributo",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Criado por um Terceiro",
         "discord_webhook_not_supported": "Webhooks do Discord não são suportados no momento.",
         "empty_webhook_message": "Seus webhooks vão aparecer aqui assim que você adicioná-los. ⏲️",
+        "endpoint_bad_gateway_error": "Gateway inválido (502): Erro de proxy/gateway, serviço inacessível",
+        "endpoint_gateway_timeout_error": "Tempo limite do gateway esgotado (504): Tempo limite do gateway esgotado, serviço inacessível",
+        "endpoint_internal_server_error": "Erro interno do servidor (500): O serviço encontrou um erro inesperado",
+        "endpoint_method_not_allowed_error": "Método não permitido (405): O endpoint existe, mas não aceita solicitações POST",
+        "endpoint_not_found_error": "Não encontrado (404): O endpoint não existe",
         "endpoint_pinged": "Uhul! Conseguimos pingar o webhook!",
         "endpoint_pinged_error": "Não consegui pingar o webhook!",
+        "endpoint_service_unavailable_error": "Serviço indisponível (503): O serviço está temporariamente indisponível",
         "learn_to_verify": "Aprenda como verificar assinaturas de webhook",
+        "no_triggers": "Nenhum Gatilho",
         "please_check_console": "Por favor, verifica o console para mais detalhes",
         "please_enter_a_url": "Por favor, insira uma URL",
         "response_created": "Resposta Criada",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Hostname personalizado",
         "customize_survey_logo": "Personalizar o logo da pesquisa",
         "darken_or_lighten_background_of_your_choice": "Escureça ou clareie o fundo da sua escolha.",
-        "date_format": "Formato de data",
         "days_before_showing_this_survey_again": "ou mais dias devem passar entre a última pesquisa exibida e a exibição desta pesquisa.",
         "delete_anyways": "Excluir mesmo assim",
         "delete_block": "Excluir bloco",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
         "response_options": "Opções de Resposta",
+        "reverse_order_occasionally": "Inverter ordem ocasionalmente",
+        "reverse_order_occasionally_except_last": "Inverter ordem ocasionalmente exceto o último",
         "roundness": "Circularidade",
         "roundness_description": "Controla o arredondamento dos cantos.",
         "row_used_in_logic_error": "Esta linha é usada na lógica da pergunta {questionIndex}. Por favor, remova-a da lógica primeiro.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Mostrar no máximo",
         "show_survey_to_users": "Mostrar pesquisa para % dos usuários",
         "show_to_x_percentage_of_targeted_users": "Mostrar para {percentage}% dos usuários segmentados",
+        "shrink_preview": "Recolher prévia",
         "simple": "Simples",
         "six_points": "6 pontos",
         "smiley": "Sorridente",
         "spam_protection_note": "A proteção contra spam não funciona para pesquisas exibidas com os SDKs iOS, React Native e Android. Isso vai quebrar a pesquisa.",
         "spam_protection_threshold_description": "Defina um valor entre 0 e 1, respostas abaixo desse valor serão rejeitadas.",
         "spam_protection_threshold_heading": "Limite de resposta",
-        "shrink_preview": "Recolher prévia",
         "star": "Estrela",
         "starts_with": "Começa com",
         "state": "Estado",

apps/web/locales/pt-PT.json

@@ -167,6 +167,7 @@
     "connect": "Conectar",
     "connect_formbricks": "Ligar Formbricks",
     "connected": "Conectado",
+    "contact": "Contacto",
     "contacts": "Contactos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -174,6 +175,7 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar Link",
+    "copy_to_environment": "Copiar para {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contacto} other {{count} contactos}}",
     "count_members": "{count, plural, one {{count} membro} other {{count} membros}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(cópia {copyNumber})",
     "e_commerce": "Comércio Eletrónico",
     "edit": "Editar",
+    "elements": "Elementos",
     "email": "Email",
     "ending_card": "Cartão de encerramento",
     "enter_url": "Introduzir URL",
     "enterprise_license": "Licença Enterprise",
     "environment": "Ambiente",
-    "environment_not_found": "Ambiente não encontrado",
     "environment_notice": "Está atualmente no ambiente {environment}.",
     "error": "Erro",
     "error_component_description": "Este recurso não existe ou não tem os direitos necessários para aceder a ele.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Inquéritos inativos",
     "integration": "integração",
     "integrations": "Integrações",
-    "invalid_date": "Data inválida",
+    "invalid_date_with_value": "Data inválida: {value}",
     "invalid_file_name": "Nome de ficheiro inválido, por favor renomeie o seu ficheiro e tente novamente",
     "invalid_file_type": "Tipo de ficheiro inválido",
     "invite": "Convidar",
     "invite_them": "Convide-os",
+    "javascript_required": "JavaScript Necessário",
+    "javascript_required_description": "O Formbricks necessita de JavaScript para funcionar corretamente. Por favor, ativa o JavaScript nas definições do teu navegador para continuar.",
     "key": "Chave",
     "label": "Etiqueta",
     "language": "Idioma",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Membros",
     "members_and_teams": "Membros e equipas",
+    "membership": "Subscrição",
     "membership_not_found": "Associação não encontrada",
+    "meta": "Meta",
     "metadata": "Metadados",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona melhor num ecrã maior. Para gerir ou criar inquéritos, mude de dispositivo.",
     "mobile_overlay_surveys_look_good": "Não se preocupe – os seus inquéritos têm uma ótima aparência em todos os dispositivos e tamanhos de ecrã!",
@@ -320,10 +326,9 @@
     "or": "ou",
     "organization": "Organização",
     "organization_id": "ID da Organização",
-    "organization_not_found": "Organização não encontrada",
     "organization_settings": "Configurações da Organização",
-    "organization_teams_not_found": "Equipas da organização não encontradas",
     "other": "Outro",
+    "other_filters": "Outros Filtros",
     "others": "Outros",
     "overlay_color": "Cor da sobreposição",
     "overview": "Visão geral",
@@ -382,6 +387,7 @@
     "select": "Selecionar",
     "select_all": "Selecionar tudo",
     "select_filter": "Selecionar filtro",
+    "select_language": "Selecionar Idioma",
     "select_survey": "Selecionar Inquérito",
     "select_teams": "Selecionar equipas",
     "selected": "Selecionado",
@@ -414,7 +420,6 @@
     "survey_id": "ID do Inquérito",
     "survey_languages": "Idiomas da Pesquisa",
     "survey_live": "Inquérito ao vivo",
-    "survey_not_found": "Inquérito não encontrado",
     "survey_paused": "Inquérito pausado.",
     "survey_type": "Tipo de Inquérito",
     "surveys": "Inquéritos",
@@ -429,7 +434,6 @@
     "team_name": "Nome da equipa",
     "team_role": "Função na equipa",
     "teams": "Equipas",
-    "teams_not_found": "Equipas não encontradas",
     "text": "Texto",
     "time": "Tempo",
     "time_to_finish": "Tempo para concluir",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Utilizador",
     "user_id": "ID do Utilizador",
-    "user_not_found": "Utilizador não encontrado",
     "variable": "Variável",
     "variable_ids": "IDs de variáveis",
     "variables": "Variáveis",
@@ -469,14 +472,13 @@
     "weeks": "semanas",
     "welcome_card": "Cartão de boas-vindas",
     "workflows": "Fluxos de trabalho",
+    "workspace": "Espaço de trabalho",
     "workspace_configuration": "Configuração do projeto",
     "workspace_created_successfully": "Projeto criado com sucesso",
     "workspace_creation_description": "Organize inquéritos em projetos para melhor controlo de acesso.",
     "workspace_id": "ID do projeto",
     "workspace_name": "Nome do projeto",
     "workspace_name_placeholder": "ex. Formbricks",
-    "workspace_not_found": "Projeto não encontrado",
-    "workspace_permission_not_found": "Permissão do projeto não encontrada",
     "workspaces": "Projetos",
     "years": "anos",
     "you": "Você",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Criado novo atributo “{key}” com tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "O ID de utilizador já existe para este ambiente e não foi atualizado.",
       "contact_deleted_successfully": "Contacto eliminado com sucesso",
-      "contact_not_found": "Nenhum contacto encontrado",
       "contacts_table_refresh": "Atualizar contactos",
       "contacts_table_refresh_success": "Contactos atualizados com sucesso",
       "create_attribute": "Criar atributo",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Criado por um Terceiro",
         "discord_webhook_not_supported": "Os webhooks do Discord não são atualmente suportados.",
         "empty_webhook_message": "Os seus webhooks aparecerão aqui assim que os adicionar. ⏲️",
+        "endpoint_bad_gateway_error": "Gateway inválido (502): Erro de proxy/gateway, serviço inacessível",
+        "endpoint_gateway_timeout_error": "Tempo limite do gateway excedido (504): Tempo limite do gateway excedido, serviço inacessível",
+        "endpoint_internal_server_error": "Erro interno do servidor (500): O serviço encontrou um erro inesperado",
+        "endpoint_method_not_allowed_error": "Método não permitido (405): O endpoint existe, mas não aceita pedidos POST",
+        "endpoint_not_found_error": "Não encontrado (404): O endpoint não existe",
         "endpoint_pinged": "Yay! Conseguimos aceder ao webhook!",
         "endpoint_pinged_error": "Não foi possível aceder ao webhook!",
+        "endpoint_service_unavailable_error": "Serviço indisponível (503): O serviço está temporariamente indisponível",
         "learn_to_verify": "Aprenda a verificar assinaturas de webhook",
+        "no_triggers": "Sem Acionadores",
         "please_check_console": "Por favor, verifique a consola para mais detalhes",
         "please_enter_a_url": "Por favor, insira um URL",
         "response_created": "Resposta Criada",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Nome do host personalizado",
         "customize_survey_logo": "Personalizar o logótipo do inquérito",
         "darken_or_lighten_background_of_your_choice": "Escurecer ou clarear o fundo da sua escolha.",
-        "date_format": "Formato da data",
         "days_before_showing_this_survey_again": "ou mais dias a decorrer entre o último inquérito apresentado e a apresentação deste inquérito.",
         "delete_anyways": "Eliminar mesmo assim",
         "delete_block": "Eliminar bloco",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
         "response_options": "Opções de Resposta",
+        "reverse_order_occasionally": "Inverter ordem ocasionalmente",
+        "reverse_order_occasionally_except_last": "Inverter ordem ocasionalmente exceto o último",
         "roundness": "Arredondamento",
         "roundness_description": "Controla o arredondamento dos cantos.",
         "row_used_in_logic_error": "Esta linha é usada na lógica da pergunta {questionIndex}. Por favor, remova-a da lógica primeiro.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Mostrar inquérito máximo de",
         "show_survey_to_users": "Mostrar inquérito a % dos utilizadores",
         "show_to_x_percentage_of_targeted_users": "Mostrar a {percentage}% dos utilizadores alvo",
+        "shrink_preview": "Reduzir pré-visualização",
         "simple": "Simples",
         "six_points": "6 pontos",
         "smiley": "Sorridente",
         "spam_protection_note": "A proteção contra spam não funciona para inquéritos exibidos com os SDKs iOS, React Native e Android. Isso irá quebrar o inquérito.",
         "spam_protection_threshold_description": "Defina um valor entre 0 e 1, respostas abaixo deste valor serão rejeitadas.",
         "spam_protection_threshold_heading": "Limite de resposta",
-        "shrink_preview": "Reduzir pré-visualização",
         "star": "Estrela",
         "starts_with": "Começa com",
         "state": "Estado",

apps/web/locales/ro-RO.json

@@ -167,6 +167,7 @@
     "connect": "Conectează",
     "connect_formbricks": "Conectează Formbricks",
     "connected": "Conectat",
+    "contact": "Contact",
     "contacts": "Contacte",
     "continue": "Continuă",
     "copied": "Copiat",
@@ -174,6 +175,7 @@
     "copy": "Copiază",
     "copy_code": "Copiază codul",
     "copy_link": "Copiază legătura",
+    "copy_to_environment": "Copiază în {{environment}}",
     "count_attributes": "{count, plural, one {{count} atribut} few {{count} atribute} other {{count} de atribute}}",
     "count_contacts": "{count, plural, one {{count} contact} few {{count} contacte} other {{count} de contacte}}",
     "count_members": "{count, plural, one {{count} membru} few {{count} membri} other {{count} de membri}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(copie {copyNumber})",
     "e_commerce": "Comerț electronic",
     "edit": "Editare",
+    "elements": "Elemente",
     "email": "Email",
     "ending_card": "Cardul de finalizare",
     "enter_url": "Introduceți URL-ul",
     "enterprise_license": "Licență Întreprindere",
     "environment": "Mediu",
-    "environment_not_found": "Mediul nu a fost găsit",
     "environment_notice": "Te afli în prezent în mediul {environment}",
     "error": "Eroare",
     "error_component_description": "Această resursă nu există sau nu aveți drepturile necesare pentru a o accesa.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Sondaje inactive",
     "integration": "integrare",
     "integrations": "Integrări",
-    "invalid_date": "Dată invalidă",
+    "invalid_date_with_value": "Dată invalidă: {value}",
     "invalid_file_name": "Nume de fișier invalid, vă rugăm să redenumiți fișierul și să încercați din nou",
     "invalid_file_type": "Tip de fișier nevalid",
     "invite": "Invită",
     "invite_them": "Invită-i",
+    "javascript_required": "JavaScript necesar",
+    "javascript_required_description": "Formbricks necesită JavaScript pentru a funcționa corect. Te rugăm să activezi JavaScript în setările browserului tău pentru a continua.",
     "key": "Cheie",
     "label": "Etichetă",
     "language": "Limba",
@@ -280,7 +284,9 @@
     "marketing": "Marketing",
     "members": "Membri",
     "members_and_teams": "Membri și echipe",
+    "membership": "Abonament",
     "membership_not_found": "Apartenența nu a fost găsită",
+    "meta": "Meta",
     "metadata": "Metadate",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funcționează cel mai bine pe un ecran mai mare. Pentru a gestiona sau crea chestionare, treceți la un alt dispozitiv.",
     "mobile_overlay_surveys_look_good": "Nu vă faceți griji – chestionarele dumneavoastră arată grozav pe orice dispozitiv și dimensiune a ecranului!",
@@ -320,10 +326,9 @@
     "or": "sau",
     "organization": "Organizație",
     "organization_id": "ID Organizație",
-    "organization_not_found": "Organizația nu a fost găsită",
     "organization_settings": "Setări Organizație",
-    "organization_teams_not_found": "Echipele organizației nu au fost găsite",
     "other": "Altele",
+    "other_filters": "Alte Filtre",
     "others": "Altele",
     "overlay_color": "Culoare overlay",
     "overview": "Prezentare generală",
@@ -382,6 +387,7 @@
     "select": "Selectați",
     "select_all": "Selectați toate",
     "select_filter": "Selectați filtrul",
+    "select_language": "Selectează limba",
     "select_survey": "Selectați chestionar",
     "select_teams": "Selectați echipele",
     "selected": "Selectat",
@@ -414,7 +420,6 @@
     "survey_id": "ID Chestionar",
     "survey_languages": "Limbi chestionar",
     "survey_live": "Chestionar activ",
-    "survey_not_found": "Sondajul nu a fost găsit",
     "survey_paused": "Chestionar oprit.",
     "survey_type": "Tip Chestionar",
     "surveys": "Sondaje",
@@ -429,7 +434,6 @@
     "team_name": "Nume echipă",
     "team_role": "Rol în echipă",
     "teams": "Echipe",
-    "teams_not_found": "Echipele nu au fost găsite",
     "text": "Text",
     "time": "Timp",
     "time_to_finish": "Timp până la finalizare",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Utilizator",
     "user_id": "ID Utilizator",
-    "user_not_found": "Utilizatorul nu a fost găsit",
     "variable": "Variabilă",
     "variable_ids": "ID-uri variabile",
     "variables": "Variante",
@@ -469,14 +472,13 @@
     "weeks": "săptămâni",
     "welcome_card": "Card de bun venit",
     "workflows": "Workflows",
+    "workspace": "Spațiu de lucru",
     "workspace_configuration": "Configurare workspace",
     "workspace_created_successfully": "Spațiul de lucru a fost creat cu succes",
     "workspace_creation_description": "Organizează sondajele în workspaces pentru un control mai bun al accesului.",
     "workspace_id": "ID workspace",
     "workspace_name": "Nume workspace",
     "workspace_name_placeholder": "ex: Formbricks",
-    "workspace_not_found": "Workspace-ul nu a fost găsit",
-    "workspace_permission_not_found": "Permisiunea pentru workspace nu a fost găsită",
     "workspaces": "Workspaces",
     "years": "ani",
     "you": "Tu",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "A fost creat un nou atribut „{key}” cu tipul „{dataType}”",
       "attributes_msg_userid_already_exists": "ID-ul de utilizator există deja pentru acest mediu și nu a fost actualizat.",
       "contact_deleted_successfully": "Contact șters cu succes",
-      "contact_not_found": "Nu a fost găsit niciun contact",
       "contacts_table_refresh": "Reîmprospătare contacte",
       "contacts_table_refresh_success": "Contactele au fost actualizate cu succes",
       "create_attribute": "Creează atribut",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Creat de o Parte Terță",
         "discord_webhook_not_supported": "Webhook-urile Discord nu sunt în prezent suportate.",
         "empty_webhook_message": "Webhook-urile tale vor apărea aici de îndată ce le vei adăuga. ⏲️",
+        "endpoint_bad_gateway_error": "Gateway invalid (502): Eroare de proxy/gateway, serviciul nu este accesibil",
+        "endpoint_gateway_timeout_error": "Timp de așteptare gateway depășit (504): Timpul de așteptare al gateway-ului a fost depășit, serviciul nu este accesibil",
+        "endpoint_internal_server_error": "Eroare internă de server (500): Serviciul a întâmpinat o eroare neașteptată",
+        "endpoint_method_not_allowed_error": "Metodă nepermisă (405): Endpointul există, dar nu acceptă cereri POST",
+        "endpoint_not_found_error": "Negăsit (404): Endpointul nu există",
         "endpoint_pinged": "Grozav! Am reușit să ping-ui webhooks-ul!",
         "endpoint_pinged_error": "Nu pot să ping-ui webhooks-ul!",
+        "endpoint_service_unavailable_error": "Serviciu indisponibil (503): Serviciul este temporar indisponibil",
         "learn_to_verify": "Află cum să verifici semnăturile webhook",
+        "no_triggers": "Fără declanșatori",
         "please_check_console": "Vă rugăm să verificați consola pentru mai multe detalii",
         "please_enter_a_url": "Vă rugăm să introduceți un URL",
         "response_created": "Răspuns creat",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Gazdă personalizată",
         "customize_survey_logo": "Personalizează logo-ul chestionarului",
         "darken_or_lighten_background_of_your_choice": "Întunecați sau luminați fundalul după preferințe.",
-        "date_format": "Format dată",
         "days_before_showing_this_survey_again": "sau mai multe zile să treacă între ultima afișare a sondajului și afișarea acestui sondaj.",
         "delete_anyways": "Șterge oricum",
         "delete_block": "Șterge blocul",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Limita răspunsurilor trebuie să depășească numărul de răspunsuri primite ({responseCount}).",
         "response_limits_redirections_and_more": "Limite de răspunsuri, redirecționări și altele.",
         "response_options": "Opțiuni răspuns",
+        "reverse_order_occasionally": "Inversare ordine ocazional",
+        "reverse_order_occasionally_except_last": "Inversare ordine ocazional cu excepția ultimului",
         "roundness": "Rotunjire",
         "roundness_description": "Controlează cât de rotunjite sunt colțurile.",
         "row_used_in_logic_error": "Această linie este folosită în logica întrebării {questionIndex}. Vă rugăm să-l eliminați din logică mai întâi.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Afișează sondajul de maxim",
         "show_survey_to_users": "Afișați sondajul la % din utilizatori",
         "show_to_x_percentage_of_targeted_users": "Afișați la {percentage}% din utilizatorii vizați",
+        "shrink_preview": "Restrânge previzualizarea",
         "simple": "Simplu",
         "six_points": "6 puncte",
         "smiley": "Smiley",
         "spam_protection_note": "Protecția împotriva spamului nu funcționează pentru sondajele afișate folosind SDK-urile iOS, React Native și Android. Va întrerupe sondajul.",
         "spam_protection_threshold_description": "Setați valoarea între 0 și 1, răspunsurile sub această valoare vor fi respinse.",
         "spam_protection_threshold_heading": "Pragul răspunsurilor",
-        "shrink_preview": "Restrânge previzualizarea",
         "star": "Stea",
         "starts_with": "Începe cu",
         "state": "Stare",

apps/web/locales/ru-RU.json

@@ -167,6 +167,7 @@
     "connect": "Подключить",
     "connect_formbricks": "Подключить Formbricks",
     "connected": "Подключено",
+    "contact": "Контакт",
     "contacts": "Контакты",
     "continue": "Продолжить",
     "copied": "Скопировано",
@@ -174,6 +175,7 @@
     "copy": "Копировать",
     "copy_code": "Скопировать код",
     "copy_link": "Скопировать ссылку",
+    "copy_to_environment": "Копировать в {{environment}}",
     "count_attributes": "{count, plural, one {{count} атрибут} few {{count} атрибута} many {{count} атрибутов} other {{count} атрибута}}",
     "count_contacts": "{count, plural, one {{count} контакт} few {{count} контакта} many {{count} контактов} other {{count} контакта}}",
     "count_members": "{count, plural, one {{count} участник} few {{count} участника} many {{count} участников} other {{count} участника}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(копия {copyNumber})",
     "e_commerce": "E-Commerce",
     "edit": "Редактировать",
+    "elements": "Элементы",
     "email": "Email",
     "ending_card": "Завершающая карточка",
     "enter_url": "Введите URL",
     "enterprise_license": "Корпоративная лицензия",
     "environment": "Окружение",
-    "environment_not_found": "Среда не найдена",
     "environment_notice": "В данный момент вы находитесь в среде {environment}.",
     "error": "Ошибка",
     "error_component_description": "Этот ресурс не существует или у вас нет необходимых прав для доступа к нему.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Неактивные опросы",
     "integration": "интеграция",
     "integrations": "Интеграции",
-    "invalid_date": "Неверная дата",
+    "invalid_date_with_value": "Неверная дата: {value}",
     "invalid_file_name": "Недопустимое имя файла, переименуйте файл и попробуйте снова",
     "invalid_file_type": "Недопустимый тип файла",
     "invite": "Пригласить",
     "invite_them": "Пригласить их",
+    "javascript_required": "Требуется JavaScript",
+    "javascript_required_description": "Для корректной работы Formbricks необходим JavaScript. Пожалуйста, включите JavaScript в настройках вашего браузера, чтобы продолжить.",
     "key": "Ключ",
     "label": "Метка",
     "language": "Язык",
@@ -280,7 +284,9 @@
     "marketing": "Маркетинг",
     "members": "Участники",
     "members_and_teams": "Участники и команды",
+    "membership": "Членство",
     "membership_not_found": "Участие не найдено",
+    "meta": "Мета",
     "metadata": "Метаданные",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks лучше всего работает на большом экране. Для управления или создания опросов перейдите на другое устройство.",
     "mobile_overlay_surveys_look_good": "Не волнуйтесь — ваши опросы отлично выглядят на любом устройстве и экране!",
@@ -320,10 +326,9 @@
     "or": "или",
     "organization": "Организация",
     "organization_id": "ID организации",
-    "organization_not_found": "Организация не найдена",
     "organization_settings": "Настройки организации",
-    "organization_teams_not_found": "Команды организации не найдены",
     "other": "Другое",
+    "other_filters": "Другие фильтры",
     "others": "Другие",
     "overlay_color": "Цвет наложения",
     "overview": "Обзор",
@@ -382,6 +387,7 @@
     "select": "Выбрать",
     "select_all": "Выбрать все",
     "select_filter": "Выбрать фильтр",
+    "select_language": "Выберите язык",
     "select_survey": "Выбрать опрос",
     "select_teams": "Выбрать команды",
     "selected": "Выбрано",
@@ -414,7 +420,6 @@
     "survey_id": "ID опроса",
     "survey_languages": "Языки опроса",
     "survey_live": "Опрос активен",
-    "survey_not_found": "Опрос не найден",
     "survey_paused": "Опрос приостановлен.",
     "survey_type": "Тип опроса",
     "surveys": "Опросы",
@@ -429,7 +434,6 @@
     "team_name": "Название команды",
     "team_role": "Роль в команде",
     "teams": "Команды",
-    "teams_not_found": "Команды не найдены",
     "text": "Текст",
     "time": "Время",
     "time_to_finish": "Время до завершения",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Пользователь",
     "user_id": "ID пользователя",
-    "user_not_found": "Пользователь не найден",
     "variable": "Переменная",
     "variable_ids": "ID переменных",
     "variables": "Переменные",
@@ -469,14 +472,13 @@
     "weeks": "недели",
     "welcome_card": "Приветственная карточка",
     "workflows": "Воркфлоу",
+    "workspace": "Рабочее пространство",
     "workspace_configuration": "Настройка рабочего пространства",
     "workspace_created_successfully": "Рабочий проект успешно создан",
     "workspace_creation_description": "Организуйте опросы в рабочих пространствах для лучшего контроля доступа.",
     "workspace_id": "ID рабочего пространства",
     "workspace_name": "Название рабочего пространства",
     "workspace_name_placeholder": "например, Formbricks",
-    "workspace_not_found": "Рабочее пространство не найдено",
-    "workspace_permission_not_found": "Разрешение на рабочее пространство не найдено",
     "workspaces": "Рабочие пространства",
     "years": "годы",
     "you": "Вы",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Создан новый атрибут «{key}» с типом «{dataType}»",
       "attributes_msg_userid_already_exists": "Этот user ID уже существует в данной среде и не был обновлён.",
       "contact_deleted_successfully": "Контакт успешно удалён",
-      "contact_not_found": "Такой контакт не найден",
       "contacts_table_refresh": "Обновить контакты",
       "contacts_table_refresh_success": "Контакты успешно обновлены",
       "create_attribute": "Создать атрибут",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Создано сторонней организацией",
         "discord_webhook_not_supported": "В настоящее время webhooks Discord не поддерживаются.",
         "empty_webhook_message": "Ваши webhooks появятся здесь, как только вы их добавите. ⏲️",
+        "endpoint_bad_gateway_error": "Ошибка шлюза (502): Ошибка прокси/шлюза, сервис недоступен",
+        "endpoint_gateway_timeout_error": "Тайм-аут шлюза (504): Тайм-аут шлюза, сервис недоступен",
+        "endpoint_internal_server_error": "Внутренняя ошибка сервера (500): Сервис столкнулся с непредвиденной ошибкой",
+        "endpoint_method_not_allowed_error": "Метод не разрешен (405): Конечная точка существует, но не принимает POST-запросы",
+        "endpoint_not_found_error": "Не найдено (404): Конечная точка не существует",
         "endpoint_pinged": "Ура! Нам удалось отправить ping на webhook!",
         "endpoint_pinged_error": "Не удалось отправить ping на webhook!",
+        "endpoint_service_unavailable_error": "Сервис недоступен (503): Сервис временно недоступен",
         "learn_to_verify": "Узнайте, как проверить подписи вебхуков",
+        "no_triggers": "Нет триггеров",
         "please_check_console": "Пожалуйста, проверьте консоль для получения подробностей",
         "please_enter_a_url": "Пожалуйста, введите URL",
         "response_created": "Ответ создан",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Пользовательский хостнейм",
         "customize_survey_logo": "Настроить логотип опроса",
         "darken_or_lighten_background_of_your_choice": "Затемните или осветлите выбранный фон.",
-        "date_format": "Формат даты",
         "days_before_showing_this_survey_again": "или больше дней должно пройти между последним показом опроса и показом этого опроса.",
         "delete_anyways": "Удалить в любом случае",
         "delete_block": "Удалить блок",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Лимит ответов должен превышать количество полученных ответов ({responseCount}).",
         "response_limits_redirections_and_more": "Лимиты ответов, перенаправления и другое.",
         "response_options": "Параметры ответа",
+        "reverse_order_occasionally": "Иногда обращать порядок",
+        "reverse_order_occasionally_except_last": "Иногда обращать порядок кроме последнего",
         "roundness": "Скругление",
         "roundness_description": "Определяет степень скругления углов.",
         "row_used_in_logic_error": "Эта строка используется в логике вопроса {questionIndex}. Пожалуйста, сначала удалите её из логики.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Показать опрос максимум",
         "show_survey_to_users": "Показать опрос % пользователей",
         "show_to_x_percentage_of_targeted_users": "Показать {percentage}% целевых пользователей",
+        "shrink_preview": "Свернуть предпросмотр",
         "simple": "Простой",
         "six_points": "6 баллов",
         "smiley": "Смайлик",
         "spam_protection_note": "Защита от спама не работает для опросов, отображаемых с помощью SDK iOS, React Native и Android. Это приведёт к сбою опроса.",
         "spam_protection_threshold_description": "Установите значение от 0 до 1, ответы ниже этого значения будут отклонены.",
         "spam_protection_threshold_heading": "Порог ответа",
-        "shrink_preview": "Свернуть предпросмотр",
         "star": "Звезда",
         "starts_with": "Начинается с",
         "state": "Состояние",

apps/web/locales/sv-SE.json

@@ -167,6 +167,7 @@
     "connect": "Anslut",
     "connect_formbricks": "Anslut Formbricks",
     "connected": "Ansluten",
+    "contact": "Kontakt",
     "contacts": "Kontakter",
     "continue": "Fortsätt",
     "copied": "Kopierad",
@@ -174,6 +175,7 @@
     "copy": "Kopiera",
     "copy_code": "Kopiera kod",
     "copy_link": "Kopiera länk",
+    "copy_to_environment": "Kopiera till {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribut} other {{count} attribut}}",
     "count_contacts": "{count, plural, one {{count} kontakt} other {{count} kontakter}}",
     "count_members": "{count, plural, one {{count} medlem} other {{count} medlemmar}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "(kopia {copyNumber})",
     "e_commerce": "E-handel",
     "edit": "Redigera",
+    "elements": "Element",
     "email": "E-post",
     "ending_card": "Avslutningskort",
     "enter_url": "Ange URL",
     "enterprise_license": "Företagslicens",
     "environment": "Miljö",
-    "environment_not_found": "Miljö hittades inte",
     "environment_notice": "Du är för närvarande i {environment}-miljön.",
     "error": "Fel",
     "error_component_description": "Denna resurs finns inte eller så har du inte de nödvändiga rättigheterna för att komma åt den.",
@@ -255,11 +257,13 @@
     "inactive_surveys": "Inaktiva enkäter",
     "integration": "integration",
     "integrations": "Integrationer",
-    "invalid_date": "Ogiltigt datum",
+    "invalid_date_with_value": "Ogiltigt datum: {value}",
     "invalid_file_name": "Ogiltigt filnamn, vänligen byt namn på din fil och försök igen",
     "invalid_file_type": "Ogiltig filtyp",
     "invite": "Bjud in",
     "invite_them": "Bjud in dem",
+    "javascript_required": "JavaScript krävs",
+    "javascript_required_description": "Formbricks kräver JavaScript för att fungera korrekt. Vänligen aktivera JavaScript i dina webbläsarinställningar för att fortsätta.",
     "key": "Nyckel",
     "label": "Etikett",
     "language": "Språk",
@@ -280,7 +284,9 @@
     "marketing": "Marknadsföring",
     "members": "Medlemmar",
     "members_and_teams": "Medlemmar och team",
+    "membership": "Medlemskap",
     "membership_not_found": "Medlemskap hittades inte",
+    "meta": "Meta",
     "metadata": "Metadata",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks fungerar bäst på en större skärm. Byt till en annan enhet för att hantera eller bygga enkäter.",
     "mobile_overlay_surveys_look_good": "Oroa dig inte – dina enkäter ser bra ut på alla enheter och skärmstorlekar!",
@@ -320,10 +326,9 @@
     "or": "eller",
     "organization": "Organisation",
     "organization_id": "Organisations-ID",
-    "organization_not_found": "Organisation hittades inte",
     "organization_settings": "Organisationsinställningar",
-    "organization_teams_not_found": "Organisationsteam hittades inte",
     "other": "Annat",
+    "other_filters": "Andra filter",
     "others": "Andra",
     "overlay_color": "Overlay-färg",
     "overview": "Översikt",
@@ -382,6 +387,7 @@
     "select": "Välj",
     "select_all": "Välj alla",
     "select_filter": "Välj filter",
+    "select_language": "Välj språk",
     "select_survey": "Välj enkät",
     "select_teams": "Välj team",
     "selected": "Vald",
@@ -414,7 +420,6 @@
     "survey_id": "Enkät-ID",
     "survey_languages": "Enkätspråk",
     "survey_live": "Enkät live",
-    "survey_not_found": "Enkät hittades inte",
     "survey_paused": "Enkät pausad.",
     "survey_type": "Enkättyp",
     "surveys": "Enkäter",
@@ -429,7 +434,6 @@
     "team_name": "Teamnamn",
     "team_role": "Teamroll",
     "teams": "Åtkomstkontroll",
-    "teams_not_found": "Team hittades inte",
     "text": "Text",
     "time": "Tid",
     "time_to_finish": "Tid att slutföra",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "Användare",
     "user_id": "Användar-ID",
-    "user_not_found": "Användare hittades inte",
     "variable": "Variabel",
     "variable_ids": "Variabel-ID:n",
     "variables": "Variabler",
@@ -469,14 +472,13 @@
     "weeks": "veckor",
     "welcome_card": "Välkomstkort",
     "workflows": "Arbetsflöden",
+    "workspace": "Arbetsyta",
     "workspace_configuration": "Arbetsytans konfiguration",
     "workspace_created_successfully": "Arbetsytan har skapats",
     "workspace_creation_description": "Organisera enkäter i arbetsytor för bättre åtkomstkontroll.",
     "workspace_id": "Arbetsyte-ID",
     "workspace_name": "Arbetsytans namn",
     "workspace_name_placeholder": "t.ex. Formbricks",
-    "workspace_not_found": "Arbetsyta hittades inte",
-    "workspace_permission_not_found": "Arbetsytebehörighet hittades inte",
     "workspaces": "Arbetsytor",
     "years": "år",
     "you": "Du",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "Nytt attribut ”{key}” med typen ”{dataType}” har skapats",
       "attributes_msg_userid_already_exists": "Användar-ID finns redan för denna miljö och uppdaterades inte.",
       "contact_deleted_successfully": "Kontakt borttagen",
-      "contact_not_found": "Ingen sådan kontakt hittades",
       "contacts_table_refresh": "Uppdatera kontakter",
       "contacts_table_refresh_success": "Kontakter uppdaterade",
       "create_attribute": "Skapa attribut",
@@ -852,9 +853,16 @@
         "created_by_third_party": "Skapad av tredje part",
         "discord_webhook_not_supported": "Discord-webhooks stöds för närvarande inte.",
         "empty_webhook_message": "Dina webhooks visas här så snart du lägger till dem. ⏲️",
+        "endpoint_bad_gateway_error": "Felaktig gateway (502): Proxy-/gatewayfel, tjänsten kan inte nås",
+        "endpoint_gateway_timeout_error": "Gateway-timeout (504): Gateway-timeout, tjänsten kan inte nås",
+        "endpoint_internal_server_error": "Internt serverfel (500): Tjänsten stötte på ett oväntat fel",
+        "endpoint_method_not_allowed_error": "Metoden tillåts inte (405): Endpointen finns, men accepterar inte POST-förfrågningar",
+        "endpoint_not_found_error": "Hittades inte (404): Endpointen finns inte",
         "endpoint_pinged": "Ja! Vi kan nå webhooken!",
         "endpoint_pinged_error": "Kunde inte nå webhooken!",
+        "endpoint_service_unavailable_error": "Tjänsten är inte tillgänglig (503): Tjänsten är tillfälligt nere",
         "learn_to_verify": "Lär dig hur du verifierar webhook-signaturer",
+        "no_triggers": "Inga utlösare",
         "please_check_console": "Vänligen kontrollera konsolen för mer information",
         "please_enter_a_url": "Vänligen ange en URL",
         "response_created": "Svar skapat",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "Anpassat värdnamn",
         "customize_survey_logo": "Anpassa undersökningens logotyp",
         "darken_or_lighten_background_of_your_choice": "Gör bakgrunden mörkare eller ljusare efter eget val.",
-        "date_format": "Datumformat",
         "days_before_showing_this_survey_again": "eller fler dagar måste gå mellan den senaste visade enkäten och att visa denna enkät.",
         "delete_anyways": "Ta bort ändå",
         "delete_block": "Ta bort block",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Svarsgränsen måste överstiga antalet mottagna svar ({responseCount}).",
         "response_limits_redirections_and_more": "Svarsgränser, omdirigeringar och mer.",
         "response_options": "Svarsalternativ",
+        "reverse_order_occasionally": "Vänd ordning ibland",
+        "reverse_order_occasionally_except_last": "Vänd ordning ibland utom sista",
         "roundness": "Rundhet",
         "roundness_description": "Styr hur rundade hörnen är.",
         "row_used_in_logic_error": "Denna rad används i logiken för fråga {questionIndex}. Vänligen ta bort den från logiken först.",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "Visa enkät maximalt",
         "show_survey_to_users": "Visa enkät för % av användare",
         "show_to_x_percentage_of_targeted_users": "Visa för {percentage}% av målgruppens användare",
+        "shrink_preview": "Minimera förhandsgranskning",
         "simple": "Enkel",
         "six_points": "6 poäng",
         "smiley": "Smiley",
         "spam_protection_note": "Spamskydd fungerar inte för enkäter som visas med iOS, React Native och Android SDK:er. Det kommer att bryta enkäten.",
         "spam_protection_threshold_description": "Ställ in värde mellan 0 och 1, svar under detta värde kommer att avvisas.",
         "spam_protection_threshold_heading": "Svarströskel",
-        "shrink_preview": "Minimera förhandsgranskning",
         "star": "Stjärna",
         "starts_with": "Börjar med",
         "state": "Delstat",

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

@@ -167,6 +167,7 @@
     "connect": "连接",
     "connect_formbricks": "连接 Formbricks",
     "connected": "已连接",
+    "contact": "联系人",
     "contacts": "联系人",
     "continue": "继续",
     "copied": "已复制",
@@ -174,6 +175,7 @@
     "copy": "复制",
     "copy_code": "复制 代码",
     "copy_link": "复制 链接",
+    "copy_to_environment": "复制到{{environment}}",
     "count_attributes": "{count, plural, one {{count} 个属性} other {{count} 个属性}}",
     "count_contacts": "{count, plural, other {{count} 联系人} }",
     "count_members": "{count, plural, one {{count} 位成员} other {{count} 位成员}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "（副本 {copyNumber}）",
     "e_commerce": "电子商务",
     "edit": "编辑",
+    "elements": "元素",
     "email": "邮箱",
     "ending_card": "结尾卡片",
     "enter_url": "输入 URL",
     "enterprise_license": "企业 许可证",
     "environment": "环境",
-    "environment_not_found": "环境 未找到",
     "environment_notice": "你 目前 位于 {environment} 环境。",
     "error": "错误",
     "error_component_description": "这个资源不存在或您没有权限访问它。",
@@ -255,11 +257,13 @@
     "inactive_surveys": "不 活跃 调查",
     "integration": "集成",
     "integrations": "集成",
-    "invalid_date": "无效 日期",
+    "invalid_date_with_value": "无效 日期: {value}",
     "invalid_file_name": "文件名无效，请重命名文件后重试",
     "invalid_file_type": "无效 的 文件 类型",
     "invite": "邀请",
     "invite_them": "邀请 他们",
+    "javascript_required": "需要启用 JavaScript",
+    "javascript_required_description": "Formbricks 需要 JavaScript 才能正常运行。请在浏览器设置中启用 JavaScript 以继续。",
     "key": "键",
     "label": "标签",
     "language": "语言",
@@ -280,7 +284,9 @@
     "marketing": "市场营销",
     "members": "成员",
     "members_and_teams": "成员和团队",
+    "membership": "会员资格",
     "membership_not_found": "未找到会员资格",
+    "meta": "元数据",
     "metadata": "元数据",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks 在 更大 的 屏幕 上 效果 最佳。 若 需要 管理 或 构建 调查， 请 切换 到 其他 设备。",
     "mobile_overlay_surveys_look_good": "别 担心 – 您 的 调查 在 每 一 种 设备 和 屏幕 尺寸 上 看起来 都 很 棒!",
@@ -320,10 +326,9 @@
     "or": "或",
     "organization": "组织",
     "organization_id": "组织 ID",
-    "organization_not_found": "组织 未找到",
     "organization_settings": "组织 设置",
-    "organization_teams_not_found": "未找到 组织 团队",
     "other": "其他",
+    "other_filters": "其他筛选条件",
     "others": "其他",
     "overlay_color": "覆盖层颜色",
     "overview": "概览",
@@ -382,6 +387,7 @@
     "select": "选择",
     "select_all": "选择 全部",
     "select_filter": "选择过滤器",
+    "select_language": "选择语言",
     "select_survey": "选择 调查",
     "select_teams": "选择 团队",
     "selected": "已选择",
@@ -414,7 +420,6 @@
     "survey_id": "调查 ID",
     "survey_languages": "调查 语言",
     "survey_live": "调查 运行中",
-    "survey_not_found": "调查 未找到",
     "survey_paused": "调查 暂停。",
     "survey_type": "调查 类型",
     "surveys": "调查",
@@ -429,7 +434,6 @@
     "team_name": "团队 名称",
     "team_role": "团队角色",
     "teams": "团队",
-    "teams_not_found": "未找到 团队",
     "text": "文本",
     "time": "时间",
     "time_to_finish": "完成 时间",
@@ -453,7 +457,6 @@
     "url": "URL",
     "user": "用户",
     "user_id": "用户 ID",
-    "user_not_found": "用户 不存在",
     "variable": "变量",
     "variable_ids": "变量 ID",
     "variables": "变量",
@@ -469,14 +472,13 @@
     "weeks": "周",
     "welcome_card": "欢迎 卡片",
     "workflows": "工作流",
+    "workspace": "工作区",
     "workspace_configuration": "工作区配置",
     "workspace_created_successfully": "工作区创建成功",
     "workspace_creation_description": "在工作区中组织调查，以便更好地进行访问控制。",
     "workspace_id": "工作区 ID",
     "workspace_name": "工作区名称",
     "workspace_name_placeholder": "例如：Formbricks",
-    "workspace_not_found": "未找到工作区",
-    "workspace_permission_not_found": "未找到工作区权限",
     "workspaces": "工作区",
     "years": "年",
     "you": "你 ",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "已创建新属性“{key}”，类型为“{dataType}”",
       "attributes_msg_userid_already_exists": "该环境下的用户ID已存在，未进行更新。",
       "contact_deleted_successfully": "联系人 删除 成功",
-      "contact_not_found": "未找到此 联系人",
       "contacts_table_refresh": "刷新 联系人",
       "contacts_table_refresh_success": "联系人 已成功刷新",
       "create_attribute": "创建属性",
@@ -852,9 +853,16 @@
         "created_by_third_party": "由 第三方 创建",
         "discord_webhook_not_supported": "Discord webhooks 目前不 支持。",
         "empty_webhook_message": "您的 Webhooks 会在您 添加 后 出现在这里。 ⏲️",
+        "endpoint_bad_gateway_error": "错误网关 (502)：代理/网关错误，服务不可达",
+        "endpoint_gateway_timeout_error": "网关超时 (504)：网关超时，服务不可达",
+        "endpoint_internal_server_error": "内部服务器错误 (500)：服务遇到了意外错误",
+        "endpoint_method_not_allowed_error": "方法不被允许 (405)：该端点存在，但不接受 POST 请求",
+        "endpoint_not_found_error": "未找到 (404)：该端点不存在",
         "endpoint_pinged": "太好了! 我们能 ping 该 webhook!",
         "endpoint_pinged_error": "无法 ping 该 webhook！",
+        "endpoint_service_unavailable_error": "服务不可用 (503)：服务暂时不可用",
         "learn_to_verify": "了解如何验证 webhook 签名",
+        "no_triggers": "无触发器",
         "please_check_console": "请查看控制台以获取更多详情",
         "please_enter_a_url": "请输入一个 URL",
         "response_created": "创建 响应",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "自 定 义 主 机 名",
         "customize_survey_logo": "自定义调查 logo",
         "darken_or_lighten_background_of_your_choice": "根据 您 的 选择 暗化 或 亮化 背景。",
-        "date_format": "日期格式",
         "days_before_showing_this_survey_again": "距离上次显示问卷后需间隔不少于指定天数，才能再次显示此问卷。",
         "delete_anyways": "仍然删除",
         "delete_block": "删除区块",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "限制 响应 需要 超过 收到 的 响应 数量 （{responseCount}）。",
         "response_limits_redirections_and_more": "响应 限制 、 重定向 和 更多 。",
         "response_options": "响应 选项",
+        "reverse_order_occasionally": "偶尔反转顺序",
+        "reverse_order_occasionally_except_last": "偶尔反转顺序（最后一项除外）",
         "roundness": "圆度",
         "roundness_description": "控制圆角的弧度。",
         "row_used_in_logic_error": "\"这个 行 在 问题 {questionIndex} 的 逻辑 中 使用。请 先 从 逻辑 中 删除 它。\"",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "显示 调查 最大 一次",
         "show_survey_to_users": "显示 问卷 给 % 的 用户",
         "show_to_x_percentage_of_targeted_users": "显示 给 {percentage}% 的 目标 用户",
+        "shrink_preview": "收起预览",
         "simple": "简单",
         "six_points": "6 分",
         "smiley": "笑脸",
         "spam_protection_note": "垃圾 邮件 保护 对于 与 iOS 、 React Native 和 Android SDK 一起 显示 的 调查 无效 。 它 将 破坏 调查。",
         "spam_protection_threshold_description": "设置 值 在 0 和 1 之间，响应 低于 此 值 将 被 拒绝。",
         "spam_protection_threshold_heading": "响应 阈值",
-        "shrink_preview": "收起预览",
         "star": "星",
         "starts_with": "以...开始",
         "state": "状态",

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

@@ -167,6 +167,7 @@
     "connect": "連線",
     "connect_formbricks": "連線 Formbricks",
     "connected": "已連線",
+    "contact": "聯絡人",
     "contacts": "聯絡人",
     "continue": "繼續",
     "copied": "已 複製",
@@ -174,6 +175,7 @@
     "copy": "複製",
     "copy_code": "複製程式碼",
     "copy_link": "複製連結",
+    "copy_to_environment": "複製到{{environment}}",
     "count_attributes": "{count, plural, other {{count} 個屬性}}",
     "count_contacts": "{count, plural, other {{count} 位聯絡人}}",
     "count_members": "{count, plural, other {{count} 位成員}}",
@@ -213,12 +215,12 @@
     "duplicate_copy_number": "（複製 {copyNumber}）",
     "e_commerce": "電子商務",
     "edit": "編輯",
+    "elements": "元素",
     "email": "電子郵件",
     "ending_card": "結尾卡片",
     "enter_url": "輸入 URL",
     "enterprise_license": "企業授權",
     "environment": "環境",
-    "environment_not_found": "找不到環境",
     "environment_notice": "您目前在 '{'environment'}' 環境中。",
     "error": "錯誤",
     "error_component_description": "此資源不存在或您沒有存取權限。",
@@ -255,11 +257,13 @@
     "inactive_surveys": "停用中的問卷",
     "integration": "整合",
     "integrations": "整合",
-    "invalid_date": "無效日期",
+    "invalid_date_with_value": "無效日期: {value}",
     "invalid_file_name": "檔案名稱無效，請重新命名檔案後再試一次",
     "invalid_file_type": "無效的檔案類型",
     "invite": "邀請",
     "invite_them": "邀請他們",
+    "javascript_required": "需要 JavaScript",
+    "javascript_required_description": "Formbricks 需要 JavaScript 才能正常運作。請在瀏覽器設定中啟用 JavaScript 以繼續使用。",
     "key": "金鑰",
     "label": "標籤",
     "language": "語言",
@@ -280,7 +284,9 @@
     "marketing": "行銷",
     "members": "成員",
     "members_and_teams": "成員與團隊",
+    "membership": "會員資格",
     "membership_not_found": "找不到成員資格",
+    "meta": "Meta",
     "metadata": "元數據",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks 適合在大螢幕上使用。若要管理或建立問卷，請切換到其他裝置。",
     "mobile_overlay_surveys_look_good": "別擔心 －你的 問卷 在每個 裝置 和 螢幕尺寸 上 都 很出色！",
@@ -320,10 +326,9 @@
     "or": "或",
     "organization": "組織",
     "organization_id": "組織 ID",
-    "organization_not_found": "找不到組織",
     "organization_settings": "組織設定",
-    "organization_teams_not_found": "找不到組織團隊",
     "other": "其他",
+    "other_filters": "其他篩選條件",
     "others": "其他",
     "overlay_color": "覆蓋層顏色",
     "overview": "概覽",
@@ -382,6 +387,7 @@
     "select": "選擇",
     "select_all": "全選",
     "select_filter": "選擇篩選器",
+    "select_language": "選擇語言",
     "select_survey": "選擇問卷",
     "select_teams": "選擇 團隊",
     "selected": "已選取",
@@ -414,7 +420,6 @@
     "survey_id": "問卷 ID",
     "survey_languages": "問卷語言",
     "survey_live": "問卷已上線",
-    "survey_not_found": "找不到問卷",
     "survey_paused": "問卷已暫停。",
     "survey_type": "問卷類型",
     "surveys": "問卷",
@@ -429,7 +434,6 @@
     "team_name": "團隊名稱",
     "team_role": "團隊角色",
     "teams": "團隊",
-    "teams_not_found": "找不到團隊",
     "text": "文字",
     "time": "時間",
     "time_to_finish": "完成時間",
@@ -453,7 +457,6 @@
     "url": "網址",
     "user": "使用者",
     "user_id": "使用者 ID",
-    "user_not_found": "找不到使用者",
     "variable": "變數",
     "variable_ids": "變數 ID",
     "variables": "變數",
@@ -469,14 +472,13 @@
     "weeks": "週",
     "welcome_card": "歡迎卡片",
     "workflows": "工作流程",
+    "workspace": "工作區",
     "workspace_configuration": "工作區設定",
     "workspace_created_successfully": "工作區已成功建立",
     "workspace_creation_description": "將問卷組織在工作區中，以便更好地控管存取權限。",
     "workspace_id": "工作區 ID",
     "workspace_name": "工作區名稱",
     "workspace_name_placeholder": "例如：Formbricks",
-    "workspace_not_found": "找不到工作區",
-    "workspace_permission_not_found": "找不到工作區權限",
     "workspaces": "工作區",
     "years": "年",
     "you": "您",
@@ -661,7 +663,6 @@
       "attributes_msg_new_attribute_created": "已建立新屬性「{key}」，型別為「{dataType}」",
       "attributes_msg_userid_already_exists": "此環境已存在該使用者 ID，未進行更新。",
       "contact_deleted_successfully": "聯絡人已成功刪除",
-      "contact_not_found": "找不到此聯絡人",
       "contacts_table_refresh": "重新整理聯絡人",
       "contacts_table_refresh_success": "聯絡人已成功重新整理",
       "create_attribute": "建立屬性",
@@ -852,9 +853,16 @@
         "created_by_third_party": "由第三方建立",
         "discord_webhook_not_supported": "目前不支援 Discord webhooks。",
         "empty_webhook_message": "您的 Webhook 將在您新增後立即顯示在此處。⏲️",
+        "endpoint_bad_gateway_error": "錯誤的閘道 (502)：代理/閘道錯誤，服務無法連線",
+        "endpoint_gateway_timeout_error": "閘道逾時 (504)：閘道逾時，服務無法連線",
+        "endpoint_internal_server_error": "內部伺服器錯誤 (500)：服務遇到了未預期的錯誤",
+        "endpoint_method_not_allowed_error": "不允許的方法 (405)：該端點存在，但不接受 POST 請求",
+        "endpoint_not_found_error": "找不到 (404)：該端點不存在",
         "endpoint_pinged": "耶！我們能夠 ping Webhook！",
         "endpoint_pinged_error": "無法 ping Webhook！",
+        "endpoint_service_unavailable_error": "服務無法使用 (503)：服務暫時無法使用",
         "learn_to_verify": "了解如何驗證 webhook 簽章",
+        "no_triggers": "無觸發條件",
         "please_check_console": "請檢查主控台以取得更多詳細資料",
         "please_enter_a_url": "請輸入網址",
         "response_created": "已建立回應",
@@ -1413,7 +1421,6 @@
         "custom_hostname": "自訂主機名稱",
         "customize_survey_logo": "自訂問卷標誌",
         "darken_or_lighten_background_of_your_choice": "變暗或變亮您選擇的背景。",
-        "date_format": "日期格式",
         "days_before_showing_this_survey_again": "距離上次顯示問卷後，需間隔指定天數才能再次顯示此問卷。",
         "delete_anyways": "仍要刪除",
         "delete_block": "刪除區塊",
@@ -1677,6 +1684,8 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "回應限制必須超過收到的回應數 ('{'responseCount'}')。",
         "response_limits_redirections_and_more": "回應限制、重新導向等。",
         "response_options": "回應選項",
+        "reverse_order_occasionally": "偶爾反轉順序",
+        "reverse_order_occasionally_except_last": "偶爾反轉順序（最後一項除外）",
         "roundness": "圓角",
         "roundness_description": "調整邊角的圓潤程度。",
         "row_used_in_logic_error": "此 row 用於問題 '{'questionIndex'}' 的邏輯中。請先從邏輯中移除。",
@@ -1705,13 +1714,13 @@
         "show_survey_maximum_of": "最多顯示問卷",
         "show_survey_to_users": "將問卷顯示給 % 的使用者",
         "show_to_x_percentage_of_targeted_users": "顯示給 '{'percentage'}'% 的目標使用者",
+        "shrink_preview": "收合預覽",
         "simple": "簡單",
         "six_points": "6 分",
         "smiley": "表情符號",
         "spam_protection_note": "垃圾郵件保護不適用於使用 iOS、React Native 和 Android SDK 顯示的問卷。它會破壞問卷。",
         "spam_protection_threshold_description": "設置值在 0 和 1 之間，低於此值的回應將被拒絕。",
         "spam_protection_threshold_heading": "回應閾值",
-        "shrink_preview": "收合預覽",
         "star": "星形",
         "starts_with": "開頭為",
         "state": "州/省",

apps/web/modules/analysis/components/ShareSurveyLink/components/LanguageDropdown.tsx

@@ -1,4 +1,5 @@
 import { Languages } from "lucide-react";
+import { useTranslation } from "react-i18next";
 import { getLanguageLabel } from "@formbricks/i18n-utils/src/utils";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";
@@ -18,6 +19,7 @@ interface LanguageDropdownProps {
 }
 
 export const LanguageDropdown = ({ survey, setLanguage, locale }: LanguageDropdownProps) => {
+  const { t } = useTranslation();
   const enabledLanguages = getEnabledLanguages(survey.languages ?? []);
 
   if (enabledLanguages.length <= 1) {
@@ -27,7 +29,10 @@ export const LanguageDropdown = ({ survey, setLanguage, locale }: LanguageDropdo
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
-        <Button variant="secondary" title="Select Language" aria-label="Select Language">
+        <Button
+          variant="secondary"
+          title={t("common.select_language")}
+          aria-label={t("common.select_language")}>
           <Languages className="h-5 w-5" />
         </Button>
       </DropdownMenuTrigger>

apps/web/modules/analysis/components/SingleResponseCard/actions.ts

@@ -2,6 +2,7 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { deleteResponse, getResponse } from "@/lib/response/service";
 import { createTag } from "@/lib/tag/service";
 import { addTagToRespone, deleteTagOnResponse } from "@/lib/tagOnResponse/service";
@@ -68,7 +69,7 @@ export const createTagToResponseAction = authenticatedActionClient
       const tagEnvironment = await getTag(parsedInput.tagId);
 
       if (!responseEnvironmentId || !tagEnvironment) {
-        throw new Error("Environment not found");
+        throw new ResourceNotFoundError("Environment", null);
       }
 
       if (responseEnvironmentId !== tagEnvironment.environmentId) {
@@ -113,7 +114,7 @@ export const deleteTagOnResponseAction = authenticatedActionClient
       const tagEnvironment = await getTag(parsedInput.tagId);
       const organizationId = await getOrganizationIdFromResponseId(parsedInput.responseId);
       if (!responseEnvironmentId || !tagEnvironment) {
-        throw new Error("Environment not found");
+        throw new ResourceNotFoundError("Environment", null);
       }
 
       if (responseEnvironmentId !== tagEnvironment.environmentId) {

apps/web/modules/analysis/components/SingleResponseCard/components/ElementSkip.tsx

@@ -5,7 +5,9 @@ import { useTranslation } from "react-i18next";
 import { TResponseData } from "@formbricks/types/responses";
 import { TSurveyElement } from "@formbricks/types/surveys/elements";
 import { getTextContent } from "@formbricks/types/surveys/validation";
+import { TUserLocale } from "@formbricks/types/user";
 import { getLocalizedValue } from "@/lib/i18n/utils";
+import { getSurveyDateFormatMap } from "@/lib/utils/date-display";
 import { parseRecallInfo } from "@/lib/utils/recall";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";
 
@@ -15,6 +17,7 @@ interface ElementSkipProps {
   elements: TSurveyElement[];
   isFirstElementAnswered?: boolean;
   responseData: TResponseData;
+  locale: TUserLocale;
 }
 
 export const ElementSkip = ({
@@ -23,8 +26,10 @@ export const ElementSkip = ({
   elements,
   isFirstElementAnswered,
   responseData,
+  locale,
 }: ElementSkipProps) => {
   const { t } = useTranslation();
+  const dateFormats = getSurveyDateFormatMap(elements);
   return (
     <div>
       {skippedElements && (
@@ -81,7 +86,11 @@ export const ElementSkip = ({
                             },
                             "default"
                           ),
-                          responseData
+                          responseData,
+                          undefined,
+                          false,
+                          locale,
+                          dateFormats
                         )
                       )}
                     </p>
@@ -120,7 +129,11 @@ export const ElementSkip = ({
                               },
                               "default"
                             ),
-                            responseData
+                            responseData,
+                            undefined,
+                            false,
+                            locale,
+                            dateFormats
                           )
                         )}
                       </p>

apps/web/modules/analysis/components/SingleResponseCard/components/RenderResponse.tsx

@@ -3,11 +3,12 @@ import React from "react";
 import { TResponseDataValue } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
 import { TSurvey } from "@formbricks/types/surveys/types";
+import { TUserLocale } from "@formbricks/types/user";
 import { cn } from "@/lib/cn";
 import { getLanguageCode, getLocalizedValue } from "@/lib/i18n/utils";
 import { getChoiceIdByValue } from "@/lib/response/utils";
 import { processResponseData } from "@/lib/responses";
-import { formatDateWithOrdinal } from "@/lib/utils/datetime";
+import { formatStoredDateForDisplay } from "@/lib/utils/date-display";
 import { renderHyperlinkedContent } from "@/modules/analysis/utils";
 import { ArrayResponse } from "@/modules/ui/components/array-response";
 import { FileUploadResponse } from "@/modules/ui/components/file-upload-response";
@@ -21,6 +22,7 @@ interface RenderResponseProps {
   element: TSurveyElement;
   survey: TSurvey;
   language: string | null;
+  locale: TUserLocale;
   isExpanded?: boolean;
   showId: boolean;
 }
@@ -30,6 +32,7 @@ export const RenderResponse: React.FC<RenderResponseProps> = ({
   element,
   survey,
   language,
+  locale,
   isExpanded = true,
   showId,
 }) => {
@@ -63,9 +66,8 @@ export const RenderResponse: React.FC<RenderResponseProps> = ({
       break;
     case TSurveyElementTypeEnum.Date:
       if (typeof responseData === "string") {
-        const parsedDate = new Date(responseData);
-
-        const formattedDate = isNaN(parsedDate.getTime()) ? responseData : formatDateWithOrdinal(parsedDate);
+        const formattedDate =
+          formatStoredDateForDisplay(responseData, element.format, locale) ?? responseData;
 
         return <p className="ph-no-capture my-1 truncate font-normal text-slate-700">{formattedDate}</p>;
       }

apps/web/modules/analysis/components/SingleResponseCard/components/SingleResponseCardBody.tsx

@@ -6,7 +6,9 @@ import { TResponseWithQuotas } from "@formbricks/types/responses";
 import { TSurveyElementTypeEnum } from "@formbricks/types/surveys/constants";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getTextContent } from "@formbricks/types/surveys/validation";
+import { TUserLocale } from "@formbricks/types/user";
 import { getLocalizedValue } from "@/lib/i18n/utils";
+import { getSurveyDateFormatMap } from "@/lib/utils/date-display";
 import { parseRecallInfo } from "@/lib/utils/recall";
 import { ResponseCardQuotas } from "@/modules/ee/quotas/components/single-response-card-quotas";
 import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
@@ -21,14 +23,17 @@ interface SingleResponseCardBodyProps {
   survey: TSurvey;
   response: TResponseWithQuotas;
   skippedQuestions: string[][];
+  locale: TUserLocale;
 }
 
 export const SingleResponseCardBody = ({
   survey,
   response,
   skippedQuestions,
+  locale,
 }: SingleResponseCardBodyProps) => {
   const elements = getElementsFromBlocks(survey.blocks);
+  const dateFormats = getSurveyDateFormatMap(elements);
   const isFirstElementAnswered = elements[0] ? !!response.data[elements[0].id] : false;
   const { t } = useTranslation();
   const formatTextWithSlashes = (text: string) => {
@@ -61,6 +66,7 @@ export const SingleResponseCardBody = ({
           status={"welcomeCard"}
           isFirstElementAnswered={isFirstElementAnswered}
           responseData={response.data}
+          locale={locale}
         />
       )}
       <div className="space-y-6">
@@ -98,7 +104,9 @@ export const SingleResponseCardBody = ({
                           getLocalizedValue(question.headline, "default"),
                           response.data,
                           response.variables,
-                          true
+                          true,
+                          locale,
+                          dateFormats
                         )
                       )
                     )}
@@ -109,6 +117,7 @@ export const SingleResponseCardBody = ({
                       survey={survey}
                       responseData={response.data[question.id]}
                       language={response.language}
+                      locale={locale}
                       showId={true}
                     />
                   </div>
@@ -118,6 +127,7 @@ export const SingleResponseCardBody = ({
                   skippedElements={skipped}
                   elements={elements}
                   responseData={response.data}
+                  locale={locale}
                   status={
                     response.finished ||
                     (skippedQuestions.length > 0 &&

apps/web/modules/analysis/components/SingleResponseCard/index.tsx

@@ -137,7 +137,12 @@ export const SingleResponseCard = ({
           locale={locale}
         />
 
-        <SingleResponseCardBody survey={survey} response={response} skippedQuestions={skippedQuestions} />
+        <SingleResponseCardBody
+          survey={survey}
+          response={response}
+          skippedQuestions={skippedQuestions}
+          locale={locale}
+        />
 
         <ResponseTagsWrapper
           key={response.id}

apps/web/modules/api/v2/management/surveys/types/surveys.ts

@@ -31,6 +31,8 @@ export const ZSurveyInput = ZSurveyWithoutQuestionType.pick({
   environmentId: true,
   questions: true,
   blocks: true,
+  startsAt: true,
+  endsAt: true,
   endings: true,
   hiddenFields: true,
   variables: true,
@@ -59,6 +61,8 @@ export const ZSurveyInput = ZSurveyWithoutQuestionType.pick({
     displayLimit: true,
     autoClose: true,
     autoComplete: true,
+    startsAt: true,
+    endsAt: true,
     surveyClosedMessage: true,
     styling: true,
     projectOverwrites: true,

apps/web/modules/auth/components/next-auth-provider.tsx

@@ -0,0 +1,15 @@
+"use client";
+
+import { SessionProvider } from "next-auth/react";
+
+interface NextAuthProviderProps {
+  children: React.ReactNode;
+  sessionMaxAge: number;
+}
+
+export const NextAuthProvider = ({ children, sessionMaxAge }: NextAuthProviderProps) => {
+  // Refresh at 1/3 of session max age, capped at 5 minutes
+  const refetchInterval = Math.min(Math.max(Math.floor(sessionMaxAge / 3), 60), 300);
+
+  return <SessionProvider refetchInterval={refetchInterval}>{children}</SessionProvider>;
+};

apps/web/modules/core/rate-limit/helpers.test.ts

@@ -84,7 +84,7 @@ describe("helpers", () => {
     test("should allow request when rate limit check passes", async () => {
       (checkRateLimit as any).mockResolvedValue(ok({ allowed: true }));
 
-      await expect(applyRateLimit(mockConfig, mockIdentifier)).resolves.toBeUndefined();
+      await expect(applyRateLimit(mockConfig, mockIdentifier)).resolves.toEqual({ allowed: true });
 
       expect(checkRateLimit).toHaveBeenCalledWith(mockConfig, mockIdentifier);
     });
@@ -127,7 +127,7 @@ describe("helpers", () => {
 
       (checkRateLimit as any).mockResolvedValue(ok({ allowed: true }));
 
-      await expect(applyRateLimit(customConfig, "api-key-identifier")).resolves.toBeUndefined();
+      await expect(applyRateLimit(customConfig, "api-key-identifier")).resolves.toEqual({ allowed: true });
 
       expect(checkRateLimit).toHaveBeenCalledWith(customConfig, "api-key-identifier");
     });
@@ -138,7 +138,7 @@ describe("helpers", () => {
       const identifiers = ["user-123", "ip-192.168.1.1", "auth-login-hashedip", "api-key-abc123"];
 
       for (const identifier of identifiers) {
-        await expect(applyRateLimit(mockConfig, identifier)).resolves.toBeUndefined();
+        await expect(applyRateLimit(mockConfig, identifier)).resolves.toEqual({ allowed: true });
         expect(checkRateLimit).toHaveBeenCalledWith(mockConfig, identifier);
       }
 
@@ -161,7 +161,7 @@ describe("helpers", () => {
       (hashString as any).mockReturnValue("hashed-ip-123");
       (checkRateLimit as any).mockResolvedValue(ok({ allowed: true }));
 
-      await expect(applyIPRateLimit(mockConfig)).resolves.toBeUndefined();
+      await expect(applyIPRateLimit(mockConfig)).resolves.toEqual({ allowed: true });
 
       expect(getClientIpFromHeaders).toHaveBeenCalledTimes(1);
       expect(hashString).toHaveBeenCalledWith("192.168.1.1");

apps/web/modules/core/rate-limit/helpers.ts

@@ -3,7 +3,7 @@ import { TooManyRequestsError } from "@formbricks/types/errors";
 import { hashString } from "@/lib/hash-string";
 import { getClientIpFromHeaders } from "@/lib/utils/client-ip";
 import { checkRateLimit } from "./rate-limit";
-import { type TRateLimitConfig } from "./types/rate-limit";
+import { type TRateLimitConfig, type TRateLimitResponse } from "./types/rate-limit";
 
 /**
  * Get client identifier for rate limiting with IP hashing
@@ -31,12 +31,20 @@ export const getClientIdentifier = async (): Promise<string> => {
  * @param identifier - Unique identifier for rate limiting (IP hash, user ID, API key, etc.)
  * @throws {Error} When rate limit is exceeded or rate limiting system fails
  */
-export const applyRateLimit = async (config: TRateLimitConfig, identifier: string): Promise<void> => {
+export const applyRateLimit = async (
+  config: TRateLimitConfig,
+  identifier: string
+): Promise<TRateLimitResponse> => {
   const result = await checkRateLimit(config, identifier);
 
   if (!result.ok || !result.data.allowed) {
-    throw new TooManyRequestsError("Maximum number of requests reached. Please try again later.");
+    throw new TooManyRequestsError(
+      "Maximum number of requests reached. Please try again later.",
+      result.ok ? result.data.retryAfter : undefined
+    );
   }
+
+  return result.data;
 };
 
 /**
@@ -46,7 +54,7 @@ export const applyRateLimit = async (config: TRateLimitConfig, identifier: strin
  * @param config - Rate limit configuration to apply
  * @throws {Error} When rate limit is exceeded or IP hashing fails
  */
-export const applyIPRateLimit = async (config: TRateLimitConfig): Promise<void> => {
+export const applyIPRateLimit = async (config: TRateLimitConfig): Promise<TRateLimitResponse> => {
   const identifier = await getClientIdentifier();
-  await applyRateLimit(config, identifier);
+  return await applyRateLimit(config, identifier);
 };

apps/web/modules/core/rate-limit/rate-limit-configs.test.ts

@@ -68,7 +68,7 @@ describe("rateLimitConfigs", () => {
 
     test("should have all API configurations", () => {
       const apiConfigs = Object.keys(rateLimitConfigs.api);
-      expect(apiConfigs).toEqual(["v1", "v2", "client"]);
+      expect(apiConfigs).toEqual(["v1", "v2", "v3", "client"]);
     });
 
     test("should have all action configurations", () => {
@@ -127,7 +127,7 @@ describe("rateLimitConfigs", () => {
       mockEval.mockResolvedValue([1, 1]);
 
       const config = rateLimitConfigs.api.v1;
-      await expect(applyRateLimit(config, "api-key-123")).resolves.toBeUndefined();
+      await expect(applyRateLimit(config, "api-key-123")).resolves.toEqual({ allowed: true });
     });
 
     test("should enforce limits correctly for each config type", async () => {
@@ -136,6 +136,7 @@ describe("rateLimitConfigs", () => {
         { config: rateLimitConfigs.auth.signup, identifier: "user-signup" },
         { config: rateLimitConfigs.api.v1, identifier: "api-v1-key" },
         { config: rateLimitConfigs.api.v2, identifier: "api-v2-key" },
+        { config: rateLimitConfigs.api.v3, identifier: "api-v3-key" },
         { config: rateLimitConfigs.api.client, identifier: "client-api-key" },
         { config: rateLimitConfigs.actions.emailUpdate, identifier: "user-profile" },
         { config: rateLimitConfigs.storage.upload, identifier: "storage-upload" },