From c14d577aa079146eacad60a7e6247a8d0c960b84 Mon Sep 17 00:00:00 2001
From: sina_sajjadi <alisina.a.a50182@gmail.com>
Date: Sat, 16 May 2026 11:06:10 +0330
Subject: [PATCH] feat: add QuestionCheckbox component for handling multiple
 choice questions with "Doesn't matter" option

---
 src/app/layout.tsx                            |   5 +-
 .../[slug]/question-detail-client.tsx         | 187 +++-
 src/components/questions/question-button.tsx  |   8 +-
 .../questions/question-checkbox.tsx           |  96 ++
 src/components/questions/question-date.tsx    |  29 +-
 .../questions/question-dropdown.tsx           |  24 +-
 src/components/questions/question-file.tsx    |  29 +-
 src/components/questions/question-number.tsx  |  92 +-
 src/components/questions/question-phone.tsx   |  22 +-
 src/components/questions/question-photo.tsx   |  26 +-
 .../questions/question-progress-tracker.tsx   |  18 +-
 src/components/questions/question-radio.tsx   |  54 +-
 src/components/questions/question-slider.tsx  |  23 +-
 .../questions/question-snap-list.tsx          |   7 +-
 src/components/questions/question-text.tsx    |  42 +-
 src/components/questions/question-title.tsx   |   4 +-
 src/data/question-data.ts                     |   8 +
 src/hooks/marriage/types.ts                   |   2 +
 src/i18n/dictionaries.ts                      |   8 +-
 src/i18n/locales/en/questions.json            | 995 +++++++++++++++---
 src/i18n/locales/fa/questions.json            | 993 ++++++++++++++---
 21 files changed, 2206 insertions(+), 466 deletions(-)
 create mode 100644 src/components/questions/question-checkbox.tsx
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 4ef905c..c2cf5ec 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 import { Amiri } from "next/font/google";
 import localFont from "next/font/local";
+import Script from "next/script";
 import DevClickToComponent from "@/components/dev/dev-click-to-component";
 import Providers from "./providers";
 import "./globals.css";
