diff --git a/src/app/new-match/page.tsx b/src/app/new-match/page.tsx
index ab2c64c..6fd31e7 100644
--- a/src/app/new-match/page.tsx
+++ b/src/app/new-match/page.tsx
@@ -24,10 +24,10 @@ const advisorAvatars = [
const fieldCandidates = {
name: ["name", "full_name", "fullname", "first_name", "display_name"],
- occupation: ["occupation", "job", "profession", "career", "work"],
+ occupation: ["occupation", "job", "profession", "career", "work", "education", "highest_level_of_education"],
age: ["age"],
- city: ["city", "current_city", "residence_city", "location", "residence"],
- maritalStatus: ["marital_status", "maritalstatus", "relationship_status"],
+ city: ["city", "current_city", "residence_city", "location", "residence", "birth_city"],
+ maritalStatus: ["marital_status", "maritalstatus", "relationship_status", "current_marital_status"],
cityPreference: [
"city_preference",
"citypreference",
@@ -192,6 +192,14 @@ export default function NewMatchPage() {
(field): field is DisplayField => Boolean(field),
);
+ const isFemaleProfile = profile?.gender === "female";
+ const matchHeadingTitle = isFemaleProfile
+ ? "پیشنهاد ازدواج جدید"
+ : "YOU HAVE A NEW MATCH!";
+ const matchHeadingDescription = isFemaleProfile
+ ? "یک گزینهی مناسب برای شما پیدا شده است. در صورت تایید، مشخصات شما جهت ادامه فرآیند معرفی ارزیابی خواهد شد."
+ : "A matching profile has been found. Information is provided by the candidate's family or introducers. If you approve, we'll share your profile with her family.";
+
return (
<>
@@ -219,11 +227,9 @@ export default function NewMatchPage() {
alt="notification"
/>
-
YOU HAVE A NEW MATCH!
+
{matchHeadingTitle}
- A matching profile has been found. Information is provided by the
- girl's family or introducers. If you approve, we'll
- share your profile with her family
+ {matchHeadingDescription}
diff --git a/src/app/request-sent/page.tsx b/src/app/request-sent/page.tsx
index 6a7895b..83b7cf5 100644
--- a/src/app/request-sent/page.tsx
+++ b/src/app/request-sent/page.tsx
@@ -37,6 +37,12 @@ export default function RequestSentPage() {
}, [profile, locale, router]);
const copy = t.findingMatch;
+ const requestSentCopy = (t as any).requestSent ?? {
+ title: "درخواست ارسال شد",
+ description: "درخواست معرفی شما از طرف ما به خانواده طرف مقابل ارسال شد. در صورت تایید ایشان، اطلاعات تماس به اطلاع شما خواهد رسید.",
+ matchProfile: "مشاهده پروفایل گزینه",
+ profileLocked: "پروفایل قفل است",
+ };
return (
<>
@@ -48,8 +54,8 @@ export default function RequestSentPage() {
>
-
Habib Marriage
-
+
{t.common.appName}
+
@@ -66,16 +72,16 @@ export default function RequestSentPage() {
- Request Sent
+ {requestSentCopy.title}
- We will propose marriage on your behalf. If they accept, their contact details will be shared with you.
+ {requestSentCopy.description}
- Match Profile
+ {requestSentCopy.matchProfile}
@@ -100,7 +106,7 @@ export default function RequestSentPage() {
/>
- Profile is locked
+ {requestSentCopy.profileLocked}
diff --git a/src/lib/get-submit-path.ts b/src/lib/get-submit-path.ts
index 13e3636..db9f5ee 100644
--- a/src/lib/get-submit-path.ts
+++ b/src/lib/get-submit-path.ts
@@ -15,12 +15,19 @@ export function getSubmitPath(profile: MarriageProfileResponse | undefined) {
if (isInCase && activeCase) {
const caseStatus = activeCase.status;
const myAction = activeCase.my_action;
+ const isFemale = profile.gender === "female";
if (caseStatus === "payment_done" || caseStatus === "finalized") {
- return "/candidate-contact";
+ if (isFemale) {
+ return "/candidate-contact";
+ }
+ return "/request-accepted";
}
if (caseStatus === "payment_pending" || caseStatus === "female_accepted") {
+ if (isFemale) {
+ return "/candidate-contact";
+ }
return "/request-accepted";
}
diff --git a/src/translations/locales/en.json b/src/translations/locales/en.json
index 63d1d36..b6db13b 100644
--- a/src/translations/locales/en.json
+++ b/src/translations/locales/en.json
@@ -137,5 +137,11 @@
"dismissReasons": "Dismiss reasons",
"dismissDescription": "Please provide the full reason for rejecting the submitted item",
"dismissPlaceholder": "Your explanatory text ..."
+ },
+ "requestSent": {
+ "title": "Request Sent",
+ "description": "We will propose marriage on your behalf. If they accept, their contact details will be shared with you.",
+ "matchProfile": "Match Profile",
+ "profileLocked": "Profile is locked"
}
}
\ No newline at end of file
diff --git a/src/translations/locales/fa.json b/src/translations/locales/fa.json
index b5e93eb..2265bcd 100644
--- a/src/translations/locales/fa.json
+++ b/src/translations/locales/fa.json
@@ -119,5 +119,11 @@
"dismissReasons": "دلایل رد کردن",
"dismissDescription": "لطفا دلیل کامل رد کردن مورد ارسالشده را بنویسید",
"dismissPlaceholder": "متن توضیحی شما ..."
+ },
+ "requestSent": {
+ "title": "درخواست ارسال شد",
+ "description": "درخواست معرفی شما از طرف ما به خانواده طرف مقابل ارسال شد. در صورت تایید ایشان، اطلاعات تماس به اطلاع شما خواهد رسید.",
+ "matchProfile": "مشاهده پروفایل گزینه",
+ "profileLocked": "پروفایل قفل است"
}
}
\ No newline at end of file