From ae1c8305172ce49aa10999878d02a6d5e7cd6eea Mon Sep 17 00:00:00 2001
From: ghorbani <muhammadamin.ghorbani@gmail.com>
Date: Mon, 3 Aug 2026 17:04:27 +0330
Subject: [PATCH] feat: implement multi-language infrastructure and dynamic
 question components for marriage matching system

---
 src/app/api/dev-reset-profile/route.ts        |   8 +-
 src/app/api/proxy/route.ts                    |  10 +-
 src/app/finding-match/page.tsx                |   4 +-
 src/app/globals.css                           | 107 ++--
 src/app/intro/page.tsx                        |  55 +-
 src/app/page.tsx                              |   4 +-
 src/app/questions-list/page.tsx               |   4 +-
 src/components/Componentes/notice-box.tsx     |  22 +-
 .../Componentes/question-dropdown.tsx         |  11 +-
 src/components/Componentes/question-radio.tsx |  40 +-
 .../Componentes/question-section-flow.tsx     |   8 +-
 .../Componentes/question-snap-list.tsx        |   1 -
 .../Componentes/required-steps-card.tsx       |   5 +-
 src/components/Componentes/slider-header.tsx  |  26 +
 src/components/Componentes/slider-page.tsx    |  94 ++-
 .../Componentes/slider-slide-five.tsx         |   6 +-
 .../Componentes/slider-slide-four.tsx         |  20 +-
 .../Componentes/slider-slide-one.tsx          | 390 ++++++++++--
 .../Componentes/slider-slide-three.tsx        |  19 +-
 .../Componentes/slider-slide-two.tsx          |  37 +-
 src/components/Componentes/token-switcher.tsx |  17 +-
 src/components/Componentes/video-player.tsx   |  90 +++
 src/data/questions/en.json                    | 588 ++++--------------
 src/data/questions/fa.json                    | 588 ++++--------------
 src/hooks/marriage/use-marriage-config.ts     |   1 +
 src/hooks/marriage/use-section-data.ts        |  40 +-
 src/lib/auth-bridge.ts                        |  16 +-
 src/lib/http.ts                               |  22 +-
 src/translations/locales/ar.json              |   2 +-
 src/translations/locales/az.json              |   2 +-
 src/translations/locales/bn.json              |   2 +-
 src/translations/locales/da.json              |   2 +-
 src/translations/locales/de.json              |   2 +-
 src/translations/locales/en.json              |   2 +-
 src/translations/locales/es.json              |   2 +-
 src/translations/locales/fa.json              |   2 +-
 src/translations/locales/fr.json              |   2 +-
 src/translations/locales/gu.json              |   2 +-
 src/translations/locales/ha.json              |   2 +-
 src/translations/locales/he.json              |   2 +-
 src/translations/locales/hi.json              |   2 +-
 src/translations/locales/id.json              |   2 +-
 src/translations/locales/ks.json              |   2 +-
 src/translations/locales/pt.json              |   2 +-
 src/translations/locales/ru.json              |   2 +-
 src/translations/locales/sw.json              |   2 +-
 src/translations/locales/tg.json              |   2 +-
 src/translations/locales/tr.json              |   2 +-
 src/translations/locales/ul.json              |   2 +-
 src/translations/locales/ur.json              |   2 +-
 src/translations/locales/uz.json              |   2 +-
 src/translations/locales/zh.json              |   2 +-
 52 files changed, 1026 insertions(+), 1255 deletions(-)
 create mode 100644 src/components/Componentes/slider-header.tsx
 create mode 100644 src/components/Componentes/video-player.tsx

diff --git a/src/app/api/dev-reset-profile/route.ts b/src/app/api/dev-reset-profile/route.ts
index b61154b..799273d 100644
--- a/src/app/api/dev-reset-profile/route.ts
+++ b/src/app/api/dev-reset-profile/route.ts
@@ -18,7 +18,8 @@ export async function POST(request: NextRequest) {
       return Response.json({ error: "userId is required" }, { status: 400 });
     }
 
-    const scriptPath = "C:\\Users\\User\\.gemini\\antigravity-ide\\brain\\5015ea2d-f1fc-4e3d-9372-4bb0670449cc\\scratch\\reset_user.py";
+    const scriptPath =
+      "C:\\Users\\User\\.gemini\\antigravity-ide\\brain\\5015ea2d-f1fc-4e3d-9372-4bb0670449cc\\scratch\\reset_user.py";
     // Construct the command safely with numeric userId
     const command = `python "${scriptPath}" ${Number(userId)}`;
     const { stdout, stderr } = await execAsync(command);
@@ -36,6 +37,9 @@ export async function POST(request: NextRequest) {
     }
   } catch (error: any) {
     console.error("Failed to reset profile:", error);
-    return Response.json({ error: error.message || "Internal Server Error" }, { status: 500 });
+    return Response.json(
+      { error: error.message || "Internal Server Error" },
+      { status: 500 },
+    );
   }
 }
