From bf41a53b8637224235f22bc24e10a9acfdc1a42c Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:02:44 +0530
Subject: [PATCH] fix: survey ui loading issue (#6755)

---
 apps/web/app/s/[surveyId]/loading.tsx    |  3 ---
 apps/web/lingodotdev/client.tsx          |  4 ++--
 apps/web/modules/survey/link/loading.tsx | 11 -----------
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 apps/web/app/s/[surveyId]/loading.tsx
 delete mode 100644 apps/web/modules/survey/link/loading.tsx

diff --git a/apps/web/app/s/[surveyId]/loading.tsx b/apps/web/app/s/[surveyId]/loading.tsx
deleted file mode 100644
index a312961734..0000000000
--- a/apps/web/app/s/[surveyId]/loading.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import { LinkSurveyLoading } from "@/modules/survey/link/loading";
-
-export default LinkSurveyLoading;
diff --git a/apps/web/lingodotdev/client.tsx b/apps/web/lingodotdev/client.tsx
index abb97ae333..4532ea8390 100644
--- a/apps/web/lingodotdev/client.tsx
+++ b/apps/web/lingodotdev/client.tsx
@@ -53,9 +53,9 @@ export const I18nProvider = ({ children, language, defaultLanguage }: I18nProvid
     initializeI18n();
   }, [locale, defaultLanguage]);
 
-  // Don't render children until i18n is ready to prevent hydration issues
+  // Don't render children until i18n is ready to prevent race conditions
   if (!isReady) {
-    return <div style={{ visibility: "hidden" }}>{children}</div>;
+    return null;
   }
 
   return (
diff --git a/apps/web/modules/survey/link/loading.tsx b/apps/web/modules/survey/link/loading.tsx
deleted file mode 100644
index c57df93712..0000000000
--- a/apps/web/modules/survey/link/loading.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-"use client";
-export const LinkSurveyLoading = () => {
-  return (
-    <div className="flex h-full w-full items-center justify-center">
-      <div className="flex h-1/2 w-3/4 flex-col sm:w-1/2 lg:w-1/4">
-        <div className="ph-no-capture h-16 w-1/3 animate-pulse rounded-lg bg-slate-200 font-medium text-slate-900"></div>
-        <div className="ph-no-capture mt-4 h-full animate-pulse rounded-lg bg-slate-200 text-slate-900"></div>
-      </div>
-    </div>
-  );
-};