diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index f1b9ed2..d49722a 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -57,7 +57,7 @@
"link_routing_back_to": "بازگشت به",
"link_routing_previuos_page": "صفحه قبل",
"link_routing_main_page": "صفحه اصلی",
- "error_message_required": "اجباری!",
+ "error_message_phone_number": "شماره تلفن خود را وارد کنید!",
"button_make_account": "ایجاد حساب",
"button_request_verification": "دریافت کد یکبارمصرف",
"sent_token_to": "ارسال کد یکبار مصرف به شماره",
@@ -75,7 +75,10 @@
"text_field_enter_your_national_id": "کد ملی خود را وارد کنید",
"text_field_navgan_id": "شماره ناوگان",
"text_field_enter_your_navgan_id": "شماره ناوگان خود را وارد کنید",
- "error_message_required": "اجباری!",
+ "error_message_phone_number": "لطفا شماره تلفن خود را وارد کنید!",
+ "error_message_verification_code": "لطفا کد یکبار مصرف خود را وارد کنید!",
+ "error_message_national_id": "لطفا کد ملی خود را وارد کنید!",
+ "error_message_navgan_id": "لطفا کد ناوگان خود را وارد کنید!",
"button_request_verification": "دریافت کد یکبارمصرف",
"button_submit": "ثبت و ورود",
"button_back_to_send_data": "بازگشت",
@@ -91,7 +94,14 @@
},
"LoanRequest": {
"loan_request_page": "فرم درخواست وام",
- "error_message_required": "اجباری!",
+ "error_message_name": "لطفا نام خود را وارد کنید!",
+ "error_message_phone_number": "لطفا شماره تلفن خود را وارد کنید!",
+ "error_message_vehicle_type": "لطفا نوع وسیله نقلیه خود را وارد کنید!",
+ "error_message_plate_number": "لطفا شماره پلاک خود را وارد کنید!",
+ "error_message_navgan_id": "لطفا کد ناوگان خود را وارد کنید!",
+ "error_message_province": "لطفا استان خود را وارد کنید!",
+ "error_message_national_code": "لطفا کد ملی خود را وارد کنید!",
+ "error_message_shenasname_id": "لطفا شماره شناسنامه خود را وارد کنید!",
"text_field_phone_number": "شماره تلفن",
"text_field_enter_your_phone_number": "شماره تلفن خود را وارد کنید",
"text_field_name": "نام",
diff --git a/src/components/dashboard/loan-request/NavyForm.jsx b/src/components/dashboard/loan-request/NavyForm.jsx
index dfe9327..81ea7e4 100644
--- a/src/components/dashboard/loan-request/NavyForm.jsx
+++ b/src/components/dashboard/loan-request/NavyForm.jsx
@@ -92,23 +92,23 @@ const NavyForm = () => {
// validation
const validationSchema = Yup.object().shape({
- name: Yup.string().required(t("LoanRequest.error_message_required")),
+ name: Yup.string().required(t("LoanRequest.error_message_name")),
phone_number: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_phone_number")
),
vehicle_type: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_vehicle_type")
),
plate_number: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_plate_number")
),
- navgan_id: Yup.string().required(t("LoanRequest.error_message_required")),
- province: Yup.string().required(t("LoanRequest.error_message_required")),
+ navgan_id: Yup.string().required(t("LoanRequest.error_message_navgan_id")),
+ province: Yup.string().required(t("LoanRequest.error_message_province")),
national_code: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_national_code")
),
shenasname_id: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_shenasname_id")
),
});
// end validation
@@ -472,6 +472,7 @@ const NavyForm = () => {
type="submit"
variant="contained"
size="large"
+ sx={{mt: 2}}
endIcon={}
disabled={props.isSubmitting ? true : false}
>
diff --git a/src/components/dashboard/loan-request/WelfareServicesForm.jsx b/src/components/dashboard/loan-request/WelfareServicesForm.jsx
index 6a50ef7..19a4501 100644
--- a/src/components/dashboard/loan-request/WelfareServicesForm.jsx
+++ b/src/components/dashboard/loan-request/WelfareServicesForm.jsx
@@ -67,22 +67,22 @@ const WelfareServicesForm = () => {
};
const validationSchema = Yup.object().shape({
- name: Yup.string().required(t("LoanRequest.error_message_required")),
+ name: Yup.string().required(t("LoanRequest.error_message_name")),
phone_number: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_phone_number")
),
vehicle_type: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_vehicle_type")
),
plate_number: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_plate_number")
),
- province: Yup.string().required(t("LoanRequest.error_message_required")),
+ province: Yup.string().required(t("LoanRequest.error_message_province")),
national_code: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_national_code")
),
shenasname_id: Yup.string().required(
- t("LoanRequest.error_message_required")
+ t("LoanRequest.error_message_shenasname_id")
),
});
@@ -419,6 +419,7 @@ const WelfareServicesForm = () => {
type="submit"
variant="contained"
size="large"
+ sx={{mt: 2}}
endIcon={}
disabled={props.isSubmitting ? true : false}
>
diff --git a/src/components/login/SendUserData.jsx b/src/components/login/SendUserData.jsx
index 8b4b056..93d0593 100644
--- a/src/components/login/SendUserData.jsx
+++ b/src/components/login/SendUserData.jsx
@@ -32,7 +32,7 @@ const SendUserData = ({
phone_number: PhoneNumber,
};
const validationSchema = Yup.object().shape({
- phone_number: Yup.string().required(t("LoginPage.error_message_required")),
+ phone_number: Yup.string().required(t("LoginPage.error_message_phone_number")),
});
const handleSubmit = async (values, props) => {
diff --git a/src/components/register/RequestOtp.jsx b/src/components/register/RequestOtp.jsx
index 88804f8..b0a78ed 100644
--- a/src/components/register/RequestOtp.jsx
+++ b/src/components/register/RequestOtp.jsx
@@ -32,7 +32,7 @@ const RequestOtp = ({
};
const validationSchema = Yup.object().shape({
phone_number: Yup.string().required(
- t("RegisterPage.error_message_required")
+ t("RegisterPage.error_message_phone_number")
),
});
diff --git a/src/components/register/navy/UserRegister.jsx b/src/components/register/navy/UserRegister.jsx
index b7a50f9..bb5ad6d 100644
--- a/src/components/register/navy/UserRegister.jsx
+++ b/src/components/register/navy/UserRegister.jsx
@@ -36,12 +36,12 @@ const UserRegister = ({
const validationSchema = Yup.object().shape({
verification_code: Yup.string().required(
- t("RegisterPage.error_message_required")
+ t("RegisterPage.error_message_verification_code")
),
national_id: Yup.string().required(
- t("RegisterPage.error_message_required")
+ t("RegisterPage.error_message_national_id")
),
- navgan_id: Yup.string().required(t("RegisterPage.error_message_required")),
+ navgan_id: Yup.string().required(t("RegisterPage.error_message_navgan_id")),
});
const handleSubmit = async (values, props) => {
diff --git a/src/components/register/welfare-services/UserRegister.jsx b/src/components/register/welfare-services/UserRegister.jsx
index 324c5c2..c83e3ba 100644
--- a/src/components/register/welfare-services/UserRegister.jsx
+++ b/src/components/register/welfare-services/UserRegister.jsx
@@ -35,10 +35,10 @@ const UserRegister = ({
const validationSchema = Yup.object().shape({
verification_code: Yup.string().required(
- t("RegisterPage.error_message_required")
+ t("RegisterPage.error_message_verification_code")
),
national_id: Yup.string().required(
- t("RegisterPage.error_message_required")
+ t("RegisterPage.error_message_national_id")
),
});
diff --git a/src/core/components/SelectBox.jsx b/src/core/components/SelectBox.jsx
index d2d38af..4d10b5e 100644
--- a/src/core/components/SelectBox.jsx
+++ b/src/core/components/SelectBox.jsx
@@ -23,6 +23,7 @@ function SelectBox({
fullWidth
size="small"
error={error}
+ sx={{mt: 0}}
>
{label}