loan/user-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixing in user project error messages of yop / placement of submit loan request and alignment of its items

Browse Source
This commit is contained in:
Mohammad Jalali
2023-07-31 17:05:28 +03:30
parent 51228f3c02
commit a869363aba
8 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/dashboard/loan-request/NavyForm.jsx
View File

@@ -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={<DataSaverOnIcon/>}
disabled={props.isSubmitting ? true : false}
>

15
src/components/dashboard/loan-request/WelfareServicesForm.jsx
View File

@@ -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={<DataSaverOnIcon/>}
disabled={props.isSubmitting ? true : false}
>

2
src/components/login/SendUserData.jsx
View File

@@ -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) => {

2
src/components/register/RequestOtp.jsx
View File

@@ -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")
),
});

6
src/components/register/navy/UserRegister.jsx
View File

@@ -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) => {

4
src/components/register/welfare-services/UserRegister.jsx
View File

@@ -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")
),
});

1
src/core/components/SelectBox.jsx
View File

@@ -23,6 +23,7 @@ function SelectBox({
fullWidth
size="small"
error={error}
sx={{mt: 0}}
>
<InputLabel id="language-label">{label}</InputLabel>
<Select