@@ -31,7 +32,9 @@ export default function RootLayout({
   return (
     <html lang="en">
       <head>
-        <script
+        <Script
+          id="flutter-response-init"
+          strategy="beforeInteractive"
           dangerouslySetInnerHTML={{
             __html: `
               if (typeof window !== 'undefined') {
diff --git a/src/app/questions-list/[slug]/question-detail-client.tsx b/src/app/questions-list/[slug]/question-detail-client.tsx
index a908ad3..dae47bd 100644
--- a/src/app/questions-list/[slug]/question-detail-client.tsx
+++ b/src/app/questions-list/[slug]/question-detail-client.tsx
@@ -2,8 +2,12 @@
 
 import { useRouter } from "next/navigation";
 import { useEffect, useMemo } from "react";
-import { QuestionAnswersProvider } from "@/components/questions/question-answer-storage";
+import {
+  QuestionAnswersProvider,
+  useQuestionAnswers,
+} from "@/components/questions/question-answer-storage";
 import QuestionButton from "@/components/questions/question-button";
+import { QuestionCheckbox } from "@/components/questions/question-checkbox";
 import QuestionDate from "@/components/questions/question-date";
 import QuestionDropdown from "@/components/questions/question-dropdown";
 import QuestionExitNavigationButton from "@/components/questions/question-exit-navigation-button";
@@ -127,6 +131,7 @@ function getStoredAge() {
 function renderQuestion(
   question: QuestionField,
   questionIndex: number,
+  disabled?: boolean,
   dobQuestion?: QuestionField,
   dobQuestionIndex?: number,
 ) {
@@ -136,8 +141,25 @@ function renderQuestion(
       question.title.toLowerCase().includes("email") ||
       question.title.toLowerCase().includes("city") ||
       question.title.toLowerCase().includes("residence") ||
-      question.title.toLowerCase().includes("location")) &&
-    !question.title.toLowerCase().includes("describe") &&
+      question.title.toLowerCase().includes("location") ||
+      question.title.toLowerCase().includes("description") ||
+      question.title.toLowerCase().includes("short") ||
+      question.title.toLowerCase().includes("duration") ||
+      question.title.toLowerCase().includes("reason") ||
+       question.title.toLowerCase().includes("lifestyle") ||
+      question.title.toLowerCase().includes("marja") ||
+      question.title.toLowerCase().includes("range") ||
+      question.title.toLowerCase().includes("ethnicity") ||
+      question.title.toLowerCase().includes("nationality") ||
+      question.title.toLowerCase().includes("مدت") ||
+      question.title.toLowerCase().includes("علت") ||
+      question.title.toLowerCase().includes("بازه") ||
+      question.title.toLowerCase().includes("قومیت") ||
+      question.title.toLowerCase().includes("ملیت") ||
+      question.title.toLowerCase().includes("کوتاه") ||
+      question.title.toLowerCase().includes("سبک زندگی") ||
+      question.title.toLowerCase().includes("مرجع")) &&
+    !question.title.toLowerCase().includes("detailed") &&
     !question.title.toLowerCase().includes("biography")
       ? "h-[54px] min-h-0 py-2"
       : undefined;
@@ -145,16 +167,44 @@ function renderQuestion(
   switch (question.type) {
     case "button":
       return (
-        <QuestionButton question={question} questionIndex={questionIndex} />
+        <QuestionButton
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
+      );
+    case "checkbox":
+      return (
+        <QuestionCheckbox
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "date":
-      return <QuestionDate question={question} questionIndex={questionIndex} />;
+      return (
+        <QuestionDate
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
+      );
     case "dropdown":
       return (
-        <QuestionDropdown question={question} questionIndex={questionIndex} />
+        <QuestionDropdown
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "file":
-      return <QuestionFile question={question} questionIndex={questionIndex} />;
+      return (
+        <QuestionFile
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
+      );
     case "number":
       if (
         question.title === "Age" &&
@@ -167,28 +217,49 @@ function renderQuestion(
             questionIndex={questionIndex}
             derivedFromQuestion={dobQuestion}
             derivedFromQuestionIndex={dobQuestionIndex}
+            disabled={disabled}
           />
         );
       }
 
       return (
-        <QuestionNumber question={question} questionIndex={questionIndex} />
+        <QuestionNumber
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "phone":
       return (
-        <QuestionPhone question={question} questionIndex={questionIndex} />
+        <QuestionPhone
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "photo":
       return (
-        <QuestionPhoto question={question} questionIndex={questionIndex} />
+        <QuestionPhoto
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "radio":
       return (
-        <QuestionRadio question={question} questionIndex={questionIndex} />
+        <QuestionRadio
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "slider":
       return (
-        <QuestionSlider question={question} questionIndex={questionIndex} />
+        <QuestionSlider
+          question={question}
+          questionIndex={questionIndex}
+          disabled={disabled}
+        />
       );
     case "text":
       return (
@@ -196,6 +267,7 @@ function renderQuestion(
           question={question}
           questionIndex={questionIndex}
           heightClassName={compactTextHeight}
+          disabled={disabled}
         />
       );
     default:
@@ -203,6 +275,70 @@ function renderQuestion(
   }
 }
 
+function QuestionFlowWrapper({
+  visibleQuestions,
+  itemSlug,
+  dobQuestion,
+  dobQuestionIndex,
+  requiredQuestionsCount,
+  continueLabel,
+  questionsListHref,
+}: {
+  visibleQuestions: QuestionField[];
+  itemSlug: string;
+  dobQuestion?: QuestionField;
+  dobQuestionIndex?: number;
+  requiredQuestionsCount: number;
+  continueLabel: string;
+  questionsListHref: string;
+}) {
+  const { getAnswerValue } = useQuestionAnswers();
+
+  return (
+    <QuestionSectionFlow
+      key={itemSlug}
+      total={requiredQuestionsCount}
+      continueLabel={continueLabel}
+      exitHref={questionsListHref}
+    >
+      {visibleQuestions.map((question, questionIndex) => {
+        let isDisabled = false;
+
+        if (question.logic?.dependsOn) {
+          const { title, values } = question.logic.dependsOn;
+          const dependentQuestionIndex = visibleQuestions.findIndex(
+            (q) => q.title === title,
+          );
+
+          if (dependentQuestionIndex !== -1) {
+            const answer = getAnswerValue(
+              visibleQuestions[dependentQuestionIndex],
+              dependentQuestionIndex,
+            );
+            isDisabled = !values.includes(String(answer));
+          }
+        }
+
+        return (
+          <div
+            key={`${itemSlug}-${question.title}`}
+            data-question-required={String(question.required)}
+            data-question-disabled={String(isDisabled)}
+          >
+            {renderQuestion(
+              question,
+              questionIndex,
+              isDisabled,
+              dobQuestion,
+              dobQuestionIndex,
+            )}
+          </div>
+        );
+      })}
+    </QuestionSectionFlow>
+  );
+}
+
 export default function QuestionDetailClient({
   closeLabel,
   continueLabel,
@@ -298,26 +434,15 @@ export default function QuestionDetailClient({
           </StickyHeader>
 
           <div className="mx-auto flex w-full max-w-md flex-col px-[17px] pt-7">
-            <QuestionSectionFlow
-              key={item.slug}
-              total={requiredQuestionsCount}
+            <QuestionFlowWrapper
+              visibleQuestions={visibleQuestions}
+              itemSlug={item.slug}
+              dobQuestion={dobQuestion}
+              dobQuestionIndex={dobQuestionIndex}
+              requiredQuestionsCount={requiredQuestionsCount}
               continueLabel={continueLabel}
-              exitHref={questionsListHref}
-            >
-              {visibleQuestions.map((question, questionIndex) => (
-                <div
-                  key={`${item.slug}-${question.title}`}
-                  data-question-required={String(question.required)}
-                >
-                  {renderQuestion(
-                    question,
-                    questionIndex,
-                    dobQuestion,
-                    dobQuestionIndex,
-                  )}
-                </div>
-              ))}
-            </QuestionSectionFlow>
+              questionsListHref={questionsListHref}
+            />
           </div>
         </main>
       </QuestionAnswersProvider>
diff --git a/src/components/questions/question-button.tsx b/src/components/questions/question-button.tsx
index cfa0582..7698734 100644
--- a/src/components/questions/question-button.tsx
+++ b/src/components/questions/question-button.tsx
@@ -8,11 +8,13 @@ import QuestionTitle from "./question-title";
 type QuestionButtonProps = {
   question: QuestionField;
   questionIndex: number;
+  disabled?: boolean;
 };
 
 export function QuestionButton({
   question,
   questionIndex,
+  disabled,
 }: QuestionButtonProps) {
   const { setValue, value } = useQuestionAnswer(question, questionIndex);
   const isAnswered = value === true;
@@ -21,7 +23,10 @@ export function QuestionButton({
     <div
       data-question-answered={isAnswered ? "true" : undefined}
       data-question-type={question.type}
-      className="space-y-3"
+      className={[
+        "space-y-3 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
     >
       <div className="flex items-center gap-2">
         <QuestionTitle question={question} />
@@ -35,6 +40,7 @@ export function QuestionButton({
       </div>
       <button
         type="button"
+        disabled={disabled}
         onClick={() => setValue(true)}
         className="min-h-[50px] rounded-[15px] bg-[#181818] px-5 py-3 text-[15px] font-semibold text-white"
       >
diff --git a/src/components/questions/question-checkbox.tsx b/src/components/questions/question-checkbox.tsx
new file mode 100644
index 0000000..6078216
--- /dev/null
+++ b/src/components/questions/question-checkbox.tsx
@@ -0,0 +1,96 @@
+"use client";
+
+import { useId } from "react";
+import type { QuestionField } from "@/data/question-data";
+import { useQuestionAnswers } from "./question-answer-storage";
+import QuestionTitle from "./question-title";
+
+type QuestionCheckboxProps = {
+  question: QuestionField;
+  questionIndex: number;
+  disabled?: boolean;
+};
+
+export function QuestionCheckbox({
+  question,
+  questionIndex,
+  disabled,
+}: QuestionCheckboxProps) {
+  const groupId = useId();
+  const options = question.extras.options;
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const rawValue = getAnswerValue(question, questionIndex);
+  
+  // Ensure value is an array
+  const value = Array.isArray(rawValue) ? rawValue : (rawValue ? [String(rawValue)] : []);
+
+  if (options.length === 0) {
+    return null;
+  }
+
+  const toggleOption = (option: string) => {
+    let nextValue: string[];
+    if (value.includes(option)) {
+      nextValue = value.filter((v) => v !== option);
+    } else {
+      nextValue = [...value, option];
+    }
+    
+    // Handle "Doesn't matter" (مهم نیست) logic if it exists
+    const doesnMatterOption = options.find(o => o.includes("مهم نیست") || o.includes("Doesn't matter"));
+    if (doesnMatterOption) {
+      if (option === doesnMatterOption) {
+        // If "Doesn't matter" is selected, clear everything else
+        nextValue = [doesnMatterOption];
+      } else if (nextValue.includes(doesnMatterOption)) {
+        // If something else is selected, remove "Doesn't matter"
+        nextValue = nextValue.filter(v => v !== doesnMatterOption);
+      }
+    }
+
+    setAnswerValue(question, questionIndex, nextValue.length > 0 ? nextValue : null);
+  };
+
+  return (
+    <div
+      className={[
+        "flex w-full flex-col gap-3 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
+      <QuestionTitle question={question} />
+      <div className="flex flex-col gap-3">
+        {options.map((option) => {
+          const optionId = `checkbox-${questionIndex}-${option}`;
+          const isSelected = value.includes(option);
+
+          return (
+            <label
+              key={option}
+              htmlFor={optionId}
+              className={[
+                "w-full cursor-pointer rounded-[12px] px-4 py-3.5",
+                "text-start text-[13px] leading-tight font-semibold transition-all duration-200",
+                isSelected
+                  ? "bg-[#F0445B] text-white shadow-[0_8px_20px_rgba(240,68,91,0.25)]"
+                  : "bg-[#F5F5F5] text-[#181818] hover:bg-[#EBEBEB]",
+              ].join(" ")}
+            >
+              <input
+                type="checkbox"
+                id={optionId}
+                checked={isSelected}
+                disabled={disabled}
+                onChange={() => toggleOption(option)}
+                className="sr-only"
+              />
+              {option}
+            </label>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
+
+export default QuestionCheckbox;
diff --git a/src/components/questions/question-date.tsx b/src/components/questions/question-date.tsx
index 376f612..9657682 100644
--- a/src/components/questions/question-date.tsx
+++ b/src/components/questions/question-date.tsx
@@ -1,33 +1,40 @@
 "use client";
 
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionDateProps = {
   question: QuestionField;
   questionIndex: number;
+  disabled?: boolean;
 };
 
-export function QuestionDate({ question, questionIndex }: QuestionDateProps) {
-  const { setValue, value } = useQuestionAnswer(question, questionIndex);
+export function QuestionDate({
+  question,
+  questionIndex,
+  disabled,
+}: QuestionDateProps) {
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const value = getAnswerValue(question, questionIndex);
   const dateValue = typeof value === "string" ? value : "";
 
   return (
-    <label data-question-type={question.type} className="block space-y-3">
+    <div
+      className={[
+        "flex w-full flex-col gap-2 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
       <QuestionTitle question={question} />
       <input
         type="date"
-        required={question.required}
         value={dateValue}
-        onChange={(event) => {
-          const nextValue = event.target.value;
-
-          setValue(nextValue.length > 0 ? nextValue : null);
-        }}
+        onChange={(event) => setAnswerValue(question, questionIndex, event.target.value)}
+        disabled={disabled}
         className="h-[54px] w-full rounded-[15px] border border-[#E7D8D5] bg-white px-4 text-[15px] text-[#181818] outline-none focus:border-[#6F6F6F]"
       />
-    </label>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-dropdown.tsx b/src/components/questions/question-dropdown.tsx
index 442a861..3211ad4 100644
--- a/src/components/questions/question-dropdown.tsx
+++ b/src/components/questions/question-dropdown.tsx
@@ -1,32 +1,36 @@
 "use client";
 
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionDropdownProps = {
   question: QuestionField;
   questionIndex: number;
+  disabled?: boolean;
 };
 
 export function QuestionDropdown({
   question,
   questionIndex,
+  disabled,
 }: QuestionDropdownProps) {
-  const { setValue, value } = useQuestionAnswer(question, questionIndex);
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const value = getAnswerValue(question, questionIndex);
   const selectValue = typeof value === "string" ? value : "";
 
   return (
-    <label data-question-type={question.type} className="block space-y-3">
+    <div
+      className={[
+        "flex w-full flex-col gap-2 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
       <QuestionTitle question={question} />
       <select
-        required={question.required}
         value={selectValue}
-        onChange={(event) => {
-          const nextValue = event.target.value;
-
-          setValue(nextValue.length > 0 ? nextValue : null);
-        }}
+        onChange={(event) => setAnswerValue(question, questionIndex, event.target.value)}
+        disabled={disabled}
         className="h-[54px] w-full rounded-[15px] border border-[#E7D8D5] bg-white px-4 text-[15px] text-[#181818] outline-none focus:border-[#6F6F6F]"
       >
         <option value="" disabled>
@@ -38,7 +42,7 @@ export function QuestionDropdown({
           </option>
         ))}
       </select>
-    </label>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-file.tsx b/src/components/questions/question-file.tsx
index 3966f62..d5e04c6 100644
--- a/src/components/questions/question-file.tsx
+++ b/src/components/questions/question-file.tsx
@@ -4,26 +4,31 @@ import Image from "next/image";
 import { useState } from "react";
 import type { QuestionField } from "@/data/question-data";
 import { useUploadTmpMediaMutation } from "@/hooks/marriage/use-upload-tmp-media";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionFileProps = {
   question: QuestionField;
   questionIndex: number;
+  disabled?: boolean;
 };
 
-export function QuestionFile({ question, questionIndex }: QuestionFileProps) {
+export function QuestionFile({
+  question,
+  questionIndex,
+  disabled,
+}: QuestionFileProps) {
   const [selectedFileName, setSelectedFileName] = useState<string | null>(null);
   const acceptedFiles = question.extras.options
     .map((option) => option.replace(/^\./, ""))
     .join(", ");
-  const { setValue } = useQuestionAnswer(question, questionIndex);
+  const { setAnswerValue } = useQuestionAnswers();
   const uploadTmpMediaMutation = useUploadTmpMediaMutation({
     onSuccess: (response) => {
-      setValue(response.path);
+      setAnswerValue(question, questionIndex, response.path);
     },
     onError: () => {
-      setValue(null);
+      setAnswerValue(question, questionIndex, null);
     },
   });
 
@@ -32,7 +37,7 @@ export function QuestionFile({ question, questionIndex }: QuestionFileProps) {
 
     if (!file) {
       setSelectedFileName(null);
-      setValue(null);
+      setAnswerValue(question, questionIndex, null);
       return;
     }
 
@@ -41,14 +46,18 @@ export function QuestionFile({ question, questionIndex }: QuestionFileProps) {
   }
 
   return (
-    <label data-question-type={question.type} className="block space-y-3">
+    <div
+      className={[
+        "flex w-full flex-col gap-2 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
       <QuestionTitle question={question} />
       <span className="relative flex aspect-[727/330] min-h-[156px] w-full cursor-pointer flex-col items-center justify-center rounded-[29px] border-2 border-dashed border-[#8D8D8D] bg-[#F7F7F7] text-center transition-colors duration-200 focus-within:outline-2 focus-within:outline-offset-4 focus-within:outline-[#6F6F6F] hover:border-[#777777]">
         <input
           type="file"
-          required={question.required}
           accept={question.extras.options.join(",")}
-          disabled={uploadTmpMediaMutation.isPending}
+          disabled={disabled || uploadTmpMediaMutation.isPending}
           onChange={(event) => handleFileChange(event.target.files)}
           className="absolute inset-0 z-10 h-full w-full cursor-pointer opacity-0"
         />
@@ -73,7 +82,7 @@ export function QuestionFile({ question, questionIndex }: QuestionFileProps) {
           </span>
         ) : null}
       </span>
-    </label>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-number.tsx b/src/components/questions/question-number.tsx
index 3cbc0e4..8b19b24 100644
--- a/src/components/questions/question-number.tsx
+++ b/src/components/questions/question-number.tsx
@@ -1,76 +1,80 @@
 "use client";
 
-import { useI18n } from "@/i18n/provider";
+import { useMemo, useEffect } from "react";
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
+import { useI18n } from "@/i18n/provider";
 
 type QuestionNumberProps = {
   question: QuestionField;
   questionIndex: number;
   disabled?: boolean;
-  valueOverride?: string;
   derivedFromQuestion?: QuestionField;
   derivedFromQuestionIndex?: number;
 };
 
-export function QuestionNumber({
+export default function QuestionNumber({
   question,
   questionIndex,
-  disabled = false,
-  valueOverride,
+  disabled,
   derivedFromQuestion,
   derivedFromQuestionIndex,
 }: QuestionNumberProps) {
-  const { dictionary } = useI18n();
+  const { dictionary: t } = useI18n();
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const value = getAnswerValue(question, questionIndex);
+  
+  const derivedValue =
+    derivedFromQuestion && derivedFromQuestionIndex !== undefined
+      ? getAnswerValue(derivedFromQuestion, derivedFromQuestionIndex)
+      : null;
+
+  useEffect(() => {
+    if (derivedFromQuestion && typeof derivedValue === "string") {
+      const age = calculateAge(derivedValue);
+      if (age !== String(value)) {
+        setAnswerValue(question, questionIndex, age);
+      }
+    }
+  }, [derivedFromQuestion, derivedValue, question, questionIndex, setAnswerValue, value]);
+
   const [min, max] = question.extras.range;
-  const { setValue, value } = useQuestionAnswer(question, questionIndex);
-  const derivedAnswer = useQuestionAnswer(
-    derivedFromQuestion ?? question,
-    derivedFromQuestionIndex ?? questionIndex,
-  ).value;
-  const derivedDateValue =
-    question.title === "Age" && typeof derivedAnswer === "string"
-      ? calculateAge(derivedAnswer)
-      : undefined;
-  const inputValue =
-    valueOverride ??
-    derivedDateValue ??
-    (typeof value === "number" || typeof value === "string"
-      ? String(value)
-      : "");
+  
+  const numValue = typeof value === "number" ? value : (typeof value === "string" ? parseFloat(value) : NaN);
+  const isOutOfRange = useMemo(() => {
+    if (Number.isNaN(numValue)) return false;
+    if (min !== 0 && numValue < min) return true;
+    if (max !== 0 && numValue > max) return true;
+    return false;
+  }, [numValue, min, max]);
 
-  const numericValue = Number.parseFloat(inputValue);
-  const isOutOfRange =
-    !Number.isNaN(numericValue) &&
-    ((min > 0 && numericValue < min) || (max > 0 && numericValue > max));
+  const inputValue = value === null ? "" : String(value);
 
   return (
-    <label data-question-type={question.type} className="block space-y-3">
+    <div
+      className={[
+        "flex w-full flex-col gap-2 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
       <QuestionTitle question={question} />
       <input
         type="number"
-        required={question.required}
-        disabled={disabled || question.title === "Age"}
+        required={question.required && !disabled}
+        disabled={disabled || Boolean(derivedFromQuestion)}
         min={min || undefined}
         max={max || undefined}
         placeholder={question.extras.placeHolder}
         value={inputValue}
         onChange={(event) => {
-          if (disabled) {
-            return;
-          }
-
           const nextValue = event.target.value;
-
-          if (nextValue.length === 0) {
-            setValue(null);
-            return;
+          if (nextValue === "") {
+            setAnswerValue(question, questionIndex, null);
+          } else {
+            const parsed = parseFloat(nextValue);
+            setAnswerValue(question, questionIndex, Number.isNaN(parsed) ? nextValue : parsed);
           }
-
-          const parsedValue = event.target.valueAsNumber;
-
-          setValue(Number.isNaN(parsedValue) ? nextValue : parsedValue);
         }}
         className={[
           "h-[54px] w-full rounded-[15px] border px-4 text-[15px] text-[#181818] outline-none placeholder:text-[#9D8F8C] focus:border-[#6F6F6F] disabled:bg-[#F5F2F1] disabled:text-[#7C7472]",
@@ -79,10 +83,10 @@ export function QuestionNumber({
       />
       {isOutOfRange ? (
         <span className="block text-[10px] font-semibold text-[#F2465F]">
-          {dictionary.common.rangeError}
+          {t.common.rangeError || `Please enter a value between ${min} and ${max}`}
         </span>
       ) : null}
-    </label>
+    </div>
   );
 }
 
@@ -106,5 +110,3 @@ function calculateAge(dateOfBirth: string) {
 
   return String(Math.max(age, 0));
 }
-
-export default QuestionNumber;
diff --git a/src/components/questions/question-phone.tsx b/src/components/questions/question-phone.tsx
index d904f60..ce224e8 100644
--- a/src/components/questions/question-phone.tsx
+++ b/src/components/questions/question-phone.tsx
@@ -4,13 +4,14 @@ import { useEffect, useRef, useState } from "react";
 import { PhoneNumberFormat, PhoneNumberUtil } from "google-libphonenumber";
 import type { QuestionField } from "@/data/question-data";
 import type { MarriagePhoneFieldValue } from "@/hooks/marriage/types";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionPhoneProps = {
   question: QuestionField;
   questionIndex: number;
   countryCode?: string;
+  disabled?: boolean;
 };
 
 type PhoneValueParts = {
@@ -192,8 +193,10 @@ export function QuestionPhone({
   question,
   questionIndex,
   countryCode = "+98",
+  disabled,
 }: QuestionPhoneProps) {
-  const { setValue, value } = useQuestionAnswer(question, questionIndex);
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const value = getAnswerValue(question, questionIndex);
   const defaultCodeValue = countryCode.trim() || "+98";
   const initialValue = readPhoneValue(value, defaultCodeValue);
   const [codeValue, setCodeValue] = useState(initialValue.codeValue);
@@ -235,14 +238,17 @@ export function QuestionPhone({
           : null;
 
     lastCommittedValueRef.current = nextValue;
-    setValue(nextValue);
+    setAnswerValue(question, questionIndex, nextValue);
   };
 
   return (
-    <label
+    <div
       data-question-answered={isAnswered ? "true" : "false"}
       data-question-type={question.type}
-      className="block space-y-3"
+      className={[
+        "flex w-full flex-col gap-2 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
     >
       <QuestionTitle question={question} />
       <div
@@ -258,7 +264,7 @@ export function QuestionPhone({
             inputMode="tel"
             aria-label="Country code"
             maxLength={4}
-            required={question.required}
+            disabled={disabled}
             placeholder={defaultCodeValue}
             value={codeValue}
             onChange={(event) => {
@@ -275,7 +281,7 @@ export function QuestionPhone({
           <input
             type="tel"
             inputMode="tel"
-            required={question.required}
+            disabled={disabled}
             placeholder={question.extras.placeHolder?.replace(/^\+\d+\s*/, "")}
             value={phoneValue}
             onChange={(event) => {
@@ -294,7 +300,7 @@ export function QuestionPhone({
           Enter a valid phone number with country code.
         </span>
       ) : null}
-    </label>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-photo.tsx b/src/components/questions/question-photo.tsx
index 5e6c8c1..c7374e6 100644
--- a/src/components/questions/question-photo.tsx
+++ b/src/components/questions/question-photo.tsx
@@ -3,12 +3,13 @@
 import Image from "next/image";
 import type { ReactNode } from "react";
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 
 type QuestionPhotoProps = {
   question: QuestionField;
   questionIndex: number;
   description?: ReactNode;
+  disabled?: boolean;
 };
 
 function getFileInputValue(files: FileList | null) {
@@ -21,23 +22,31 @@ export function QuestionPhoto({
   question,
   questionIndex,
   description,
+  disabled,
 }: QuestionPhotoProps) {
   const acceptedFiles = question.extras.options.join(",");
   const descriptionContent = description ?? question.description;
-  const { setValue } = useQuestionAnswer(question, questionIndex);
+  const { setAnswerValue } = useQuestionAnswers();
 
   return (
-    <label
-      data-question-type={question.type}
-      className="block cursor-pointer text-center"
+    <div
+      className={[
+        "flex w-full flex-col items-center text-center transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
     >
       <input
         type="file"
-        required={question.required}
         accept={acceptedFiles}
-        onChange={(event) => setValue(getFileInputValue(event.target.files))}
+        onChange={(event) => setAnswerValue(question, questionIndex, getFileInputValue(event.target.files))}
+        disabled={disabled}
         className="sr-only"
+        id={`photo-input-${questionIndex}`}
       />
+      <label
+        htmlFor={`photo-input-${questionIndex}`}
+        className="flex w-full cursor-pointer flex-col items-center"
+      >
       <span className="flex w-full flex-col items-center">
         <Image
           src="/assets/images/Frame 2095586679.svg"
@@ -59,7 +68,8 @@ export function QuestionPhoto({
           </span>
         ) : null}
       </span>
-    </label>
+      </label>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-progress-tracker.tsx b/src/components/questions/question-progress-tracker.tsx
index 3c27a4b..b867f61 100644
--- a/src/components/questions/question-progress-tracker.tsx
+++ b/src/components/questions/question-progress-tracker.tsx
@@ -47,10 +47,11 @@ function isQuestionAnswered(question: Element) {
 
 export function QuestionProgressTracker({
   children,
-  total,
+  total: initialTotal,
 }: QuestionProgressTrackerProps) {
   const containerRef = useRef<HTMLDivElement>(null);
   const [answered, setAnswered] = useState(0);
+  const [total, setTotal] = useState(initialTotal);
   const safeTotal = Math.max(total, 0);
   const progress = safeTotal > 0 ? (answered / safeTotal) * 100 : 0;
 
@@ -61,13 +62,16 @@ export function QuestionProgressTracker({
       return;
     }
 
-    const questions = Array.from(
-      container.querySelectorAll("[data-question-type]"),
-    ).filter((el) => el.getAttribute("data-question-required") === "true");
-    const nextAnswered = questions.filter(isQuestionAnswered).length;
+    const requiredQuestions = Array.from(
+      container.querySelectorAll("[data-question-required='true']"),
+    ).filter((el) => el.getAttribute("data-question-disabled") !== "true");
 
-    setAnswered(Math.min(nextAnswered, safeTotal));
-  }, [safeTotal]);
+    const nextTotal = requiredQuestions.length;
+    const nextAnswered = requiredQuestions.filter(isQuestionAnswered).length;
+
+    setTotal(nextTotal);
+    setAnswered(nextAnswered);
+  }, []);
 
   useEffect(() => {
     const container = containerRef.current;
diff --git a/src/components/questions/question-radio.tsx b/src/components/questions/question-radio.tsx
index 87a904e..c83f60e 100644
--- a/src/components/questions/question-radio.tsx
+++ b/src/components/questions/question-radio.tsx
@@ -3,62 +3,70 @@
 import { useId } from "react";
 
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionRadioProps = {
   question: QuestionField;
   questionIndex: number;
+  disabled?: boolean;
 };
 
-export function QuestionRadio({ question, questionIndex }: QuestionRadioProps) {
+export function QuestionRadio({
+  question,
+  questionIndex,
+  disabled,
+}: QuestionRadioProps) {
   const groupId = useId();
   const options = question.extras.options;
-  const { setValue, value } = useQuestionAnswer(question, questionIndex);
-  const selectedOption = typeof value === "string" ? value : undefined;
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const value = getAnswerValue(question, questionIndex);
 
-  if (options.length === 0) {
+  if (question.extras.options.length === 0) {
     return null;
   }
 
   return (
-    <fieldset data-question-type={question.type} className="space-y-7">
-      <legend>
-        <QuestionTitle question={question} />
-      </legend>
-
-      <div className="flex flex-wrap gap-x-5 gap-y-4">
-        {options.map((option) => {
-          const optionId = `${groupId}-${option}`;
-          const isSelected = selectedOption === option;
+    <div
+      className={[
+        "flex w-full flex-col gap-3 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
+      <QuestionTitle question={question} />
+      <div className="flex flex-col gap-3">
+        {question.extras.options.map((option) => {
+          const optionId = `question-${questionIndex}-${option}`;
+          const isSelected = String(value) === option;
 
           return (
             <label
               key={option}
               htmlFor={optionId}
               className={[
-                "cursor-pointer rounded-[10px] px-3.5 py-2",
-                "text-center leading-none font-semibold transition-colors",
+                "w-full cursor-pointer rounded-[12px] px-4 py-3.5",
+                "text-start text-[13px] leading-tight font-semibold transition-all duration-200",
                 isSelected
-                  ? "bg-[#F0445B] text-white"
-                  : "bg-[#DBDBDB] text-[#181818]",
+                  ? "bg-[#F0445B] text-white shadow-[0_8px_20px_rgba(240,68,91,0.25)]"
+                  : "bg-[#F5F5F5] text-[#181818] hover:bg-[#EBEBEB]",
               ].join(" ")}
             >
               <input
-                id={optionId}
-                className="sr-only"
                 type="radio"
-                name={groupId}
+                id={optionId}
+                name={`question-${questionIndex}`}
                 value={option}
                 checked={isSelected}
-                onChange={() => setValue(option)}
+                disabled={disabled}
+                onChange={() => setAnswerValue(question, questionIndex, option)}
+                className="sr-only"
               />
               {option}
             </label>
           );
         })}
       </div>
-    </fieldset>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-slider.tsx b/src/components/questions/question-slider.tsx
index 283193f..138d4b3 100644
--- a/src/components/questions/question-slider.tsx
+++ b/src/components/questions/question-slider.tsx
@@ -2,24 +2,24 @@
 
 import { useLayoutEffect, useRef, useState } from "react";
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionSliderProps = {
   question: QuestionField;
   questionIndex: number;
+  disabled?: boolean;
 };
 
 export function QuestionSlider({
   question,
   questionIndex,
+  disabled,
 }: QuestionSliderProps) {
   const [min, max] = question.extras.range;
   const initialValue = Math.round((min + max) / 2);
-  const { setValue, value: storedValue } = useQuestionAnswer(
-    question,
-    questionIndex,
-  );
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const storedValue = getAnswerValue(question, questionIndex);
   const value = typeof storedValue === "number" ? storedValue : initialValue;
   const progress = max === min ? 0 : ((value - min) / (max - min)) * 100;
   const sliderWrapperRef = useRef<HTMLDivElement>(null);
@@ -67,7 +67,12 @@ export function QuestionSlider({
   }, [progress]);
 
   return (
-    <label data-question-type={question.type} className="block space-y-6">
+    <div
+      className={[
+        "flex w-full flex-col gap-6 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
       <QuestionTitle question={question} />
       <div className="pt-9">
         <div ref={sliderWrapperRef} className="relative">
@@ -80,12 +85,12 @@ export function QuestionSlider({
           <input
             ref={sliderRef}
             type="range"
-            required={question.required}
             min={min}
             max={max}
             step={1}
             value={value}
-            onChange={(event) => setValue(Number(event.target.value))}
+            onChange={(event) => setAnswerValue(question, questionIndex, Number(event.target.value))}
+            disabled={disabled}
             className="question-slider-range w-full"
             style={{
               background: `linear-gradient(to right, #F43F5E 0%, #F43F5E ${progress}%, #FAD1D8 ${progress}%, #FAD1D8 100%)`,
@@ -98,7 +103,7 @@ export function QuestionSlider({
           ))}
         </div>
       </div>
-    </label>
+    </div>
   );
 }
 
diff --git a/src/components/questions/question-snap-list.tsx b/src/components/questions/question-snap-list.tsx
index d665e4c..1244711 100644
--- a/src/components/questions/question-snap-list.tsx
+++ b/src/components/questions/question-snap-list.tsx
@@ -13,7 +13,7 @@ import {
 const WHEEL_GESTURE_IDLE_MS = 320;
 const TOUCH_MIN_DISTANCE = 8;
 const AUTO_FOCUS_SELECTOR = [
-  'textarea:not([disabled])',
+  "textarea:not([disabled])",
   'input[type="text"]:not([disabled])',
   'input[type="number"]:not([disabled])',
 ].join(", ");
@@ -88,7 +88,10 @@ export function QuestionSnapList({
 
       const valueLength = firstFocusableInput.value.length;
 
-      if (valueLength > 0 && typeof firstFocusableInput.setSelectionRange === "function") {
+      if (
+        valueLength > 0 &&
+        typeof firstFocusableInput.setSelectionRange === "function"
+      ) {
         firstFocusableInput.setSelectionRange(valueLength, valueLength);
       }
     });
diff --git a/src/components/questions/question-text.tsx b/src/components/questions/question-text.tsx
index 70dd0fe..e918a46 100644
--- a/src/components/questions/question-text.tsx
+++ b/src/components/questions/question-text.tsx
@@ -1,47 +1,51 @@
 "use client";
 
 import type { QuestionField } from "@/data/question-data";
-import { useQuestionAnswer } from "./question-answer-storage";
+import { useQuestionAnswers } from "./question-answer-storage";
 import QuestionTitle from "./question-title";
 
 type QuestionTextProps = {
   question: QuestionField;
   questionIndex: number;
   description?: string;
+  disabled?: boolean;
   heightClassName?: string;
 };
 
-export function QuestionText({
+export default function QuestionText({
   question,
   questionIndex,
   description,
-  heightClassName = "min-h-[116px]",
+  disabled,
+  heightClassName,
 }: QuestionTextProps) {
-  const { setValue, value } = useQuestionAnswer(question, questionIndex);
-  const textValue = typeof value === "string" ? value : "";
+  const { getAnswerValue, setAnswerValue } = useQuestionAnswers();
+  const value = getAnswerValue(question, questionIndex);
 
   return (
-    <label data-question-type={question.type} className="block space-y-3">
+    <div
+      className={[
+        "flex w-full flex-col gap-2 transition-opacity duration-200",
+        disabled ? "pointer-events-none opacity-30" : "",
+      ].join(" ")}
+    >
       <QuestionTitle question={question} />
-      <textarea
-        required={question.required}
-        rows={1}
+      <input
+        type="text"
+        value={String(value ?? "")}
+        onChange={(e) => setAnswerValue(question, questionIndex, e.target.value)}
         placeholder={question.extras.placeHolder}
-        value={textValue}
-        onChange={(event) => {
-          const nextValue = event.target.value;
-
-          setValue(nextValue.length > 0 ? nextValue : null);
-        }}
-        className={`w-full resize-none rounded-[15px] border border-[#8B8B8B] bg-white px-4 py-3 text-[#181818] outline-none placeholder:text-[#8B8B8B] focus:border-[#6F6F6F] ${heightClassName}`}
+        disabled={disabled}
+        className={[
+          "w-full rounded-[10px] bg-[#DBDBDB] px-[14px] py-[10px] text-[13px] font-semibold text-[#181818] outline-none placeholder:text-[#808080]",
+          heightClassName || "min-h-[116px]",
+        ].join(" ")}
       />
       {description ? (
         <span className="block text-[10px] font-semibold text-[#747474]">
           {description}
         </span>
       ) : null}
-    </label>
+    </div>
   );
 }
-
-export default QuestionText;
diff --git a/src/components/questions/question-title.tsx b/src/components/questions/question-title.tsx
index 2e346b6..9b14e35 100644
--- a/src/components/questions/question-title.tsx
+++ b/src/components/questions/question-title.tsx
@@ -10,10 +10,10 @@ export function QuestionTitle({ question, className }: QuestionTitleProps) {
   return (
     <span className="block">
       {question.private ? (
-        <span className="mb-3 flex min-h-[42px] w-full items-center gap-3 rounded-[22px] bg-[#F6D7D8] px-5 py-2 text-[14px] leading-tight font-semibold text-[#DF4146]">
+        <span className="mb-3 mx-auto flex w-fit items-center gap-1.5 rounded-[10px] bg-[#F6D7D8] px-2.5 py-1.5 text-[10px] leading-tight font-semibold text-[#DF4146]">
           <IoEyeOff
             aria-hidden="true"
-            className="shrink-0 text-[24px] text-[#DF4146]"
+            className="shrink-0 text-[18px] text-[#DF4146]"
           />
           <span>Private Field (Visible to Habib Marriage advisors only)</span>
         </span>
diff --git a/src/data/question-data.ts b/src/data/question-data.ts
index dce206a..fa9e42d 100644
--- a/src/data/question-data.ts
+++ b/src/data/question-data.ts
@@ -28,6 +28,13 @@ type QuestionAudienceRule = {
   minAge?: number;
 };
 
+export type QuestionLogic = {
+  dependsOn: {
+    title: string;
+    values: string[];
+  };
+};
+
 export type QuestionField = {
   title: string;
   type: string;
@@ -38,6 +45,7 @@ export type QuestionField = {
   extras: QuestionExtras;
   audience?: QuestionAudienceRule;
   requiredWhen?: QuestionAudienceRule;
+  logic?: QuestionLogic;
 };
 
 export type QuestionListItem = {
diff --git a/src/hooks/marriage/types.ts b/src/hooks/marriage/types.ts
index ae8ab19..54a4ed6 100644
--- a/src/hooks/marriage/types.ts
+++ b/src/hooks/marriage/types.ts
@@ -32,6 +32,7 @@ export type MarriagePhoneFieldValue = {
 
 export type MarriageFieldValue =
   | string
+  | string[]
   | number
   | boolean
   | MarriagePhoneFieldValue
@@ -83,6 +84,7 @@ export type MarriageProfile = {
   id: number;
   status: MarriageProfileStatus;
   gender: MarriageGender | null;
+  age: number | null;
   is_registering_for_self: boolean | null;
   can_edit_profile: boolean;
   can_message_expert: boolean;
diff --git a/src/i18n/dictionaries.ts b/src/i18n/dictionaries.ts
index 55ecff2..afb8500 100644
--- a/src/i18n/dictionaries.ts
+++ b/src/i18n/dictionaries.ts
@@ -35,10 +35,10 @@ export const dictionaries = {
       requiredStepsProgress: "{completed} of {total} required steps completed",
       findMatches: "Find Matches",
       findingMatch: "Finding Match",
-      optionalInfoPromptTitle: "Important point",
+      optionalInfoPromptTitle: "Important Note",
       optionalInfoPromptDescription:
         "You've completed all required fields. However, filling in all sections will help us find better matches for you",
-      completeNecessaryForms: "(Complete Necessary forms)",
+      completeNecessaryForms: "(Complete Required Forms)",
       openQuestion: "Open {title}",
       answerAtYourOwnPace: "Answer at Your Own Pace",
       answerAtYourOwnPaceDescription:
@@ -80,7 +80,7 @@ export const dictionaries = {
         "You can now view their family's contact details and arrange further steps.",
       viewContact: "View Contact",
       penalty:
-        "Please note: if you do not make contact within 2 days, a penalty may apply",
+        "Please note: Failure to contact within 2 days may result in a penalty",
       profileLocked: "Profile is locked",
       lockedDescription:
         "You can't edit your profile while we're searching for matches",
@@ -97,7 +97,7 @@ export const dictionaries = {
     },
     candidateContact: {
       imageAlt: "Selected candidate contact status",
-      title: "The selected candidate will contact your family shortly.",
+      title: "The selected candidate will be in touch with your family shortly.",
       contacted: "contacted",
       noContactYet: "no contact yet ?",
       afterTwoDays: "(after 2 days)",
diff --git a/src/i18n/locales/en/questions.json b/src/i18n/locales/en/questions.json
index 3770372..fdd75ba 100644
--- a/src/i18n/locales/en/questions.json
+++ b/src/i18n/locales/en/questions.json
@@ -74,17 +74,17 @@
     "estimateTime": "20 minutes",
     "tooltip": "Contact and current residence details.",
     "progress": 0,
-    "description": "Captures contact details, current residence, and family communication information.",
+    "description": "Contact details and residence.",
     "questions": [
       {
-        "title": "Liaison's Full Name",
+        "title": "Representative's Full Name",
         "type": "text",
         "required": false,
         "requiredWhen": {
           "genders": ["female"],
           "maxAge": 26
         },
-        "tooltip": "Enter the full name of your liaison or contact person.",
+        "tooltip": "Enter the full name of your representative.",
         "extras": {
           "placeHolder": "e.g. Sara Ahmadi",
           "range": [0, 0],
@@ -92,14 +92,14 @@
         }
       },
       {
-        "title": "Relationship to Liaison",
+        "title": "Relationship to Representative",
         "type": "radio",
         "required": false,
         "requiredWhen": {
           "genders": ["female"],
           "maxAge": 26
         },
-        "tooltip": "Select your relationship with the liaison.",
+        "tooltip": "Select your relationship with the representative.",
         "extras": {
           "placeHolder": "Select one option",
           "range": [0, 0],
@@ -117,14 +117,14 @@
         }
       },
       {
-        "title": "Liaison's Contact Number with Country Code",
+        "title": "Representative's Contact Number with Country Code",
         "type": "phone",
         "required": false,
         "requiredWhen": {
           "genders": ["female"],
           "maxAge": 26
         },
-        "tooltip": "Enter the contact number of your liaison including country code.",
+        "tooltip": "Enter the contact number of your representative including country code.",
         "extras": {
           "placeHolder": "e.g. +98 912 123 4567",
           "range": [0, 0],
@@ -133,6 +133,100 @@
       }
     ]
   },
+  {
+    "title": "Family Background",
+    "icon": "user-circle",
+    "slug": "family_background",
+    "required": true,
+    "estimateTime": "10 minutes",
+    "tooltip": "Questions about your family structure, parents, and religious/economic atmosphere.",
+    "progress": 0,
+    "description": "Information about your siblings, parents, and family lifestyle.",
+    "questions": [
+      {
+        "title": "Number of Siblings",
+        "type": "number",
+        "required": true,
+        "tooltip": "Enter the total number of your brothers and sisters.",
+        "extras": {
+          "placeHolder": "e.g. 2",
+          "range": [0, 20],
+          "options": []
+        }
+      },
+      {
+        "title": "Parents' Survival Status",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select the current survival status of your parents.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Both parents are alive",
+            "Father has passed away",
+            "Mother has passed away",
+            "Both parents have passed away"
+          ]
+        }
+      },
+      {
+        "title": "Parents' Marital Status",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select your parents' current marital status.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Living together",
+            "Separated / Divorced",
+            "One parent remarried",
+            "Special family circumstances (explained in comments)"
+          ]
+        }
+      },
+      {
+        "title": "Family's Religious and Ideological Atmosphere",
+        "type": "radio",
+        "required": false,
+        "description": "Please select the option that best describes the general atmosphere and lifestyle of your family.",
+        "tooltip": "This helps in understanding your family values and lifestyle.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Religious and strictly observant",
+            "Religious (committed to duties)",
+            "Traditional (respectful of religious values)",
+            "Non-religious / Customary"
+          ]
+        }
+      },
+      {
+        "title": "Family Economic Status",
+        "type": "radio",
+        "required": false,
+        "tooltip": "Select the option that best describes your family's financial situation.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": ["Weak", "Average", "Good", "Prosperous"]
+        }
+      },
+      {
+        "title": "Short Family Description",
+        "type": "text",
+        "required": false,
+        "tooltip": "Briefly share any additional details about your family background.",
+        "extras": {
+          "placeHolder": "Enter details here...",
+          "range": [0, 0],
+          "options": []
+        }
+      }
+    ]
+  },
   {
     "title": "Physical Appearance, Health, and Physical Activity",
     "icon": "heart-handshake",
@@ -398,241 +492,383 @@
     ]
   },
   {
-    "title": "Career & Educattion",
-    "icon": "school",
-    "slug": "career_and_education",
+    "title": "Marital Status, Marriage History, and Children",
+    "icon": "heart",
+    "slug": "marital_history_children",
     "required": true,
-    "estimateTime": "20 minutes",
-    "tooltip": "Career and education details.",
+    "estimateTime": "10 minutes",
+    "tooltip": "Your marital status, history, and details about children.",
     "progress": 0,
-    "description": "Captures career, education, and background details.",
+    "description": "Information about your current marital status, previous marriages, and children.",
     "questions": [
       {
-        "title": "Preferred City",
-        "type": "dropdown",
-        "required": false,
-        "description": "Select the city you prefer to live in after marriage.",
-        "tooltip": "You can use this to help with compatibility matching.",
+        "title": "Current Marital Status",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select your current marital status.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Single; never married",
+            "Failed engagement / Annulled marriage; without living together",
+            "Divorced; after living together",
+            "Widowed"
+          ]
+        }
+      },
+      {
+        "title": "Previous Marriage Duration",
+        "type": "text",
+        "required": true,
+        "tooltip": "Specify the duration of your previous marriage or engagement.",
+        "logic": {
+          "dependsOn": {
+            "title": "Current Marital Status",
+            "values": [
+              "Failed engagement / Annulled marriage; without living together",
+              "Divorced; after living together",
+              "Widowed"
+            ]
+          }
+        },
         "extras": {
-          "placeHolder": "Choose a city",
+          "placeHolder": "e.g., 3 years",
           "range": [0, 0],
-          "options": ["Tehran", "Isfahan", "Shiraz", "Tabriz", "Mashhad"]
+          "options": []
         }
       },
       {
-        "title": "Describe Your Ideal Partner",
+        "title": "Reason for Separation",
         "type": "text",
         "required": false,
-        "description": "Write a short description of the qualities you value most.",
-        "tooltip": "Keep it concise and specific.",
+        "tooltip": "Briefly share the reason for separation if applicable.",
+        "logic": {
+          "dependsOn": {
+            "title": "Current Marital Status",
+            "values": [
+              "Failed engagement / Annulled marriage; without living together",
+              "Divorced; after living together"
+            ]
+          }
+        },
         "extras": {
-          "placeHolder": "Kind, family-oriented, emotionally mature...",
+          "placeHolder": "Enter details here...",
           "range": [0, 0],
           "options": []
         }
       },
       {
-        "title": "Importance of Family Values",
-        "type": "slider",
+        "title": "Children and Guardianship Status",
+        "type": "radio",
         "required": true,
-        "description": "Rate how important family values are to you.",
-        "tooltip": "Move the slider from low to high importance.",
+        "tooltip": "Select the option that describes your children and guardianship status.",
         "extras": {
-          "placeHolder": "",
-          "range": [1, 10],
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "No children",
+            "Have children living with me",
+            "Have children not living with me",
+            "Someone else is under my guardianship"
+          ]
+        }
+      },
+      {
+        "title": "Number of Children",
+        "type": "number",
+        "required": true,
+        "tooltip": "Specify the number of children you have.",
+        "logic": {
+          "dependsOn": {
+            "title": "Current Marital Status",
+            "values": [
+              "Divorced; after living together",
+              "Widowed"
+            ]
+          }
+        },
+        "extras": {
+          "placeHolder": "e.g., 2",
+          "range": [0, 10],
           "options": []
         }
       },
       {
-        "title": "Ready to Continue",
-        "type": "button",
+        "title": "Short Children/Guardianship Explanation",
+        "type": "text",
         "required": false,
-        "description": "Confirms that you want to proceed to the next section.",
-        "tooltip": "This can be used as a UI action trigger.",
+        "tooltip": "Briefly share any additional details about your children or guardianship conditions.",
         "extras": {
-          "placeHolder": "Continue",
+          "placeHolder": "Enter details here...",
           "range": [0, 0],
-          "options": ["Continue"]
+          "options": []
         }
       }
     ]
   },
   {
-    "title": "Expactancy & equality",
-    "icon": "heart-handshake",
-    "slug": "expactancy_and_equality",
+    "title": "Beliefs, Lifestyle, and Personal Boundaries",
+    "icon": "shield-check",
+    "slug": "beliefs_lifestyle_boundaries",
     "required": true,
-    "estimateTime": "40 minutes",
-    "tooltip": "Relationship expectations and equality preferences.",
+    "estimateTime": "15 minutes",
+    "tooltip": "Your religious beliefs, lifestyle choices, and personal red lines.",
     "progress": 0,
-    "description": "Captures expectations, equality preferences, and relationship readiness.",
+    "description": "Details about religious practice, public appearance, political outlook, habits, and lifestyle preferences.",
     "questions": [
       {
-        "title": "National ID Upload",
-        "type": "file",
+        "title": "Marja' al-Taqlid (Religious Authority)",
+        "type": "text",
         "required": true,
-        "description": "Upload a clear image or PDF of your national ID.",
-        "tooltip": "Accepted formats can be restricted in the UI layer.",
+        "tooltip": "Specify your Marja' al-Taqlid or mention if this is not a priority for you.",
         "extras": {
-          "placeHolder": "Choose a file",
+          "placeHolder": "e.g., Ayatollah Sistani",
           "range": [0, 0],
-          "options": [".jpg", ".png", ".pdf"]
+          "options": []
         }
       },
       {
-        "title": "Marriage Timeline",
-        "type": "dropdown",
-        "required": false,
-        "description": "Choose your preferred timeline for marriage.",
-        "tooltip": "This helps prioritize urgency and compatibility.",
+        "title": "Commitment to Obligatory Prayers",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select your level of commitment to daily prayers.",
         "extras": {
-          "placeHolder": "Select a timeline",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": ["Within 6 months", "6-12 months", "1-2 years", "Flexible"]
+          "options": [
+            "Always committed, preferably at the earliest time",
+            "Always committed, but not necessarily at the earliest time",
+            "Sometimes",
+            "Do not pray"
+          ]
         }
-      }
-    ]
-  },
-  {
-    "title": "Cantact",
-    "icon": "file-text",
-    "slug": "contact",
-    "required": true,
-    "estimateTime": "Not specified",
-    "tooltip": "Contact details and communication preferences.",
-    "progress": 0,
-    "description": "Captures contact details and preferred communication channels.",
-    "questions": [
+      },
       {
-        "title": "Short Biography",
-        "type": "text",
+        "title": "Commitment to Ramadan Fasting",
+        "type": "radio",
         "required": true,
-        "description": "Provide a short written introduction.",
-        "tooltip": "This exercises the text input type.",
+        "tooltip": "Select your level of commitment to fasting during Ramadan.",
         "extras": {
-          "placeHolder": "Write a short introduction about yourself",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": []
+          "options": [
+            "Fully committed",
+            "Do not fast for religious or medical reasons",
+            "Occasionally do not fast without a specific reason",
+            "Not committed"
+          ]
         }
       },
       {
-        "title": "Preferred Wedding Date",
-        "type": "date",
+        "title": "Type of Hijab and Public Appearance",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Choose the option that best describes your daily public appearance.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Full Islamic covering (Maximum Hijab) - Abaya, Jilbab, Chador, or Niqab with full observance.",
+            "Full Hijab with loose modest clothing - Wide and long outfits with full hair covering.",
+            "Customary/Everyday clothing with Hijab - Modern styles with hair covered by shawl or turban.",
+            "Modest and dignified (No hair covering) - Formal and modest outfits without a headscarf.",
+            "Modern and casual (No Hijab) - Following international styles without Islamic Hijab rules."
+          ]
+        }
+      },
+      {
+        "title": "Makeup in Public",
+        "type": "radio",
         "required": false,
-        "description": "Select your preferred wedding date.",
-        "tooltip": "This exercises the date picker type.",
+        "tooltip": "Select your typical use of makeup in public settings.",
+        "audience": {
+          "genders": [
+            "female"
+          ]
+        },
         "extras": {
-          "placeHolder": "YYYY-MM-DD",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": []
+          "options": [
+            "Do not wear makeup at all",
+            "Only very light makeup",
+            "Full makeup"
+          ]
         }
       },
       {
-        "title": "Preferred Contact Method",
+        "title": "Attitude towards Religion and Politics",
         "type": "radio",
         "required": true,
-        "description": "Choose one preferred contact method.",
-        "tooltip": "This exercises the radio selection type.",
+        "tooltip": "Describe your outlook on the relationship between religion and politics.",
         "extras": {
           "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": ["Phone", "WhatsApp", "Email"]
+          "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.",
+            "Traditional and non-political view of Shiasm; cannot marry someone with a political view.",
+            "Non-political view of Shiasm, but it's not a red line if my spouse has political views.",
+            "These concepts and categories are not a major concern for me."
+          ]
         }
       },
       {
-        "title": "Home Phone Number",
-        "type": "phone",
+        "title": "Stance on Current Government/State",
+        "type": "radio",
         "required": false,
-        "description": "Enter your home landline or household phone number.",
-        "tooltip": "Include the area code if applicable.",
+        "tooltip": "Share your general stance to avoid belief-based conflicts in marriage.",
         "extras": {
-          "placeHolder": "e.g. 021-12345678",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": []
+          "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.",
+            "Opposed to the current government; serious support from my spouse is a red line.",
+            "Opposed to the current government, but a difference in view is not a red line.",
+            "No specific stance; political differences are not significant for my marriage."
+          ]
         }
       },
       {
-        "title": "Father's Phone Number",
-        "type": "phone",
-        "required": false,
-        "description": "Enter the phone number of your father for contact purposes.",
-        "tooltip": "Use a number that can reliably receive calls.",
+        "title": "Boundaries with the Opposite Sex",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Describe your social boundaries in interactions with the opposite sex.",
         "extras": {
-          "placeHolder": "e.g. 0912-1234567",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": []
+          "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.",
+            "Social and comfortable (Within religious limits) - Active in social circles within moral limits.",
+            "No specific boundaries - Fully comfortable with modern social interactions."
+          ]
         }
       },
       {
-        "title": "Household Size Preference",
-        "type": "number",
-        "required": false,
-        "description": "Enter the household size you are comfortable with.",
-        "tooltip": "This exercises the number input type.",
+        "title": "Smoking",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify your smoking habits.",
         "extras": {
-          "placeHolder": "e.g. 4",
-          "range": [1, 12],
-          "options": []
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Do not smoke at all",
+            "Occasional / Recreational",
+            "Regular smoker",
+            "Quitting"
+          ]
         }
       },
       {
-        "title": "Current City",
-        "type": "dropdown",
+        "title": "Hookah",
+        "type": "radio",
         "required": true,
-        "description": "Choose the city you currently live in.",
-        "tooltip": "This exercises the dropdown type.",
+        "tooltip": "Specify your hookah usage habits.",
         "extras": {
-          "placeHolder": "Select your city",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": ["Tehran", "Karaj", "Shiraz", "Mashhad"]
+          "options": [
+            "Do not smoke hookah at all",
+            "Occasional / Recreational",
+            "Regular hookah smoker",
+            "Quitting"
+          ]
         }
       },
       {
-        "title": "Importance of Shared Goals",
-        "type": "slider",
+        "title": "Vape / E-cigarettes",
+        "type": "radio",
         "required": true,
-        "description": "Rate how important shared long-term goals are to you.",
-        "tooltip": "This exercises the slider type.",
+        "tooltip": "Specify your vape or e-cigarette usage habits.",
         "extras": {
-          "placeHolder": "Move the slider",
-          "range": [1, 10],
-          "options": []
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Do not use at all",
+            "Occasional / Recreational",
+            "Regular user",
+            "Quitting"
+          ]
         }
       },
       {
-        "title": "Review Answers",
-        "type": "button",
-        "required": false,
-        "description": "Use this action to review the current section.",
-        "tooltip": "This exercises the button type.",
+        "title": "Alcoholic Beverages",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify your alcohol consumption habits.",
         "extras": {
-          "placeHolder": "Review",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": ["Review"]
+          "options": [
+            "Do not consume at all",
+            "Alcohol is a serious red line for me",
+            "Occasional consumption",
+            "Regular consumption"
+          ]
         }
       },
       {
-        "title": "Profile Photo Upload",
-        "type": "file",
-        "required": false,
-        "description": "Upload a profile photo or supporting image.",
-        "tooltip": "This exercises the file upload type.",
+        "title": "Narcotics or Illegal Substances",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify your stance or history with illegal substances.",
         "extras": {
-          "placeHolder": "Choose an image",
+          "placeHolder": "Select one option",
           "range": [0, 0],
-          "options": [".jpg", ".jpeg", ".png"]
+          "options": [
+            "Never used",
+            "Used in the past, but not anymore",
+            "Current user",
+            "In treatment or recovery"
+          ]
         }
       },
       {
-        "title": "User Photo",
-        "type": "photo",
+        "title": "Attitude towards Music",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify your preferences and religious attitude towards music.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Do not listen to any music",
+            "Only listen to Nasheeds, Acapella, religious, or instrument-free music",
+            "Listen to Halal and permissible music",
+            "No specific sensitivity towards music types"
+          ]
+        }
+      },
+      {
+        "title": "Attitude towards Wedding Ceremony",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Describe how you envision your wedding ceremony.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "No ceremony or very simple",
+            "Strictly religious and gender-segregated",
+            "Respectful mixed ceremony, no dancing/non-permissible music",
+            "Mixed ceremony with music and dancing",
+            "Undecided; depends on family agreement"
+          ]
+        }
+      },
+      {
+        "title": "Short explanation about your lifestyle",
+        "type": "text",
         "required": false,
-        "description": "Please ensure your photo follows the required dress guidelines. Your photo will be reviewed by our female staff and handled with strict confidentiality. It will not be shared with anyone",
-        "tooltip": "This exercises the photo upload type.",
+        "tooltip": "Optionally share more details about your daily routine or habits.",
         "extras": {
-          "placeHolder": "Choose an image",
+          "placeHolder": "Enter details here...",
           "range": [0, 0],
-          "options": [".jpg", ".jpeg", ".png"]
+          "options": []
         }
       }
     ]
