revert: enhance welcome card to support video uploads (#7712)

Co-authored-by: pandeymangg <anshuman.pandey9999@gmail.com>

packages/surveys/i18n.json

@@ -12,6 +12,7 @@
       "da",
       "de",
       "es",
+      "et",
       "fr",
       "hi",
       "hu",

packages/surveys/i18n.lock

@@ -34,6 +34,7 @@ checksums:
     common/terms_of_service: 5add91f519e39025708e54a7eb7a9fc5
     common/the_servers_cannot_be_reached_at_the_moment: f8adbeccac69f9230a55b5b3af52b081
     common/they_will_be_redirected_immediately: 936bc99cb575cba95ea8f04d82bb353b
+    common/welcome_video: 1f87e84c0a563c2522eef5cb71a1f95c
     common/your_feedback_is_stuck: db2b6aba26723b01aee0fc918d3ca052
     errors/all_options_must_be_ranked: 360a2edff623496f7047907bad115ea1
     errors/all_rows_must_be_answered: 295f41a0ef04cbb3491c798053c61abd

packages/surveys/locales/ar.json

@@ -33,6 +33,7 @@
     "terms_of_service": "شروط الخدمة",
     "the_servers_cannot_be_reached_at_the_moment": "لا يمكن الوصول إلى الخوادم في الوقت الحالي.",
     "they_will_be_redirected_immediately": "سيتم إعادة توجيههم فورًا",
+    "welcome_video": "فيديو بطاقة الترحيب",
     "your_feedback_is_stuck": "تعليقك عالق :("
   },
   "errors": {

packages/surveys/locales/da.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Vilkår for brug",
     "the_servers_cannot_be_reached_at_the_moment": "Serverne kan ikke kontaktes lige nu.",
     "they_will_be_redirected_immediately": "De bliver straks omdirigeret",
+    "welcome_video": "Velkomstkortvideo",
     "your_feedback_is_stuck": "Din feedback sidder fast :("
   },
   "errors": {

packages/surveys/locales/de.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Nutzungsbedingungen",
     "the_servers_cannot_be_reached_at_the_moment": "Die Server sind momentan nicht erreichbar.",
     "they_will_be_redirected_immediately": "Sie werden sofort weitergeleitet",
+    "welcome_video": "Willkommenskarten-Video",
     "your_feedback_is_stuck": "Ihr Feedback steckt fest :("
   },
   "errors": {

packages/surveys/locales/en.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Terms of Service",
     "the_servers_cannot_be_reached_at_the_moment": "The servers cannot be reached at the moment.",
     "they_will_be_redirected_immediately": "They will be redirected immediately",
+    "welcome_video": "Welcome Card video",
     "your_feedback_is_stuck": "Your feedback is stuck :("
   },
   "errors": {

packages/surveys/locales/es.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Términos de servicio",
     "the_servers_cannot_be_reached_at_the_moment": "Los servidores no pueden ser alcanzados en este momento.",
     "they_will_be_redirected_immediately": "Serán redirigidos inmediatamente",
+    "welcome_video": "Vídeo de la tarjeta de bienvenida",
     "your_feedback_is_stuck": "Tu feedback está atascado :("
   },
   "errors": {

packages/surveys/locales/et.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Teenusetingimused",
     "the_servers_cannot_be_reached_at_the_moment": "Serveritega ei saa hetkel ühendust.",
     "they_will_be_redirected_immediately": "Nad suunatakse kohe ümber",
+    "welcome_video": "Tervituskaardi video",
     "your_feedback_is_stuck": "Sinu tagasiside on kinni jäänud :("
   },
   "errors": {

packages/surveys/locales/fr.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Conditions d'utilisation",
     "the_servers_cannot_be_reached_at_the_moment": "Les serveurs ne sont pas accessibles pour le moment.",
     "they_will_be_redirected_immediately": "Ils seront redirigés immédiatement",
+    "welcome_video": "Vidéo de la carte de bienvenue",
     "your_feedback_is_stuck": "Votre feedback est bloqué :("
   },
   "errors": {

packages/surveys/locales/hi.json

@@ -33,6 +33,7 @@
     "terms_of_service": "सेवा की शर्तें",
     "the_servers_cannot_be_reached_at_the_moment": "इस समय सर्वर तक पहुंचा नहीं जा सकता है।",
     "they_will_be_redirected_immediately": "उन्हें तुरंत रीडायरेक्ट किया जाएगा",
+    "welcome_video": "स्वागत कार्ड वीडियो",
     "your_feedback_is_stuck": "आपकी प्रतिक्रिया अटक गई है :("
   },
   "errors": {

packages/surveys/locales/hu.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Használati feltételek",
     "the_servers_cannot_be_reached_at_the_moment": "Jelenleg nem lehet elérni a kiszolgálókat.",
     "they_will_be_redirected_immediately": "Azonnal át lesznek irányítva",
+    "welcome_video": "Üdvözlő kártya videó",
     "your_feedback_is_stuck": "A visszajelzése elakadt :("
   },
   "errors": {

packages/surveys/locales/it.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Termini di servizio",
     "the_servers_cannot_be_reached_at_the_moment": "I server non sono raggiungibili al momento.",
     "they_will_be_redirected_immediately": "Saranno reindirizzati immediatamente",
+    "welcome_video": "Video della scheda di benvenuto",
     "your_feedback_is_stuck": "Il tuo feedback è bloccato :("
   },
   "errors": {

packages/surveys/locales/ja.json

@@ -33,6 +33,7 @@
     "terms_of_service": "利用規約",
     "the_servers_cannot_be_reached_at_the_moment": "現在サーバーに接続できません。",
     "they_will_be_redirected_immediately": "すぐにリダイレクトされます",
+    "welcome_video": "ウェルカムカード動画",
     "your_feedback_is_stuck": "フィードバックが送信できません :("
   },
   "errors": {

packages/surveys/locales/nl.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Servicevoorwaarden",
     "the_servers_cannot_be_reached_at_the_moment": "De servers zijn momenteel niet bereikbaar.",
     "they_will_be_redirected_immediately": "Ze worden onmiddellijk doorgestuurd",
+    "welcome_video": "Welkomstkaart video",
     "your_feedback_is_stuck": "Je feedback blijft hangen :("
   },
   "errors": {

packages/surveys/locales/pt.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Termos de serviço",
     "the_servers_cannot_be_reached_at_the_moment": "Os servidores não podem ser alcançados no momento.",
     "they_will_be_redirected_immediately": "Eles serão redirecionados imediatamente",
+    "welcome_video": "Vídeo do Cartão de Boas-vindas",
     "your_feedback_is_stuck": "Seu feedback está preso :("
   },
   "errors": {

packages/surveys/locales/ro.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Termeni și condiții",
     "the_servers_cannot_be_reached_at_the_moment": "Serverele nu pot fi accesate momentan.",
     "they_will_be_redirected_immediately": "Vor fi redirecționați imediat",
+    "welcome_video": "Videoclip Card de bun venit",
     "your_feedback_is_stuck": "Feedback-ul tău este blocat :("
   },
   "errors": {

packages/surveys/locales/ru.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Условия использования",
     "the_servers_cannot_be_reached_at_the_moment": "Сервера в данный момент недоступны.",
     "they_will_be_redirected_immediately": "Они будут немедленно перенаправлены",
+    "welcome_video": "Видео приветственной карточки",
     "your_feedback_is_stuck": "Ваш отзыв застрял :("
   },
   "errors": {

packages/surveys/locales/sv.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Användarvillkor",
     "the_servers_cannot_be_reached_at_the_moment": "Servrarna kan inte nås för tillfället.",
     "they_will_be_redirected_immediately": "De kommer att omdirigeras omedelbart",
+    "welcome_video": "Välkomstkortvideo",
     "your_feedback_is_stuck": "Din feedback fastnade :("
   },
   "errors": {

packages/surveys/locales/uz.json

@@ -33,6 +33,7 @@
     "terms_of_service": "Xizmat ko'rsatish shartlari",
     "the_servers_cannot_be_reached_at_the_moment": "Hozirda serverlarga ulanish imkoni yo'q.",
     "they_will_be_redirected_immediately": "Ular darhol yo'naltiriladi",
+    "welcome_video": "Xush kelibsiz kartasi videosi",
     "your_feedback_is_stuck": "Sizning fikr-mulohazangiz qotib qoldi :("
   },
   "errors": {

packages/surveys/locales/zh-Hans.json

@@ -33,6 +33,7 @@
     "terms_of_service": "服务条款",
     "the_servers_cannot_be_reached_at_the_moment": "目前无法连接到服务器。",
     "they_will_be_redirected_immediately": "他们将立即被重定向",
+    "welcome_video": "欢迎卡片视频",
     "your_feedback_is_stuck": "您的反馈卡住了 :("
   },
   "errors": {

packages/surveys/package.json

@@ -49,7 +49,8 @@
     "i18next-icu": "2.4.3",
     "isomorphic-dompurify": "3.1.0",
     "preact": "10.29.0",
-    "react-i18next": "16.5.8"
+    "react-i18next": "16.5.8",
+    "tailwind-merge": "3.5.0"
   },
   "devDependencies": {
     "@formbricks/config-typescript": "workspace:*",

packages/surveys/src/components/general/element-media.tsx

@@ -23,15 +23,16 @@ interface ElementMediaProps {
   imgUrl?: string;
   videoUrl?: string;
   altText?: string;
+  className?: string;
 }
 
-export function ElementMedia({ imgUrl, videoUrl, altText = "Image" }: ElementMediaProps) {
+export function ElementMedia({ imgUrl, videoUrl, altText = "Image", className }: ElementMediaProps) {
   const { t } = useTranslation();
   const videoUrlWithParams = videoUrl ? getVideoUrlWithParams(videoUrl) : undefined;
   const [isLoading, setIsLoading] = useState(true);
 
   return (
-    <div className="group/image relative mb-6 block min-h-40 rounded-md">
+    <div className={cn("group/image relative mb-6 block min-h-40 rounded-md", className)}>
       {isLoading ? (
         <div className="absolute inset-auto flex h-full w-full animate-pulse items-center justify-center rounded-md bg-slate-200" />
       ) : null}

packages/surveys/src/components/general/welcome-card.tsx

@@ -147,8 +147,10 @@ export function WelcomeCard({
   return (
     <ScrollableContainer fullSizeCards={fullSizeCards}>
       <div>
-        {fileUrl || videoUrl ? (
-          <ElementMedia imgUrl={fileUrl} videoUrl={videoUrl} altText={t("common.company_logo")} />
+        {fileUrl ? (
+          <ElementMedia imgUrl={fileUrl} altText={t("common.company_logo")} className="mb-8 min-h-0 w-1/4" />
+        ) : videoUrl ? (
+          <ElementMedia videoUrl={videoUrl} altText={t("common.welcome_video")} />
         ) : null}
 
         <Headline

packages/surveys/src/lib/utils.test.ts

@@ -4,6 +4,7 @@ import type { TJsEnvironmentStateSurvey } from "../../../types/js";
 import { type TAllowedFileExtension, mimeTypes } from "../../../types/storage";
 import type { TSurveyLanguage } from "../../../types/surveys/types";
 import {
+  cn,
   findBlockByElementId,
   getDefaultLanguageCode,
   getElementsFromSurveyBlocks,
@@ -510,3 +511,45 @@ describe("isRTLLanguage", () => {
     expect(isRTLLanguage(survey, "default")).toBe(true);
   });
 });
+
+describe("cn", () => {
+  test("joins multiple classes", () => {
+    expect(cn("foo", "bar")).toBe("foo bar");
+  });
+
+  test("filters out undefined values", () => {
+    expect(cn("foo", undefined, "bar")).toBe("foo bar");
+  });
+
+  test("filters out empty strings", () => {
+    expect(cn("foo", "", "bar")).toBe("foo bar");
+  });
+
+  test("merges conflicting tailwind classes (last wins)", () => {
+    expect(cn("mb-6", "mb-8")).toBe("mb-8");
+  });
+
+  test("merges conflicting min-h classes", () => {
+    expect(cn("min-h-40", "min-h-0")).toBe("min-h-0");
+  });
+
+  test("merges conflicting padding classes", () => {
+    expect(cn("p-4", "p-2")).toBe("p-2");
+  });
+
+  test("keeps non-conflicting classes", () => {
+    expect(cn("mb-6 block rounded-md", "w-1/4")).toBe("mb-6 block rounded-md w-1/4");
+  });
+
+  test("handles single class", () => {
+    expect(cn("foo")).toBe("foo");
+  });
+
+  test("handles no arguments", () => {
+    expect(cn()).toBe("");
+  });
+
+  test("handles all undefined", () => {
+    expect(cn(undefined, undefined)).toBe("");
+  });
+});

packages/surveys/src/lib/utils.ts

@@ -1,3 +1,4 @@
+import { twMerge } from "tailwind-merge";
 import { type Result, err, ok, wrapThrowsAsync } from "@formbricks/types/error-handlers";
 import { type ApiErrorResponse } from "@formbricks/types/errors";
 import { type TJsEnvironmentStateSurvey } from "@formbricks/types/js";
@@ -11,8 +12,8 @@ import { type TSurveyElement, type TSurveyElementChoice } from "@formbricks/type
 import { type TShuffleOption } from "@formbricks/types/surveys/types";
 import { ApiResponse, ApiSuccessResponse } from "@/types/api";
 
-export const cn = (...classes: string[]) => {
-  return classes.filter(Boolean).join(" ");
+export const cn = (...classes: (string | undefined)[]) => {
+  return twMerge(classes.filter(Boolean).join(" "));
 };
 
 export const getSecureRandom = (): number => {

pnpm-lock.yaml

@@ -990,6 +990,9 @@ importers:
       react-i18next:
         specifier: 16.5.8
         version: 16.5.8(i18next@25.8.18(typescript@5.9.3))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)
+      tailwind-merge:
+        specifier: 3.5.0
+        version: 3.5.0
     devDependencies:
       '@formbricks/config-typescript':
         specifier: workspace:*