diff --git a/src/app/api/proxy/route.ts b/src/app/api/proxy/route.ts
index 464d650..28cd2bf 100644
--- a/src/app/api/proxy/route.ts
+++ b/src/app/api/proxy/route.ts
@@ -131,7 +131,7 @@ function getRequestHeaders(request: NextRequest, targetUrl: URL) {
       getCookieValue(cookieHeader, "token") ??
       getCookieValue(cookieHeader, "auth_token");
 
-    if (cookieToken) {
+    if (cookieToken && cookieToken !== "NO_TOKEN") {
       headers.set("authorization", `Token ${cookieToken}`);
     }
   }
@@ -141,6 +141,14 @@ function getRequestHeaders(request: NextRequest, targetUrl: URL) {
     headers.set("authorization", `Token ${authKey}`);
   }
 
+  // Fall back to the development default token when nothing else provided auth.
+  if (!headers.has("authorization")) {
+    const defaultToken = process.env.NEXT_PUBLIC_DEFAULT_TOKEN;
+    if (defaultToken && defaultToken !== "NO_TOKEN") {
+      headers.set("authorization", `Token ${defaultToken}`);
+    }
+  }
+
   // Dynamically set language headers
   let lang =
     getCookieValue(cookieHeader, "HABIB_LANGUAGE") ??
diff --git a/src/app/finding-match/page.tsx b/src/app/finding-match/page.tsx
index 7ee7247..1c9cd1c 100644
--- a/src/app/finding-match/page.tsx
+++ b/src/app/finding-match/page.tsx
@@ -89,7 +89,9 @@ export default function FindingMatchPage() {
             role="status"
           >
             <FaLock aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
-            <span className="group-16 leading-none font-semibold">{t.requestSent.profileLocked}</span>
+            <span className="group-16 leading-none font-semibold">
+              {t.requestSent.profileLocked}
+            </span>
           </div>
         ) : (
           <Link
diff --git a/src/app/globals.css b/src/app/globals.css
index 14f00e0..2042ff2 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -8,67 +8,67 @@
   --safe-right: 0px;
 
   /* ─── Semantic Tokens (Light) ─── */
-  --semantic-neutral-bg: #F1F5F9;
+  --semantic-neutral-bg: #f1f5f9;
   --semantic-neutral-text: #475569;
-  --semantic-neutral-border: #CBD5E1;
-  --semantic-neutral-icon: #64748B;
-  
-  --semantic-info-bg: #EFF6FF;
-  --semantic-info-text: #1D4ED8;
-  --semantic-info-border: #BFDBFE;
-  --semantic-info-icon: #2563EB;
-  
-  --semantic-success-bg: #ECFDF5;
+  --semantic-neutral-border: #cbd5e1;
+  --semantic-neutral-icon: #64748b;
+
+  --semantic-info-bg: #eff6ff;
+  --semantic-info-text: #1d4ed8;
+  --semantic-info-border: #bfdbfe;
+  --semantic-info-icon: #2563eb;
+
+  --semantic-success-bg: #ecfdf5;
   --semantic-success-text: #047857;
-  --semantic-success-border: #A7F3D0;
+  --semantic-success-border: #a7f3d0;
   --semantic-success-icon: #059669;
-  
-  --semantic-warning-bg: #FFFBEB;
-  --semantic-warning-text: #B45309;
-  --semantic-warning-border: #FDE68A;
-  --semantic-warning-icon: #D97706;
-  
-  --semantic-danger-bg: #FEF2F2;
-  --semantic-danger-text: #B91C1C;
-  --semantic-danger-border: #FECACA;
-  --semantic-danger-icon: #DC2626;
-  
-  --semantic-ai-bg: #F5F3FF;
-  --semantic-ai-text: #6D28D9;
-  --semantic-ai-border: #DDD6FE;
-  --semantic-ai-icon: #7C3AED;
+
+  --semantic-warning-bg: #fffbeb;
+  --semantic-warning-text: #b45309;
+  --semantic-warning-border: #fde68a;
+  --semantic-warning-icon: #d97706;
+
+  --semantic-danger-bg: #fef2f2;
+  --semantic-danger-text: #b91c1c;
+  --semantic-danger-border: #fecaca;
+  --semantic-danger-icon: #dc2626;
+
+  --semantic-ai-bg: #f5f3ff;
+  --semantic-ai-text: #6d28d9;
+  --semantic-ai-border: #ddd6fe;
+  --semantic-ai-icon: #7c3aed;
 }
 
 .dark {
-  --semantic-neutral-bg: #1E293B;
-  --semantic-neutral-text: #E2E8F0;
+  --semantic-neutral-bg: #1e293b;
+  --semantic-neutral-text: #e2e8f0;
   --semantic-neutral-border: #475569;
-  --semantic-neutral-icon: #CBD5E1;
-  
+  --semantic-neutral-icon: #cbd5e1;
+
   --semantic-info-bg: #172554;
-  --semantic-info-text: #BFDBFE;
-  --semantic-info-border: #1D4ED8;
-  --semantic-info-icon: #93C5FD;
-  
-  --semantic-success-bg: #052E2B;
-  --semantic-success-text: #A7F3D0;
+  --semantic-info-text: #bfdbfe;
+  --semantic-info-border: #1d4ed8;
+  --semantic-info-icon: #93c5fd;
+
+  --semantic-success-bg: #052e2b;
+  --semantic-success-text: #a7f3d0;
   --semantic-success-border: #047857;
-  --semantic-success-icon: #6EE7B7;
-  
-  --semantic-warning-bg: #451A03;
-  --semantic-warning-text: #FDE68A;
-  --semantic-warning-border: #B45309;
-  --semantic-warning-icon: #FCD34D;
-  
-  --semantic-danger-bg: #450A0A;
-  --semantic-danger-text: #FECACA;
-  --semantic-danger-border: #B91C1C;
-  --semantic-danger-icon: #FCA5A5;
-  
-  --semantic-ai-bg: #2E1065;
-  --semantic-ai-text: #DDD6FE;
-  --semantic-ai-border: #7C3AED;
-  --semantic-ai-icon: #C4B5FD;
+  --semantic-success-icon: #6ee7b7;
+
+  --semantic-warning-bg: #451a03;
+  --semantic-warning-text: #fde68a;
+  --semantic-warning-border: #b45309;
+  --semantic-warning-icon: #fcd34d;
+
+  --semantic-danger-bg: #450a0a;
+  --semantic-danger-text: #fecaca;
+  --semantic-danger-border: #b91c1c;
+  --semantic-danger-icon: #fca5a5;
+
+  --semantic-ai-bg: #2e1065;
+  --semantic-ai-text: #ddd6fe;
+  --semantic-ai-border: #7c3aed;
+  --semantic-ai-icon: #c4b5fd;
 }
 
 @theme inline {
@@ -174,7 +174,8 @@ html:lang(ar) body,
 [dir="rtl"].font-faminela,
 [dir="rtl"].font-ryling,
 .font-faminela {
-  font-family: var(--font-faminela-local), "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+  font-family:
+    var(--font-faminela-local), "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
 }
 
 .app-shell {
diff --git a/src/app/intro/page.tsx b/src/app/intro/page.tsx
index fa40a76..1b1b586 100644
--- a/src/app/intro/page.tsx
+++ b/src/app/intro/page.tsx
@@ -13,6 +13,7 @@ import { authBridge } from "@/lib/auth-bridge";
 import { getSubmitPath } from "@/lib/get-submit-path";
 import { localizePath } from "@/translations/config";
 import { useI18n } from "@/translations/provider";
+import VideoPlayer from "@/components/Componentes/video-player";
 
 const REDIRECT_SESSION_KEY = "redirect";
 
@@ -114,7 +115,11 @@ export default function Intro() {
         );
       }
 
-      const nextPath = localizePath(getSubmitPath(profileResponse), locale);
+      const submitPath = getSubmitPath(profileResponse);
+      const nextPath = localizePath(
+        submitPath === "/intro" ? "/terms" : submitPath,
+        locale,
+      );
       router.push(nextPath);
     } catch (error) {
       console.error("Submission/redirect failed", error);
@@ -201,12 +206,15 @@ export default function Intro() {
             </div>
           </div>
         </div>
-        <div 
+        <div
           className="mt-14 relative cursor-pointer group rounded-2xl overflow-hidden aspect-[344/221] max-w-[344px] w-full mx-auto"
           onClick={() => setIsPlayerOpen(true)}
         >
           <Image
-            src={config?.intro_video_thumbnail_url || "/assets/images/Frame 2095586523.png"}
+            src={
+              config?.intro_video_thumbnail_url ||
+              "/assets/images/Frame 2095586523.png"
+            }
             alt={t.intro.videoAlt}
             fill
             sizes="344px"
@@ -223,42 +231,11 @@ export default function Intro() {
           />
         </div>
 
-        {isPlayerOpen && (
-          <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/90 backdrop-blur-sm p-4">
-            <div className="relative w-full max-w-[640px] aspect-video rounded-2xl overflow-hidden bg-black shadow-2xl">
-              <button
-                onClick={(e) => {
-                  e.stopPropagation();
-                  setIsPlayerOpen(false);
-                }}
-                className="absolute top-4 right-4 z-10 flex items-center justify-center w-10 h-10 rounded-full bg-white/20 hover:bg-white/30 text-white transition-colors active:scale-95 cursor-pointer"
-                aria-label="Close video player"
-              >
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  className="h-6 w-6"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor"
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    strokeWidth={2}
-                    d="M6 18L18 6M6 6l12 12"
-                  />
-                </svg>
-              </button>
-              <video
-                src={config?.intro_video_url || "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"}
-                controls
-                autoPlay
-                playsInline
-                className="w-full h-full object-contain"
-              />
-            </div>
-          </div>
-        )}
+        <VideoPlayer
+          isOpen={isPlayerOpen}
+          onClose={() => setIsPlayerOpen(false)}
+          videoUrl={config?.intro_video_url}
+        />
         <div className="pointer-events-none fixed bottom-0 left-1/2 z-20 w-full sm:max-w-[375px] -translate-x-1/2 bg-[#F5F5F5]">
           <div
             style={{ paddingBottom: "calc(20px + var(--safe-bottom))" }}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 2b9f8f8..da09b03 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,7 +6,9 @@ export const dynamic = "force-dynamic";
 
 export default async function RootPage() {
   const cookieStore = await cookies();
-  const habibLanguage = cookieStore.get("HABIB_LANGUAGE")?.value ?? cookieStore.get("habib_language")?.value;
+  const habibLanguage =
+    cookieStore.get("HABIB_LANGUAGE")?.value ??
+    cookieStore.get("habib_language")?.value;
 
   let targetLocale = defaultLocale;
 
diff --git a/src/app/questions-list/page.tsx b/src/app/questions-list/page.tsx
index af79996..8522cc8 100644
--- a/src/app/questions-list/page.tsx
+++ b/src/app/questions-list/page.tsx
@@ -45,7 +45,6 @@ export default function QuestionsListPage() {
     refetchOnMount: "always",
   });
 
-
   const startMatchMutation = useStartMarriageMatchMutation({
     onSuccess: () => {
       markMatchStarted();
@@ -134,8 +133,7 @@ export default function QuestionsListPage() {
   const profileStatus = profile?.status;
   const isProfileSuspended = profileStatus === "suspended";
   const isProfileBlocked =
-    profileStatus === "in_case" ||
-    profileStatus === "matched";
+    profileStatus === "in_case" || profileStatus === "matched";
   const canStartMatch =
     !isProfileSuspended && !isProfileBlocked && allRequiredSectionsCompleted;
   const [isSyncError, setIsSyncError] = useState(false);
diff --git a/src/components/Componentes/notice-box.tsx b/src/components/Componentes/notice-box.tsx
index f79cf71..8435f37 100644
--- a/src/components/Componentes/notice-box.tsx
+++ b/src/components/Componentes/notice-box.tsx
@@ -4,19 +4,35 @@ type NoticeBoxProps = {
   children?: ReactNode;
   text?: string;
   className?: string;
+  align?: "center" | "justify" | "left" | "right";
 };
 
-export function NoticeBox({ children, text, className = "" }: NoticeBoxProps) {
+export function NoticeBox({
+  children,
+  text,
+  className = "",
+  align = "center",
+}: NoticeBoxProps) {
+  const alignClass =
+    align === "justify"
+      ? "text-justify"
+      : align === "left"
+        ? "text-left"
+        : align === "right"
+          ? "text-right"
+          : "text-center";
+
   return (
     <div
       className={[
-        "mt-3 bg-[#F14B46]/10 py-2.5 px-3.5 border border-[#F14B46] rounded-xl text-center",
+        "mt-3 bg-[#F14B46]/10 py-2.5 px-3.5 border border-[#F14B46] rounded-xl",
+        alignClass,
         className,
       ]
         .filter(Boolean)
         .join(" ")}
     >
-      <p className="text-[#F14B46] group-12 font-semibold text-center leading-[1.6]">
+      <p className={`text-[#F14B46] group-12 font-semibold leading-[1.6] ${alignClass}`}>
         {text || children}
       </p>
     </div>
diff --git a/src/components/Componentes/question-dropdown.tsx b/src/components/Componentes/question-dropdown.tsx
index c63d6ce..3fd68b3 100644
--- a/src/components/Componentes/question-dropdown.tsx
+++ b/src/components/Componentes/question-dropdown.tsx
@@ -216,8 +216,7 @@ export function QuestionDropdown({
       );
       if (hasOther) {
         nextValue = selectedList.filter(
-          (v) =>
-            v !== otherOptionName && !v.startsWith(`${otherOptionName}: `),
+          (v) => v !== otherOptionName && !v.startsWith(`${otherOptionName}: `),
         );
       } else {
         nextValue = [...selectedList, otherOptionName];
@@ -311,8 +310,12 @@ export function QuestionDropdown({
               isPersonalityTraits
                 ? (t.questions.writeOtherTraits ?? "Write other options...")
                 : isSmokingSubstances
-                  ? (locale === "fa" ? "خط قرمزهای دیگر را بنویسید..." : "Write other red lines...")
-                  : (locale === "fa" ? "سرگرمی‌ها یا علایق دیگر را بنویسید..." : "Write other hobbies or interests...")
+                  ? locale === "fa"
+                    ? "خط قرمزهای دیگر را بنویسید..."
+                    : "Write other red lines..."
+                  : locale === "fa"
+                    ? "سرگرمی‌ها یا علایق دیگر را بنویسید..."
+                    : "Write other hobbies or interests..."
             }
             className="h-[48px] w-full rounded-[14px] border border-[#D0D5DD] bg-white px-4 text-[14px] font-medium text-[#181818] outline-none transition-all placeholder:text-[#98A2B3] hover:border-[#98A2B3] focus:border-[#6F6F6F] focus:ring-1 focus:ring-[#6F6F6F]"
           />
diff --git a/src/components/Componentes/question-radio.tsx b/src/components/Componentes/question-radio.tsx
index 02bca2a..392b8d9 100644
--- a/src/components/Componentes/question-radio.tsx
+++ b/src/components/Componentes/question-radio.tsx
@@ -86,25 +86,27 @@ export function QuestionRadio({
                   )}
                 </div>
               )}
-              {option.includes(" - ")
-                ? (() => {
-                    const parts = option.split(" - ");
-                    const title = parts[0];
-                    const description = parts.slice(1).join(" - ");
-                    return (
-                      <span className="flex flex-col gap-1 text-start flex-1">
-                        <span className="font-bold">{title}</span>
-                        <ExplanationUiFont
-                          textColor={
-                            isSelected ? "text-white/85" : "text-[#667085]"
-                          }
-                        >
-                          {description}
-                        </ExplanationUiFont>
-                      </span>
-                    );
-                  })()
-                : <span className="flex-1">{option}</span>}
+              {option.includes(" - ") ? (
+                (() => {
+                  const parts = option.split(" - ");
+                  const title = parts[0];
+                  const description = parts.slice(1).join(" - ");
+                  return (
+                    <span className="flex flex-col gap-1 text-start flex-1">
+                      <span className="font-bold">{title}</span>
+                      <ExplanationUiFont
+                        textColor={
+                          isSelected ? "text-white/85" : "text-[#667085]"
+                        }
+                      >
+                        {description}
+                      </ExplanationUiFont>
+                    </span>
+                  );
+                })()
+              ) : (
+                <span className="flex-1">{option}</span>
+              )}
             </label>
           );
         })}
diff --git a/src/components/Componentes/question-section-flow.tsx b/src/components/Componentes/question-section-flow.tsx
index 1674ceb..804b0e8 100644
--- a/src/components/Componentes/question-section-flow.tsx
+++ b/src/components/Componentes/question-section-flow.tsx
@@ -149,7 +149,13 @@ function SectionFlowContent({
         clearTimeout(timerId);
       }
     };
-  }, [isCompleted, isLeaving, activeQuestionIndex, questions?.length, handleContinue]);
+  }, [
+    isCompleted,
+    isLeaving,
+    activeQuestionIndex,
+    questions?.length,
+    handleContinue,
+  ]);
 
   const age = getStoredAge();
   const activeQuestion = questions?.[activeQuestionIndex];
diff --git a/src/components/Componentes/question-snap-list.tsx b/src/components/Componentes/question-snap-list.tsx
index c255073..1fd78d3 100644
--- a/src/components/Componentes/question-snap-list.tsx
+++ b/src/components/Componentes/question-snap-list.tsx
@@ -410,7 +410,6 @@ export function QuestionSnapList({
           {firstQuestionHint}
         </div>
       ) : null}
-
     </section>
   );
 }
diff --git a/src/components/Componentes/required-steps-card.tsx b/src/components/Componentes/required-steps-card.tsx
index 3d299cd..a10e671 100644
--- a/src/components/Componentes/required-steps-card.tsx
+++ b/src/components/Componentes/required-steps-card.tsx
@@ -2,10 +2,7 @@
 
 import { useMemo } from "react";
 import { IoAlert, IoCheckmark } from "react-icons/io5";
-import {
-  getLocalSectionProgress,
-  getStoredAge,
-} from "./progress-helper";
+import { getLocalSectionProgress, getStoredAge } from "./progress-helper";
 import {
   getQuestionListItems,
   isQuestionListItemVisibleForProfile,
diff --git a/src/components/Componentes/slider-header.tsx b/src/components/Componentes/slider-header.tsx
new file mode 100644
index 0000000..90a49c6
--- /dev/null
+++ b/src/components/Componentes/slider-header.tsx
@@ -0,0 +1,26 @@
+import type { ReactNode } from "react";
+
+type SliderHeaderProps = {
+  index: number;
+  title: ReactNode;
+  totalSteps?: number;
+  stepLabel?: string;
+};
+
+export function SliderHeader({
+  index,
+  title,
+  totalSteps = 5,
+  stepLabel,
+}: SliderHeaderProps) {
+  return (
+    <div className="text-center">
+      <p className="text-[#747474] group-10 font-semibold">
+        {stepLabel || `Step ${index + 1} of ${totalSteps}`}
+      </p>
+      <p className="text-[#111111] group-16 font-bold">{title}</p>
+    </div>
+  );
+}
+
+export default SliderHeader;
diff --git a/src/components/Componentes/slider-page.tsx b/src/components/Componentes/slider-page.tsx
index daf6fca..90272e7 100644
--- a/src/components/Componentes/slider-page.tsx
+++ b/src/components/Componentes/slider-page.tsx
@@ -3,58 +3,35 @@
 import { useRouter } from "next/navigation";
 import type { TouchEvent } from "react";
 import { useEffect, useState } from "react";
-import type {
-  GenderAnswer,
-  RegistrationAnswer,
-} from "./slider-slide";
+import { useUpdateMarriageProfileBasicMutation } from "@/hooks/marriage/use-profile-basic";
+import { localizePath } from "@/translations/config";
+import { useI18n } from "@/translations/provider";
+import Button from "./button";
+import NavigationButton from "./navigation-button";
+import type { GenderAnswer, RegistrationAnswer } from "./slider-slide";
 import { SliderSlideFive } from "./slider-slide-five";
 import { SliderSlideFour } from "./slider-slide-four";
-import {
-  SliderSlideOne,
-  SliderSlideOneActions,
-} from "./slider-slide-one";
+import { SliderSlideOne, SliderSlideOneActions } from "./slider-slide-one";
 import { SliderSlideThree } from "./slider-slide-three";
 import { SliderSlideTwo } from "./slider-slide-two";
-import Button from "./button";
-import NavigationButton from "./navigation-button";
-import { useUpdateMarriageProfileBasicMutation } from "@/hooks/marriage/use-profile-basic";
 
-import { localizePath } from "@/translations/config";
-import { useI18n } from "@/translations/provider";
-
-const BASE_SLIDE_COUNT = 4;
 const FINAL_SLIDE_COUNT = 5;
 const SWIPE_THRESHOLD = 40;
 const SLIDER_ANSWERS_STORAGE_KEY = "marriage-slider-answers";
 
-type SavedSliderAnswers = {
-  gender: GenderAnswer;
-  registration: RegistrationAnswer;
-};
-
-const isGenderAnswer = (value: unknown): value is GenderAnswer =>
-  value === "man" || value === "woman";
-
-const isRegistrationAnswer = (value: unknown): value is RegistrationAnswer =>
-  value === "self" || value === "other";
-
 export default function SliderPage() {
   const router = useRouter();
   const { locale } = useI18n();
   const [activeSlide, setActiveSlide] = useState(0);
   const [selectedGender, setSelectedGender] = useState<GenderAnswer>("woman");
   const [selectedRegistration, setSelectedRegistration] =
-    useState<RegistrationAnswer>("other");
+    useState<RegistrationAnswer>("self");
+  const [hasReadRules, setHasReadRules] = useState(false);
   const [touchStartX, setTouchStartX] = useState<number | null>(null);
   const updateProfileBasicMutation = useUpdateMarriageProfileBasicMutation();
-  const hasFinalNotice = selectedGender === "woman";
-  const maxSlideIndex = hasFinalNotice
-    ? FINAL_SLIDE_COUNT - 1
-    : BASE_SLIDE_COUNT - 1;
-  const displaySlideCount =
-    hasFinalNotice && activeSlide === FINAL_SLIDE_COUNT - 1
-      ? FINAL_SLIDE_COUNT
-      : BASE_SLIDE_COUNT;
+  const hasFinalNotice = true;
+  const maxSlideIndex = FINAL_SLIDE_COUNT - 1;
+  const displaySlideCount = FINAL_SLIDE_COUNT;
   const navDotCount = displaySlideCount;
 
   useEffect(() => {
@@ -64,12 +41,6 @@ export default function SliderPage() {
     }
   }, []);
 
-  useEffect(() => {
-    if (!hasFinalNotice && activeSlide >= FINAL_SLIDE_COUNT - 1) {
-      setActiveSlide(BASE_SLIDE_COUNT - 1);
-    }
-  }, [activeSlide, hasFinalNotice]);
-
   const goToSlide = (index: number) => {
     setActiveSlide(Math.max(0, Math.min(index, maxSlideIndex)));
   };
@@ -83,6 +54,26 @@ export default function SliderPage() {
   };
 
   const completeSlider = async () => {
+    const navigateAway = () => {
+      if (typeof window !== "undefined") {
+        window.localStorage.removeItem(SLIDER_ANSWERS_STORAGE_KEY);
+        // Use hard navigation instead of router.push() to ensure the
+        // destination page loads with a fresh auth state.  SPA (soft)
+        // navigation sometimes leaves stale query-cache / token state
+        // that causes the profile query to return 401 and the page to
+        // stay stuck on the loading spinner.
+        window.location.href = localizePath(
+          "/questions-list/personal_info",
+          locale,
+        );
+        return;
+      }
+      router.push(localizePath("/questions-list/personal_info", locale));
+    };
+
+    // Safety timeout — navigate after 5 seconds even if the request hangs
+    const timeout = setTimeout(navigateAway, 5000);
+
     try {
       await updateProfileBasicMutation.mutateAsync({
         gender: selectedGender === "man" ? "male" : "female",
@@ -91,11 +82,8 @@ export default function SliderPage() {
     } catch (error) {
       console.warn("Failed to update profile basic details:", error);
     } finally {
-      if (typeof window !== "undefined") {
-        window.localStorage.removeItem(SLIDER_ANSWERS_STORAGE_KEY);
-      }
-      // Action Item 3: Immediately direct user into Card 1 (personal_info) after onboarding
-      router.push(localizePath("/questions-list/personal_info", locale));
+      clearTimeout(timeout);
+      navigateAway();
     }
   };
 
@@ -165,7 +153,10 @@ export default function SliderPage() {
           className="flex h-full w-full transition-transform duration-300 ease-out"
           style={{ transform: `translateX(-${activeSlide * 100}%)` }}
         >
-          <SliderSlideOne index={0} />
+          <SliderSlideOne
+            index={0}
+            onScrollToEnd={() => setHasReadRules(true)}
+          />
           <SliderSlideTwo index={1} />
           <SliderSlideThree
             index={2}
@@ -188,12 +179,9 @@ export default function SliderPage() {
         >
           <div className="pointer-events-auto">
             {activeSlide === 0 ? (
-              <SliderSlideOneActions onAccept={goToNextSlide} />
-            ) : activeSlide === BASE_SLIDE_COUNT - 1 ? (
-              <SliderFinalActions
-                onBack={goToPreviousSlide}
-                isFinishing={updateProfileBasicMutation.isPending}
-                onFinish={hasFinalNotice ? goToNextSlide : completeSlider}
+              <SliderSlideOneActions
+                onAccept={goToNextSlide}
+                disabled={!hasReadRules}
               />
             ) : activeSlide === maxSlideIndex ? (
               <SliderFinalActions
diff --git a/src/components/Componentes/slider-slide-five.tsx b/src/components/Componentes/slider-slide-five.tsx
index fb838fe..e2685a3 100644
--- a/src/components/Componentes/slider-slide-five.tsx
+++ b/src/components/Componentes/slider-slide-five.tsx
@@ -1,3 +1,4 @@
+import { SliderHeader } from "./slider-header";
 import type { SliderSlideProps } from "./slider-slide";
 
 const NOTICE_ITEMS = [
@@ -16,10 +17,7 @@ export function SliderSlideFive({ index }: SliderSlideProps) {
       className="flex h-full min-h-0 w-full shrink-0 flex-col"
     >
       <div className="min-h-0 flex-1 overflow-y-auto pb-28">
-        <div className="text-center">
-          <p className="text-[#747474] text-xs font-semibold">Submit Process</p>
-          <p className="text-[#111111] font-bold">5/5 Final Notice</p>
-        </div>
+        <SliderHeader index={index} totalSteps={5} title="Final Notice" />
 
         <div className="mt-6 space-y-5">
           <p className="text-[#36363C] text-sm font-semibold leading-5">
diff --git a/src/components/Componentes/slider-slide-four.tsx b/src/components/Componentes/slider-slide-four.tsx
index 4fe1568..06bd6ba 100644
--- a/src/components/Componentes/slider-slide-four.tsx
+++ b/src/components/Componentes/slider-slide-four.tsx
@@ -1,10 +1,8 @@
 "use client";
 
-import type {
-  RegistrationAnswer,
-  SliderSlideProps,
-} from "./slider-slide";
 import NoticeBox from "./notice-box";
+import { SliderHeader } from "./slider-header";
+import type { RegistrationAnswer, SliderSlideProps } from "./slider-slide";
 
 type SliderSlideFourProps = SliderSlideProps & {
   selectedRegistration: RegistrationAnswer;
@@ -27,17 +25,9 @@ export function SliderSlideFour({
       className="flex h-full min-h-0 w-full shrink-0 flex-col"
     >
       <div className="min-h-0 flex-1 overflow-y-auto pb-28">
-        <div className="text-center">
-          <p className="text-[#747474] group-10 font-semibold">
-            Submit Process
-          </p>
-          <p className="text-[#111111] group-16 font-bold">
-            {index + 1}/4 Registration Type
-          </p>
-        </div>
-        <NoticeBox className="mt-8">
-          Read the terms and conditions carefully so that you don't run into any
-          problems in the next process - reading this section is mandatory.
+        <SliderHeader index={index} title="Registration Type" />
+        <NoticeBox className="mt-8" align="justify">
+          You can register both for yourself and for your loved ones, but obtaining the explicit consent and permission of the person you are creating the profile for is mandatory. To ensure accuracy, it is best to let the individual complete the subsequent steps themselves. Remember that all matches are introduced with absolute privacy and strictly based on the information you provide.
         </NoticeBox>
         <div className="flex min-h-[calc(100dvh-520px)] items-center justify-center pt-6">
           <div className="w-full max-w-[440px] space-y-4">
diff --git a/src/components/Componentes/slider-slide-one.tsx b/src/components/Componentes/slider-slide-one.tsx
index 275818b..3e7c39f 100644
--- a/src/components/Componentes/slider-slide-one.tsx
+++ b/src/components/Componentes/slider-slide-one.tsx
@@ -1,16 +1,57 @@
-import type { SliderSlideProps } from "./slider-slide";
+"use client";
+
+import { useEffect, useRef } from "react";
 import Button from "./button";
+import { SliderHeader } from "./slider-header";
+import type { SliderSlideProps } from "./slider-slide";
 
 const ACTION_AREA_HEIGHT = 80;
 const CONTENT_MASK = `linear-gradient(to bottom, black 0, black calc(100% - ${ACTION_AREA_HEIGHT}px), transparent calc(100% - ${ACTION_AREA_HEIGHT}px), transparent 100%)`;
 
-export function SliderSlideOne({ index }: SliderSlideProps) {
+type SliderSlideOneProps = SliderSlideProps & {
+  onScrollToEnd?: () => void;
+};
+
+export function SliderSlideOne({ index, onScrollToEnd }: SliderSlideOneProps) {
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const container = containerRef.current;
+    if (!container) return;
+
+    const checkScroll = () => {
+      const tolerance = 10;
+      const isBottom =
+        container.scrollHeight - container.scrollTop <=
+        container.clientHeight + tolerance;
+      if (isBottom) {
+        onScrollToEnd?.();
+      }
+    };
+
+    // Check initially
+    checkScroll();
+
+    container.addEventListener("scroll", checkScroll);
+    window.addEventListener("resize", checkScroll);
+
+    // Check after short delay for dynamically rendered container layout
+    const timer = setTimeout(checkScroll, 150);
+
+    return () => {
+      container.removeEventListener("scroll", checkScroll);
+      window.removeEventListener("resize", checkScroll);
+      clearTimeout(timer);
+    };
+  }, [onScrollToEnd]);
+
   return (
     <section
       aria-label={`Slide ${index + 1}`}
       className="flex h-full min-h-0 w-full shrink-0 flex-col"
     >
       <div
+        ref={containerRef}
         className="min-h-0 flex-1 overflow-y-auto"
         style={{
           paddingBottom: ACTION_AREA_HEIGHT,
@@ -18,98 +59,370 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
           maskImage: CONTENT_MASK,
         }}
       >
-        <div className="text-center">
-          <p className="text-[#747474] group-10 font-semibold">
-            Submit Process
-          </p>
-          <p className="text-[#111111] group-16 font-bold">
-            {index + 1}/4 terms & conditions
-          </p>
-        </div>
+        <SliderHeader index={index} title="Terms & Conditions" />
         <div className="bg-[#F14B46]/10 py-2.5 px-3.5 border border-[#F14B46] rounded-xl mt-8">
           <p className="text-[#F14B46] group-12 font-semibold text-center">
-            Dear user, while welcoming you to the Habib Marij application,
-            please read the following rules and regulations carefully before
-            using the services of this platform. Your registration and use of
-            this application constitutes full acceptance of these rules.
+            Welcome to Habib Marriage. Please review our terms of service before
+            proceeding. By registering and using this platform, you agree to
+            these terms
           </p>
         </div>
         <div className="bg-white rounded-2xl mt-4 overflow-y-auto shadow-xs">
           <div className="space-y-6 px-5 py-5">
             <div className="space-y-3.5">
               <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
-                1. Eligibility and Membership Requirements
+                1. Acceptance of Rules and Platform Goal
+              </h3>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Full Acceptance of Agreement:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Registration and use of any part of the application means
+                  reading and fully accepting all rules. If you do not agree,
+                  you must refrain from further use.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Changes and Updates:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  The application reserves the right to edit the rules when
+                  necessary, and your continued use will constitute acceptance
+                  of the new changes.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Exclusive Goal of the Application:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  This platform is designed solely for matchmaking and permanent
+                  marriage. Use with the purpose of dating, temporary
+                  relationships, or entertainment is prohibited.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Age and Legal Capacity Requirement:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Use of services is allowed only for individuals over 18 years
+                  of age who have the legal and religious capacity for marriage.
+                </span>
+              </p>
+            </div>
+
+            <div className="space-y-3.5 pt-1">
+              <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
+                2. User Account, Security, and Authentication
+              </h3>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Accuracy of Personal Information:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  The user is obliged to enter all identity, occupational,
+                  educational, and marital status information completely
+                  accurately and honestly.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Prohibition of Fake Accounts:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Creating an account using the identity, name, mobile number,
+                  or photos of others, as well as creating multiple user
+                  accounts, is a serious violation.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Maintaining Account Security:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  The responsibility for maintaining the confidentiality of the
+                  password and login code lies with the user, and transferring
+                  or renting the account to another person is prohibited.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Introducing a Trusted Person:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  To enhance security, users can introduce a trusted family
+                  member. This information is used strictly for security and
+                  urgent cases.
+                </span>
+              </p>
+            </div>
+
+            <div className="space-y-3.5 pt-1">
+              <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
+                3. Communications, Ethics, and User Behavior
+              </h3>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Mutual Respect:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Conversations must be ethical and purposeful. Sending
+                  offensive, sexual, obscene, threatening, or harassing messages
+                  is strictly prohibited.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Respecting Others&apos; Privacy:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Saving, sending, or publishing screenshots of conversations
+                  and photos of other users outside the application is a
+                  violation of privacy.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Absolute Prohibition of Financial Requests:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Requesting money, loans, gift cards, cryptocurrency, or any
+                  financial benefit from other users under any pretext is
+                  prohibited.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Prohibition of Commercial Activity:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Any advertising, marketing, selling goods, or raising capital
+                  within the application environment is considered a violation.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Respectful End of Conversation:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  If the other party does not wish to continue the
+                  communication, the user is obliged to respect their decision
+                  and refrain from pursuing or causing harassment.
+                </span>
+              </p>
+            </div>
+
+            <div className="space-y-3.5 pt-1">
+              <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
+                4. Privacy, Data, and Intellectual Property
+              </h3>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Personal Information Protection:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  The application is committed to protecting your sensitive
+                  information in accordance with the privacy policy and will not
+                  sell it to third parties without permission.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Public Profile Display:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  By completing the profile, the user consents to their public
+                  information being displayed to other qualified users for
+                  service delivery.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Account Deletion Rules:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Upon requesting account deletion, your information is removed
+                  from public view, but necessary data for legal and security
+                  requirements will remain archived in the system.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Intellectual Property Rights:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  All rights to software codes, design, database, and brand name
+                  belong to the platform, and any copying or scraping is
+                  prohibited.
+                </span>
+              </p>
+            </div>
+
+            <div className="space-y-3.5 pt-1">
+              <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
+                5. Financial Terms and Subscriptions
               </h3>
 
               <p className="group-12 leading-[1.55]">
-                <span className="font-bold text-[#262626]">Legal Age:</span>{" "}
+                <span className="font-bold text-[#262626]">
+                  Nature of Paid Services:
+                </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Users must meet the minimum legal age for independent
-                  registration.
+                  Payment is solely for using premium features and software
+                  infrastructure and does not provide any guarantee for marriage
+                  or finding a spouse.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">Refund Policy:</span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Paid fees are non-refundable, except in definitive cases of
+                  system technical errors.
                 </span>
               </p>
 
               <p className="group-12 leading-[1.55]">
                 <span className="font-bold text-[#262626]">
-                  Identity Verification:
+                  Disclaimer for External Transactions:
                 </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Mandatory submission of valid government-issued ID upon
-                  registration.
+                  The application holds no responsibility for financial
+                  transactions between users or outside the application&apos;s
+                  official payment gateway.
                 </span>
               </p>
+            </div>
+
+            <div className="space-y-3.5 pt-1">
+              <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
+                6. Monitoring, Violations, and Legal Prosecution
+              </h3>
 
               <p className="group-12 leading-[1.55]">
                 <span className="font-bold text-[#262626]">
-                  Single Status Commitment:
+                  Confidential Reporting:
                 </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Users must provide proof of being single, or documents
-                  confirming divorce or spouse&apos;s death upon request.
+                  Users must report violations, suspicious behavior, or
+                  financial requests through the report violation option. The
+                  identity of the reporter remains confidential.
                 </span>
               </p>
 
               <p className="group-12 leading-[1.55]">
-                <span className="font-bold text-[#262626]">Intent:</span>{" "}
+                <span className="font-bold text-[#262626]">
+                  Authorities of Application Moderators:
+                </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Commitment to monogamy and intention for permanent marriage
-                  only (no simultaneous or temporary relationships).
+                  The platform reserves the right to block, restrict, or suspend
+                  the user account without prior notice if any violation or
+                  breach of rules is detected.
                 </span>
               </p>
 
               <p className="group-12 leading-[1.55]">
                 <span className="font-bold text-[#262626]">
-                  General Health:
+                  Cooperation with Law Enforcement:
                 </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Self-declaration regarding mental health, absence of
-                  addiction, and no criminal record.
+                  In the event of cybercrimes, fraud, or threats, the
+                  application will refer the necessary information to judicial
+                  and law enforcement authorities.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Dispute Resolution:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Any legal dispute must first be pursued through application
+                  support. If no agreement is reached, the competent authority
+                  will be the courts of the city where the application is
+                  registered.
                 </span>
               </p>
             </div>
 
             <div className="space-y-3.5 pt-1">
               <h3 className="text-[#F14B46] group-14 font-bold tracking-tight mb-3">
-                2. Privacy and Data Management
+                7. Disclaimer and In-Person Meetings
               </h3>
 
               <p className="group-12 leading-[1.55]">
                 <span className="font-bold text-[#262626]">
-                  Content Security:
+                  Role of the Application:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  This platform is only a facilitator for initial communication
+                  and does not replace family background research, counseling,
+                  and pre-marital investigations.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Responsibility for Accuracy of Claims:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Accurate verification of users&apos; claims regarding their
+                  financial, occupational, marital, and health status is the
+                  responsibility of the user and their family.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Responsibility for In-Person Meetings:
+                </span>{" "}
+                <span className="font-normal text-[#525252]">
+                  Planning and deciding to meet in person is entirely the
+                  responsibility of the users, and the application assumes no
+                  liability for any incidents or potential damages.
+                </span>
+              </p>
+
+              <p className="group-12 leading-[1.55]">
+                <span className="font-bold text-[#262626]">
+                  Safety Recommendations in Meetings:
                 </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Technical prevention of screenshots from profiles and chat
-                  environments.
+                  It is strongly recommended that initial meetings be held in
+                  crowded public places, and that a family member or a trusted
+                  person be kept informed.
                 </span>
               </p>
 
               <p className="group-12 leading-[1.55]">
                 <span className="font-bold text-[#262626]">
-                  Progressive Disclosure:
+                  Force Majeure Conditions:
                 </span>{" "}
                 <span className="font-normal text-[#525252]">
-                  Sensitive information (face, contact details) revealed
-                  step-by-step only with mutual consent.
+                  In the event of occurrences beyond control, such as a
+                  nationwide internet outage, natural disasters, or sanctions,
+                  the application will have no liability for temporary service
+                  outages.
                 </span>
               </p>
             </div>
@@ -122,10 +435,12 @@ export function SliderSlideOne({ index }: SliderSlideProps) {
 
 type SliderSlideOneActionsProps = {
   onAccept: () => void;
+  disabled?: boolean;
 };
 
 export function SliderSlideOneActions({
   onAccept,
+  disabled,
 }: SliderSlideOneActionsProps) {
   return (
     <div className="flex items-center gap-3 [&>a]:flex-1 [&>button]:flex-1">
@@ -137,6 +452,7 @@ export function SliderSlideOneActions({
         countdownSeconds={0}
         onClick={onAccept}
         className="flex-1"
+        disabled={disabled}
       >
         Accept
       </Button>
diff --git a/src/components/Componentes/slider-slide-three.tsx b/src/components/Componentes/slider-slide-three.tsx
index 179a5f1..cfee8d4 100644
--- a/src/components/Componentes/slider-slide-three.tsx
+++ b/src/components/Componentes/slider-slide-three.tsx
@@ -1,10 +1,8 @@
 "use client";
 
 import Image from "next/image";
-import type {
-  GenderAnswer,
-  SliderSlideProps,
-} from "./slider-slide";
+import { SliderHeader } from "./slider-header";
+import type { GenderAnswer, SliderSlideProps } from "./slider-slide";
 
 type GenderOption = {
   id: GenderAnswer;
@@ -17,14 +15,14 @@ type GenderOption = {
 const GENDER_OPTIONS: GenderOption[] = [
   {
     id: "man",
-    label: "Submit Man",
+    label: "Man",
     alt: "man",
     enabledSrc: "/assets/images/Group 27033.svg",
     disabledSrc: "/assets/images/disabled Group 27033.svg",
   },
   {
     id: "woman",
-    label: "Submit Woman",
+    label: "Woman",
     alt: "woman",
     enabledSrc: "/assets/images/enabled Group 27032.svg",
     disabledSrc: "/assets/images/Group 27032.svg",
@@ -46,14 +44,9 @@ export function SliderSlideThree({
       aria-label={`Slide ${index + 1}`}
       className="flex h-full min-h-0 w-full shrink-0 flex-col justify-between"
     >
-      <div className="text-center">
-        <p className="text-[#747474] group-10 font-semibold">Submit Process</p>
-        <p className="text-[#111111] group-16 font-bold">
-          {index + 1}/4 Select Gender
-        </p>
-      </div>
+      <SliderHeader index={index} title="Select your gender" />
 
-      <div className="flex items-center justify-evenly">
+      <div className="flex w-full items-center justify-evenly">
         {GENDER_OPTIONS.map((option) => {
           const isSelected = option.id === selectedGender;
 
diff --git a/src/components/Componentes/slider-slide-two.tsx b/src/components/Componentes/slider-slide-two.tsx
index 111ff68..1cb802a 100644
--- a/src/components/Componentes/slider-slide-two.tsx
+++ b/src/components/Componentes/slider-slide-two.tsx
@@ -1,36 +1,44 @@
+"use client";
+
 import Image from "next/image";
+import { useState } from "react";
+import { useMarriageConfigQuery } from "@/hooks/marriage/use-marriage-config";
+import { SliderHeader } from "./slider-header";
 import type { SliderSlideProps } from "./slider-slide";
+import VideoPlayer from "./video-player";
 
 export function SliderSlideTwo({ index }: SliderSlideProps) {
+  const [isPlayerOpen, setIsPlayerOpen] = useState(false);
+  const { data: config } = useMarriageConfigQuery();
+
   return (
     <section
       aria-label={`Slide ${index + 1}`}
       className="flex h-full min-h-0 w-full shrink-0 flex-col"
     >
       <div className="min-h-0 flex-1 overflow-y-auto pb-[86px]">
-        <div className="text-center">
-          <p className="text-[#747474] group-10 font-semibold">
-            Submit Process
-          </p>
-          <p className="text-[#111111] group-16 font-bold">
-            {index + 1}/4 Watch Video
-          </p>
-        </div>
-        <div className="mt-8 flex min-h-0 justify-center">
+        <SliderHeader index={index} title="Watch Video" />
+        <div
+          className="mt-8 flex min-h-0 justify-center cursor-pointer group"
+          onClick={() => setIsPlayerOpen(true)}
+        >
           <div className="relative w-full max-w-[344px]">
             <Image
-              src={"/assets/images/Frame 20953586523.png"}
+              src={
+                config?.intro_video_thumbnail_url ||
+                "/assets/images/Frame 20953586523.png"
+              }
               alt="video"
               width={344}
               height={488}
-              className="h-auto w-full"
+              className="h-auto w-full transition-transform duration-300 group-hover:scale-102 rounded-2xl"
             />
             <Image
               src={"/assets/images/Frame 1116607280.svg"}
               alt="play"
               width={68}
               height={68}
-              className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2"
+              className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 transition-transform duration-300 group-hover:scale-110 active:scale-95"
             />
           </div>
         </div>
@@ -53,6 +61,11 @@ export function SliderSlideTwo({ index }: SliderSlideProps) {
           </p>
         </div>
       </div>
+      <VideoPlayer
+        isOpen={isPlayerOpen}
+        onClose={() => setIsPlayerOpen(false)}
+        videoUrl={config?.video_step_2_url}
+      />
     </section>
   );
 }
diff --git a/src/components/Componentes/token-switcher.tsx b/src/components/Componentes/token-switcher.tsx
index 8375a78..b3390dd 100644
--- a/src/components/Componentes/token-switcher.tsx
+++ b/src/components/Componentes/token-switcher.tsx
@@ -98,7 +98,12 @@ export function TokenSwitcher({
       }
 
       // 3. Set the target token in the cookies and redirect to /
-      const targetToken = userId === 17119 ? MALE_TOKEN : userId === 147714 ? FEMALE_TOKEN : "NO_TOKEN";
+      const targetToken =
+        userId === 17119
+          ? MALE_TOKEN
+          : userId === 147714
+            ? FEMALE_TOKEN
+            : "NO_TOKEN";
 
       setClientCookie(TOKEN_COOKIE_NAME, targetToken);
       setClientCookie("habib_token", targetToken);
@@ -134,7 +139,15 @@ export function TokenSwitcher({
           .join(" ")}
       >
         <MdOutlineSwitchAccount className="size-5 text-rose-500" />
-        <span>{isMale ? "آقا 👨" : isFemale ? "خانم 👩" : isNoToken ? "بدون توکن 👤" : "توکن 🔑"}</span>
+        <span>
+          {isMale
+            ? "آقا 👨"
+            : isFemale
+              ? "خانم 👩"
+              : isNoToken
+                ? "بدون توکن 👤"
+                : "توکن 🔑"}
+        </span>
       </button>
 
       {isOpen && (
diff --git a/src/components/Componentes/video-player.tsx b/src/components/Componentes/video-player.tsx
new file mode 100644
index 0000000..d1ceeee
--- /dev/null
+++ b/src/components/Componentes/video-player.tsx
@@ -0,0 +1,90 @@
+"use client";
+
+import { useEffect, useState, type FC } from "react";
+import { createPortal } from "react-dom";
+
+type VideoPlayerProps = {
+  isOpen: boolean;
+  onClose: () => void;
+  videoUrl?: string;
+};
+
+export const VideoPlayer: FC<VideoPlayerProps> = ({
+  isOpen,
+  onClose,
+  videoUrl,
+}) => {
+  const [mounted, setMounted] = useState(false);
+  // Default to a responsive landscape layout that adapts nicely
+  const [containerStyle, setContainerStyle] = useState(
+    "relative w-full max-w-[640px] aspect-video rounded-2xl overflow-hidden bg-black shadow-2xl transition-all duration-300 ease-out",
+  );
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+
+  const handleLoadedMetadata = (e: React.SyntheticEvent<HTMLVideoElement>) => {
+    const video = e.currentTarget;
+    if (video.videoWidth && video.videoHeight) {
+      const ratio = video.videoWidth / video.videoHeight;
+      if (ratio < 0.8) {
+        // Vertical/portrait video (mobile format like TikTok/selfie)
+        setContainerStyle(
+          "relative w-full max-w-[340px] sm:max-w-[380px] aspect-[9/16] rounded-2xl overflow-hidden bg-black shadow-2xl max-h-[82vh] transition-all duration-300 ease-out",
+        );
+      } else {
+        // Horizontal/landscape video (standard format)
+        setContainerStyle(
+          "relative w-full max-w-[640px] sm:max-w-[720px] md:max-w-[800px] aspect-video rounded-2xl overflow-hidden bg-black shadow-2xl max-h-[85vh] transition-all duration-300 ease-out",
+        );
+      }
+    }
+  };
+
+  if (!isOpen || !mounted) return null;
+
+  return createPortal(
+    <div
+      className="fixed inset-0 z-50 flex items-center justify-center bg-black/85 backdrop-blur-xs p-4"
+      onClick={onClose}
+    >
+      <div className={containerStyle} onClick={(e) => e.stopPropagation()}>
+        <button
+          onClick={onClose}
+          className="absolute top-3 right-3 sm:top-4 sm:right-4 z-10 flex items-center justify-center w-11 h-11 rounded-full bg-black/40 hover:bg-black/60 text-white transition-all active:scale-95 cursor-pointer backdrop-blur-xs"
+          aria-label="Close video player"
+        >
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            className="h-6 w-6"
+            fill="none"
+            viewBox="0 0 24 24"
+            stroke="currentColor"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth={2}
+              d="M6 18L18 6M6 6l12 12"
+            />
+          </svg>
+        </button>
+        <video
+          src={
+            videoUrl ||
+            "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+          }
+          controls
+          autoPlay
+          playsInline
+          onLoadedMetadata={handleLoadedMetadata}
+          className="w-full h-full object-contain"
+        />
+      </div>
+    </div>,
+    document.body,
+  );
+};
+
+export default VideoPlayer;
diff --git a/src/data/questions/en.json b/src/data/questions/en.json
index d3fc097..477ac6a 100644
--- a/src/data/questions/en.json
+++ b/src/data/questions/en.json
@@ -14,10 +14,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Sarah Smith",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": false
@@ -28,10 +25,7 @@
         "required": true,
         "extras": {
           "placeHolder": "YYYY-MM-DD",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -41,10 +35,7 @@
         "required": false,
         "extras": {
           "placeHolder": "",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -54,10 +45,7 @@
         "required": true,
         "extras": {
           "placeHolder": "City, region, or neighborhood",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Iran",
             "United States",
@@ -86,10 +74,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select country",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Iran",
             "United States",
@@ -119,10 +104,7 @@
         "required": true,
         "extras": {
           "placeHolder": "British",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -132,10 +114,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Persian",
             "English",
@@ -158,10 +137,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Persian",
             "English",
@@ -195,10 +171,7 @@
         "required": true,
         "extras": {
           "placeHolder": "+44 7911 123456",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -209,10 +182,7 @@
         "required": true,
         "extras": {
           "placeHolder": "user@example.com",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -224,10 +194,7 @@
         "tooltip": "A precise address is not required. Just the general area of where you live is sufficient, such as the city, region, neighborhood, or nearest major city.",
         "extras": {
           "placeHolder": "City, region, or neighborhood",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Iran",
             "United States",
@@ -256,10 +223,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Citizen / National",
             "Permanent Residence",
@@ -278,10 +242,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Fully flexible; moving to another city or country is not a problem.",
             "Willing to move to another city, but only within my current country.",
@@ -296,24 +257,17 @@
         "type": "text",
         "required": false,
         "requiredWhen": {
-          "genders": [
-            "female"
-          ],
+          "genders": ["female"],
           "maxAge": 26
         },
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "showGuardianNotice": true,
         "tooltip": "This field specifies the full name of the designated intermediary whose contact information is provided to the other party to facilitate communication.",
         "extras": {
           "placeHolder": "Sarah Smith",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -323,22 +277,15 @@
         "type": "dropdown",
         "required": false,
         "requiredWhen": {
-          "genders": [
-            "female"
-          ],
+          "genders": ["female"],
           "maxAge": 26
         },
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Father",
             "Mother",
@@ -359,22 +306,15 @@
         "type": "phone",
         "required": false,
         "requiredWhen": {
-          "genders": [
-            "female"
-          ],
+          "genders": ["female"],
           "maxAge": 26
         },
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "+44 7911 123456",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -396,10 +336,7 @@
         "required": true,
         "extras": {
           "placeHolder": "175",
-          "range": [
-            100,
-            230
-          ],
+          "range": [100, 230],
           "options": []
         },
         "private": true
@@ -410,10 +347,7 @@
         "required": true,
         "extras": {
           "placeHolder": "70",
-          "range": [
-            40,
-            180
-          ],
+          "range": [40, 180],
           "options": []
         },
         "private": true
@@ -424,10 +358,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Fair / White",
             "Light Tan / Wheatish",
@@ -443,10 +374,7 @@
         "private": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "I am in perfect health.",
             "I have a specific or chronic illness.",
@@ -471,10 +399,7 @@
         "tooltip": "Provide more details if you have any health conditions or limitations.",
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -485,10 +410,7 @@
         "private": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "I have no specific issues.",
             "I have a history of counseling or am currently undergoing treatment.",
@@ -503,18 +425,13 @@
         "logic": {
           "dependsOn": {
             "title": "Mental Health Status",
-            "values": [
-              "I am undergoing pharmacotherapy."
-            ]
+            "values": ["I am undergoing pharmacotherapy."]
           }
         },
         "tooltip": "This field requires the user to declare all permanent medications currently being taken for any physical, psychological, medical, or non-medical condition.",
         "extras": {
           "placeHolder": "Insulin, etc.",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -536,10 +453,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Below High School",
             "High School Diploma",
@@ -560,10 +474,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Computer Science",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -573,10 +484,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Full-time Employed",
             "Part-time Employed",
@@ -598,10 +506,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Software Engineer",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -611,10 +516,7 @@
         "required": false,
         "extras": {
           "placeHolder": "London, Remote",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -624,10 +526,7 @@
         "required": true,
         "extras": {
           "placeHolder": "3500 GBP, 4000 USD",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -638,10 +537,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Stable and reliable income",
             "Income is variable",
@@ -658,16 +554,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Fully able to support expenses",
             "Able to support the main portion of expenses",
@@ -684,16 +575,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Homeowner",
             "Renting independently",
@@ -711,16 +597,11 @@
         "type": "radio",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Have a personal home for living together",
             "Can buy a home",
@@ -736,10 +617,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Enter your explanation here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -762,10 +640,7 @@
         "required": true,
         "extras": {
           "placeHolder": "2",
-          "range": [
-            0,
-            20
-          ],
+          "range": [0, 20],
           "options": []
         }
       },
@@ -775,10 +650,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Both parents are alive",
             "Father has passed away",
@@ -793,10 +665,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Living together",
             "Separated / Divorced",
@@ -811,10 +680,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select option(s)",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "No, I do not have any ongoing responsibility.",
             "I am responsible for caring for my parent(s) (father, mother, or both).",
@@ -830,10 +696,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Yes, they live with me permanently.",
             "Yes, they live with me temporarily or periodically.",
@@ -859,10 +722,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -886,10 +746,7 @@
         "tooltip": "### Family Religious Atmosphere Options\n\n* **Religious and Strictly Observant:** This specifies a family highly dedicated to performing all **obligatory duties**, strictly maintaining **religious boundaries** (such as Mahram rules), and upholding **religious rituals and teachings** across all aspects of life.\n* **Religious (Observant of Obligations):** This indicates a family committed to core **religious duties** (such as prayer and fasting) and **Islamic ethics**, living within the standard frameworks of a religious society.\n* **Traditional (Respectful of Religious Values):** This describes a family that holds devotion to moral values and **respects religion**, but may not strictly execute every specific **religious law** or obligation.\n* **Non-religious / Secular:** This represents a family where **religious rituals and frameworks** do not significantly influence their daily **lifestyle, relationships, or decisions**, despite holding a general respect for religion.",
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Religious and strictly observant",
             "Religious (observant of obligations)",
@@ -904,16 +761,8 @@
         "required": false,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
-          "options": [
-            "Weak",
-            "Average",
-            "Good",
-            "Prosperous"
-          ]
+          "range": [0, 0],
+          "options": ["Weak", "Average", "Good", "Prosperous"]
         }
       },
       {
@@ -922,10 +771,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "tooltip": "Write any important point that was not covered in the options above here."
@@ -947,10 +793,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Single; never married",
             "Failed engagement / Annulled marriage; without living together",
@@ -977,10 +820,7 @@
         },
         "extras": {
           "placeHolder": "3 years",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1000,10 +840,7 @@
         },
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1014,10 +851,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "No children",
             "Have children living with me",
@@ -1034,18 +868,12 @@
         "logic": {
           "dependsOn": {
             "title": "Current Marital Status",
-            "values": [
-              "Divorced; after living together",
-              "Widowed"
-            ]
+            "values": ["Divorced; after living together", "Widowed"]
           }
         },
         "extras": {
           "placeHolder": "2",
-          "range": [
-            0,
-            10
-          ],
+          "range": [0, 10],
           "options": []
         },
         "private": true
@@ -1056,10 +884,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "I have full custody of the child(ren).",
             "Joint custody or periodic visitation/relocation between parents.",
@@ -1085,10 +910,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Permanently or most days of the week with me.",
             "Approximately half the time (joint custody/schedule).",
@@ -1113,10 +935,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "No, it has no significant impact on residence or relocation.",
             "Yes, relocation or immigration requires coordination, agreement, or a legal permit.",
@@ -1141,10 +960,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Ongoing financial commitment (paying child support or sharing expenses).",
             "Receiving child support regularly.",
@@ -1169,10 +985,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "I accept necessary, respectful, and limited communication regarding child matters.",
             "I only accept formal and highly limited communication regarding essential child matters.",
@@ -1198,10 +1011,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1223,10 +1033,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Ayatollah Sistani",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1237,10 +1044,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Always committed, preferably at the earliest time",
             "Always committed, but not necessarily at the earliest time",
@@ -1256,10 +1060,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Fully committed",
             "Do not fast for religious or medical reasons",
@@ -1275,10 +1076,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Full Islamic covering (Maximum Hijab) - Abaya, Jilbab, Chador, or Niqab with full observance.",
             "Full Hijab with modest clothing - Modest styling with hair completely covered.",
@@ -1296,16 +1094,11 @@
         "type": "radio",
         "required": false,
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Do not wear makeup at all",
             "Only very light makeup",
@@ -1321,10 +1114,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Religion and politics are inseparable; my spouse must share this outlook.",
             "Religion and politics are inseparable, but active engagement is not a requirement for my spouse.",
@@ -1343,10 +1133,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Supporter of the current government; serious opposition from my spouse is a red line.",
             "Supporter of the current government, but a difference in view is not a red line.",
@@ -1365,10 +1152,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Very formal and limited (Only as necessary) - Avoid any unnecessary conversation or jokes.",
             "Respectful and conventional (No intimacy) - Polite interactions with clear personal boundaries.",
@@ -1385,10 +1169,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Do not smoke at all",
             "Occasional / Recreational",
@@ -1404,10 +1185,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Do not smoke hookah at all",
             "Occasional / Recreational",
@@ -1423,10 +1201,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Do not use at all",
             "Occasional / Recreational",
@@ -1442,10 +1217,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Do not consume at all",
             "Alcohol is a serious red line for me",
@@ -1461,10 +1233,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Never used",
             "Used in the past, but not anymore",
@@ -1480,10 +1249,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Do not listen to any music",
             "Only listen to Nasheeds, Acapella, religious, or instrument-free music",
@@ -1499,10 +1265,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "No ceremony or very simple",
             "Strictly religious and gender-segregated",
@@ -1520,10 +1283,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            1,
-            10
-          ],
+          "range": [1, 10],
           "options": [
             "Calm and Introverted",
             "Social and Extroverted",
@@ -1552,10 +1312,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            1,
-            15
-          ],
+          "range": [1, 15],
           "options": [
             "Quran Recitation and Religious Studies",
             "Mosque and Religious Gatherings",
@@ -1585,10 +1342,7 @@
         "required": false,
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -1632,10 +1386,7 @@
         "description": "",
         "extras": {
           "placeHolder": "25-30",
-          "range": [
-            18,
-            80
-          ],
+          "range": [18, 80],
           "options": []
         },
         "private": true
@@ -1646,10 +1397,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Under 160",
@@ -1668,10 +1416,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Slim",
@@ -1690,10 +1435,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Fair / White",
@@ -1712,10 +1454,7 @@
         "description": "",
         "extras": {
           "placeHolder": "English, French, etc.",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1726,10 +1465,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Minimum High School",
@@ -1749,10 +1485,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Employed",
@@ -1772,10 +1505,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Never married only; history is a red line",
             "Never married preferred, but open to special cases",
@@ -1791,10 +1521,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Will not accept",
             "Accept in special conditions",
@@ -1818,16 +1545,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Full Islamic covering mandatory",
             "Sharia Hijab mandatory, type doesn't matter",
@@ -1844,16 +1566,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Formal, dignified, and religious",
             "Simple, neat, and modest",
@@ -1871,10 +1588,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Must intend to continue",
@@ -1891,16 +1605,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Must be employed",
@@ -1919,10 +1628,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Doesn't matter.",
             "Parents not divorced",
@@ -1941,10 +1647,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Close and active",
             "Respectful but independent",
@@ -1960,10 +1663,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Very religious and committed",
             "Moderate religious",
@@ -1979,10 +1679,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Must align with mine",
             "Differences okay with mutual respect",
@@ -1998,10 +1695,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Very formal and limited",
             "Normal and respectful",
@@ -2016,10 +1710,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select options",
-          "range": [
-            1,
-            10
-          ],
+          "range": [1, 10],
           "options": [
             "Smoking is a red line",
             "Hookah is a red line",
@@ -2039,10 +1730,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Should not listen",
             "Only religious/instrument-free okay",
@@ -2058,10 +1746,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Simple or no ceremony",
             "Strictly religious and segregated",
@@ -2079,10 +1764,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Red line",
             "Consider in special cases",
@@ -2098,10 +1780,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "No problem",
             "Depends on stability",
@@ -2117,10 +1796,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Country doesn't matter",
             "Stay in my current country",
@@ -2139,10 +1815,7 @@
         "required": true,
         "extras": {
           "placeHolder": "Select one option",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "Only independent life",
             "Temporary with family okay",
@@ -2159,10 +1832,7 @@
         "description": "",
         "extras": {
           "placeHolder": "Enter details here...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -2187,15 +1857,8 @@
         "description": "This field requires the user to upload a recent, clear facial photograph that will remain private and accessible exclusively to advisors.",
         "extras": {
           "placeHolder": "Upload photo",
-          "range": [
-            0,
-            0
-          ],
-          "options": [
-            ".jpg",
-            ".jpeg",
-            ".png"
-          ]
+          "range": [0, 0],
+          "options": [".jpg", ".jpeg", ".png"]
         }
       },
       {
@@ -2206,16 +1869,8 @@
         "description": "Passport, National ID, or Driver's License",
         "extras": {
           "placeHolder": "Upload document",
-          "range": [
-            0,
-            0
-          ],
-          "options": [
-            ".pdf",
-            ".jpg",
-            ".jpeg",
-            ".png"
-          ]
+          "range": [0, 0],
+          "options": [".pdf", ".jpg", ".jpeg", ".png"]
         }
       },
       {
@@ -2224,10 +1879,7 @@
         "required": true,
         "extras": {
           "placeHolder": "I confirm",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "I confirm that my name, age, photo, and identity details match the uploaded documents."
           ]
@@ -2236,4 +1888,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/src/data/questions/fa.json b/src/data/questions/fa.json
index 52845a6..4029d0c 100644
--- a/src/data/questions/fa.json
+++ b/src/data/questions/fa.json
@@ -14,10 +14,7 @@
         "required": true,
         "extras": {
           "placeHolder": "سارا اسمیت",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": false
@@ -28,10 +25,7 @@
         "required": true,
         "extras": {
           "placeHolder": "YYYY-MM-DD",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -41,10 +35,7 @@
         "required": false,
         "extras": {
           "placeHolder": "",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -54,10 +45,7 @@
         "required": true,
         "extras": {
           "placeHolder": "شهر، منطقه یا محله",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "ایران",
             "ایالات متحده",
@@ -86,10 +74,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کشور",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "ایران",
             "ایالات متحده",
@@ -119,10 +104,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انگلستان",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -132,10 +114,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "فارسی",
             "انگلیسی",
@@ -158,10 +137,7 @@
         "required": false,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "فارسی",
             "انگلیسی",
@@ -195,10 +171,7 @@
         "required": true,
         "extras": {
           "placeHolder": "+44 7911 123456",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -209,10 +182,7 @@
         "required": true,
         "extras": {
           "placeHolder": "user@example.com",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -224,10 +194,7 @@
         "tooltip": "نیازی به آدرس دقیق نیست. فقط محدوده کلی محل زندگی کافی است؛ مثلاً نام شهر، منطقه، ناحیه یا نزدیکترین شهر بزرگ.",
         "extras": {
           "placeHolder": "شهر، منطقه یا محله",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "ایران",
             "ایالات متحده",
@@ -256,10 +223,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "شهروند / دارای تابعیت",
             "اقامت دائم",
@@ -278,10 +242,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "کاملاً منعطف هستم؛ جابجایی به شهر یا کشور دیگر برایم مشکلی ندارد.",
             "حاضرم به شهر دیگری نقل مکان کنم، اما فقط در کشور فعلی خودم حاضر به زندگی هستم.",
@@ -296,24 +257,17 @@
         "type": "text",
         "required": false,
         "requiredWhen": {
-          "genders": [
-            "female"
-          ],
+          "genders": ["female"],
           "maxAge": 26
         },
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "showGuardianNotice": true,
         "tooltip": "این فیلد نام و نام خانوادگی رابط مشخص‌شده را تعیین می‌کند که اطلاعات تماس او جهت تسهیل ارتباط در اختیار طرف مقابل قرار می‌گیرد.",
         "extras": {
           "placeHolder": "سارا اسمیت",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -323,22 +277,15 @@
         "type": "dropdown",
         "required": false,
         "requiredWhen": {
-          "genders": [
-            "female"
-          ],
+          "genders": ["female"],
           "maxAge": 26
         },
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "پدر",
             "مادر",
@@ -359,22 +306,15 @@
         "type": "phone",
         "required": false,
         "requiredWhen": {
-          "genders": [
-            "female"
-          ],
+          "genders": ["female"],
           "maxAge": 26
         },
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "+44 7911 123456",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -396,10 +336,7 @@
         "required": true,
         "extras": {
           "placeHolder": "۱۷۵",
-          "range": [
-            100,
-            230
-          ],
+          "range": [100, 230],
           "options": []
         },
         "private": true
@@ -410,10 +347,7 @@
         "required": true,
         "extras": {
           "placeHolder": "۷۰",
-          "range": [
-            40,
-            180
-          ],
+          "range": [40, 180],
           "options": []
         },
         "private": true
@@ -424,10 +358,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "سفید / روشن",
             "گندم‌گون / سبزه روشن",
@@ -443,10 +374,7 @@
         "private": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "در سلامت کامل هستم.",
             "بیماری خاص یا مزمن دارم.",
@@ -471,10 +399,7 @@
         "tooltip": "وضعیت بیماریهای مزمن، محدودیتهای جسمانی یا داروهای مصرفی خود را به دقت شرح داده و در صورت سلامت، عبارت «دارای سلامت کامل جسمانی» را در این کادر ثبت کنید.",
         "extras": {
           "placeHolder": "توضیحات را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -485,10 +410,7 @@
         "private": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مشکل خاصی ندارم.",
             "سابقه مشاوره داشته یا در حال حاضر تحت درمان هستم.",
@@ -503,18 +425,13 @@
         "logic": {
           "dependsOn": {
             "title": "وضعیت سلامت روان",
-            "values": [
-              "تحت دارو درمانی هستم."
-            ]
+            "values": ["تحت دارو درمانی هستم."]
           }
         },
         "tooltip": "این فیلد برای ثبت تمامی داروهای دائمی است که در حال حاضر به دلایل جسمی، روانی، پزشکی یا غیرپزشکی مصرف می‌کنید.",
         "extras": {
           "placeHolder": "انسولین و غیره",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -536,10 +453,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "زیر دیپلم",
             "دیپلم / High School",
@@ -560,10 +474,7 @@
         "required": false,
         "extras": {
           "placeHolder": "مهندسی کامپیوتر",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -573,10 +484,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "شاغل تمام‌وقت",
             "شاغل پاره‌وقت",
@@ -598,10 +506,7 @@
         "required": false,
         "extras": {
           "placeHolder": "مهندس نرم‌افزار",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -611,10 +516,7 @@
         "required": false,
         "extras": {
           "placeHolder": "لندن، دورکاری",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         }
       },
@@ -624,10 +526,7 @@
         "required": true,
         "extras": {
           "placeHolder": "۳۵۰۰ پوند، ۴۰۰۰ دلار",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -638,10 +537,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "درآمد پایدار و قابل اتکا دارم.",
             "درآمد دارم، اما متغیر است.",
@@ -658,16 +554,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "توانایی تأمین کامل هزینه‌های زندگی مشترک را دارم.",
             "توانایی تأمین بخش اصلی هزینه‌ها را دارم.",
@@ -684,16 +575,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مالک خانه شخصی هستم.",
             "مستأجر هستم و مستقل زندگی می‌کنم.",
@@ -711,16 +597,11 @@
         "type": "radio",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "خانه شخصی دارم و امکان زندگی مشترک در آن وجود دارد.",
             "امکان خرید خانه دارم.",
@@ -736,10 +617,7 @@
         "required": false,
         "extras": {
           "placeHolder": "توضیحات خود را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -762,10 +640,7 @@
         "required": true,
         "extras": {
           "placeHolder": "۲",
-          "range": [
-            0,
-            20
-          ],
+          "range": [0, 20],
           "options": []
         }
       },
@@ -775,10 +650,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "هر دو در قید حیات هستند.",
             "پدر فوت شده است.",
@@ -793,10 +665,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "با هم زندگی می‌کنند.",
             "از هم جدا شده‌اند / طلاق گرفته‌اند.",
@@ -811,10 +680,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب گزینه‌ها",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "خیر، مسئولیت مستمری ندارم.",
             "مسئولیت مراقبت از والدین (پدر، مادر یا هر دو) را بر عهده دارم.",
@@ -830,10 +696,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "بله، بهصورت دائم با من زندگی میکنند.",
             "بله، بهصورت موقت یا دورهای با من زندگی میکنند.",
@@ -859,10 +722,7 @@
         "required": true,
         "extras": {
           "placeHolder": "توضیحات خود را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -886,10 +746,7 @@
         "tooltip": "### راهنمای گزینه‌های فضای مذهبی خانواده\n\n* **مذهبی و کاملاً مقید:** خانواده‌ای که تقید بسیار بالایی به انجام تمام واجبات دارد، حدود شرعی (مانند محرم و نامحرم) را به شدت رعایت می‌کند و آداب و مناسک مذهبی در تمام شئون زندگی آن‌ها جریان دارد.\n* **مذهبی (مقید به واجبات):** خانواده‌ای که متعهد به واجبات اصلی مذهبی (مانند نماز و روزه) و اخلاق اسلامی است و در چارچوب‌های متعارف یک جامعه متدین زندگی می‌کند.\n* **سنتی (محترم به ارزش‌های دینی):** خانواده‌ای که به ارزش‌های اخلاقی پایبند است و به دین احترام می‌گذارد، اما ممکن است تمام احکام و واجبات مذهبی را به طور دقیق و کامل اجرا نکند.\n* **غیرمذهبی / عرفی:** خانواده‌ای که مناسک و چارچوب‌های مذهبی تاثیر تعیین‌کننده‌ای بر سبک زندگی، ارتباطات یا تصمیم‌گیری‌های روزمره‌شان ندارد، هرچند ممکن است احترامی کلی برای مذهب قائل باشند.",
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مذهبی و کاملاً مقید",
             "مذهبی (مقید به واجبات)",
@@ -904,16 +761,8 @@
         "required": false,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
-          "options": [
-            "ضعیف",
-            "متوسط",
-            "خوب",
-            "مرفه"
-          ]
+          "range": [0, 0],
+          "options": ["ضعیف", "متوسط", "خوب", "مرفه"]
         }
       },
       {
@@ -922,10 +771,7 @@
         "required": false,
         "extras": {
           "placeHolder": "توضیحات خود را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "tooltip": "هر نکته مهمی که در گزینه‌های بالا نبود، اینجا بنویسید."
@@ -947,10 +793,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مجرد؛ بدون هیچ‌گونه سابقه عقد یا ازدواج",
             "عقد ناموفق / فسخ نامزدی؛ بدون شروع زندگی مشترک",
@@ -977,10 +820,7 @@
         },
         "extras": {
           "placeHolder": "۳ سال",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1000,10 +840,7 @@
         },
         "extras": {
           "placeHolder": "توضیحات را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1014,10 +851,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "فرزندی ندارم.",
             "فرزند دارم و با من زندگی می‌کند.",
@@ -1034,18 +868,12 @@
         "logic": {
           "dependsOn": {
             "title": "وضعیت تأهل فعلی",
-            "values": [
-              "جدا شده؛ طلاق پس از زندگی مشترک",
-              "همسر فوت شده"
-            ]
+            "values": ["جدا شده؛ طلاق پس از زندگی مشترک", "همسر فوت شده"]
           }
         },
         "extras": {
           "placeHolder": "۲",
-          "range": [
-            0,
-            10
-          ],
+          "range": [0, 10],
           "options": []
         },
         "private": true
@@ -1056,10 +884,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "حضانت کامل فرزند یا فرزندان با من است.",
             "حضانت به صورت مشترک یا رفت‌وآمد دوره‌ای انجام می‌شود.",
@@ -1085,10 +910,7 @@
         "required": false,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "به‌صورت تمام‌وقت یا بیشتر روزهای هفته با من زندگی می‌کنند.",
             "تقریباً نیمی از زمان (به‌صورت مشترک) با من زندگی می‌کنند.",
@@ -1113,10 +935,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "خیر، تأثیر قابل‌توجهی بر محل زندگی یا مهاجرت ندارد.",
             "بله، جابه‌جایی یا مهاجرت نیازمند هماهنگی، رضایت والد دیگر یا مجوز قانونی است.",
@@ -1141,10 +960,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "تعهد مالی مستمر دارم (پرداخت منظم نفقه یا تقسیم هزینه‌ها).",
             "حمایت مالی مستمر دریافت می‌کنم (دریافت منظم نفقه).",
@@ -1169,10 +985,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "ارتباط ضروری، محترمانه و محدود به امور فرزند را میپذیرم.",
             "فقط ارتباط رسمی و محدود درباره امور ضروری فرزند را میپذیرم.",
@@ -1198,10 +1011,7 @@
         "required": false,
         "extras": {
           "placeHolder": "توضیحات را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1223,10 +1033,7 @@
         "required": true,
         "extras": {
           "placeHolder": "آیت‌الله سیستانی",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1237,10 +1044,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "همیشه مقید هستم، ترجیحاً اول وقت",
             "همیشه مقید هستم، اما نه لزوماً اول وقت",
@@ -1256,10 +1060,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "کاملاً مقید هستم",
             "به دلیل عذر شرعی یا پزشکی روزه نمی‌گیرم",
@@ -1275,10 +1076,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "پوشش کامل اسلامی (حداکثری) - چادر، عبا یا پوشش‌های مشابه با رعایت کامل حدود شرعی.",
             "حجاب کامل با لباس‌های پوشیده و آزاد - مانتوهای بلند و گشاد با پوشش کامل موی سر.",
@@ -1296,16 +1094,11 @@
         "type": "radio",
         "required": false,
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "اصلاً آرایش نمی‌کنم",
             "فقط آرایش بسیار ملایم",
@@ -1321,10 +1114,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "دین و سیاست از هم جدایی‌ناپذیرند و حتماً همسرم باید همین دیدگاه را داشته باشد.",
             "دین و سیاست از هم جدایی‌ناپذیرند، اما فعالیت سیاسی همسرم الزامی نیست.",
@@ -1343,10 +1133,7 @@
         "required": false,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "موافق و حامی نظام فعلی؛ مخالفت جدی همسرم خط قرمز است.",
             "موافق و حامی نظام فعلی، اما تفاوت دیدگاه همسرم خط قرمز نیست.",
@@ -1365,10 +1152,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "بسیار رسمی و محدود (فقط در حد ضرورت) - اجتناب از هرگونه گفتگوی غیرضروری یا شوخی.",
             "محترمانه و متعارف (بدون صمیمیت) - تعاملات مؤدبانه با حفظ مرزهای مشخص شخصی.",
@@ -1385,10 +1169,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "اصلاً مصرف نمی‌کنم",
             "گاهی / تفریحی مصرف می‌کنم",
@@ -1404,10 +1185,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "اصلاً مصرف نمی‌کنم",
             "گاهی / تفریحی مصرف می‌کنم",
@@ -1423,10 +1201,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "اصلاً مصرف نمی‌کنم",
             "گاهی / تفریحی مصرف می‌کنم",
@@ -1442,10 +1217,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "اصلاً مصرف نمی‌کنم",
             "مصرف الکل برای من خط قرمز جدی است",
@@ -1461,10 +1233,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "هرگز مصرف نکرده‌ام",
             "در گذشته مصرف داشته‌ام اما اکنون ترک کرده‌ام",
@@ -1480,10 +1249,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "اصلاً به هیچ موسیقی گوش نمی‌دهم",
             "فقط به تواشیح، موسیقی‌های مذهبی یا بدون ساز گوش می‌دهم",
@@ -1499,10 +1265,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "بدون مراسم یا بسیار ساده",
             "کاملاً مذهبی و تفکیک‌شده (زنانه و مردانه جدا)",
@@ -1520,10 +1283,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            1,
-            10
-          ],
+          "range": [1, 10],
           "options": [
             "آرام و درونگرا",
             "اجتماعی و برونگرا",
@@ -1552,10 +1312,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            1,
-            15
-          ],
+          "range": [1, 15],
           "options": [
             "تلاوت قرآن و مطالعه دینی",
             "حضور در مسجد و هیئت",
@@ -1585,10 +1342,7 @@
         "required": false,
         "extras": {
           "placeHolder": "توضیحات را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -1632,10 +1386,7 @@
         "description": "",
         "extras": {
           "placeHolder": "۲۵-۳۰",
-          "range": [
-            18,
-            80
-          ],
+          "range": [18, 80],
           "options": []
         },
         "private": true
@@ -1646,10 +1397,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "کمتر از ۱۶۰",
@@ -1668,10 +1416,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "لاغراندام",
@@ -1690,10 +1435,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "سفید / روشن",
@@ -1712,10 +1454,7 @@
         "description": "",
         "extras": {
           "placeHolder": "انگلیسی، فرانسوی و...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true
@@ -1726,10 +1465,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "حداقل دیپلم",
@@ -1749,10 +1485,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "شاغل باشد.",
@@ -1772,10 +1505,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "فقط مجرد؛ سابقه عقد یا ازدواج قبلی برایم خط قرمز است.",
             "مجرد ترجیح دارد، اما شرایط خاص را بررسی می‌کنم.",
@@ -1791,10 +1521,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "به هیچ وجه نمی‌پذیرم.",
             "در شرایط خاص می‌پذیرم.",
@@ -1818,16 +1545,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "male"
-          ]
+          "genders": ["male"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "پوشش کامل اسلامی مانند چادر، عبایا یا جلباب الزامی است.",
             "حجاب شرعی الزامی است، اما نوع آن مهم نیست.",
@@ -1844,16 +1566,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "پوشش رسمی، سنگین و مذهبی داشته باشد.",
             "ساده، مرتب و محجوب باشد.",
@@ -1871,10 +1588,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "حتماً قصد ادامه تحصیل داشته باشد.",
@@ -1891,16 +1605,11 @@
         "type": "dropdown",
         "required": true,
         "audience": {
-          "genders": [
-            "female"
-          ]
+          "genders": ["female"]
         },
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مهم نیست.",
             "حتماً شاغل باشد.",
@@ -1919,10 +1628,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "این معیارها برایم مهم نیست.",
             "والدین همسرم طلاق نگرفته باشند.",
@@ -1941,10 +1647,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "ارتباط نزدیک و پررنگ با خانواده‌ها را دوست دارم.",
             "ارتباط محترمانه اما با حفظ استقلال زندگی مشترک را ترجیح می‌دهم.",
@@ -1960,10 +1663,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "بسیار مذهبی و مقید",
             "مذهبی معتدل",
@@ -1979,10 +1679,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "حتماً همسو با دیدگاه من باشد.",
             "تفاوت دیدگاه سیاسی مهم نیست، به شرط احترام متقابل.",
@@ -1998,10 +1695,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "بسیار رسمی و محدود باشد.",
             "معمولی و محترمانه باشد.",
@@ -2016,10 +1710,7 @@
         "required": true,
         "extras": {
           "placeHolder": "انتخاب کنید",
-          "range": [
-            1,
-            10
-          ],
+          "range": [1, 10],
           "options": [
             "سیگار برایم خط قرمز است.",
             "قلیان برایم خط قرمز است.",
@@ -2039,10 +1730,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "نباید به موسیقی گوش بدهد.",
             "فقط موسیقی مذهبی / بدون ساز / نشید قابل قبول است.",
@@ -2058,10 +1746,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "مراسم ساده یا بدون مراسم را ترجیح دهد.",
             "فقط مراسم کاملاً شرعی و تفکیک‌شده قابل قبول است.",
@@ -2079,10 +1764,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "برایم خط قرمز است.",
             "در شرایط خاص و با توضیح کامل بررسی می‌کنم.",
@@ -2098,10 +1780,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "برایم مشکلی ندارد.",
             "بستگی به شرایط فعلی و میزان ثبات دارد.",
@@ -2117,10 +1796,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "کشور محل زندگی طرف مقابل برایم مهم نیست.",
             "ترجیح می‌دهم در کشور فعلی خودم بمانم.",
@@ -2139,10 +1815,7 @@
         "required": true,
         "extras": {
           "placeHolder": "یک گزینه را انتخاب کنید",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "فقط زندگی مستقل را می‌پذیرم.",
             "زندگی موقت با خانواده در ابتدای ازدواج قابل قبول است.",
@@ -2159,10 +1832,7 @@
         "description": "",
         "extras": {
           "placeHolder": "توضیحات تکمیلی را اینجا وارد کنید...",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": []
         },
         "private": true,
@@ -2187,15 +1857,8 @@
         "description": "این بخش از کاربر می‌خواهد یک عکس جدید و واضح از چهره خود بارگذاری کند که کاملاً خصوصی باقی مانده و منحصراً برای معرف‌ها قابل دسترسی خواهد بود.",
         "extras": {
           "placeHolder": "بارگذاری تصویر",
-          "range": [
-            0,
-            0
-          ],
-          "options": [
-            ".jpg",
-            ".jpeg",
-            ".png"
-          ]
+          "range": [0, 0],
+          "options": [".jpg", ".jpeg", ".png"]
         }
       },
       {
@@ -2206,16 +1869,8 @@
         "description": "پاسپورت، کارت ملی یا گواهینامه",
         "extras": {
           "placeHolder": "بارگذاری مدرک",
-          "range": [
-            0,
-            0
-          ],
-          "options": [
-            ".pdf",
-            ".jpg",
-            ".jpeg",
-            ".png"
-          ]
+          "range": [0, 0],
+          "options": [".pdf", ".jpg", ".jpeg", ".png"]
         }
       },
       {
@@ -2224,10 +1879,7 @@
         "required": true,
         "extras": {
           "placeHolder": "تأیید می‌کنم",
-          "range": [
-            0,
-            0
-          ],
+          "range": [0, 0],
           "options": [
             "تأیید می‌کنم که نام، سن، تصویر و اطلاعات هویتی من با مدارک بارگذاری‌شده مطابقت دارد."
           ]
@@ -2236,4 +1888,4 @@
       }
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/src/hooks/marriage/use-marriage-config.ts b/src/hooks/marriage/use-marriage-config.ts
index 7475e52..51d9ea1 100644
--- a/src/hooks/marriage/use-marriage-config.ts
+++ b/src/hooks/marriage/use-marriage-config.ts
@@ -6,6 +6,7 @@ import { http } from "@/lib/http";
 export type MarriageConfig = {
   intro_video_url: string;
   intro_video_thumbnail_url: string;
+  video_step_2_url?: string;
 };
 
 export async function getMarriageConfig() {
diff --git a/src/hooks/marriage/use-section-data.ts b/src/hooks/marriage/use-section-data.ts
index 08431f2..081c937 100644
--- a/src/hooks/marriage/use-section-data.ts
+++ b/src/hooks/marriage/use-section-data.ts
@@ -80,21 +80,31 @@ export async function updateMarriageSectionData(
   payload: UpdateMarriageSectionDataPayload,
 ) {
   if (slug === "family_marital_history") {
-    const mergedItemEn = getQuestionListItemBySlug("family_marital_history", "en");
-    const mergedItemFa = getQuestionListItemBySlug("family_marital_history", "fa");
-
-    const fbQuestionsEn = mergedItemEn?.questions.filter(
-      (q) => q.originalSlug === "family_background",
-    ) || [];
-    const mhQuestionsEn = mergedItemEn?.questions.filter(
-      (q) => q.originalSlug === "marital_history_children",
-    ) || [];
-    const fbQuestionsFa = mergedItemFa?.questions.filter(
-      (q) => q.originalSlug === "family_background",
-    ) || [];
-    const mhQuestionsFa = mergedItemFa?.questions.filter(
-      (q) => q.originalSlug === "marital_history_children",
-    ) || [];
+    const mergedItemEn = getQuestionListItemBySlug(
+      "family_marital_history",
+      "en",
+    );
+    const mergedItemFa = getQuestionListItemBySlug(
+      "family_marital_history",
+      "fa",
+    );
+
+    const fbQuestionsEn =
+      mergedItemEn?.questions.filter(
+        (q) => q.originalSlug === "family_background",
+      ) || [];
+    const mhQuestionsEn =
+      mergedItemEn?.questions.filter(
+        (q) => q.originalSlug === "marital_history_children",
+      ) || [];
+    const fbQuestionsFa =
+      mergedItemFa?.questions.filter(
+        (q) => q.originalSlug === "family_background",
+      ) || [];
+    const mhQuestionsFa =
+      mergedItemFa?.questions.filter(
+        (q) => q.originalSlug === "marital_history_children",
+      ) || [];
 
     const fbKeys = new Set([
       ...fbQuestionsEn.map((q, idx) =>
diff --git a/src/lib/auth-bridge.ts b/src/lib/auth-bridge.ts
index 36c548b..f4431df 100644
--- a/src/lib/auth-bridge.ts
+++ b/src/lib/auth-bridge.ts
@@ -217,18 +217,21 @@ class AuthBridge {
     const cookieToken =
       getClientCookie(TOKEN_COOKIE_NAME) ??
       getClientCookie("habib_token") ??
-      (typeof window !== "undefined" ? sessionStorage.getItem(TOKEN_COOKIE_NAME) : null);
+      (typeof window !== "undefined"
+        ? sessionStorage.getItem(TOKEN_COOKIE_NAME)
+        : null);
 
-    if (cookieToken === "NO_TOKEN") {
-      return null;
-    }
+    // Treat "NO_TOKEN" the same as having no cookie at all — fall through
+    // to the default token instead of returning null.
+    const effectiveCookie =
+      cookieToken && cookieToken !== "NO_TOKEN" ? cookieToken : null;
 
     if (this.token) {
       return this.token;
     }
 
-    if (cookieToken) {
-      return cookieToken;
+    if (effectiveCookie) {
+      return effectiveCookie;
     }
 
     return (
@@ -248,4 +251,3 @@ class AuthBridge {
 }
 
 export const authBridge = new AuthBridge();
-
diff --git a/src/lib/http.ts b/src/lib/http.ts
index 8a81213..ba4762f 100644
--- a/src/lib/http.ts
+++ b/src/lib/http.ts
@@ -87,22 +87,34 @@ http.interceptors.request.use((config) => {
   config.headers["Cache-Control"] = "no-cache, no-store, must-revalidate";
   config.headers["Pragma"] = "no-cache";
 
+  const stripNoToken = (v: string | null) =>
+    v && v !== "NO_TOKEN" ? v : null;
+
   const token =
     authBridge.getToken() ??
-    getClientCookie("HABIB_TOKEN") ??
-    getClientCookie("habib_token");
+    stripNoToken(getClientCookie("HABIB_TOKEN")) ??
+    stripNoToken(getClientCookie("habib_token"));
 
   if (token) {
     config.headers.Authorization = `Token ${token}`;
   }
 
-  let lang: string | undefined = (getClientCookie("HABIB_LANGUAGE") ?? getClientCookie("habib_language")) ?? undefined;
+  let lang: string | undefined =
+    getClientCookie("HABIB_LANGUAGE") ??
+    getClientCookie("habib_language") ??
+    undefined;
   if (!isLocale(lang)) {
-    const pathSegment = typeof window !== "undefined" ? window.location.pathname.split("/")[1] : undefined;
+    const pathSegment =
+      typeof window !== "undefined"
+        ? window.location.pathname.split("/")[1]
+        : undefined;
     if (isLocale(pathSegment)) {
       lang = pathSegment;
     } else {
-      const docLang = typeof document !== "undefined" ? document.documentElement.lang : undefined;
+      const docLang =
+        typeof document !== "undefined"
+          ? document.documentElement.lang
+          : undefined;
       lang = isLocale(docLang) ? docLang : "fa";
     }
   }
diff --git a/src/translations/locales/ar.json b/src/translations/locales/ar.json
index 23a2537..63e17d1 100644
--- a/src/translations/locales/ar.json
+++ b/src/translations/locales/ar.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/az.json b/src/translations/locales/az.json
index 3883f28..a439c94 100644
--- a/src/translations/locales/az.json
+++ b/src/translations/locales/az.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/bn.json b/src/translations/locales/bn.json
index 62761d2..fdc0e5c 100644
--- a/src/translations/locales/bn.json
+++ b/src/translations/locales/bn.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/da.json b/src/translations/locales/da.json
index 922efaf..9412cd9 100644
--- a/src/translations/locales/da.json
+++ b/src/translations/locales/da.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/de.json b/src/translations/locales/de.json
index d70fac9..8cc9a9b 100644
--- a/src/translations/locales/de.json
+++ b/src/translations/locales/de.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/en.json b/src/translations/locales/en.json
index 2a493db..e3607fa 100644
--- a/src/translations/locales/en.json
+++ b/src/translations/locales/en.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/es.json b/src/translations/locales/es.json
index e1aaf4e..35c37e4 100644
--- a/src/translations/locales/es.json
+++ b/src/translations/locales/es.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/fa.json b/src/translations/locales/fa.json
index 92973b9..1e7e743 100644
--- a/src/translations/locales/fa.json
+++ b/src/translations/locales/fa.json
@@ -226,4 +226,4 @@
     "back": "قبلی",
     "accept": "پذیرش"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/fr.json b/src/translations/locales/fr.json
index 197209c..55c8daf 100644
--- a/src/translations/locales/fr.json
+++ b/src/translations/locales/fr.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/gu.json b/src/translations/locales/gu.json
index ede3d6e..4dcd222 100644
--- a/src/translations/locales/gu.json
+++ b/src/translations/locales/gu.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/ha.json b/src/translations/locales/ha.json
index 5ef5eee..77dd9e3 100644
--- a/src/translations/locales/ha.json
+++ b/src/translations/locales/ha.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/he.json b/src/translations/locales/he.json
index 0e1dd7c..c5e76f2 100644
--- a/src/translations/locales/he.json
+++ b/src/translations/locales/he.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/hi.json b/src/translations/locales/hi.json
index 70595cc..68dec07 100644
--- a/src/translations/locales/hi.json
+++ b/src/translations/locales/hi.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/id.json b/src/translations/locales/id.json
index 72edbcf..9e405a9 100644
--- a/src/translations/locales/id.json
+++ b/src/translations/locales/id.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/ks.json b/src/translations/locales/ks.json
index 4c816fa..008cc0a 100644
--- a/src/translations/locales/ks.json
+++ b/src/translations/locales/ks.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/pt.json b/src/translations/locales/pt.json
index 741fa24..a172383 100644
--- a/src/translations/locales/pt.json
+++ b/src/translations/locales/pt.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/ru.json b/src/translations/locales/ru.json
index 99d1fe9..eee7926 100644
--- a/src/translations/locales/ru.json
+++ b/src/translations/locales/ru.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/sw.json b/src/translations/locales/sw.json
index 95e90a7..54eeb70 100644
--- a/src/translations/locales/sw.json
+++ b/src/translations/locales/sw.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/tg.json b/src/translations/locales/tg.json
index 3950328..70a1975 100644
--- a/src/translations/locales/tg.json
+++ b/src/translations/locales/tg.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/tr.json b/src/translations/locales/tr.json
index bd2675a..f7724ac 100644
--- a/src/translations/locales/tr.json
+++ b/src/translations/locales/tr.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/ul.json b/src/translations/locales/ul.json
index f0f4897..42fa232 100644
--- a/src/translations/locales/ul.json
+++ b/src/translations/locales/ul.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/ur.json b/src/translations/locales/ur.json
index a8b5747..dfdd09f 100644
--- a/src/translations/locales/ur.json
+++ b/src/translations/locales/ur.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/uz.json b/src/translations/locales/uz.json
index e51b50e..1d27413 100644
--- a/src/translations/locales/uz.json
+++ b/src/translations/locales/uz.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translations/locales/zh.json b/src/translations/locales/zh.json
index 0c41c14..8c98322 100644
--- a/src/translations/locales/zh.json
+++ b/src/translations/locales/zh.json
@@ -226,4 +226,4 @@
     "back": "Back",
     "accept": "Accept"
   }
-}
\ No newline at end of file
+}