diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/violation/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/violation/page.js
index 2f810e0..4101687 100644
--- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/violation/page.js
+++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/violation/page.js
@@ -6,7 +6,14 @@ export const metadata = {
 const Page = () => {
     return (
         <>
-            <WithPermission permission_name={["all"]}>
+            <WithPermission
+                permission_name={[
+                    "manage-violation-city",
+                    "manage-violation-country",
+                    "manage-violation-province",
+                    "manage-violation-station",
+                ]}
+            >
                 <ViolationsPage />
                 {/* <ActivityCodeLog activity_code={1152} /> */}
             </WithPermission>
diff --git a/src/components/dashboard/rahdaran/Actions/Create/Form/CreateFormContent.jsx b/src/components/dashboard/rahdaran/Actions/Create/Form/CreateFormContent.jsx
index b42727e..52a4e71 100644
--- a/src/components/dashboard/rahdaran/Actions/Create/Form/CreateFormContent.jsx
+++ b/src/components/dashboard/rahdaran/Actions/Create/Form/CreateFormContent.jsx
@@ -19,7 +19,6 @@ import LogesticController from "./LogesticController";
 
 const validationSchema = object({
     provinceId: string().required("لطفا استان را وارد کنید!!!"),
-    edarehShahriId: string().required("لطفا اداره را وارد کنید!!!"),
     name: string().required("وارد کردن نام و نام خانوادگی الزامیست!"),
     code: string()
         .required("لطفا کد ملی را وارد کنید!!!")
diff --git a/src/components/dashboard/rahdaran/Actions/Create/Form/LogesticController.jsx b/src/components/dashboard/rahdaran/Actions/Create/Form/LogesticController.jsx
index 69ea8ca..23d7285 100644
--- a/src/components/dashboard/rahdaran/Actions/Create/Form/LogesticController.jsx
+++ b/src/components/dashboard/rahdaran/Actions/Create/Form/LogesticController.jsx
@@ -33,9 +33,6 @@ const LogesticController = ({ control }) => {
                     />
                 </Stack>
             ) : null}
-            <Stack>
-                <CityController control={control} />
-            </Stack>
         </>
     );
 };
diff --git a/src/components/dashboard/rahdaran/Actions/Create/Form/index.jsx b/src/components/dashboard/rahdaran/Actions/Create/Form/index.jsx
index 08fbd66..b51bbda 100644
--- a/src/components/dashboard/rahdaran/Actions/Create/Form/index.jsx
+++ b/src/components/dashboard/rahdaran/Actions/Create/Form/index.jsx
@@ -17,7 +17,6 @@ const CreateForm = ({ open, setOpen, mutate }) => {
         isDriver: "0",
         isProvince: !hasCountryPermission,
         provinceId: !hasCountryPermission ? user.province_id : "",
-        edarehShahriId: "",
         name: "",
         code: "",
         phone_number: "",
@@ -26,7 +25,6 @@ const CreateForm = ({ open, setOpen, mutate }) => {
         const formData = new FormData();
         formData.append("is_driver", result.isDriver);
         formData.append("province_id", result.provinceId);
-        formData.append("edareh_shahri_id", result.edarehShahriId);
         formData.append("name", result.name);
         formData.append("code", result.code);
         formData.append("mobile", result.phone_number);
diff --git a/src/components/dashboard/rahdaran/Actions/Edit/EditController.jsx b/src/components/dashboard/rahdaran/Actions/Edit/EditController.jsx
index 0813975..9f01563 100644
--- a/src/components/dashboard/rahdaran/Actions/Edit/EditController.jsx
+++ b/src/components/dashboard/rahdaran/Actions/Edit/EditController.jsx
@@ -10,7 +10,6 @@ const EditController = ({ rowId, mutate, setOpen, row }) => {
     const defaultData = {
         isDriver: `${row.original?.is_driver}` || "0",
         provinceId: row.original?.province_id || "",
-        edarehShahriId: row.original?.edareh_shahri_id || "",
         name: row.original?.name || "",
         code: row.original?.code || "",
         phone_number: row.original?.mobile || "",
@@ -19,7 +18,6 @@ const EditController = ({ rowId, mutate, setOpen, row }) => {
         const formData = new FormData();
         formData.append("is_driver", result.isDriver);
         formData.append("province_id", result.provinceId);
-        formData.append("edareh_shahri_id", result.edarehShahriId);
         formData.append("name", result.name);
         formData.append("code", result.code);
         formData.append("mobile", result.phone_number);
diff --git a/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx
index 949fbaa..57db6f6 100644
--- a/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx
+++ b/src/components/dashboard/roadMissions/operator/RowActions/Edit/EditController/index.jsx
@@ -35,8 +35,11 @@ const EditController = ({ row, mutate, openEditDialog, setOpenEditDialog }) => {
 
     const submitForm = async (result) => {
         setSubmitting(true);
-        const bound = result.bound.getLatLngs();
-        let area = bound.map((ring) => ring.map((latlng) => [latlng.lat, latlng.lng]));
+         const latlngs = result.bound.getLatLngs();
+
+        const normalized = result.bound_type === "polygon" ? latlngs : [latlngs];
+
+        const area = normalized.map((ring) => ring.map(({ lat, lng }) => [lat, lng]));
         await requestServer(`${UPDATE_REQUEST_MISSION}/${row.original.id}`, "post", {
             data: {
                 explanation: result.explanation,
diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js
index 97c7001..0a04951 100644
--- a/src/core/utils/pageMenu.js
+++ b/src/core/utils/pageMenu.js
@@ -157,7 +157,12 @@ export const pageMenu = [
                 icon: <RemoveRoadIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/road-missions/violation",
                 // badges: [{ key: "mission.control" }], // TODO: add badge and permission
-                permissions: ["all"],
+                permissions: [
+                    "manage-violation-city",
+                    "manage-violation-country",
+                    "manage-violation-province",
+                    "manage-violation-station",
+                ],
             },
             // {
             //     id: "roadMissionsReports",
diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js
index 90ae25f..c887a41 100644
--- a/src/core/utils/pageMenuDev.js
+++ b/src/core/utils/pageMenuDev.js
@@ -156,7 +156,12 @@ export const pageMenuDev = [
                 icon: <RemoveRoadIcon sx={{ width: "inherit", height: "inherit" }} />,
                 route: "/dashboard/road-missions/violation",
                 // badges: [{ key: "mission.control" }], // TODO: add badge and permission
-                permissions: ["all"],
+                permissions: [
+                    "manage-violation-city",
+                    "manage-violation-country",
+                    "manage-violation-province",
+                    "manage-violation-station",
+                ],
             },
             // {
             //     id: "roadMissionsReports",