diff --git a/src/features/province/components/create-guilds/utils/formUtils.js b/src/features/province/components/create-guilds/utils/formUtils.js
index 49a5fe1..233a00a 100644
--- a/src/features/province/components/create-guilds/utils/formUtils.js
+++ b/src/features/province/components/create-guilds/utils/formUtils.js
@@ -83,7 +83,13 @@ export const getInitialValues = (guildDataForEdit) => {
     gender: userDataFromEdit.gender || "",
     person_city: userDataFromEdit.city || cityDataFromEdit?.name || "",
     city: cityDataFromEdit?.id ?? cityDataFromEdit?.key ?? "",
-    is_alive: userDataFromEdit.isAlive || "",
+    is_alive:
+      userDataFromEdit.isAlive === true || userDataFromEdit.is_alive === true
+        ? "بلی"
+        : userDataFromEdit.isAlive === false ||
+          userDataFromEdit.is_alive === false
+        ? "خیر"
+        : "",
     mobile: userDataFromEdit.mobile || "",
 
     // Guild Information Fields (from guild object in edit mode)
@@ -99,7 +105,8 @@ export const getInitialValues = (guildDataForEdit) => {
     union_name: guildDataForEdit?.unionName || "",
     postal_code: addressDataFromEdit.postalCode || "",
     phone_number: guildDataForEdit?.phoneNumber || "",
-    license_number: guildDataForEdit?.licenseNumber || "",
+    license_number:
+      guildDataForEdit?.license_number ?? guildDataForEdit?.licenseNumber ?? "",
     // شناسه ملی شرکت: from company_identifier when dbRegister true
     guild_national_id:
       guildDataForEdit?.company_identifier ??
@@ -142,7 +149,7 @@ export const getInitialValues = (guildDataForEdit) => {
     company_identifier: guildDataForEdit?.companyIdentifier || "",
     type_activity_name: guildDataForEdit?.typeActivityName || "",
 
-    // Guilds array for validation (edit mode)
+    // Guilds array for validation (edit mode) – must include license_number for schema
     guilds: guildDataForEdit
       ? [
           {
@@ -158,6 +165,10 @@ export const getInitialValues = (guildDataForEdit) => {
                 : typeof guildDataForEdit?.isGuild === "boolean"
                 ? guildDataForEdit.isGuild
                 : false,
+            license_number:
+              guildDataForEdit?.license_number ??
+              guildDataForEdit?.licenseNumber ??
+              "",
           },
         ]
       : [],
diff --git a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js
index c565ec2..cd9f007 100644
--- a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js
+++ b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js
@@ -229,6 +229,16 @@ const LegalGuildForm = ({
                   style={{ width: "100%" }}
                   disablePortal
                   id="province"
+                  value={
+                    provinces?.find((p) => p.key === formik.values.province)
+                      ? {
+                          id: formik.values.province,
+                          label: provinces.find(
+                            (p) => p.key === formik.values.province
+                          )?.name,
+                        }
+                      : null
+                  }
                   options={
                     provinces
                       ? provinces.map((i) => ({
@@ -255,6 +265,16 @@ const LegalGuildForm = ({
                   disabled={!formik.values.province}
                   disablePortal
                   id="city"
+                  value={
+                    cities?.find((c) => c.key === formik.values.city)
+                      ? {
+                          id: formik.values.city,
+                          label: cities.find(
+                            (c) => c.key === formik.values.city
+                          )?.name,
+                        }
+                      : null
+                  }
                   options={
                     cities
                       ? cities.map((i) => ({ id: i.key, label: i.name }))
@@ -387,17 +407,17 @@ export const ProvinceLegalGuildsForm = ({ updateTable, item, userType }) => {
     national_id: item?.user?.nationalId || "",
     first_name: item?.user?.firstName || "",
     last_name: item?.user?.lastName || "",
-    province: item?.address?.province?.name || "",
-    city: item?.address?.city?.name || "",
-    address: item?.address?.address || "",
+    province: "",
+    city: "",
+    address: "",
     mobile: item?.user?.mobile || "",
     type_activity: item?.typeActivity || "",
   };
 
   if (IS_STEWARD) {
-    userInitialValue["name"] = item?.name;
+    userInitialValue["name"] = item?.guilds_name || item?.name;
   } else {
-    userInitialValue["unit_name"] = item?.guildsName;
+    userInitialValue["unit_name"] = item?.guilds_name || item?.guildsName;
   }
 
   const dispatch = useDispatch();
@@ -602,6 +622,35 @@ export const ProvinceLegalGuildsForm = ({ updateTable, item, userType }) => {
     }
   }, [formik?.values?.province]);
 
+  useEffect(() => {
+    if (item && provinceData && !formik?.values?.province) {
+      const provinceName = item?.provinceName;
+      if (provinceName) {
+        const province = provinceData.find((p) => p?.name === provinceName);
+        if (province?.key) {
+          formik?.setFieldValue("province", province.key);
+        }
+      }
+    }
+  }, [item, provinceData]);
+
+  useEffect(() => {
+    if (
+      item &&
+      cityData?.length &&
+      formik?.values?.province &&
+      !formik?.values?.city
+    ) {
+      const cityName = item?.cityName;
+      if (cityName) {
+        const city = cityData.find((c) => c?.name === cityName);
+        if (city?.key) {
+          formik?.setFieldValue("city", city.key);
+        }
+      }
+    }
+  }, [item, cityData, formik?.values?.province]);
+
   if (!userData && !item) {
     return (
       <InquiryForm
diff --git a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
index e6cc728..9bcb55a 100644
--- a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
+++ b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
@@ -94,8 +94,8 @@ export const ProvinceLegalGuildsInProvince = ({ userType }) => {
         (IS_STEWARD ? item?.name : item?.guildsName) || "-",
         `${item?.user?.fullname || "-"}`,
         item?.user?.mobile || "-",
-        item?.address?.province?.name || "-",
-        item?.address?.city?.name || "-",
+        item?.provinceName || "-",
+        item?.cityName || "-",
         item?.typeActivity || "-",
         item?.active ? "فعال" : "غیر فعال",
         <ProvinceLegalGuildsOperations
diff --git a/src/features/province/components/province-true-guilds-out-province/ProvinceTrueGuildsOutProvince.js b/src/features/province/components/province-true-guilds-out-province/ProvinceTrueGuildsOutProvince.js
index f2af3ce..15316ac 100644
--- a/src/features/province/components/province-true-guilds-out-province/ProvinceTrueGuildsOutProvince.js
+++ b/src/features/province/components/province-true-guilds-out-province/ProvinceTrueGuildsOutProvince.js
@@ -5,7 +5,7 @@ import {
   DRAWER,
   LOADING_END,
   LOADING_START,
-  OPEN_MODAL
+  OPEN_MODAL,
 } from "../../../../lib/redux/slices/appSlice";
 import { getRoleFromUrl } from "../../../../utils/getRoleFromUrl";
 import { Grid } from "../../../../components/grid/Grid";
@@ -40,7 +40,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
         page: page,
         pageSize: perPage,
         searchValue: textValue,
-        buyer_type: IS_STEWARD ? "Steward" : "Guilds"
+        buyer_type: IS_STEWARD ? "Steward" : "Guilds",
       });
       setData(response.data.results);
       setTotalRows(response.data.count);
@@ -84,7 +84,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
             0
           ).toLocaleString(),
           (req?.total_quantity ?? req?.totalQuantity ?? 0).toLocaleString(),
-          (req?.total_weight ?? req?.totalWeight ?? 0).toLocaleString()
+          (req?.total_weight ?? req?.totalWeight ?? 0).toLocaleString(),
         ];
       }) ?? [];
     dispatch(
@@ -105,11 +105,11 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
               "شهر",
               "تعداد درخواست",
               "حجم (قطعه)",
-              "وزن (کیلوگرم)"
+              "وزن (کیلوگرم)",
             ]}
             customWidth={"80vw"}
           />
-        )
+        ),
       })
     );
   };
@@ -131,7 +131,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
             0
           ).toLocaleString(),
           (req?.total_quantity ?? req?.totalQuantity ?? 0).toLocaleString(),
