diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 696dcb5..261793b 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -231,6 +231,18 @@
     "update_loan_page": "ویرایش وام | {person_type}",
     "loading_show_component": "درحال دریافت اطلاعات درخواست...",
     "tel_number_max": "شماره ثابت می بایست 11 رقم باشد",
+    "national_code_number": "کد ملی می بایست شامل اعداد باشد",
+    "national_code_positive": "کد ملی می بایست مثبت باشد",
+    "national_code_max": "کد ملی می بایست 10 رقم باشد",
+    "national_number_positive": "شناسه ملی می بایست مثبت باشد",
+    "error_message_national_id": "لطفا کد ملی خود را وارد کنید!",
+    "national_number_number": "شناسه ملی می بایست شامل اعداد باشد",
+    "national_number_max": "شناسه ملی می بایست 11 رقم باشد",
+    "error_message_national_number": "لطفا شناسه ملی خود را وارد کنید!",
+    "error_message_shenasname_serial": "لطفا سریال پشت کارت ملی خود را وارد کنید!",
+    "error_message_tracking_code": "لطفا کد رهگیری کارت ملی خود را وارد کنید!",
+    "text_field_shenasname_serial": "سریال پشت کارت ملی",
+    "text_field_national_trackin_code": "کد رهگیری کارت ملی",
     "text_field_national_id": "کد ملی",
     "text_field_postal_code": "کد پستی",
     "text_field_national_serial_number": "سریال پشت کارت ملی",
diff --git a/src/components/dashboard/navgan/show/form/UpdateForm.jsx b/src/components/dashboard/navgan/show/form/UpdateForm.jsx
index d844bdd..c4d4434 100644
--- a/src/components/dashboard/navgan/show/form/UpdateForm.jsx
+++ b/src/components/dashboard/navgan/show/form/UpdateForm.jsx
@@ -52,7 +52,7 @@ const UpdateForm = ({LoanDetails, LoanId}) => {
         education_id: LoanDetails.education_id,
         occupation_id: LoanDetails.occupation_id, ..._shenase_meli,
         national_serial_number: LoanDetails.national_serial_number ?? "",
-        national_tracking_code: LoanDetails.national_card_tracking_code ?? ""
+        national_tracking_code: LoanDetails.national_tracking_code ?? ""
     };
     // end initial values
 
@@ -79,23 +79,25 @@ const UpdateForm = ({LoanDetails, LoanId}) => {
         occupation_id: Yup.string().required(t("ShowLoan.error_message_occupation_id")),
         education_id: Yup.string().required(t("ShowLoan.error_message_education_id")),
         birthday: Yup.string().required(t("ShowLoan.error_message_date_of_birth")),
-        national_id: Yup.mixed()
-            .test("is-number", `${t("LoanRequest.national_code_number")}`, (value) => !isNaN(value))
-            .test("positive", `${t("LoanRequest.national_code_positive")}`, (value) => value >= 0)
-            .test("max", `${t("LoanRequest.national_code_max")}`, (value) => value.toString().length === 10)
-            .required(t("LoanRequest.error_message_national_id")),
+        national_id: Yup.mixed().when('is_legal_person', ([is_legal_person], schema) => {
+            return is_legal_person === 1 ? schema
+                .test("is-number", `${t("ShowLoan.national_code_number")}`, (value) => !isNaN(value))
+                .test("positive", `${t("ShowLoan.national_code_positive")}`, (value) => value >= 0)
+                .test("max", `${t("ShowLoan.national_code_max")}`, (value) => value && value.toString().length === 10)
+                .required(t("ShowLoan.error_message_national_id")) : schema;
+        }),
         shenase_meli: Yup.mixed().when('is_legal_person', ([is_legal_person], schema) => {
             return is_legal_person === 1 ? schema
-                .test("is-number", `${t("LoanRequest.national_number_number")}`, (value) => !isNaN(value))
-                .test("positive", `${t("LoanRequest.national_number_positive")}`, (value) => value >= 0)
-                .test("max", `${t("LoanRequest.national_number_max")}`, (value) => value && value.toString().length === 11)
-                .required(t("LoanRequest.error_message_national_number")) : schema;
+                .test("is-number", `${t("ShowLoan.national_number_number")}`, (value) => !isNaN(value))
+                .test("positive", `${t("ShowLoan.national_number_positive")}`, (value) => value >= 0)
+                .test("max", `${t("ShowLoan.national_number_max")}`, (value) => value && value.toString().length === 11)
+                .required(t("ShowLoan.error_message_national_number")) : schema;
         }),
         national_serial_number: Yup.string().when('national_serial_number_or_tracking_code', ([national_serial_number_or_tracking_code], schema) => {
-            return national_serial_number_or_tracking_code === 'serial_number' ? schema.required(t("LoanRequest.error_message_shenasname_serial")) : schema
+            return national_serial_number_or_tracking_code === 'serial_number' ? schema.required(t("ShowLoan.error_message_shenasname_serial")) : schema
         }),
         national_tracking_code: Yup.string().when('national_serial_number_or_tracking_code', ([national_serial_number_or_tracking_code], schema) => {
-            return national_serial_number_or_tracking_code === 'tracking_code' ? schema.required(t("LoanRequest.error_message_tracking_code")) : schema
+            return national_serial_number_or_tracking_code === 'tracking_code' ? schema.required(t("ShowLoan.error_message_tracking_code")) : schema
         })
     });
     // end validation
@@ -428,10 +430,10 @@ const UpdateForm = ({LoanDetails, LoanId}) => {
                                         }}
                                     >
                                         <ToggleButton value="serial_number">
-                                            {t("LoanRequest.text_field_shenasname_serial")}
+                                            {t("ShowLoan.text_field_shenasname_serial")}
                                         </ToggleButton>
                                         <ToggleButton value="tracking_code">
-                                            {t("LoanRequest.text_field_national_trackin_code")}
+                                            {t("ShowLoan.text_field_national_trackin_code")}
                                         </ToggleButton>
                                     </ToggleButtonGroup>
                                 </Box>
@@ -771,6 +773,7 @@ const UpdateForm = ({LoanDetails, LoanId}) => {
                                     width: {xs: "100%", sm: "30%", md: "25%"},
                                 }}
                             >
+                                {console.log(props.errors)}
                                 <Button
                                     fullWidth
                                     type="submit"