@@ -696,5 +932,488 @@
         }
       }
     ]
+  },
+  {
+    "title": "Future Spouse Criteria and Red Lines",
+    "icon": "shield-check",
+    "slug": "future_spouse_criteria",
+    "required": true,
+    "estimateTime": "20 minutes",
+    "tooltip": "Your criteria, expectations, and red lines regarding your future spouse.",
+    "progress": 0,
+    "description": "Criteria and Red Lines.",
+    "questions": [
+      {
+        "title": "Desired Age Range of Future Spouse",
+        "type": "text",
+        "required": true,
+        "description": "from [number] to [number] years",
+        "tooltip": "e.g. from 25 to 30 years old",
+        "extras": {
+          "placeHolder": "e.g. 25-30",
+          "range": [0, 0],
+          "options": []
+        }
+      },
+      {
+        "title": "Desired Height Range of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "Select the desired height range.",
+        "extras": {
+          "placeHolder": "Select options",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Under 160",
+            "160 to 170",
+            "170 to 180",
+            "180 to 190",
+            "Above 190"
+          ]
+        }
+      },
+      {
+        "title": "Desired Body Type of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "Select the desired body type.",
+        "extras": {
+          "placeHolder": "Select options",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Slim",
+            "Fit/Average",
+            "Athletic",
+            "Curvy/Full",
+            "Large frame"
+          ]
+        }
+      },
+      {
+        "title": "Desired Skin Color of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "Select the desired skin color.",
+        "extras": {
+          "placeHolder": "Select options",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Fair / White",
+            "Light Tan / Wheatish",
+            "Dark Tan / Brown",
+            "Dark / Black"
+          ]
+        }
+      },
+      {
+        "title": "Desired Ethnicity, Language, or Nationality of Future Spouse",
+        "type": "text",
+        "required": false,
+        "description": "Optional text field",
+        "tooltip": "Optionally enter your ethnic or national preferences.",
+        "extras": {
+          "placeHolder": "e.g. Persian, Turkish, etc.",
+          "range": [0, 0],
+          "options": []
+        }
+      },
+      {
+        "title": "Minimum Education Level of Future Spouse",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select the minimum expected education level.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Minimum High School",
+            "Minimum Bachelor's",
+            "Minimum Master's",
+            "Doctorate or higher preferred",
+            "Must have religious studies",
+            "Maturity is more important than degree"
+          ]
+        }
+      },
+      {
+        "title": "Desired Employment Status of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "Select the desired employment status.",
+        "extras": {
+          "placeHolder": "Select options",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Employed",
+            "Student",
+            "Homemaker",
+            "Entrepreneur / Business Owner",
+            "In career growth path",
+            "Negotiable"
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Future Spouse's Marriage History",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify your stance on future spouse's marital history.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Never married only; history is a red line",
+            "Never married preferred, but open to special cases",
+            "No difference",
+            "Depends on reason, duration, and conditions"
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Children from Previous Marriage",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify your stance on future spouse's children.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Will not accept",
+            "Accept in special conditions",
+            "No difference",
+            "Only if children don't live with them"
+          ]
+        }
+      },
+      {
+        "title": "Desired Clothing and Hijab Criteria",
+        "type": "radio",
+        "required": true,
+        "audience": {
+          "genders": ["male"]
+        },
+        "tooltip": "Select expectations for spouse's clothing.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Full Islamic covering mandatory",
+            "Sharia Hijab mandatory, type doesn't matter",
+            "Customary clothing with Hijab acceptable",
+            "Modest clothing important, details negotiable",
+            "No specific sensitivity"
+          ]
+        }
+      },
+      {
+        "title": "Desired Clothing and Grooming for Future Spouse",
+        "type": "radio",
+        "required": true,
+        "audience": {
+          "genders": ["female"]
+        },
+        "tooltip": "Select expectations for spouse's clothing.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Formal, dignified, and religious",
+            "Simple, neat, and modest",
+            "Regular and well-groomed",
+            "Modern style okay",
+            "No specific sensitivity"
+          ]
+        }
+      },
+      {
+        "title": "Desired Spouse's Tendency for Further Education",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select your preference for spouse's education plans.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Must intend to continue",
+            "Positive but not mandatory",
+            "Prefer not to continue after marriage",
+            "Negotiable"
+          ]
+        }
+      },
+      {
+        "title": "Desired Spouse's Tendency for Employment",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select your preference for spouse's employment.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Must be employed",
+            "Must be a homemaker",
+            "Up to them",
+            "Negotiable",
+            "Compatible with religious values"
+          ]
+        }
+      },
+      {
+        "title": "Desired Spouse's Family Status and Values",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "Select desired family criteria.",
+        "extras": {
+          "placeHolder": "Select options",
+          "range": [0, 0],
+          "options": [
+            "Doesn't matter.",
+            "Parents not divorced",
+            "Father alive",
+            "Mother alive",
+            "Religious family atmosphere",
+            "Respectful family communication"
+          ]
+        }
+      },
+      {
+        "title": "Level of Family Communication Post-Marriage",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select communication preference with families.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Close and active",
+            "Respectful but independent",
+            "Limited and controlled",
+            "Based on conditions"
+          ]
+        }
+      },
+      {
+        "title": "Desired Level of Religious Commitment",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select desired religious level.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Very religious and committed",
+            "Moderate religious",
+            "Customary but respectful",
+            "Not important"
+          ]
+        }
+      },
+      {
+        "title": "Desired Political Outlook",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select desired political outlook.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Must align with mine",
+            "Differences okay with mutual respect",
+            "Prefer non-political",
+            "Not important"
+          ]
+        }
+      },
+      {
+        "title": "Boundaries with the Opposite Sex",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select desired social boundaries.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Very formal and limited",
+            "Normal and respectful",
+            "Social within religious/moral limits"
+          ]
+        }
+      },
+      {
+        "title": "Red Lines for Smoking, Alcohol, and Substances",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "Select your red lines.",
+        "extras": {
+          "placeHolder": "Select options",
+          "range": [0, 0],
+          "options": [
+            "Smoking is a red line",
+            "Hookah is a red line",
+            "Vape is a red line",
+            "Alcohol is a serious red line",
+            "Drugs are a definite red line",
+            "Occasional smoking okay in special cases",
+            "None are red lines"
+          ]
+        }
+      },
+      {
+        "title": "Attitude towards Music",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select preference regarding music.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Should not listen",
+            "Only religious/instrument-free okay",
+            "Halal/permissible okay",
+            "No sensitivity"
+          ]
+        }
+      },
+      {
+        "title": "Attitude towards Wedding Ceremony",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select preference for wedding ceremony.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Simple or no ceremony",
+            "Strictly religious and segregated",
+            "Respectful mixed without non-sharia elements",
+            "Mixed with music and dancing",
+            "Based on family agreement"
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Chronic Illness or Disability",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify stance on medical conditions.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Red line",
+            "Consider in special cases",
+            "Accept if not hindering healthy life",
+            "Case-by-case with consultation"
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Psychological Counseling History",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Specify stance on counseling history.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "No problem",
+            "Depends on stability",
+            "Red line",
+            "Needs serious review"
+          ]
+        }
+      },
+      {
+        "title": "Residence Preference after Marriage",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select residence preference.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Country doesn't matter",
+            "Stay in my current country",
+            "Move to spouse's current country",
+            "Only my current city",
+            "Third country",
+            "Based on conditions"
+          ]
+        }
+      },
+      {
+        "title": "Preference for Living with Family",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select living preference.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Only independent life",
+            "Temporary with family okay",
+            "Living with either family okay",
+            "Based on conditions"
+          ]
+        }
+      },
+      {
+        "title": "Additional Comments and Red Lines",
+        "type": "text",
+        "required": true,
+        "description": "Large text field",
+        "tooltip": "Any important point not covered above.",
+        "extras": {
+          "placeHolder": "Enter details here...",
+          "range": [0, 0],
+          "options": []
+        }
+      }
+    ]
+  },
+  {
+    "title": "Identity Verification and Documents",
+    "icon": "shield-check",
+    "slug": "identity_verification",
+    "required": true,
+    "estimateTime": "5 minutes",
+    "tooltip": "Upload identity documents and profile photo for authentication.",
+    "progress": 0,
+    "description": "Upload identity documents.",
+    "questions": [
+      {
+        "title": "Profile Picture",
+        "type": "photo",
+        "required": true,
+        "private": true,
+        "description": "Recent and clear face photo",
+        "tooltip": "This image is strictly for identity verification and will never be shown to other users. It is only reviewed by verified same-gender advisors to ensure authenticity and prevent misrepresentation.\n\nGuide for suitable photo:\n- Must be recent and clear\n- Face must be fully visible\n- No heavy filters\n- No group photos\n- Adequate lighting",
+        "extras": {
+          "placeHolder": "Upload photo",
+          "range": [0, 0],
+          "options": [".jpg", ".jpeg", ".png"]
+        }
+      },
+      {
+        "title": "Valid Identification Document",
+        "type": "file",
+        "required": true,
+        "private": true,
+        "description": "Passport, National ID, or Driver's License",
+        "tooltip": "Upload a clear scan or photo of your valid identity document. Acceptable documents include:\n- Passport\n- National ID Card\n- Driver's License\n- Valid Residence Card\n- Any official government-issued ID from your country of residence",
+        "extras": {
+          "placeHolder": "Upload document",
+          "range": [0, 0],
+          "options": [".pdf", ".jpg", ".jpeg", ".png"]
+        }
+      }
+    ]
   }
 ]