-          (req?.total_weight ?? req?.totalWeight ?? 0).toLocaleString()
+          (req?.total_weight ?? req?.totalWeight ?? 0).toLocaleString(),
         ];
       }) ?? [];
     dispatch(
@@ -151,11 +151,11 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
               "شهر",
               "تعداد درخواست",
               "حجم (قطعه)",
-              "وزن (کیلوگرم)"
+              "وزن (کیلوگرم)",
             ]}
             customWidth={"80vw"}
           />
-        )
+        ),
       })
     );
   };
@@ -186,7 +186,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
             totalQuantity:
               acc.totalQuantity + (r?.total_quantity ?? r?.totalQuantity ?? 0),
             totalWeight:
-              acc.totalWeight + (r?.total_weight ?? r?.totalWeight ?? 0)
+              acc.totalWeight + (r?.total_weight ?? r?.totalWeight ?? 0),
           };
         },
         { numberOfRequests: 0, totalQuantity: 0, totalWeight: 0 }
@@ -222,7 +222,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
                 sx={{
                   minWidth: "fit-content",
                   whiteSpace: "nowrap",
-                  fontSize: "0.8125rem"
+                  fontSize: "0.8125rem",
                 }}
                 variant="outlined"
                 onClick={() => openKillHousesModal(khList)}
