diff --git a/src/app/questions-list/[slug]/question-detail-client.tsx b/src/app/questions-list/[slug]/question-detail-client.tsx
index 57a255c..49ca667 100644
--- a/src/app/questions-list/[slug]/question-detail-client.tsx
+++ b/src/app/questions-list/[slug]/question-detail-client.tsx
@@ -172,9 +172,9 @@ function QuestionFlowWrapper({
const dynamicQuestions = useMemo(() => {
// Find employment status question by title or by choices length (10)
const employmentQuestionIndex = visibleQuestions.findIndex((q) => {
+ const enTitle = q.englishTitle || q.title;
return (
- q.title === "Employment Status" ||
- q.title === "وضعیت اشتغال" ||
+ enTitle === "Employment Status" ||
(q.type === "dropdown" && q.extras.options?.length === 10)
);
});
@@ -191,10 +191,8 @@ function QuestionFlowWrapper({
// Find Parents' Survival Status question index and check selected index
const survivalStatusQuestionIndex = visibleQuestions.findIndex((q) => {
- return (
- q.title === "Parents' Survival Status" ||
- q.title === "وضعیت حیات والدین"
- );
+ const enTitle = q.englishTitle || q.title;
+ return enTitle === "Parents' Survival Status";
});
let survivalSelectedOptionIndex = -1;
@@ -209,9 +207,8 @@ function QuestionFlowWrapper({
// Find Parents' Marital Status question index and check selected index
const maritalStatusQuestionIndex = visibleQuestions.findIndex((q) => {
- return (
- q.title === "Parents' Marital Status" || q.title === "وضعیت تأهل والدین"
- );
+ const enTitle = q.englishTitle || q.title;
+ return enTitle === "Parents' Marital Status";
});
let isCircumstancesSelected = false;
@@ -227,9 +224,8 @@ function QuestionFlowWrapper({
// Find Current Marital Status question index and check selected index
const currentMaritalQuestionIndex = visibleQuestions.findIndex((q) => {
- return (
- q.title === "Current Marital Status" || q.title === "وضعیت تأهل فعلی"
- );
+ const enTitle = q.englishTitle || q.title;
+ return enTitle === "Current Marital Status";
});
let maritalSelectedIndex = -1;
@@ -244,10 +240,8 @@ function QuestionFlowWrapper({
// Find Children and Guardianship Status question index
const custodyQuestionIndex = visibleQuestions.findIndex((q) => {
- return (
- q.title === "Children and Guardianship Status" ||
- q.title === "وضعیت فرزند و تکفل"
- );
+ const enTitle = q.englishTitle || q.title;
+ return enTitle === "Children and Guardianship Status";
});
let hasChildrenSelected = false;
@@ -258,46 +252,41 @@ function QuestionFlowWrapper({
const ans = getAnswerValue(custodyQuestion, custodyQuestionIndex);
if (ans) {
const ansList = Array.isArray(ans) ? ans.map(String) : [String(ans)];
- hasChildrenSelected = ansList.some(
- (val) => val.includes("Have children") || val.includes("فرزند دارم"),
+ const selectedIndices = ansList.map((val) =>
+ custodyQuestion.extras.options?.indexOf(val),
+ );
+ hasChildrenSelected = selectedIndices.some(
+ (idx) => idx === 1 || idx === 2,
);
- hasAnyGuardianshipSelected = ansList.some(
- (val) =>
- val.includes("Have children") ||
- val.includes("فرزند دارم") ||
- val.includes("under my guardianship") ||
- val.includes("تحت تکفل"),
+ hasAnyGuardianshipSelected = selectedIndices.some(
+ (idx) => idx === 2 || idx === 3,
);
}
}
const filtered = visibleQuestions.filter((question, index) => {
+ const enTitle = question.englishTitle || question.title;
// Check if this is one of the marital status/children questions
if (currentMaritalQuestionIndex !== -1) {
const isDuration =
index === currentMaritalQuestionIndex + 1 ||
- question.title === "Previous Marriage Duration" ||
- question.title === "مدت ازدواج یا عقد قبلی";
+ enTitle === "Previous Marriage Duration";
const isSeparation =
index === currentMaritalQuestionIndex + 2 ||
- question.title === "Reason for Separation" ||
- question.title === "علت جدایی، در صورت وجود";
+ enTitle === "Reason for Separation";
const isCustody =
index === currentMaritalQuestionIndex + 3 ||
- question.title === "Children and Guardianship Status" ||
- question.title === "وضعیت فرزند و تکفل";
+ enTitle === "Children and Guardianship Status";
const isChildrenCount =
index === currentMaritalQuestionIndex + 4 ||
- question.title === "Number of Children" ||
- question.title === "تعداد فرزندان";
+ enTitle === "Number of Children";
const isChildrenExplanation =
index === currentMaritalQuestionIndex + 5 ||
- question.title === "Short Children/Guardianship Explanation" ||
- question.title === "توضیح کوتاه درباره شرایط فرزند یا تکفل";
+ enTitle === "Short Children/Guardianship Explanation";
if (isDuration) {
return [1, 2, 3].includes(maritalSelectedIndex);
@@ -321,19 +310,13 @@ function QuestionFlowWrapper({
// Check if this is one of the three job-related questions
if (employmentQuestionIndex !== -1) {
const isJobTitle =
- index === employmentQuestionIndex + 1 ||
- question.title === "Job Title" ||
- question.title === "عنوان شغلی";
+ index === employmentQuestionIndex + 1 || enTitle === "Job Title";
const isWorkLocation =
- index === employmentQuestionIndex + 2 ||
- question.title === "Work Location" ||
- question.title === "محل فعالیت";
+ index === employmentQuestionIndex + 2 || enTitle === "Work Location";
const isMonthlyIncome =
- index === employmentQuestionIndex + 3 ||
- question.title === "Monthly Income" ||
- question.title === "میزان درآمد ماهانه";
+ index === employmentQuestionIndex + 3 || enTitle === "Monthly Income";
if (isJobTitle || isWorkLocation || isMonthlyIncome) {
// If no employment status is selected yet, hide them by default
@@ -371,9 +354,7 @@ function QuestionFlowWrapper({
// Check Parents' Survival Status to decide if Parents' Marital Status is visible
if (survivalStatusQuestionIndex !== -1) {
- const isParentsMaritalStatus =
- question.title === "Parents' Marital Status" ||
- question.title === "وضعیت تأهل والدین";
+ const isParentsMaritalStatus = enTitle === "Parents' Marital Status";
if (isParentsMaritalStatus) {
return survivalSelectedOptionIndex === 0;
@@ -404,10 +385,8 @@ function QuestionFlowWrapper({
});
return filtered.map((question) => {
- if (
- question.title === "Short Family Description" ||
- question.title === "توضیح کوتاه درباره خانواده"
- ) {
+ const enTitle = question.englishTitle || question.title;
+ if (enTitle === "Short Family Description") {
return {
...question,
required: isCircumstancesSelected,
@@ -415,30 +394,17 @@ function QuestionFlowWrapper({
}
if (
- question.title === "Previous Marriage Duration" ||
- question.title === "مدت ازدواج یا عقد قبلی" ||
- question.title === "Number of Children" ||
- question.title === "تعداد فرزندان" ||
- question.title === "Short Children/Guardianship Explanation" ||
- question.title === "توضیح کوتاه درباره شرایط فرزند یا تکفل" ||
- question.title === "Additional details about family responsibility" ||
- question.title === "توضیحات تکمیلی درباره مسئولیت خانوادگی" ||
- question.title === "Do the supported individual(s) live with you?" ||
- question.title === "آیا فرد یا افراد تحت حمایت با شما زندگی میکنند؟" ||
- question.title === "What is the custody status of your child(ren)?" ||
- question.title === "وضعیت حضانت فرزند یا فرزندان شما چگونه است؟" ||
- question.title ===
+ enTitle === "Previous Marriage Duration" ||
+ enTitle === "Number of Children" ||
+ enTitle === "Short Children/Guardianship Explanation" ||
+ enTitle === "Additional details about family responsibility" ||
+ enTitle === "Do the supported individual(s) live with you?" ||
+ enTitle === "What is the custody status of your child(ren)?" ||
+ enTitle ===
"Does the custody, visitation, or relocation schedule impact your residence or immigration?" ||
- question.title ===
- "آیا برنامه حضانت، ملاقات یا جابهجایی فرزند بر محل زندگی یا امکان مهاجرت شما تأثیر میگذارد؟" ||
- question.title ===
- "What is the payment or receipt status of child support?" ||
- question.title ===
- "وضعیت پرداخت یا دریافت نفقه و حمایت مالی فرزند چگونه است؟" ||
- question.title ===
- "Acceptance of necessary communication between future spouse and the other parent" ||
- question.title === "پذیرش ارتباط ضروری همسر آینده با والد دیگرِ فرزند" ||
- question.title === "پذیرش ارتباط ضروری همسر آینده با والد دیگر فرزند"
+ enTitle === "What is the payment or receipt status of child support?" ||
+ enTitle ===
+ "Acceptance of necessary communication between future spouse and the other parent"
) {
return {
...question,
@@ -470,7 +436,9 @@ function QuestionFlowWrapper({
if (originalIndex === -1) {
// Spread-copied questions lose reference equality; fall back to title
originalIndex = visibleQuestions.findIndex(
- (q) => q.title === question.title,
+ (q) =>
+ (q.englishTitle || q.title) ===
+ (question.englishTitle || question.title),
);
}
const answer = getAnswerValue(question, originalIndex);
@@ -478,9 +446,9 @@ function QuestionFlowWrapper({
let isAnswered = hasAnswer;
if (hasAnswer) {
- const isEmailQuestion =
- question.title.toLowerCase().includes("email") ||
- question.title.includes("ایمیل");
+ const isEmailQuestion = (question.englishTitle || question.title)
+ .toLowerCase()
+ .includes("email");
if (isEmailQuestion) {
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
isAnswered = emailRegex.test(String(answer).trim());
diff --git a/src/app/request-accepted/page.tsx b/src/app/request-accepted/page.tsx
index 4ba05f7..b0da952 100644
--- a/src/app/request-accepted/page.tsx
+++ b/src/app/request-accepted/page.tsx
@@ -180,7 +180,7 @@ export default function RequestAcceptedPage() {
});
const titleText = isFemaleProfile
? t.requestAccepted.titleFemale
- : caseStatus === "payment_done"
+ : (caseStatus === "payment_done" || caseStatus === "contacted")
? t.requestAccepted.titleMalePaymentDone
: t.requestAccepted.titleMalePaymentPending;
const primaryActionText = isFemaleProfile
@@ -188,7 +188,7 @@ export default function RequestAcceptedPage() {
: t.requestAccepted.primaryMale;
const secondaryActionText = isFemaleProfile
? t.requestAccepted.secondaryFemale
- : caseStatus === "payment_done"
+ : (caseStatus === "payment_done" || caseStatus === "contacted")
? t.requestAccepted.secondaryMalePaymentDone
: t.requestAccepted.secondaryMalePaymentPending;
const contactInfoPhoneItems = getContactInfoPhoneItems(
@@ -206,7 +206,7 @@ export default function RequestAcceptedPage() {
return;
}
- if (caseStatus === "payment_done") {
+ if (caseStatus === "payment_done" || caseStatus === "contacted") {
if (!caseId) {
return;
}
@@ -337,7 +337,7 @@ export default function RequestAcceptedPage() {
- {t.requestAccepted.description}
+ {isFemaleProfile ? t.candidateContact.title : t.requestAccepted.description}
diff --git a/src/components/Componentes/outcome-selection-sheet.tsx b/src/components/Componentes/outcome-selection-sheet.tsx
new file mode 100644
index 0000000..4420973
--- /dev/null
+++ b/src/components/Componentes/outcome-selection-sheet.tsx
@@ -0,0 +1,217 @@
+"use client";
+
+import type { HTMLAttributes } from "react";
+import { useEffect, useId, useState } from "react";
+import { useI18n } from "@/translations/provider";
+
+const EXIT_ANIMATION_MS = 220;
+
+export type OutcomeSelectionSheetProps = Omit<
+ HTMLAttributes
,
+ "title" | "onSubmit"
+> & {
+ closeOnOutside?: boolean;
+ onClose?: () => void;
+ onSubmit?: (status: "success" | "failure") => void;
+};
+
+export function OutcomeSelectionSheet({
+ closeOnOutside = true,
+ onClose,
+ onSubmit,
+ className,
+ ...props
+}: OutcomeSelectionSheetProps) {
+ const { dictionary: t } = useI18n();
+ const groupId = useId();
+ const [isVisible, setIsVisible] = useState(true);
+ const [isEntering, setIsEntering] = useState(true);
+ const [isClosing, setIsClosing] = useState(false);
+ const [selectedStatus, setSelectedStatus] = useState<"success" | "failure">(
+ "success",
+ );
+
+ const closeSheet = () => {
+ if (isClosing) {
+ return;
+ }
+ setIsClosing(true);
+ };
+
+ useEffect(() => {
+ const frameId = window.requestAnimationFrame(() => {
+ setIsEntering(false);
+ });
+
+ return () => {
+ window.cancelAnimationFrame(frameId);
+ };
+ }, []);
+
+ useEffect(() => {
+ if (!isVisible) {
+ return;
+ }
+
+ const previousBodyOverflow = document.body.style.overflow;
+ const previousHtmlOverflow = document.documentElement.style.overflow;
+
+ document.body.style.overflow = "hidden";
+ document.documentElement.style.overflow = "hidden";
+
+ return () => {
+ document.body.style.overflow = previousBodyOverflow;
+ document.documentElement.style.overflow = previousHtmlOverflow;
+ };
+ }, [isVisible]);
+
+ useEffect(() => {
+ if (!isClosing) {
+ return;
+ }
+
+ const timeoutId = window.setTimeout(() => {
+ setIsVisible(false);
+ onClose?.();
+ }, EXIT_ANIMATION_MS);
+
+ return () => {
+ window.clearTimeout(timeoutId);
+ };
+ }, [isClosing, onClose]);
+
+ if (!isVisible) {
+ return null;
+ }
+
+ const options = [
+ { value: "success" as const, label: t.candidateContact.marriageSuccess },
+ { value: "failure" as const, label: t.candidateContact.marriageFailure },
+ ];
+
+ return (
+ {
+ if (closeOnOutside && event.target === event.currentTarget) {
+ closeSheet();
+ }
+ }}
+ onKeyDown={(event) => {
+ if (
+ closeOnOutside &&
+ event.target === event.currentTarget &&
+ (event.key === "Escape" || event.key === "Enter" || event.key === " ")
+ ) {
+ event.preventDefault();
+ closeSheet();
+ }
+ }}
+ >
+
+
+
+ {t.candidateContact.outcomeTitle}
+
+
+
+
+ {t.candidateContact.outcomeTitle}
+
+
+
+ {options.map((option) => {
+ const checked = selectedStatus === option.value;
+
+ return (
+
+ );
+ })}
+
+
+
+
+
+
+
+
+
+