diff --git a/src/i18n/locales/fa/questions.json b/src/i18n/locales/fa/questions.json
index 78d893c..64be4bb 100644
--- a/src/i18n/locales/fa/questions.json
+++ b/src/i18n/locales/fa/questions.json
@@ -67,17 +67,17 @@
     ]
   },
   {
-    "title": "اطلاعات تماس، سکونت و ارتباطات خانوادگی",
+    "title": "Contact, Residence, and Family Communication",
     "icon": "file-text",
     "slug": "contact_residence_family_communication",
     "required": true,
     "estimateTime": "20 دقیقه",
     "tooltip": "جزئیات تماس و محل سکونت فعلی.",
     "progress": 0,
-    "description": "ثبت جزئیات تماس، محل سکونت فعلی و اطلاعات ارتباطات خانوادگی.",
+    "description": "اطلاعات تماس و سکونت.",
     "questions": [
       {
-        "title": "نام و نام خانوادگی رابط",
+        "title": "Representative's Full Name",
         "type": "text",
         "required": false,
         "requiredWhen": {
@@ -92,7 +92,7 @@
         }
       },
       {
-        "title": "نسبت رابط با شما",
+        "title": "Relationship to Representative",
         "type": "radio",
         "required": false,
         "requiredWhen": {
@@ -117,7 +117,7 @@
         }
       },
       {
-        "title": "شماره تماس رابط با کد کشور",
+        "title": "Representative's Contact Number with Country Code",
         "type": "phone",
         "required": false,
         "requiredWhen": {
@@ -133,6 +133,100 @@
       }
     ]
   },
+  {
+    "title": "Family Background",
+    "icon": "user-circle",
+    "slug": "family_background",
+    "required": true,
+    "estimateTime": "10 minutes",
+    "tooltip": "Questions about your family structure, parents, and religious/economic atmosphere.",
+    "progress": 0,
+    "description": "Information about your siblings, parents, and family lifestyle.",
+    "questions": [
+      {
+        "title": "Number of Siblings",
+        "type": "number",
+        "required": true,
+        "tooltip": "Enter the total number of your brothers and sisters.",
+        "extras": {
+          "placeHolder": "e.g. 2",
+          "range": [0, 20],
+          "options": []
+        }
+      },
+      {
+        "title": "Parents' Survival Status",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select the current survival status of your parents.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Both parents are alive",
+            "Father has passed away",
+            "Mother has passed away",
+            "Both parents have passed away"
+          ]
+        }
+      },
+      {
+        "title": "Parents' Marital Status",
+        "type": "radio",
+        "required": true,
+        "tooltip": "Select your parents' current marital status.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Living together",
+            "Separated / Divorced",
+            "One parent remarried",
+            "Special family circumstances (explained in comments)"
+          ]
+        }
+      },
+      {
+        "title": "Family's Religious and Ideological Atmosphere",
+        "type": "radio",
+        "required": false,
+        "description": "Please select the option that best describes the general atmosphere and lifestyle of your family.",
+        "tooltip": "This helps in understanding your family values and lifestyle.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": [
+            "Religious and strictly observant",
+            "Religious (committed to duties)",
+            "Traditional (respectful of religious values)",
+            "Non-religious / Customary"
+          ]
+        }
+      },
+      {
+        "title": "Family Economic Status",
+        "type": "radio",
+        "required": false,
+        "tooltip": "Select the option that best describes your family's financial situation.",
+        "extras": {
+          "placeHolder": "Select one option",
+          "range": [0, 0],
+          "options": ["Weak", "Average", "Good", "Prosperous"]
+        }
+      },
+      {
+        "title": "Short Family Description",
+        "type": "text",
+        "required": false,
+        "tooltip": "Briefly share any additional details about your family background.",
+        "extras": {
+          "placeHolder": "Enter details here...",
+          "range": [0, 0],
+          "options": []
+        }
+      }
+    ]
+  },
   {
     "title": "ویژگی‌های ظاهری، سلامت و فعالیت بدنی",
     "icon": "heart-handshake",
@@ -398,241 +492,383 @@
     ]
   },
   {
-    "title": "Career & Educattion",
-    "icon": "school",
-    "slug": "career_and_education",
+    "title": "وضعیت تأهل، سابقه ازدواج و فرزندان",
+    "icon": "heart",
+    "slug": "marital_history_children",
     "required": true,
-    "estimateTime": "20 minutes",
-    "tooltip": "Career and education details.",
+    "estimateTime": "۱۰ دقیقه",
+    "tooltip": "وضعیت تأهل فعلی، سوابق قبلی و اطلاعات مربوط به فرزندان.",
     "progress": 0,
-    "description": "Captures career, education, and background details.",
+    "description": "ثبت اطلاعات مربوط به وضعیت تأهل فعلی، ازدواج‌های قبلی و فرزندان شما.",
     "questions": [
       {
-        "title": "Preferred City",
-        "type": "dropdown",
-        "required": false,
-        "description": "Select the city you prefer to live in after marriage.",
-        "tooltip": "You can use this to help with compatibility matching.",
+        "title": "وضعیت تأهل فعلی",
+        "type": "radio",
+        "required": true,
+        "tooltip": "وضعیت تأهل فعلی خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مجرد؛ بدون هیچ‌گونه سابقه عقد یا ازدواج",
+            "عقد ناموفق / فسخ نامزدی؛ بدون شروع زندگی مشترک",
+            "جدا شده؛ طلاق پس از زندگی مشترک",
+            "همسر فوت شده"
+          ]
+        }
+      },
+      {
+        "title": "مدت ازدواج یا عقد قبلی",
+        "type": "text",
+        "required": true,
+        "tooltip": "مدت زمان ازدواج یا دوران عقد قبلی خود را مشخص کنید.",
+        "logic": {
+          "dependsOn": {
+            "title": "وضعیت تأهل فعلی",
+            "values": [
+              "عقد ناموفق / فسخ نامزدی؛ بدون شروع زندگی مشترک",
+              "جدا شده؛ طلاق پس از زندگی مشترک",
+              "همسر فوت شده"
+            ]
+          }
+        },
         "extras": {
-          "placeHolder": "Choose a city",
+          "placeHolder": "مثلاً ۳ سال",
           "range": [0, 0],
-          "options": ["Tehran", "Isfahan", "Shiraz", "Tabriz", "Mashhad"]
+          "options": []
         }
       },
       {
-        "title": "Describe Your Ideal Partner",
+        "title": "علت جدایی، در صورت وجود",
         "type": "text",
         "required": false,
-        "description": "Write a short description of the qualities you value most.",
-        "tooltip": "Keep it concise and specific.",
+        "tooltip": "در صورت تمایل، علت جدایی خود را کوتاه بنویسید.",
+        "logic": {
+          "dependsOn": {
+            "title": "وضعیت تأهل فعلی",
+            "values": [
+              "عقد ناموفق / فسخ نامزدی؛ بدون شروع زندگی مشترک",
+              "جدا شده؛ طلاق پس از زندگی مشترک"
+            ]
+          }
+        },
         "extras": {
-          "placeHolder": "Kind, family-oriented, emotionally mature...",
+          "placeHolder": "توضیحات را اینجا وارد کنید...",
           "range": [0, 0],
           "options": []
         }
       },
       {
-        "title": "Importance of Family Values",
-        "type": "slider",
+        "title": "وضعیت فرزند و تکفل",
+        "type": "radio",
         "required": true,
-        "description": "Rate how important family values are to you.",
-        "tooltip": "Move the slider from low to high importance.",
+        "tooltip": "وضعیتی که بهتر شرایط فرزندان و تکفل شما را توصیف می‌کند انتخاب کنید.",
         "extras": {
-          "placeHolder": "",
-          "range": [1, 10],
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "فرزندی ندارم.",
+            "فرزند دارم و با من زندگی می‌کند.",
+            "فرزند دارم اما با من زندگی نمی‌کند.",
+            "شخص دیگری غیر از فرزند تحت تکفل من است."
+          ]
+        }
+      },
+      {
+        "title": "تعداد فرزندان",
+        "type": "number",
+        "required": true,
+        "tooltip": "تعداد فرزندان خود را وارد کنید.",
+        "logic": {
+          "dependsOn": {
+            "title": "وضعیت تأهل فعلی",
+            "values": [
+              "جدا شده؛ طلاق پس از زندگی مشترک",
+              "همسر فوت شده"
+            ]
+          }
+        },
+        "extras": {
+          "placeHolder": "مثلاً ۲",
+          "range": [0, 10],
           "options": []
         }
       },
       {
-        "title": "Ready to Continue",
-        "type": "button",
+        "title": "توضیح کوتاه درباره شرایط فرزند یا تکفل",
+        "type": "text",
         "required": false,
-        "description": "Confirms that you want to proceed to the next section.",
-        "tooltip": "This can be used as a UI action trigger.",
+        "tooltip": "هرگونه توضیح تکمیلی درباره شرایط فرزندان یا افراد تحت تکفل خود را بنویسید.",
         "extras": {
-          "placeHolder": "Continue",
+          "placeHolder": "توضیحات را اینجا وارد کنید...",
           "range": [0, 0],
-          "options": ["Continue"]
+          "options": []
         }
       }
     ]
   },
   {
-    "title": "Expactancy & equality",
-    "icon": "heart-handshake",
-    "slug": "expactancy_and_equality",
+    "title": "اعتقادات، سبک زندگی، شخصیت و خطوط قرمز شخصی",
+    "icon": "shield-check",
+    "slug": "beliefs_lifestyle_boundaries",
     "required": true,
-    "estimateTime": "40 minutes",
-    "tooltip": "Relationship expectations and equality preferences.",
+    "estimateTime": "۱۵ دقیقه",
+    "tooltip": "اعتقادات مذهبی، انتخاب‌های سبک زندگی و مرزهای شخصی شما.",
     "progress": 0,
-    "description": "Captures expectations, equality preferences, and relationship readiness.",
+    "description": "جزئیات مربوط به فرایض مذهبی، پوشش در اجتماع، دیدگاه سیاسی، عادات و ترجیحات سبک زندگی.",
     "questions": [
       {
-        "title": "National ID Upload",
-        "type": "file",
+        "title": "مرجع تقلید",
+        "type": "text",
         "required": true,
-        "description": "Upload a clear image or PDF of your national ID.",
-        "tooltip": "Accepted formats can be restricted in the UI layer.",
+        "tooltip": "نام مرجع تقلید خود را بنویسید یا ذکر کنید که این موضوع برایتان اولویت ندارد.",
         "extras": {
-          "placeHolder": "Choose a file",
+          "placeHolder": "مثلاً آیت‌الله سیستانی",
           "range": [0, 0],
-          "options": [".jpg", ".png", ".pdf"]
+          "options": []
         }
       },
       {
-        "title": "Marriage Timeline",
-        "type": "dropdown",
-        "required": false,
-        "description": "Choose your preferred timeline for marriage.",
-        "tooltip": "This helps prioritize urgency and compatibility.",
+        "title": "میزان تقید به نمازهای واجب",
+        "type": "radio",
+        "required": true,
+        "tooltip": "میزان پایبندی خود به نمازهای روزانه را انتخاب کنید.",
         "extras": {
-          "placeHolder": "Select a timeline",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": ["Within 6 months", "6-12 months", "1-2 years", "Flexible"]
+          "options": [
+            "همیشه مقید هستم، ترجیحاً اول وقت",
+            "همیشه مقید هستم، اما نه لزوماً اول وقت",
+            "گاهی اوقات می‌خوانم",
+            "نمی‌خوانم"
+          ]
         }
-      }
-    ]
-  },
-  {
-    "title": "Cantact",
-    "icon": "file-text",
-    "slug": "contact",
-    "required": true,
-    "estimateTime": "Not specified",
-    "tooltip": "Contact details and communication preferences.",
-    "progress": 0,
-    "description": "Captures contact details and preferred communication channels.",
-    "questions": [
+      },
       {
-        "title": "Short Biography",
-        "type": "text",
+        "title": "میزان تقید به روزه ماه رمضان",
+        "type": "radio",
         "required": true,
-        "description": "Provide a short written introduction.",
-        "tooltip": "This exercises the text input type.",
+        "tooltip": "میزان پایبندی خود به روزه گرفتن در ماه رمضان را انتخاب کنید.",
         "extras": {
-          "placeHolder": "Write a short introduction about yourself",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": []
+          "options": [
+            "کاملاً مقید هستم",
+            "به دلیل عذر شرعی یا پزشکی روزه نمی‌گیرم",
+            "گاهی بدون عذر شرعی روزه نمی‌گیرم",
+            "مقید نیستم"
+          ]
         }
       },
       {
-        "title": "Preferred Wedding Date",
-        "type": "date",
+        "title": "نوع پوشش و ظاهر در اجتماع",
+        "type": "radio",
+        "required": true,
+        "tooltip": "گزینه‌ای را انتخاب کنید که بیشترین تطابق را با پوشش روزمره شما در اجتماع دارد.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "پوشش کامل اسلامی (حداکثری) - چادر، عبا یا پوشش‌های مشابه با رعایت کامل حدود شرعی.",
+            "حجاب کامل با لباس‌های پوشیده و آزاد - مانتوهای بلند و گشاد با پوشش کامل موی سر.",
+            "پوشش عرفی و امروزی با رعایت حجاب - استایل‌های مدرن با استفاده از شال یا توربان برای پوشش مو.",
+            "پوشش آراسته و سنگین (بدون پوشش مو) - لباس‌های رسمی و موقر بدون استفاده از روسری یا شال.",
+            "پوشش مدرن و آزاد (بدون رعایت حجاب) - دنبال کردن استایل‌های روز بدون پایبندی به قواعد حجاب اسلامی."
+          ]
+        }
+      },
+      {
+        "title": "استفاده از آرایش در اجتماع",
+        "type": "radio",
         "required": false,
-        "description": "Select your preferred wedding date.",
-        "tooltip": "This exercises the date picker type.",
+        "tooltip": "میزان استفاده معمول خود از لوازم آرایشی در محیط‌های عمومی را انتخاب کنید.",
+        "audience": {
+          "genders": [
+            "female"
+          ]
+        },
         "extras": {
-          "placeHolder": "YYYY-MM-DD",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": []
+          "options": [
+            "اصلاً آرایش نمی‌کنم",
+            "فقط آرایش بسیار ملایم",
+            "آرایش کامل"
+          ]
         }
       },
       {
-        "title": "Preferred Contact Method",
+        "title": "نگرش به رابطه دین و سیاست",
         "type": "radio",
         "required": true,
-        "description": "Choose one preferred contact method.",
-        "tooltip": "This exercises the radio selection type.",
+        "tooltip": "دیدگاه خود را درباره پیوند میان دین و مسائل سیاسی توصیف کنید.",
         "extras": {
-          "placeHolder": "Select one option",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": ["Phone", "WhatsApp", "Email"]
+          "options": [
+            "دین و سیاست از هم جدایی‌ناپذیرند و حتماً همسرم باید همین دیدگاه را داشته باشد.",
+            "دین و سیاست از هم جدایی‌ناپذیرند، اما فعالیت سیاسی همسرم الزامی نیست.",
+            "نگرش سنتی و غیرسیاسی به تشیع؛ با فردی که دیدگاه سیاسی داشته باشد نمی‌توانم ازدواج کنم.",
+            "نگرش غیرسیاسی به تشیع، اما اگر همسرم دیدگاه سیاسی داشته باشد خط قرمز من نیست.",
+            "این مفاهیم و دسته‌بندی‌ها دغدغه اصلی من نیست."
+          ]
         }
       },
       {
-        "title": "Home Phone Number",
-        "type": "phone",
+        "title": "موضع نسبت به نظام و حاکمیت فعلی",
+        "type": "radio",
         "required": false,
-        "description": "Enter your home landline or household phone number.",
-        "tooltip": "Include the area code if applicable.",
+        "tooltip": "موضع کلی خود را جهت پیشگیری از اختلافات اعتقادی در زندگی مشترک مشخص کنید.",
         "extras": {
-          "placeHolder": "e.g. 021-12345678",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": []
+          "options": [
+            "موافق و حامی نظام فعلی؛ مخالفت جدی همسرم خط قرمز است.",
+            "موافق و حامی نظام فعلی، اما تفاوت دیدگاه همسرم خط قرمز نیست.",
+            "مخالف نظام فعلی؛ حمایت جدی همسرم از حاکمیت خط قرمز است.",
+            "مخالف نظام فعلی، اما تفاوت دیدگاه همسرم خط قرمز نیست.",
+            "موضع خاصی ندارم؛ تفاوت‌های سیاسی برایم در ازدواج تعیین‌کننده نیست."
+          ]
         }
       },
       {
-        "title": "Father's Phone Number",
-        "type": "phone",
-        "required": false,
-        "description": "Enter the phone number of your father for contact purposes.",
-        "tooltip": "Use a number that can reliably receive calls.",
+        "title": "حدود روابط با جنس مخالف",
+        "type": "radio",
+        "required": true,
+        "tooltip": "مرزهای اجتماعی خود در برخورد با جنس مخالف را توصیف کنید.",
         "extras": {
-          "placeHolder": "e.g. 0912-1234567",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": []
+          "options": [
+            "بسیار رسمی و محدود (فقط در حد ضرورت) - اجتناب از هرگونه گفتگوی غیرضروری یا شوخی.",
+            "محترمانه و متعارف (بدون صمیمیت) - تعاملات مؤدبانه با حفظ مرزهای مشخص شخصی.",
+            "اجتماعی و راحت (در چارچوب شرعی) - حضور فعال در جمع‌های اجتماعی با رعایت حدود اخلاقی.",
+            "مرز خاصی ندارم - با تعاملات اجتماعی مدرن کاملاً راحت هستم."
+          ]
         }
       },
       {
-        "title": "Household Size Preference",
-        "type": "number",
-        "required": false,
-        "description": "Enter the household size you are comfortable with.",
-        "tooltip": "This exercises the number input type.",
+        "title": "سیگار",
+        "type": "radio",
+        "required": true,
+        "tooltip": "وضعیت مصرف سیگار خود را مشخص کنید.",
         "extras": {
-          "placeHolder": "e.g. 4",
-          "range": [1, 12],
-          "options": []
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "اصلاً مصرف نمی‌کنم",
+            "گاهی / تفریحی مصرف می‌کنم",
+            "مرتب مصرف می‌کنم",
+            "در حال ترک هستم"
+          ]
         }
       },
       {
-        "title": "Current City",
-        "type": "dropdown",
+        "title": "قلیان",
+        "type": "radio",
         "required": true,
-        "description": "Choose the city you currently live in.",
-        "tooltip": "This exercises the dropdown type.",
+        "tooltip": "وضعیت مصرف قلیان خود را مشخص کنید.",
         "extras": {
-          "placeHolder": "Select your city",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": ["Tehran", "Karaj", "Shiraz", "Mashhad"]
+          "options": [
+            "اصلاً مصرف نمی‌کنم",
+            "گاهی / تفریحی مصرف می‌کنم",
+            "مرتب مصرف می‌کنم",
+            "در حال ترک هستم"
+          ]
         }
       },
       {
-        "title": "Importance of Shared Goals",
-        "type": "slider",
+        "title": "ویپ / سیگار الکترونیک",
+        "type": "radio",
         "required": true,
-        "description": "Rate how important shared long-term goals are to you.",
-        "tooltip": "This exercises the slider type.",
+        "tooltip": "وضعیت مصرف ویپ یا سیگار الکترونیک خود را مشخص کنید.",
         "extras": {
-          "placeHolder": "Move the slider",
-          "range": [1, 10],
-          "options": []
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "اصلاً مصرف نمی‌کنم",
+            "گاهی / تفریحی مصرف می‌کنم",
+            "مرتب مصرف می‌کنم",
+            "در حال ترک هستم"
+          ]
         }
       },
       {
-        "title": "Review Answers",
-        "type": "button",
-        "required": false,
-        "description": "Use this action to review the current section.",
-        "tooltip": "This exercises the button type.",
+        "title": "مشروبات الکلی",
+        "type": "radio",
+        "required": true,
+        "tooltip": "وضعیت مصرف مشروبات الکلی خود را مشخص کنید.",
         "extras": {
-          "placeHolder": "Review",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": ["Review"]
+          "options": [
+            "اصلاً مصرف نمی‌کنم",
+            "مصرف الکل برای من خط قرمز جدی است",
+            "گاهی مصرف می‌کنم",
+            "مصرف می‌کنم"
+          ]
         }
       },
       {
-        "title": "Profile Photo Upload",
-        "type": "file",
-        "required": false,
-        "description": "Upload a profile photo or supporting image.",
-        "tooltip": "This exercises the file upload type.",
+        "title": "مواد مخدر یا مواد غیرقانونی",
+        "type": "radio",
+        "required": true,
+        "tooltip": "وضعیت مصرف یا سابقه خود در مورد مواد غیرقانونی را مشخص کنید.",
         "extras": {
-          "placeHolder": "Choose an image",
+          "placeHolder": "یک گزینه را انتخاب کنید",
           "range": [0, 0],
-          "options": [".jpg", ".jpeg", ".png"]
+          "options": [
+            "هرگز مصرف نکرده‌ام",
+            "در گذشته مصرف داشته‌ام اما اکنون ترک کرده‌ام",
+            "در حال حاضر مصرف می‌کنم",
+            "در حال درمان یا بازپروری هستم"
+          ]
         }
       },
       {
-        "title": "User Photo",
-        "type": "photo",
+        "title": "نگرش به موسیقی",
+        "type": "radio",
+        "required": true,
+        "tooltip": "سلیقه و دیدگاه اعتقادی خود را در مورد موسیقی مشخص کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "اصلاً به هیچ موسیقی گوش نمی‌دهم",
+            "فقط به تواشیح، موسیقی‌های مذهبی یا بدون ساز گوش می‌دهم",
+            "به موسیقی‌های مجاز و حلال گوش می‌دهم",
+            "حساسیت خاصی روی نوع موسیقی ندارم"
+          ]
+        }
+      },
+      {
+        "title": "نگرش به مراسم عروسی",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نحوه برگزاری مراسم عروسی مورد نظر خود را توصیف کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "بدون مراسم یا بسیار ساده",
+            "کاملاً مذهبی و تفکیک‌شده (زنانه و مردانه جدا)",
+            "مراسم مختلط سنگین بدون رقص و موسیقی غیرمجاز",
+            "مراسم مختلط همراه با موسیقی و رقص",
+            "هنوز تصمیم نگرفته‌ام؛ بستگی به توافق خانواده‌ها دارد"
+          ]
+        }
+      },
+      {
+        "title": "توضیح کوتاه درباره سبک زندگی",
+        "type": "text",
         "required": false,
-        "description": "Please ensure your photo follows the required dress guidelines. Your photo will be reviewed by our female staff and handled with strict confidentiality. It will not be shared with anyone",
-        "tooltip": "This exercises the photo upload type.",
+        "tooltip": "در صورت تمایل، جزئیات بیشتری درباره روتین روزانه یا عادات خود به اشتراک بگذارید.",
         "extras": {
-          "placeHolder": "Choose an image",
+          "placeHolder": "توضیحات را اینجا وارد کنید...",
           "range": [0, 0],
-          "options": [".jpg", ".jpeg", ".png"]
+          "options": []
         }
       }
     ]