@@ -240,8 +240,8 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
                   borderColor: "#008f6b",
                   "&:hover": {
                     borderColor: "#006b52",
-                    backgroundColor: "rgba(0, 143, 107, 0.08)"
-                  }
+                    backgroundColor: "rgba(0, 143, 107, 0.08)",
+                  },
                 }}
                 variant="outlined"
                 onClick={() => openStewardsModal(stList)}
@@ -270,7 +270,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
           userType={userType}
           item={item}
           updateTable={() => fetchApiData(page)}
-        />
+        />,
       ];
     });
 
@@ -301,7 +301,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
             <Button
               variant="contained"
               sx={{
-                mr: SPACING.SMALL
+                mr: SPACING.SMALL,
               }}
               onClick={() => {
                 dispatch(
@@ -321,7 +321,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
                     ),
                     title: `افزودن ${
                       IS_STEWARD ? "مباشر" : "صنف"
-                    } خارج از استان`
+                    } خارج از استان`,
                   })
                 );
               }}
@@ -361,7 +361,7 @@ export const ProvinceTrueGuildsOutProvince = ({ userType }) => {
           "تعداد درخواست ها",
           "حجم تقریبی (قطعه)",
           "وزن (کیلوگرم)",
-          "عملیات"
+          "عملیات",
         ]}
         handlePageChange={handlePageChange}
         totalRows={totalRows}
diff --git a/src/features/steward/components/steward-add-buyer/InquiryForStewardAddBuyer.js b/src/features/steward/components/steward-add-buyer/InquiryForStewardAddBuyer.js
index 891ee19..dbdc16e 100644
--- a/src/features/steward/components/steward-add-buyer/InquiryForStewardAddBuyer.js
+++ b/src/features/steward/components/steward-add-buyer/InquiryForStewardAddBuyer.js
@@ -182,12 +182,16 @@ export const InquiryForStewardAddBuyer = ({
       })
     ).then((r) => {
       dispatch(LOADING_END());
-      if (r.error) {
+      const hasError = r.error || r.payload?.error;
+      if (hasError) {
         setNotFound(true);
         openNotif({
           vertical: "top",
           horizontal: "center",
-          msg: "خریدار یافت نشد، یک خریدار جدید ثبت کنید!",
+          msg:
+            typeof hasError === "string"
+              ? hasError
+              : "خریدار یافت نشد، یک خریدار جدید ثبت کنید!",
           severity: "error",
         });
       } else {
diff --git a/src/features/steward/components/steward-add-buyer/StewardAddBuyer.js b/src/features/steward/components/steward-add-buyer/StewardAddBuyer.js
index 2b9290a..5d355c7 100644
--- a/src/features/steward/components/steward-add-buyer/StewardAddBuyer.js
+++ b/src/features/steward/components/steward-add-buyer/StewardAddBuyer.js
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from "react";
+import React, { useContext, useEffect, useState, useCallback } from "react";
 import { Grid } from "../../../../components/grid/Grid";
 import { Button } from "@mui/material";
 import { Yup } from "../../../../lib/yup/yup";
@@ -43,59 +43,74 @@ import {
 import { inspectorGetKillHousesService } from "../../../inspector/services/inspector-get-kill-houses";
 import { slaughterGetStewardsForAllocateService } from "../../../slaughter-house/services/slaughter-get-guilds-for-allocate";
 
-// userType enums = steward | steward_true | steward_legal | _true | _legal
+const PAGE_STEWARD = "steward_add_buyer";
+const PAGE_SLAUGHTER = "slaughter_add_buyer";
+const PAGE_SLAUGHTER_MANAGE = "slaughter_manage_add_buyer";
+const PAGE_ADMIN = "admin_add_buyer";
+
+const ADMIN_ROUTES = [
+  ROUTE_ADMINX_ROUTE_OUT_PROVINCE_TRUE_GUILDS,
+  ROUTE_ADMINX_ROUTE_OUT_PROVINCE_LEGAL_GUILDS,
+  ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_LEGAL,
+  ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_TRUE,
+];
 
 const getCurrentPage = (role, pathname) => {
-  if (role === "Steward") {
-    if (pathname === ROUTE_STEWARD_SALE_OUT_PROVINCE) {
-      return "steward_add_buyer";
-    }
+  if (role === "Steward" && pathname === ROUTE_STEWARD_SALE_OUT_PROVINCE) {
+    return PAGE_STEWARD;
   }
   if (role === "KillHouse") {
     if (pathname === ROUTE_SLAUGHTER_INVENTORY_SELL_CARCASS_OUT_PROVINCE) {
-      return "slaughter_add_buyer";
+      return PAGE_SLAUGHTER;
     }
     if (pathname === ROUTE_SLAUGHTER_MANAGE_GUILDS_OUT_PROVINCE_TRUE) {
-      return "slaughter_manage_add_buyer";
+      return PAGE_SLAUGHTER_MANAGE;
     }
   }
-  if (role === "AdminX") {
-    const routes = [
-      ROUTE_ADMINX_ROUTE_OUT_PROVINCE_TRUE_GUILDS,
-      ROUTE_ADMINX_ROUTE_OUT_PROVINCE_LEGAL_GUILDS,
-      ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_LEGAL,
-      ROUTE_ADMINX_ROUTE_MANAGE_STEWARDS_OUT_PROVINCE_TRUE,
-    ];
-    if (routes.some((r) => r === pathname)) {
-      return "admin_add_buyer";
-    }
+  if (role === "AdminX" && ADMIN_ROUTES.some((r) => r === pathname)) {
+    return PAGE_ADMIN;
   }
+  return null;
+};
+
+const INITIAL_VALUES_BASE = {
+  mobile: "",
+  firstName: "",
+  lastName: "",
+  unit_name: "",
+  province: "",
+  city: "",
 };
 
 const getInitialValues = (page) => {
-  const initialValues = {
-    mobile: "",
-    firstName: "",
-    lastName: "",
-    unit_name: "",
-    province: "",
-    city: "",
-  };
-  if (page === "steward_add_buyer" || page === "slaughter_manage_add_buyer") {
-    return initialValues;
-  } else if (page === "slaughter_add_buyer") {
-    return {
-      ...initialValues,
-      nationalId: "",
-    };
-  } else if (page === "admin_add_buyer") {
-    return {
-      ...initialValues,
-      role_key: "",
-      type: "",
-    };
+  if (page === PAGE_SLAUGHTER) {
+    return { ...INITIAL_VALUES_BASE, nationalId: "" };
+  }
+  if (page === PAGE_ADMIN) {
+    return { ...INITIAL_VALUES_BASE, role_key: "", type: "" };
+  }
+  return { ...INITIAL_VALUES_BASE };
+};
+
+const getValidationSchema = (page, isRealPerson, isEdit) => {
+  if (page === PAGE_STEWARD) return validationSchemaForStewardAddBuyer;
+  if (page === PAGE_SLAUGHTER || page === PAGE_SLAUGHTER_MANAGE) {
+    return validationSchemaForSlaughterAddBuyer(isRealPerson, isEdit);
+  }
+  if (page === PAGE_ADMIN) {
+    return validationSchemaForAdminAddBuyer(isRealPerson, isEdit);
+  }
+  return Yup.object({});
+};
+
+const setFormDataFromTableData = (page, data, formik) => {
+  if (page === PAGE_STEWARD) {
+    handleSetFormDataFromTableDataForStewardAddBuyer(data, formik);
+  } else if (page === PAGE_SLAUGHTER || page === PAGE_SLAUGHTER_MANAGE) {
+    handleSetFormDataFromTableDataForSlaughterAddBuyer(data, formik);
+  } else if (page === PAGE_ADMIN) {
+    handleSetFormDataFromTableDataForAdminAddBuyer(data, formik);
   }
-  return initialValues;
 };
 
 export const StewardAddBuyer = ({
@@ -104,18 +119,16 @@ export const StewardAddBuyer = ({
   data,
   isRealPerson,
   buyerType = "",
-  // buyerYype => "Guilds" | "Steward"
 }) => {
   const role = getRoleFromUrl();
   const { pathname } = useLocation();
+  const dispatch = useDispatch();
+  const [openNotif] = useContext(AppContext);
+  const [notFound, setNotFound] = useState(false);
+  const { selectedSubUser } = useSelector((state) => state.userSlice);
 
   const page = getCurrentPage(role, pathname);
 
-  const IS_STEWARD_ADD_BUYER = page === "steward_add_buyer";
-  const IS_SLAUGHTER_ADD_BUYER = page === "slaughter_add_buyer";
-  const IS_SLAUGHTER_MANAGE_ADD_BUYER = page === "slaughter_manage_add_buyer";
-  const IS_ADMIN_ADD_BUYER = page === "admin_add_buyer";
-
   const {
     killHouses,
     stewards,
@@ -127,71 +140,190 @@ export const StewardAddBuyer = ({
     setUserData,
   } = useAddBuyer(page);
 
-  const { selectedSubUser } = useSelector((state) => state.userSlice);
-
-  const [openNotif] = useContext(AppContext);
-  const [notFound, setNotFound] = useState(false);
-  const dispatch = useDispatch();
-
   const formik = useFormik({
     initialValues: getInitialValues(page),
-    validationSchema: IS_STEWARD_ADD_BUYER
-      ? validationSchemaForStewardAddBuyer
-      : IS_SLAUGHTER_ADD_BUYER || IS_SLAUGHTER_MANAGE_ADD_BUYER
-      ? validationSchemaForSlaughterAddBuyer(isRealPerson, isEdit)
-      : IS_ADMIN_ADD_BUYER
-      ? validationSchemaForAdminAddBuyer(isRealPerson, isEdit)
-      : Yup.object({}),
+    validationSchema: getValidationSchema(page, isRealPerson, isEdit),
   });
 
+  // Re-validate when switching to edit mode
   useEffect(() => {
-    if (isEdit) {
-      formik.validateForm();
-    }
+    if (isEdit) formik.validateForm();
   }, [isEdit]);
 
+  // Populate form when editing
   useEffect(() => {
-    if (IS_ADMIN_ADD_BUYER) {
-      if (formik.values.type === "KillHouse") {
-        dispatch(inspectorGetKillHousesService());
-      } else {
-        dispatch(
-          slaughterGetStewardsForAllocateService({
-            free: true,
-          })
-        ).then((r) => {
-          setStewards(r.payload.data || []);
-        });
-      }
+    if (isEdit && page && data) {
+      setFormDataFromTableData(page, data, formik);
     }
-  }, [formik.values.type]);
+  }, [isEdit, page]);
 
+  // Load cities when province changes
   useEffect(() => {
-    if (isEdit) {
-      if (IS_STEWARD_ADD_BUYER) {
-        handleSetFormDataFromTableDataForStewardAddBuyer(data, formik);
-      }
-      if (IS_SLAUGHTER_ADD_BUYER || IS_SLAUGHTER_MANAGE_ADD_BUYER) {
-        handleSetFormDataFromTableDataForSlaughterAddBuyer(data, formik);
-      }
-      if (IS_ADMIN_ADD_BUYER) {
-        handleSetFormDataFromTableDataForAdminAddBuyer(data, formik);
-      }
+    if (!formik.values.province) {
+      setCityData([]);
+      return;
     }
-  }, [isEdit]);
+    setCityData([]);
+    dispatch(slaughterGetCitiesService(formik.values.province)).then((r) => {
+      setCityData(r.payload?.data ?? []);
+    });
+  }, [formik.values.province, dispatch]);
 
+  // Admin: load stewards or kill houses by type
   useEffect(() => {
-    if (formik.values.province) {
-      setCityData(
-        [],
-        dispatch(slaughterGetCitiesService(formik.values.province)).then(
-          (r) => {
-            setCityData(r.payload.data);
-          }
-        )
+    if (page !== PAGE_ADMIN) return;
+    if (formik.values.type === "KillHouse") {
+      dispatch(inspectorGetKillHousesService());
+    } else {
+      dispatch(slaughterGetStewardsForAllocateService({ free: true })).then(
+        (r) => {
+          setStewards(r.payload?.data ?? []);
+        }
       );
     }
-  }, [formik.values.province]);
+  }, [page, formik.values.type, dispatch]);
+
+  const handleSubmit = useCallback(() => {
+    if (page === PAGE_STEWARD) {
+      handleSubmitForStewardAddBuyer(
+        formik,
+        dispatch,
+        isEdit,
+        data,
+        updateTable,
+        openNotif,
+        DRAWER,
+        role
+      );
+      return;
+    }
+    if (page === PAGE_SLAUGHTER) {
+      handleSubmitForSlaughterAddBuyer(
+        formik,
+        dispatch,
+        isEdit,
+        data,
+        updateTable,
+        openNotif,
+        DRAWER,
+        selectedSubUser,
+        isRealPerson
+      );
+      return;
+    }
+    if (page === PAGE_SLAUGHTER_MANAGE) {
+      handleSubmitForSlaughterAddBuyer(
+        formik,
+        dispatch,
+        isEdit,
+        data,
+        updateTable,
+        openNotif,
+        DRAWER,
+        selectedSubUser,
+        isRealPerson,
+        buyerType
+      );
+      return;
+    }
+    if (page === PAGE_ADMIN) {
+      handleSubmitForAdminAddBuyer(
+        formik,
+        dispatch,
+        isEdit,
+        data,
+        updateTable,
+        openNotif,
+        DRAWER,
+        isRealPerson,
+        buyerType
+      );
+    }
+  }, [
+    page,
+    formik,
+    dispatch,
+    isEdit,
+    data,
+    updateTable,
+    openNotif,
+    role,
+    selectedSubUser,
+    isRealPerson,
+    buyerType,
+  ]);
+
+  const showInquiry = !isEdit && page;
+  const showForm = (userData || notFound || isEdit) && page;
+
+  const inquiryProps = {
+    notFound,
+    setNotFound,
+    setUserData,
+    formik,
+  };
+
+  const formProps = {
+    formik,
+    provinceData,
+    cityData,
+    notFound,
+  };
+
+  const renderInquiry = () => {
+    if (!showInquiry) return null;
+    if (page === PAGE_STEWARD) {
+      return <InquiryForStewardAddBuyer {...inquiryProps} />;
+    }
+    if (page === PAGE_SLAUGHTER || page === PAGE_SLAUGHTER_MANAGE) {
+      return (
+        <InquiryForSlaughterAddBuyer
+          {...inquiryProps}
+          isEdit={isEdit}
+          isRealPerson={isRealPerson}
+          provinceData={provinceData}
+        />
+      );
+    }
+    if (page === PAGE_ADMIN) {
+      return (
+        <InquiryForAdminAddBuyer
+          {...inquiryProps}
+          isEdit={isEdit}
+          isRealPerson={isRealPerson}
+          provinceData={provinceData}
+        />
+      );
+    }
+    return null;
+  };
+
+  const renderForm = () => {
+    if (!showForm) return null;
+    if (page === PAGE_STEWARD) {
+      return <StewardAddBuyerForm {...formProps} />;
+    }
+    if (page === PAGE_SLAUGHTER || page === PAGE_SLAUGHTER_MANAGE) {
+      return (
+        <SlaughterAddBuyerForm {...formProps} isRealPerson={isRealPerson} />
+      );
+    }
+    if (page === PAGE_ADMIN) {
+      return (
+        <AdminAddBuyerForm
+          {...formProps}
+          isRealPerson={isRealPerson}
+          killHouses={killHouses}
+          stewards={stewards}
+        />
+      );
+    }
+    return null;
+  };
+
+  if (!page) {
+    return null;
+  }
 
   return (
     <Grid
@@ -202,124 +334,15 @@ export const StewardAddBuyer = ({
       direction="column"
       gap={2}
     >
-      {!isEdit ? (
-        IS_STEWARD_ADD_BUYER ? (
-          <InquiryForStewardAddBuyer
-            notFound={notFound}
-            setNotFound={setNotFound}
-            setUserData={setUserData}
-            formik={formik}
-          />
-        ) : IS_SLAUGHTER_ADD_BUYER || IS_SLAUGHTER_MANAGE_ADD_BUYER ? (
-          <InquiryForSlaughterAddBuyer
-            notFound={notFound}
-            setNotFound={setNotFound}
-            setUserData={setUserData}
-            formik={formik}
-            isEdit={isEdit}
-            isRealPerson={isRealPerson}
-            provinceData={provinceData}
-          />
-        ) : IS_ADMIN_ADD_BUYER ? (
-          <InquiryForAdminAddBuyer
-            notFound={notFound}
-            setNotFound={setNotFound}
-            setUserData={setUserData}
-            formik={formik}
-            isEdit={isEdit}
-            isRealPerson={isRealPerson}
-            provinceData={provinceData}
-          />
-        ) : null
-      ) : null}
-      {userData || notFound || isEdit ? (
-        IS_STEWARD_ADD_BUYER ? (
-          <StewardAddBuyerForm
-            formik={formik}
-            provinceData={provinceData}
-            cityData={cityData}
-            notFound={notFound}
-          />
-        ) : IS_SLAUGHTER_ADD_BUYER || IS_SLAUGHTER_MANAGE_ADD_BUYER ? (
-          <SlaughterAddBuyerForm
-            formik={formik}
-            provinceData={provinceData}
-            cityData={cityData}
-            notFound={notFound}
-            isRealPerson={isRealPerson}
-          />
-        ) : IS_ADMIN_ADD_BUYER ? (
-          <AdminAddBuyerForm
-            formik={formik}
-            provinceData={provinceData}
-            cityData={cityData}
-            notFound={notFound}
-            isRealPerson={isRealPerson}
-            killHouses={killHouses}
-            stewards={stewards}
-          />
-        ) : null
-      ) : null}
-      {(userData || notFound || isEdit) && (
+      {renderInquiry()}
+      {renderForm()}
+      {showForm && (
         <Grid container xs={12}>
           <Button
             fullWidth
             variant="contained"
             disabled={!formik.isValid}
-            onClick={() => {
-              if (IS_STEWARD_ADD_BUYER) {
-                handleSubmitForStewardAddBuyer(
-                  formik,
-                  dispatch,
-                  isEdit,
-                  data,
-                  updateTable,
-                  openNotif,
-                  DRAWER,
-                  role
-                );
-              }
-              if (IS_SLAUGHTER_ADD_BUYER) {
-                handleSubmitForSlaughterAddBuyer(
-                  formik,
-                  dispatch,
-                  isEdit,
-                  data,
-                  updateTable,
-                  openNotif,
-                  DRAWER,
-                  selectedSubUser,
-                  isRealPerson
-                );
-              }
-              if (IS_SLAUGHTER_MANAGE_ADD_BUYER) {
-                handleSubmitForSlaughterAddBuyer(
-                  formik,
-                  dispatch,
-                  isEdit,
-                  data,
-                  updateTable,
-                  openNotif,
-                  DRAWER,
-                  selectedSubUser,
-                  isRealPerson,
-                  buyerType
-                );
-              }
-              if (IS_ADMIN_ADD_BUYER) {
-                handleSubmitForAdminAddBuyer(
-                  formik,
-                  dispatch,
-                  isEdit,
-                  data,
-                  updateTable,
-                  openNotif,
-                  DRAWER,
-                  isRealPerson,
-                  buyerType
-                );
-              }
-            }}
+            onClick={handleSubmit}
           >
             {isEdit ? "ویرایش" : "ثبت"}
           </Button>
diff --git a/src/features/steward/components/steward-add-buyer/hooks/useAddBuyer.js b/src/features/steward/components/steward-add-buyer/hooks/useAddBuyer.js
index 2248d4b..7164a83 100644
--- a/src/features/steward/components/steward-add-buyer/hooks/useAddBuyer.js
+++ b/src/features/steward/components/steward-add-buyer/hooks/useAddBuyer.js
@@ -20,13 +20,16 @@ export const useAddBuyer = (page) => {
   }, []);
 
   useEffect(() => {
-    if (page === "admin_add_buyer") {
-      const d = inspectorGetKillHouses?.map((item) => {
-        return { name: item.name, key: item.key, killer: item.killer };
-      });
-      setKillhouses(d);
+    if (page === "admin_add_buyer" && inspectorGetKillHouses?.length) {
+      setKillhouses(
+        inspectorGetKillHouses.map((item) => ({
+          name: item.name,
+          key: item.key,
+          killer: item.killer,
+        }))
+      );
     }
-  }, [inspectorGetKillHouses]);
+  }, [page, inspectorGetKillHouses]);
 
   return {
     killHouses,