@@ -696,5 +932,488 @@
         }
       }
     ]
+  },
+  {
+    "title": "Future Spouse Criteria and Red Lines",
+    "icon": "shield-check",
+    "slug": "future_spouse_criteria",
+    "required": true,
+    "estimateTime": "20 دقیقه",
+    "tooltip": "معیارها، انتظارات و خطوط قرمز شما در مورد همسر آینده.",
+    "progress": 0,
+    "description": "معیارها و خطوط قرمز.",
+    "questions": [
+      {
+        "title": "Desired Age Range of Future Spouse",
+        "type": "text",
+        "required": true,
+        "description": "از [عدد] تا [عدد] سال",
+        "tooltip": "مثلاً از ۲۵ تا ۳۰ سال",
+        "extras": {
+          "placeHolder": "مثلاً ۲۵-۳۰",
+          "range": [0, 0],
+          "options": []
+        }
+      },
+      {
+        "title": "Desired Height Range of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "محدوده قدی مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "کمتر از ۱۶۰",
+            "۱۶۰ تا ۱۷۰",
+            "۱۷۰ تا ۱۸۰",
+            "۱۸۰ تا ۱۹۰",
+            "بالای ۱۹۰"
+          ]
+        }
+      },
+      {
+        "title": "Desired Body Type of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "تیپ بدنی مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "لاغراندام",
+            "متناسب",
+            "ورزیده",
+            "توپر",
+            "درشت‌اندام"
+          ]
+        }
+      },
+      {
+        "title": "Desired Skin Color of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "رنگ پوست مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "سفید / روشن",
+            "گندمگون / سبزه روشن",
+            "سبزه تیره / قهوه‌ای",
+            "تیره / سیاهپوست"
+          ]
+        }
+      },
+      {
+        "title": "Desired Ethnicity, Language, or Nationality of Future Spouse",
+        "type": "text",
+        "required": false,
+        "description": "فیلد متنی اختیاری",
+        "tooltip": "در صورت تمایل، ترجیحات قومی یا ملیتی خود را وارد کنید.",
+        "extras": {
+          "placeHolder": "مثلاً فارس، ترک، عرب و ...",
+          "range": [0, 0],
+          "options": []
+        }
+      },
+      {
+        "title": "Minimum Education Level of Future Spouse",
+        "type": "radio",
+        "required": true,
+        "tooltip": "حداقل سطح تحصیلات مورد انتظار خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "حداقل دیپلم",
+            "حداقل کارشناسی",
+            "حداقل کارشناسی ارشد",
+            "دکتری یا بالاتر ترجیح دارد.",
+            "حتماً تحصیلات حوزوی / علوم دینی داشته باشد.",
+            "تحصیلات دانشگاهی مهم نیست، اما بلوغ فکری مهم است."
+          ]
+        }
+      },
+      {
+        "title": "Desired Employment Status of Future Spouse",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "وضعیت اشتغال مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "شاغل باشد.",
+            "دانشجو باشد.",
+            "خانه‌دار باشد.",
+            "کارآفرین / صاحب کسب‌وکار باشد.",
+            "در مسیر رشد شغلی باشد.",
+            "بسته به شرایط قابل گفتگو است."
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Future Spouse's Marriage History",
+        "type": "radio",
+        "required": true,
+        "tooltip": "موضع خود را در مورد سابقه تاهل همسر آینده مشخص کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "فقط مجرد؛ سابقه عقد یا ازدواج قبلی برایم خط قرمز است.",
+            "مجرد ترجیح دارد، اما شرایط خاص را بررسی می‌کنم.",
+            "تفاوتی ندارد.",
+            "بستگی به علت جدایی، مدت ازدواج قبلی و شرایط خانوادگی دارد."
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Children from Previous Marriage",
+        "type": "radio",
+        "required": true,
+        "tooltip": "موضع خود را در مورد فرزند داشتن همسر آینده مشخص کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "به هیچ وجه نمی‌پذیرم.",
+            "در شرایط خاص می‌پذیرم.",
+            "تفاوتی ندارد.",
+            "فقط اگر فرزند با او زندگی نکند، بررسی می‌کنم."
+          ]
+        }
+      },
+      {
+        "title": "Desired Clothing and Hijab Criteria",
+        "type": "radio",
+        "required": true,
+        "audience": {
+          "genders": ["male"]
+        },
+        "tooltip": "انتظارات خود از پوشش همسر آینده را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "پوشش کامل اسلامی مانند چادر، عبایا یا جلباب الزامی است.",
+            "حجاب شرعی الزامی است، اما نوع آن مهم نیست.",
+            "پوشش عرفی همراه با حجاب قابل قبول است.",
+            "پوشش محجوب و سنگین مهم است، اما جزئیات قابل گفتگو است.",
+            "حساسیت خاصی ندارم."
+          ]
+        }
+      },
+      {
+        "title": "Desired Clothing and Grooming for Future Spouse",
+        "type": "radio",
+        "required": true,
+        "audience": {
+          "genders": ["female"]
+        },
+        "tooltip": "انتظارات خود از پوشش همسر آینده را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "پوشش رسمی، سنگین و مذهبی داشته باشد.",
+            "ساده، مرتب و محجوب باشد.",
+            "پوشش معمولی و آراسته کافی است.",
+            "پوشش مدرن برایم مشکلی ندارد.",
+            "حساسیت خاصی ندارم."
+          ]
+        }
+      },
+      {
+        "title": "Desired Spouse's Tendency for Further Education",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نظر خود را در مورد ادامه تحصیل همسر آینده انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "حتماً قصد ادامه تحصیل داشته باشد.",
+            "ادامه تحصیل مثبت است، اما الزامی نیست.",
+            "ترجیح می‌دهم بعد از ازدواج ادامه تحصیل ندهد.",
+            "بسته به شرایط زندگی مشترک تصمیم می‌گیریم."
+          ]
+        }
+      },
+      {
+        "title": "Desired Spouse's Tendency for Employment",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نظر خود را در مورد اشتغال همسر آینده انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مهم نیست.",
+            "حتماً شاغل باشد.",
+            "حتماً خانه‌دار باشد.",
+            "اختیار با خودش باشد.",
+            "بسته به شرایط زندگی، فرزندآوری و توافق مشترک تصمیم می‌گیریم.",
+            "فقط با شغلی که با ارزش‌های دینی و خانوادگی من سازگار باشد موافقم."
+          ]
+        }
+      },
+      {
+        "title": "Desired Spouse's Family Status and Values",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "معیارهای خانوادگی مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "این معیارها برایم مهم نیست.",
+            "والدین همسرم طلاق نگرفته باشند.",
+            "پدر همسر آینده‌ام در قید حیات باشد.",
+            "مادر همسر آینده‌ام در قید حیات باشد.",
+            "فضای مذهبی خانواده همسر برایم مهم است.",
+            "خانواده همسر باید اهل ارتباط محترمانه و سالم باشند."
+          ]
+        }
+      },
+      {
+        "title": "Level of Family Communication Post-Marriage",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نحوه ارتباط با خانواده‌ها بعد از ازدواج را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "ارتباط نزدیک و پررنگ با خانواده‌ها را دوست دارم.",
+            "ارتباط محترمانه اما با حفظ استقلال زندگی مشترک را ترجیح می‌دهم.",
+            "ارتباط محدود و کنترل‌شده را ترجیح می‌دهم.",
+            "بسته به شرایط خانواده‌ها تصمیم می‌گیرم."
+          ]
+        }
+      },
+      {
+        "title": "Desired Level of Religious Commitment",
+        "type": "radio",
+        "required": true,
+        "tooltip": "سطح مذهبی مورد نظر همسر آینده را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "بسیار مذهبی و مقید",
+            "مذهبی معتدل",
+            "عرفی اما محترم به دین",
+            "این معیار برایم اهمیت زیادی ندارد."
+          ]
+        }
+      },
+      {
+        "title": "Desired Political Outlook",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نگرش سیاسی مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "حتماً همسو با دیدگاه من باشد.",
+            "تفاوت دیدگاه سیاسی مهم نیست، به شرط احترام متقابل.",
+            "ترجیح می‌دهم سیاسی نباشد.",
+            "سیاست برایم اهمیتی در ازدواج ندارد."
+          ]
+        }
+      },
+      {
+        "title": "Boundaries with the Opposite Sex",
+        "type": "radio",
+        "required": true,
+        "tooltip": "حدود روابط اجتماعی همسر آینده را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "بسیار رسمی و محدود باشد.",
+            "معمولی و محترمانه باشد.",
+            "اجتماعی‌تر باشد، اما در چارچوب شرع و اخلاق."
+          ]
+        }
+      },
+      {
+        "title": "Red Lines for Smoking, Alcohol, and Substances",
+        "type": "checkbox",
+        "required": true,
+        "tooltip": "خط قرمزهای خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "سیگار برایم خط قرمز است.",
+            "قلیان برایم خط قرمز است.",
+            "ویپ برایم خط قرمز است.",
+            "الکل برایم خط قرمز جدی است.",
+            "مواد مخدر برایم خط قرمز قطعی است.",
+            "مصرف تفریحی دخانیات را در شرایط خاص می‌پذیرم.",
+            "هیچ‌کدام برایم خط قرمز نیست."
+          ]
+        }
+      },
+      {
+        "title": "Attitude towards Music",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نگرش مورد نظر خود را در مورد موسیقی انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "نباید به موسیقی گوش بدهد.",
+            "فقط موسیقی مذهبی / بدون ساز / نشید قابل قبول است.",
+            "موسیقی حلال و مجاز قابل قبول است.",
+            "حساسیت خاصی ندارم."
+          ]
+        }
+      },
+      {
+        "title": "Attitude towards Wedding Ceremony",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نحوه برگزاری مراسم عروسی مورد نظر خود را انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "مراسم ساده یا بدون مراسم را ترجیح دهد.",
+            "فقط مراسم کاملاً شرعی و تفکیک‌شده قابل قبول است.",
+            "مراسم مختلط محترمانه و بدون رقص و موسیقی غیرشرعی قابل قبول است.",
+            "مراسم مختلط با موسیقی و رقص قابل قبول است.",
+            "بسته به توافق خانواده‌ها قابل تصمیم‌گیری است."
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Chronic Illness or Disability",
+        "type": "radio",
+        "required": true,
+        "tooltip": "موضع خود را در مورد بیماری یا معلولیت همسر آینده مشخص کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "برایم خط قرمز است.",
+            "در شرایط خاص و با توضیح کامل بررسی می‌کنم.",
+            "اگر مانع زندگی مشترک سالم نباشد، می‌پذیرم.",
+            "موردی و با مشورت بررسی می‌کنم."
+          ]
+        }
+      },
+      {
+        "title": "Acceptance of Psychological Counseling History",
+        "type": "radio",
+        "required": true,
+        "tooltip": "موضع خود را در مورد سابقه مشاوره همسر آینده مشخص کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "برایم مشکلی ندارد.",
+            "بستگی به شرایط فعلی و میزان ثبات دارد.",
+            "برایم خط قرمز است.",
+            "نیاز به بررسی جدی‌تر دارد."
+          ]
+        }
+      },
+      {
+        "title": "Residence Preference after Marriage",
+        "type": "radio",
+        "required": true,
+        "tooltip": "محل زندگی مورد نظر خود را بعد از ازدواج انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "کشور محل زندگی طرف مقابل برایم مهم نیست.",
+            "ترجیح می‌دهم در کشور فعلی خودم بمانم.",
+            "ترجیح می‌دهم در کشور فعلی همسر آینده‌ام زندگی کنیم.",
+            "فقط در شهر فعلی خودم حاضر به زندگی هستم.",
+            "آماده مهاجرت به کشور ثالث هستم.",
+            "بسته به کار، اقامت، خانواده و شرایط مالی تصمیم می‌گیریم."
+          ]
+        }
+      },
+      {
+        "title": "Preference for Living with Family",
+        "type": "radio",
+        "required": true,
+        "tooltip": "نظر خود را در مورد زندگی با خانواده بعد از ازدواج انتخاب کنید.",
+        "extras": {
+          "placeHolder": "یک گزینه را انتخاب کنید",
+          "range": [0, 0],
+          "options": [
+            "فقط زندگی مستقل را می‌پذیرم.",
+            "زندگی موقت با خانواده در ابتدای ازدواج قابل قبول است.",
+            "زندگی با خانواده همسر یا خانواده خودم برایم مشکلی ندارد.",
+            "بستگی به شرایط دارد."
+          ]
+        }
+      },
+      {
+        "title": "Additional Comments and Red Lines",
+        "type": "text",
+        "required": true,
+        "description": "فیلد متنی بزرگ",
+        "tooltip": "هر نکته مهمی که در گزینه‌های بالا نبود، اینجا بنویسید.",
+        "extras": {
+          "placeHolder": "توضیحات تکمیلی را اینجا وارد کنید...",
+          "range": [0, 0],
+          "options": []
+        }
+      }
+    ]
+  },
+  {
+    "title": "Identity Verification and Documents",
+    "icon": "shield-check",
+    "slug": "identity_verification",
+    "required": true,
+    "estimateTime": "5 دقیقه",
+    "tooltip": "بارگذاری مدارک شناسایی و تصویر چهره جهت احراز هویت.",
+    "progress": 0,
+    "description": "بارگذاری مدارک شناسایی.",
+    "questions": [
+      {
+        "title": "Profile Picture",
+        "type": "photo",
+        "required": true,
+        "private": true,
+        "description": "عکس جدید و واضح",
+        "tooltip": "این تصویر به هیچ عنوان به طرف مقابل یا سایر کاربران نمایش داده نمی‌شود. عکس شما فقط توسط کارشناسان تأییدشده و هم‌جنس برای احراز هویت، بررسی تطابق ظاهری و جلوگیری از اختلافات ظاهری شدید بررسی می‌شود.\n\nراهنمای عکس مناسب:\n- عکس جدید و واضح باشد.\n- چهره کاملاً مشخص باشد.\n- فیلتر سنگین نداشته باشد.\n- عکس گروهی نباشد.\n- نور کافی داشته باشد.",
+        "extras": {
+          "placeHolder": "بارگذاری تصویر",
+          "range": [0, 0],
+          "options": [".jpg", ".jpeg", ".png"]
+        }
+      },
+      {
+        "title": "Valid Identification Document",
+        "type": "file",
+        "required": true,
+        "private": true,
+        "description": "پاسپورت، کارت ملی یا گواهینامه",
+        "tooltip": "تصویر واضح از مدرک شناسایی معتبر خود را بارگذاری کنید. مدارک قابل قبول:\n- پاسپورت\n- کارت ملی\n- گواهینامه\n- کارت اقامت معتبر\n- مدرک شناسایی رسمی کشور محل سکونت",
+        "extras": {
+          "placeHolder": "بارگذاری مدرک",
+          "range": [0, 0],
+          "options": [".pdf", ".jpg", ".jpeg", ".png"]
+        }
+      }
+    ]
   }
 ]
