diff --git a/app/[locale]/(protected)/admin/management-user/internal/create/page.tsx b/app/[locale]/(protected)/admin/management-user/internal/create/page.tsx
index 4e0bdbcc..dd7e7b97 100644
--- a/app/[locale]/(protected)/admin/management-user/internal/create/page.tsx
+++ b/app/[locale]/(protected)/admin/management-user/internal/create/page.tsx
@@ -5,7 +5,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { Check, ChevronsUpDown, Eye, EyeOff } from "lucide-react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
-
 import { cn, getCookiesDecrypt } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
 import {
diff --git a/app/[locale]/(protected)/admin/settings/category/component/table.tsx b/app/[locale]/(protected)/admin/settings/category/component/table.tsx
index f63857b0..5d6b81b8 100644
--- a/app/[locale]/(protected)/admin/settings/category/component/table.tsx
+++ b/app/[locale]/(protected)/admin/settings/category/component/table.tsx
@@ -28,21 +28,10 @@ import {
 import { useSearchParams } from "next/navigation";
 import TablePagination from "@/components/table/table-pagination";
 import columns from "./column";
-
-import { listEnableCategory } from "@/service/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
 import { Link, useRouter } from "@/i18n/routing";
-import { NewCampaignIcon } from "@/components/icon";
 import { getCategories } from "@/service/settings/settings";
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
 import CreateCategoryModal from "./create";
 import { useTranslations } from "next-intl";
 import {
diff --git a/app/[locale]/(public)/audio/filter/page.tsx b/app/[locale]/(public)/audio/filter/page.tsx
index 0baa0973..a5c6eb96 100644
--- a/app/[locale]/(public)/audio/filter/page.tsx
+++ b/app/[locale]/(public)/audio/filter/page.tsx
@@ -593,6 +593,116 @@ const FilterPage = () => {
               <h3 className="text-sm font-medium text-gray-700 dark:text-white">
                 {t("categories", { defaultValue: "Categories" })}
               </h3>
+
+              <ul className="mt-2 space-y-2">
+                {categories.map((category: any) => (
+                  <li key={category?.id}>
+                    <label
+                      className="inline-flex items-center"
+                      htmlFor={`${category.id}`}
+                    >
+                      <Checkbox
+                        id={`${category.id}`}
+                        value={category.id}
+                        checked={categoryFilter.includes(String(category.id))}
+                        onCheckedChange={(e) =>
+                          handleCategoryFilter(Boolean(e), category.id)
+                        }
+                      />
+                      <span className="ml-2 text-gray-700 dark:text-white">
+                        {category?.name}
+                      </span>
+                    </label>
+                  </li>
+                ))}
+              </ul>
+
+              {/* ⬇️ Pagination kategori (rata sejajar) */}
+              <div className="mt-4 flex justify-center items-center gap-2 flex-wrap">
+                {/* Tombol Prev */}
+                <button
+                  onClick={() =>
+                    setCategoryPage((prev) => Math.max(prev - 1, 1))
+                  }
+                  disabled={categoryPage === 1}
+                  className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="currentColor"
+                      d="m13.15 16.15l-3.625-3.625q-.125-.125-.175-.25T9.3 12t.05-.275t.175-.25L13.15 7.85q.075-.075.163-.112T13.5 7.7q.2 0 .35.138T14 8.2v7.6q0 .225-.15.363t-.35.137q-.05 0-.35-.15"
+                    />
+                  </svg>
+                </button>
+
+                {(() => {
+                  const maxVisible = 4;
+                  let startPage = Math.max(
+                    1,
+                    Math.min(
+                      categoryPage - Math.floor(maxVisible / 2),
+                      categoryTotalPages - maxVisible + 1
+                    )
+                  );
+                  const endPage = Math.min(
+                    categoryTotalPages,
+                    startPage + maxVisible - 1
+                  );
+
+                  const visiblePages = [];
+                  for (let i = startPage; i <= endPage; i++) {
+                    visiblePages.push(i);
+                  }
+
+                  return visiblePages.map((pageNum) => (
+                    <button
+                      key={pageNum}
+                      onClick={() => setCategoryPage(pageNum)}
+                      className={`px-3 py-1 border rounded text-sm transition-colors ${
+                        categoryPage === pageNum
+                          ? "bg-[#bb3523] text-white"
+                          : "bg-white dark:bg-gray-800"
+                      }`}
+                    >
+                      {pageNum}
+                    </button>
+                  ));
+                })()}
+
+                {/* Tombol Next */}
+                <button
+                  onClick={() =>
+                    setCategoryPage((prev) =>
+                      Math.min(prev + 1, categoryTotalPages)
+                    )
+                  }
+                  disabled={categoryPage === categoryTotalPages}
+                  className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="currentColor"
+                      d="M10.5 16.3q-.2 0-.35-.137T10 15.8V8.2q0-.225.15-.362t.35-.138q.05 0 .35.15l3.625 3.625q.125.125.175.25t.05.275t-.05.275t-.175.25L10.85 16.15q-.075.075-.162.113t-.188.037"
+                    />
+                  </svg>
+                </button>
+              </div>
+            </div>
+
+            {/* <div>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                {t("categories", { defaultValue: "Categories" })}
+              </h3>
               <ul className="mt-2 space-y-2">
                 {categories?.map((category: any) => (
                   <li key={category?.id}>
@@ -670,7 +780,7 @@ const FilterPage = () => {
                   </button>
                 </div>
               </ul>
-            </div>
+            </div> */}
             {/* Garis */}
             <div className="border-t border-black my-4 dark:border-white"></div>
             {/* Garis */}
diff --git a/app/[locale]/(public)/document/filter/page.tsx b/app/[locale]/(public)/document/filter/page.tsx
index 3061d04a..fabf010d 100644
--- a/app/[locale]/(public)/document/filter/page.tsx
+++ b/app/[locale]/(public)/document/filter/page.tsx
@@ -609,6 +609,116 @@ const FilterPage = () => {
               <h3 className="text-sm font-medium text-gray-700 dark:text-white">
                 {t("categories", { defaultValue: "Categories" })}
               </h3>
+
+              <ul className="mt-2 space-y-2">
+                {categories.map((category: any) => (
+                  <li key={category?.id}>
+                    <label
+                      className="inline-flex items-center"
+                      htmlFor={`${category.id}`}
+                    >
+                      <Checkbox
+                        id={`${category.id}`}
+                        value={category.id}
+                        checked={categoryFilter.includes(String(category.id))}
+                        onCheckedChange={(e) =>
+                          handleCategoryFilter(Boolean(e), category.id)
+                        }
+                      />
+                      <span className="ml-2 text-gray-700 dark:text-white">
+                        {category?.name}
+                      </span>
+                    </label>
+                  </li>
+                ))}
+              </ul>
+
+              {/* ⬇️ Pagination kategori (rata sejajar) */}
+              <div className="mt-4 flex justify-center items-center gap-2 flex-wrap">
+                {/* Tombol Prev */}
+                <button
+                  onClick={() =>
+                    setCategoryPage((prev) => Math.max(prev - 1, 1))
+                  }
+                  disabled={categoryPage === 1}
+                  className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="currentColor"
+                      d="m13.15 16.15l-3.625-3.625q-.125-.125-.175-.25T9.3 12t.05-.275t.175-.25L13.15 7.85q.075-.075.163-.112T13.5 7.7q.2 0 .35.138T14 8.2v7.6q0 .225-.15.363t-.35.137q-.05 0-.35-.15"
+                    />
+                  </svg>
+                </button>
+
+                {(() => {
+                  const maxVisible = 4;
+                  let startPage = Math.max(
+                    1,
+                    Math.min(
+                      categoryPage - Math.floor(maxVisible / 2),
+                      categoryTotalPages - maxVisible + 1
+                    )
+                  );
+                  const endPage = Math.min(
+                    categoryTotalPages,
+                    startPage + maxVisible - 1
+                  );
+
+                  const visiblePages = [];
+                  for (let i = startPage; i <= endPage; i++) {
+                    visiblePages.push(i);
+                  }
+
+                  return visiblePages.map((pageNum) => (
+                    <button
+                      key={pageNum}
+                      onClick={() => setCategoryPage(pageNum)}
+                      className={`px-3 py-1 border rounded text-sm transition-colors ${
+                        categoryPage === pageNum
+                          ? "bg-[#bb3523] text-white"
+                          : "bg-white dark:bg-gray-800"
+                      }`}
+                    >
+                      {pageNum}
+                    </button>
+                  ));
+                })()}
+
+                {/* Tombol Next */}
+                <button
+                  onClick={() =>
+                    setCategoryPage((prev) =>
+                      Math.min(prev + 1, categoryTotalPages)
+                    )
+                  }
+                  disabled={categoryPage === categoryTotalPages}
+                  className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="currentColor"
+                      d="M10.5 16.3q-.2 0-.35-.137T10 15.8V8.2q0-.225.15-.362t.35-.138q.05 0 .35.15l3.625 3.625q.125.125.175.25t.05.275t-.05.275t-.175.25L10.85 16.15q-.075.075-.162.113t-.188.037"
+                    />
+                  </svg>
+                </button>
+              </div>
+            </div>
+
+            {/* <div>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                {t("categories", { defaultValue: "Categories" })}
+              </h3>
               <ul className="mt-2 space-y-2">
                 {categories.map((category: any) => (
                   <li key={category?.id}>
@@ -686,7 +796,7 @@ const FilterPage = () => {
                   </button>
                 </div>
               </ul>
-            </div>
+            </div> */}
             {/* Garis */}
             <div className="border-t border-black my-4 dark:border-white"></div>
             {/* Garis */}
diff --git a/app/[locale]/(public)/image/filter/page.tsx b/app/[locale]/(public)/image/filter/page.tsx
index 60035428..d89e0542 100644
--- a/app/[locale]/(public)/image/filter/page.tsx
+++ b/app/[locale]/(public)/image/filter/page.tsx
@@ -627,6 +627,7 @@ const FilterPage = () => {
                 <h3 className="text-sm font-medium text-gray-700 dark:text-white">
                   {t("categories", { defaultValue: "Categories" })}
                 </h3>
+
                 <ul className="mt-2 space-y-2">
                   {categories.map((category: any) => (
                     <li key={category?.id}>
@@ -648,65 +649,90 @@ const FilterPage = () => {
                       </label>
                     </li>
                   ))}
-                  <div className="mt-4 flex gap-2 justify-center items-center">
-                    <button
-                      onClick={() =>
-                        setCategoryPage((prev) => Math.max(prev - 1, 1))
-                      }
-                      disabled={categoryPage === 1}
-                      className="px-3 py-1 border rounded disabled:opacity-50"
-                    >
-                      <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="24"
-                        height="24"
-                        viewBox="0 0 24 24"
-                      >
-                        <path
-                          fill="currentColor"
-                          d="m13.15 16.15l-3.625-3.625q-.125-.125-.175-.25T9.3 12t.05-.275t.175-.25L13.15 7.85q.075-.075.163-.112T13.5 7.7q.2 0 .35.138T14 8.2v7.6q0 .225-.15.363t-.35.137q-.05 0-.35-.15"
-                        />
-                      </svg>
-                    </button>
+                </ul>
 
-                    {Array.from({ length: categoryTotalPages }, (_, i) => (
+                {/* ⬇️ Pagination kategori (rata sejajar) */}
+                <div className="mt-4 flex justify-center items-center gap-2 flex-wrap">
+                  {/* Tombol Prev */}
+                  <button
+                    onClick={() =>
+                      setCategoryPage((prev) => Math.max(prev - 1, 1))
+                    }
+                    disabled={categoryPage === 1}
+                    className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                  >
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="16"
+                      height="16"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        fill="currentColor"
+                        d="m13.15 16.15l-3.625-3.625q-.125-.125-.175-.25T9.3 12t.05-.275t.175-.25L13.15 7.85q.075-.075.163-.112T13.5 7.7q.2 0 .35.138T14 8.2v7.6q0 .225-.15.363t-.35.137q-.05 0-.35-.15"
+                      />
+                    </svg>
+                  </button>
+
+                  {(() => {
+                    const maxVisible = 4;
+                    let startPage = Math.max(
+                      1,
+                      Math.min(
+                        categoryPage - Math.floor(maxVisible / 2),
+                        categoryTotalPages - maxVisible + 1
+                      )
+                    );
+                    const endPage = Math.min(
+                      categoryTotalPages,
+                      startPage + maxVisible - 1
+                    );
+
+                    const visiblePages = [];
+                    for (let i = startPage; i <= endPage; i++) {
+                      visiblePages.push(i);
+                    }
+
+                    return visiblePages.map((pageNum) => (
                       <button
-                        key={i}
-                        onClick={() => setCategoryPage(i + 1)}
-                        className={`px-3 py-1 border rounded ${
-                          categoryPage === i + 1
+                        key={pageNum}
+                        onClick={() => setCategoryPage(pageNum)}
+                        className={`px-3 py-1 border rounded text-sm transition-colors ${
+                          categoryPage === pageNum
                             ? "bg-[#bb3523] text-white"
-                            : ""
+                            : "bg-white dark:bg-gray-800"
                         }`}
                       >
-                        {i + 1}
+                        {pageNum}
                       </button>
-                    ))}
+                    ));
+                  })()}
 
-                    <button
-                      onClick={() =>
-                        setCategoryPage((prev) =>
-                          Math.min(prev + 1, categoryTotalPages)
-                        )
-                      }
-                      disabled={categoryPage === categoryTotalPages}
-                      className="px-3 py-1 border rounded disabled:opacity-50"
+                  {/* Tombol Next */}
+                  <button
+                    onClick={() =>
+                      setCategoryPage((prev) =>
+                        Math.min(prev + 1, categoryTotalPages)
+                      )
+                    }
+                    disabled={categoryPage === categoryTotalPages}
+                    className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                  >
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="16"
+                      height="16"
+                      viewBox="0 0 24 24"
                     >
-                      <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        width="24"
-                        height="24"
-                        viewBox="0 0 24 24"
-                      >
-                        <path
-                          fill="currentColor"
-                          d="M10.5 16.3q-.2 0-.35-.137T10 15.8V8.2q0-.225.15-.362t.35-.138q.05 0 .35.15l3.625 3.625q.125.125.175.25t.05.275t-.05.275t-.175.25L10.85 16.15q-.075.075-.162.113t-.188.037"
-                        />
-                      </svg>
-                    </button>
-                  </div>
-                </ul>
+                      <path
+                        fill="currentColor"
+                        d="M10.5 16.3q-.2 0-.35-.137T10 15.8V8.2q0-.225.15-.362t.35-.138q.05 0 .35.15l3.625 3.625q.125.125.175.25t.05.275t-.05.275t-.175.25L10.85 16.15q-.075.075-.162.113t-.188.037"
+                      />
+                    </svg>
+                  </button>
+                </div>
               </div>
+
               {/* Garis */}
               <div className="border-t border-black my-4 dark:border-white"></div>
               {/* Garis */}
diff --git a/app/[locale]/(public)/profile/page.tsx b/app/[locale]/(public)/profile/page.tsx
index 2021dd2f..627ba1d8 100644
--- a/app/[locale]/(public)/profile/page.tsx
+++ b/app/[locale]/(public)/profile/page.tsx
@@ -19,14 +19,15 @@ import { Link } from "@/components/navigation";
 import { useTranslations } from "next-intl";
 
 const profileSchema = z.object({
-  username: z.string().min(1, { message: "Judul diperlukan" }),
-  fullname: z.string().min(1, { message: "Judul diperlukan" }),
-  memberIdentity: z.string().min(1, { message: "Judul diperlukan" }),
-  email: z.string().min(1, { message: "Judul diperlukan" }),
-  address: z.string().min(2, { message: "Narasi Penugasan harus lebih dari 2 karakter." }),
-  phoneNumber: z.string().min(1, { message: "Kategori diperlukan" }),
+  username: z.string().optional(),
+  fullname: z.string().optional(),
+  memberIdentity: z.string().optional(),
+  email: z.string().email("Format email tidak valid").optional(),
+  address: z.string().optional(),
+  phoneNumber: z.string().optional(),
 });
 
+
 type Detail = {
   id: number;
   userId: any;
diff --git a/app/[locale]/(public)/video/filter/page.tsx b/app/[locale]/(public)/video/filter/page.tsx
index f5b44e4c..f88195fc 100644
--- a/app/[locale]/(public)/video/filter/page.tsx
+++ b/app/[locale]/(public)/video/filter/page.tsx
@@ -610,6 +610,116 @@ const FilterPage = () => {
               <h3 className="text-sm font-medium text-gray-700 dark:text-white">
                 {t("categories", { defaultValue: "Categories" })}
               </h3>
+
+              <ul className="mt-2 space-y-2">
+                {categories.map((category: any) => (
+                  <li key={category?.id}>
+                    <label
+                      className="inline-flex items-center"
+                      htmlFor={`${category.id}`}
+                    >
+                      <Checkbox
+                        id={`${category.id}`}
+                        value={category.id}
+                        checked={categoryFilter.includes(String(category.id))}
+                        onCheckedChange={(e) =>
+                          handleCategoryFilter(Boolean(e), category.id)
+                        }
+                      />
+                      <span className="ml-2 text-gray-700 dark:text-white">
+                        {category?.name}
+                      </span>
+                    </label>
+                  </li>
+                ))}
+              </ul>
+
+              {/* ⬇️ Pagination kategori (rata sejajar) */}
+              <div className="mt-4 flex justify-center items-center gap-2 flex-wrap">
+                {/* Tombol Prev */}
+                <button
+                  onClick={() =>
+                    setCategoryPage((prev) => Math.max(prev - 1, 1))
+                  }
+                  disabled={categoryPage === 1}
+                  className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="currentColor"
+                      d="m13.15 16.15l-3.625-3.625q-.125-.125-.175-.25T9.3 12t.05-.275t.175-.25L13.15 7.85q.075-.075.163-.112T13.5 7.7q.2 0 .35.138T14 8.2v7.6q0 .225-.15.363t-.35.137q-.05 0-.35-.15"
+                    />
+                  </svg>
+                </button>
+
+                {(() => {
+                  const maxVisible = 4;
+                  let startPage = Math.max(
+                    1,
+                    Math.min(
+                      categoryPage - Math.floor(maxVisible / 2),
+                      categoryTotalPages - maxVisible + 1
+                    )
+                  );
+                  const endPage = Math.min(
+                    categoryTotalPages,
+                    startPage + maxVisible - 1
+                  );
+
+                  const visiblePages = [];
+                  for (let i = startPage; i <= endPage; i++) {
+                    visiblePages.push(i);
+                  }
+
+                  return visiblePages.map((pageNum) => (
+                    <button
+                      key={pageNum}
+                      onClick={() => setCategoryPage(pageNum)}
+                      className={`px-3 py-1 border rounded text-sm transition-colors ${
+                        categoryPage === pageNum
+                          ? "bg-[#bb3523] text-white"
+                          : "bg-white dark:bg-gray-800"
+                      }`}
+                    >
+                      {pageNum}
+                    </button>
+                  ));
+                })()}
+
+                {/* Tombol Next */}
+                <button
+                  onClick={() =>
+                    setCategoryPage((prev) =>
+                      Math.min(prev + 1, categoryTotalPages)
+                    )
+                  }
+                  disabled={categoryPage === categoryTotalPages}
+                  className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="currentColor"
+                      d="M10.5 16.3q-.2 0-.35-.137T10 15.8V8.2q0-.225.15-.362t.35-.138q.05 0 .35.15l3.625 3.625q.125.125.175.25t.05.275t-.05.275t-.175.25L10.85 16.15q-.075.075-.162.113t-.188.037"
+                    />
+                  </svg>
+                </button>
+              </div>
+            </div>
+
+            {/* <div>
+              <h3 className="text-sm font-medium text-gray-700 dark:text-white">
+                {t("categories", { defaultValue: "Categories" })}
+              </h3>
               <ul className="mt-2 space-y-2">
                 {categories.map((category: any) => (
                   <li key={category?.id}>
@@ -687,7 +797,7 @@ const FilterPage = () => {
                   </button>
                 </div>
               </ul>
-            </div>
+            </div> */}
             {/* Garis */}
             <div className="border-t border-black my-4 dark:border-white"></div>
             {/* Garis */}
diff --git a/components/form/content/image-detail-form.tsx b/components/form/content/image-detail-form.tsx
index b61e294b..07f7555d 100644
--- a/components/form/content/image-detail-form.tsx
+++ b/components/form/content/image-detail-form.tsx
@@ -959,7 +959,7 @@ export default function FormImageDetail() {
         }
 
         // Set the selected target to the category ID from details
-        setSelectedTarget(String(details.category.id));
+        setSelectedTarget(String(details?.category?.id));
 
         const filesData = details.files || [];
         const fileUrls = filesData.map((file: { thumbnailFileUrl: string }) =>
diff --git a/components/form/content/image-form.tsx b/components/form/content/image-form.tsx
index 45355491..36925885 100644
--- a/components/form/content/image-form.tsx
+++ b/components/form/content/image-form.tsx
@@ -152,6 +152,10 @@ export default function FormImage() {
   const [translatedContent, setTranslatedContent] = React.useState("");
   const [selectedLang, setSelectedLang] = React.useState<"id" | "en">("id");
 
+  // 🔹 state untuk translate judul
+  const [translatedTitle, setTranslatedTitle] = useState("");
+  const [isLoadingTranslateTitle, setIsLoadingTranslateTitle] = useState(false);
+
   const options: Option[] = [
     { id: "all", label: "SEMUA" },
     { id: "5", label: "UMUM" },
@@ -211,6 +215,7 @@ export default function FormImage() {
     title: z.string().min(1, { message: t("titleRequired") }),
     description: z.string().optional(),
     descriptionOri: z.string().optional(),
+    htmlDescription: z.string().optional(),
     rewriteDescription: z.string().optional(),
     creatorName: z.string().min(1, { message: t("creatorRequired") }),
     files: z
@@ -555,48 +560,53 @@ export default function FormImage() {
     }
 
     const finalTags = tags.join(", ");
-    const finalTitle = isSwitchOn ? title : data.title;
+    // const finalTitle = isSwitchOn ? title : data.title;
+    let finalTitle = isSwitchOn ? title : data.title;
+
+    // ✅ Jika sudah translate judul → kirim versi English
+    if (translatedTitle && translatedTitle.trim() !== "") {
+      finalTitle = translatedTitle;
+      console.log("📤 Upload Title versi Inggris (translate)");
+    }
 
     // pilih description dasar
-    let finalDescription = isSwitchOn
-      ? data.description
-      : selectedFileType === "rewrite"
-      ? data.rewriteDescription
-      : data.descriptionOri;
+    // let finalDescription = isSwitchOn
+    //   ? data.description
+    //   : selectedFileType === "rewrite"
+    //   ? data.rewriteDescription
+    //   : data.descriptionOri;
+
+    // 👉 tempelkan hasil translate ke field form agar ikut terkirim
+    // if (translatedContent) {
+    //   data.descriptionOri = translatedContent; // versi Inggris yang dikirim
+    // } else {
+    //   data.descriptionOri = getValues("descriptionOri"); // fallback IDN
+    // }
+
+    // ✅ Tentukan deskripsi final yang akan dikirim
+    let finalDescription = "";
+
+    if (translatedContent && translatedContent.trim() !== "") {
+      // jika user sudah translate → kirim versi Inggris
+      finalDescription = translatedContent;
+      console.log("📤 Upload versi Inggris (translate)");
+    } else if (data.rewriteDescription && selectedFileType === "rewrite") {
+      finalDescription = data.rewriteDescription;
+      console.log("📤 Upload versi rewrite");
+    } else {
+      // fallback: gunakan versi Indonesia original
+      finalDescription = data.descriptionOri ?? "";
+      console.log("📤 Upload versi Indonesia (original)");
+    }
 
     if (!finalDescription?.trim()) {
       MySwal.fire("Error", "Deskripsi tidak boleh kosong.", "error");
       return;
     }
 
-    // 👉 tempelkan hasil translate ke field form agar ikut terkirim
-    if (translatedContent) {
-      data.descriptionOri = translatedContent;
-      console.log(
-        "🌍 Translate dimasukkan ke descriptionOri:",
-        translatedContent
-      );
-    }
-
-    let requestData: {
-      title: string;
-      description: string;
-      htmlDescription: string;
-      fileTypeId: string;
-      categoryId: any;
-      subCategoryId: any;
-      uploadedBy: string;
-      statusId: string;
-      publishedFor: string;
-      creatorName: string;
-      tags: string;
-      isYoutube: boolean;
-      isInternationalMedia: boolean;
-      attachFromScheduleId?: number;
-    } = {
-      ...data,
+    let requestData: any = {
       title: finalTitle,
-      description: htmlToString(finalDescription), // plain text
+      description: htmlToString(finalDescription), // versi plain text
       htmlDescription: finalDescription, // versi HTML
       fileTypeId,
       categoryId: selectedCategory,
@@ -605,11 +615,43 @@ export default function FormImage() {
       statusId: "1",
       publishedFor: publishedFor.join(","),
       creatorName: data.creatorName,
-      tags: finalTags,
+      tags: tags.join(", "),
       isYoutube: false,
       isInternationalMedia: false,
     };
 
+    // let requestData: {
+    //   title: string;
+    //   description: string;
+    //   htmlDescription: string;
+    //   fileTypeId: string;
+    //   categoryId: any;
+    //   subCategoryId: any;
+    //   uploadedBy: string;
+    //   statusId: string;
+    //   publishedFor: string;
+    //   creatorName: string;
+    //   tags: string;
+    //   isYoutube: boolean;
+    //   isInternationalMedia: boolean;
+    //   attachFromScheduleId?: number;
+    // } = {
+    //   ...data,
+    //   title: finalTitle,
+    //   description: htmlToString(finalDescription), // plain text
+    //   htmlDescription: finalDescription, // versi HTML
+    //   fileTypeId,
+    //   categoryId: selectedCategory,
+    //   subCategoryId: selectedCategory,
+    //   uploadedBy: "2b7c8d83-d298-4b19-9f74-b07924506b58",
+    //   statusId: "1",
+    //   publishedFor: publishedFor.join(","),
+    //   creatorName: data.creatorName,
+    //   tags: finalTags,
+    //   isYoutube: false,
+    //   isInternationalMedia: false,
+    // };
+
     let id = Cookies.get("idCreate");
 
     if (scheduleId !== undefined) {
@@ -881,8 +923,84 @@ export default function FormImage() {
               {t("form-image", { defaultValue: "Form Image" })}
             </p>
             <div className="gap-5 mb-5">
-              {/* Input Title */}
-              <div className="space-y-2 py-3">
+              <div className="py-3 space-y-2">
+                <div className="flex justify-between items-center">
+                  <Label>{t("title", { defaultValue: "Title" })}</Label>
+
+                  {roleId === "14" && (
+                    <button
+                      type="button"
+                      onClick={async () => {
+                        try {
+                          loading();
+                          setIsLoadingTranslateTitle(true);
+                          const res = await translateText({
+                            text: getValues("title"),
+                            sourceLang: "ID",
+                            targetLang: "EN",
+                          });
+                          if (!res.error) {
+                            const resultText =
+                              res?.data?.data?.translations?.[0]?.text || "";
+                            setTranslatedTitle(resultText);
+                          }
+                        } catch (err) {
+                          console.error("Translate title gagal:", err);
+                        } finally {
+                          close();
+                          setIsLoadingTranslateTitle(false);
+                        }
+                      }}
+                      className="px-3 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600"
+                    >
+                      {isLoadingTranslateTitle
+                        ? "Translating..."
+                        : "Translate to English"}
+                    </button>
+                  )}
+                </div>
+                {/* Title Indonesia */}
+                <div className="mt-3">
+                  <Label className="text-sm font-semibold">
+                    Indonesian Title
+                  </Label>
+                  <Controller
+                    control={control}
+                    name="title"
+                    render={({ field }) => (
+                      <Input
+                        size="md"
+                        type="text"
+                        value={field.value}
+                        onChange={field.onChange}
+                        placeholder="Masukkan Judul Bahasa Indonesia"
+                      />
+                    )}
+                  />
+                </div>
+
+                {/* Title English (hanya muncul setelah translate) */}
+                {translatedTitle && (
+                  <div className="mt-4">
+                    <Label className="text-sm font-semibold">
+                      English Title
+                    </Label>
+                    <Input
+                      size="md"
+                      type="text"
+                      value={translatedTitle}
+                      onChange={(e) => setTranslatedTitle(e.target.value)}
+                      placeholder="English version"
+                    />
+                  </div>
+                )}
+
+                {errors.title?.message && (
+                  <p className="text-red-400 text-sm">{errors.title.message}</p>
+                )}
+              </div>
+
+              {/* <div className="space-y-2 py-3">
                 <Label>{t("title", { defaultValue: "Title" })}</Label>
                 <Controller
                   control={control}
@@ -902,7 +1020,7 @@ export default function FormImage() {
                 {errors.title?.message && (
                   <p className="text-red-400 text-sm">{errors.title.message}</p>
                 )}
-              </div>
+              </div> */}
 
               {/* <div className="flex items-center">
                 <div className="py-3 space-y-2 w-full">
@@ -1233,18 +1351,12 @@ export default function FormImage() {
                   <RadioGroup
                     onValueChange={(value) => setSelectedFileType(value)}
                     value={selectedFileType}
-                    className=" grid-cols-1"
+                    className="grid-cols-1"
                   >
-                    <div className="">
-                      <RadioGroupItem value="original" id="original-file" />
-                      <Label htmlFor="original-file">
-                        Select Original Description
-                      </Label>
-                    </div>
-
+                    {/* HAPUS radio, ganti jadi preview side-by-side */}
                     <div className="py-3 space-y-2">
                       <div className="flex justify-between items-center">
-                        <Label>
+                        <Label className="text-[15px]">
                           {t("description", { defaultValue: "Description" })}
                         </Label>
 
@@ -1265,7 +1377,6 @@ export default function FormImage() {
                                   const resultText =
                                     res?.data?.data?.translations?.[0]?.text ||
                                     "";
-
                                   setTranslatedContent(resultText);
                                 }
                               } catch (err) {
@@ -1284,156 +1395,45 @@ export default function FormImage() {
                           </button>
                         )}
                       </div>
-
-                      {/* Pilihan bahasa untuk posting */}
-                      {roleId === "14" && (
-                        <div className="flex items-center gap-4 mb-2">
-                          <label className="flex items-center gap-2">
-                            <input
-                              type="radio"
-                              value="id"
-                              checked={selectedLang === "id"}
-                              onChange={() => setSelectedLang("id")}
-                            />
-                            <span>Gunakan Bahasa Indonesia</span>
-                          </label>
-                        </div>
-                      )}
-
-                      {/* Editor Bahasa Indonesia */}
-                      <Controller
-                        control={control}
-                        name="descriptionOri"
-                        render={({ field: { onChange, value } }) => (
-                          <CustomEditor
-                            onChange={onChange}
-                            initialData={value}
-                          />
-                        )}
-                      />
-
-                      {/* Editor Bahasa Inggris */}
-                      {translatedContent && (
-                        <div className="mt-4">
-                          <div className="flex flex-col">
-                            <Label className="text-[15px]">
-                              English Version
-                            </Label>{" "}
-                            <label className="flex items-center gap-2">
-                              <input
-                                type="radio"
-                                value="en"
-                                checked={selectedLang === "en"}
-                                onChange={() => setSelectedLang("en")}
-                                disabled={!translatedContent} // kalau belum translate, disable
+                      {/* Editor side-by-side */}
+                      <div className="flex flex-col gap-3 mt-3">
+                        <div className="mt-3">
+                          <Label className="text-sm font-semibold">
+                            Indonesian Version
+                          </Label>
+                          <Controller
+                            control={control}
+                            name="descriptionOri"
+                            render={({ field: { onChange, value } }) => (
+                              <CustomEditor
+                                onChange={onChange}
+                                initialData={value}
                               />
-                              <span>Gunakan Bahasa Inggris</span>
-                            </label>
-                          </div>
-
-                          <CustomEditor
-                            onChange={(val: any) => setTranslatedContent(val)}
-                            initialData={translatedContent}
+                            )}
                           />
                         </div>
-                      )}
-
+                        {translatedContent && (
+                          <div className="mt-5">
+                            <Label className="text-sm font-semibold">
+                              English Version
+                            </Label>
+                            <CustomEditor
+                              onChange={(val: any) => setTranslatedContent(val)}
+                              initialData={translatedContent}
+                            />
+                          </div>
+                        )}
+                      </div>
                       {errors.description?.message && (
                         <p className="text-red-400 text-sm">
                           {errors.description.message}
                         </p>
                       )}
                     </div>
-                    {/* <div className="py-3 space-y-2">
-                      <div className="flex justify-between items-center">
-                        <Label>
-                          {t("description", { defaultValue: "Description" })}
-                        </Label>
 
-                        {roleId === "14" && (
-                          <button
-                            type="button"
-                            onClick={async () => {
-                              try {
-                                loading();
-                                setIsLoadingTranslate(true);
-                                const res = await translateText({
-                                  text: getValues("descriptionOri"),
-                                  sourceLang: "ID",
-                                  targetLang: "EN",
-                                });
-                                console.log("RRRR", res);
-
-                                if (!res.error) {
-                                  // setLocalContent(res.data.translatedText);
-                                  setValue(
-                                    "descriptionOri",
-                                    res?.data?.data?.translations[0]?.text || ""
-                                  );
-                                  // setEditorContent(res.data.translatedText);
-                                }
-                              } catch (err) {
-                                close();
-                                console.error("Translate gagal:", err);
-                              } finally {
-                                close();
-                                setIsLoadingTranslate(false);
-                              }
-                            }}
-                            className="px-3 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600"
-                          >
-                            {isLoadingTranslate
-                              ? "Translating..."
-                              : "Translate to English"}
-                          </button>
-                        )}
-                      </div>
-
-                      <Controller
-                        control={control}
-                        name="descriptionOri"
-                        render={({ field: { onChange, value } }) => (
-                          <CustomEditor
-                            onChange={(val: any) => {
-                              onChange(val);
-                              // setLocalContent(val);
-                              // setEditorContent(val);
-                            }}
-                            initialData={value}
-                          />
-                        )}
-                      />
-
-                      {errors.description?.message && (
-                        <p className="text-red-400 text-sm">
-                          {errors.description.message}
-                        </p>
-                      )}
-                    </div> */}
-                    {/* <div className="py-3 space-y-2">
-                      <Label>
-                        {t("description", { defaultValue: "Description" })}
-                      </Label>
-                      <Controller
-                        control={control}
-                        name="descriptionOri"
-                        render={({ field: { onChange, value } }) => (
-                          <CustomEditor
-                            onChange={(value: any) => {
-                              onChange(value);
-                              setEditorContent(value);
-                            }}
-                            initialData={value}
-                          />
-                        )}
-                      />
-                      {errors.description?.message && (
-                        <p className="text-red-400 text-sm">
-                          {errors.description.message}
-                        </p>
-                      )}
-                    </div> */}
-                    <p className="text-sm font-semibold">Content Rewrite</p>
+                    <p className="text-sm font-semibold mt-3">
+                      Content Rewrite
+                    </p>
                     <div className="my-2">
                       <Button
                         size="sm"
@@ -1444,6 +1444,7 @@ export default function FormImage() {
                         Content Rewrite
                       </Button>
                     </div>
+
                     {showRewriteEditor && (
                       <div>
                         {isGeneratedArticle && (
@@ -1455,7 +1456,7 @@ export default function FormImage() {
                                 className={`mr-3 px-3 py-2 rounded-md ${
                                   selectedArticleId === id
                                     ? "bg-green-500 text-white"
-                                    : "border-2 border-green-500 bg-white  text-green-500 hover:bg-green-500 hover:text-white hover:border-green-500"
+                                    : "border-2 border-green-500 bg-white text-green-500 hover:bg-green-500 hover:text-white hover:border-green-500"
                                 }`}
                                 onClick={() => handleArticleIdClick(id)}
                               >
@@ -1464,12 +1465,6 @@ export default function FormImage() {
                             ))}
                           </div>
                         )}
-                        <div className="flex items-center space-x-2 mt-3">
-                          <RadioGroupItem value="rewrite" id="rewrite-file" />
-                          <Label htmlFor="rewrite-file">
-                            Select Description Rewrite
-                          </Label>
-                        </div>
                         <div className="py-3 space-y-2">
                           <Label>
                             {t("file-rewrite", {
@@ -1503,6 +1498,7 @@ export default function FormImage() {
                   </RadioGroup>
                 </>
               )}
+
               <div className="py-3 space-y-2">
                 <Label>
                   {t("select-file", { defaultValue: "Select File" })}
diff --git a/components/form/content/image-update-form.tsx b/components/form/content/image-update-form.tsx
index 05f0ead8..522804a9 100644
--- a/components/form/content/image-update-form.tsx
+++ b/components/form/content/image-update-form.tsx
@@ -24,9 +24,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Checkbox } from "@/components/ui/checkbox";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-
-import { register } from "module";
 import { Switch } from "@/components/ui/switch";
 import Cookies from "js-cookie";
 import {
@@ -39,7 +36,6 @@ import {
   uploadThumbnail,
 } from "@/service/content/content";
 import { detailMedia } from "@/service/curated-content/curated-content";
-import { Badge } from "@/components/ui/badge";
 import { CloudUpload, MailIcon } from "lucide-react";
 import dynamic from "next/dynamic";
 import { useDropzone } from "react-dropzone";
@@ -175,6 +171,10 @@ export default function FormImageUpdate() {
   const [translatedContent, setTranslatedContent] = React.useState("");
   const [selectedLang, setSelectedLang] = React.useState<"id" | "en">("id");
 
+  // 🔹 State untuk translate judul
+  const [translatedTitle, setTranslatedTitle] = useState("");
+  const [isLoadingTranslateTitle, setIsLoadingTranslateTitle] = useState(false);
+
   const handleThumbnailChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (file) {
@@ -985,16 +985,22 @@ export default function FormImageUpdate() {
     loading();
     const finalTags = tags.join(", ");
 
-    // ✅ tentukan isi description sesuai pilihan bahasa
-    const descFinal =
-      selectedLang === "en" && translatedContent
-        ? translatedContent
-        : data.description;
+    // const descFinal =
+    //   selectedLang === "en" && translatedContent
+    //     ? translatedContent
+    //     : data.description;
+    const descFinal = translatedContent || data.description;
+
+    const finalTitle =
+      translatedTitle && translatedTitle.trim() !== ""
+        ? translatedTitle
+        : data.title;
 
     const requestData = {
       ...data,
       id: detail?.id,
-      title: data.title,
+      // title: data.title,
+      title: finalTitle,
       description: htmlToString(descFinal), // versi plain text
       htmlDescription: descFinal, // versi HTML
       fileTypeId,
@@ -1562,8 +1568,88 @@ export default function FormImageUpdate() {
                 {t("form-image", { defaultValue: "Form Image" })}
               </p>
               <div className="gap-5 mb-5">
-                {/* Input Title */}
-                <div className="space-y-2 py-3">
+                {/* Input Title dengan translate */}
+                <div className="py-3 space-y-2">
+                  <div className="flex justify-between items-center">
+                    <Label>{t("title", { defaultValue: "Title" })}</Label>
+
+                    {roleId === "14" && (
+                      <button
+                        type="button"
+                        onClick={async () => {
+                          try {
+                            loading();
+                            setIsLoadingTranslateTitle(true);
+                            const res = await translateText({
+                              text: getValues("title"),
+                              sourceLang: "ID",
+                              targetLang: "EN",
+                            });
+                            if (!res.error) {
+                              const resultText =
+                                res?.data?.data?.translations?.[0]?.text || "";
+                              setTranslatedTitle(resultText);
+                            }
+                          } catch (err) {
+                            console.error("Translate title gagal:", err);
+                          } finally {
+                            close();
+                            setIsLoadingTranslateTitle(false);
+                          }
+                        }}
+                        className="px-3 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600"
+                      >
+                        {isLoadingTranslateTitle
+                          ? "Translating..."
+                          : "Translate to English"}
+                      </button>
+                    )}
+                  </div>
+
+                  {/* Judul Bahasa Indonesia */}
+                  <div className="mt-2">
+                    <Label className="text-sm font-semibold">
+                      Indonesian Title
+                    </Label>
+                    <Controller
+                      control={control}
+                      name="title"
+                      render={({ field }) => (
+                        <Input
+                          size="md"
+                          type="text"
+                          value={field.value}
+                          onChange={field.onChange}
+                          placeholder="Masukkan Judul Bahasa Indonesia"
+                        />
+                      )}
+                    />
+                  </div>
+
+                  {/* Judul Bahasa Inggris (muncul setelah klik translate) */}
+                  {translatedTitle && (
+                    <div className="mt-4">
+                      <Label className="text-sm font-semibold">
+                        English Title
+                      </Label>
+                      <Input
+                        size="md"
+                        type="text"
+                        value={translatedTitle}
+                        onChange={(e) => setTranslatedTitle(e.target.value)}
+                        placeholder="English version"
+                      />
+                    </div>
+                  )}
+
+                  {errors.title?.message && (
+                    <p className="text-red-400 text-sm">
+                      {errors.title.message}
+                    </p>
+                  )}
+                </div>
+
+                {/* <div className="space-y-2 py-3">
                   <Label>{t("title", { defaultValue: "Title" })}</Label>
                   <Controller
                     control={control}
@@ -1583,7 +1669,7 @@ export default function FormImageUpdate() {
                       {errors.title.message}
                     </p>
                   )}
-                </div>
+                </div> */}
                 <div className="flex items-center">
                   <div className="py-3 w-full space-y-2">
                     <Label>{t("category", { defaultValue: "Category" })}</Label>
@@ -1624,6 +1710,7 @@ export default function FormImageUpdate() {
                   </div>
                 </div>
 
+                {/* Description section (stacked, auto overwrite English when translated) */}
                 <div className="py-3 space-y-2">
                   <div className="flex justify-between items-center">
                     <Label>
@@ -1646,7 +1733,6 @@ export default function FormImageUpdate() {
                             if (!res.error) {
                               const resultText =
                                 res?.data?.data?.translations?.[0]?.text || "";
-
                               setTranslatedContent(resultText);
                             }
                           } catch (err) {
@@ -1666,50 +1752,29 @@ export default function FormImageUpdate() {
                     )}
                   </div>
 
-                  {/* Pilihan bahasa untuk posting */}
-                  {roleId === "14" && (
-                    <div className="flex items-center gap-4 mb-2">
-                      <label className="flex items-center gap-2">
-                        <input
-                          type="radio"
-                          value="id"
-                          checked={selectedLang === "id"}
-                          onChange={() => setSelectedLang("id")}
-                        />
-                        <span>Gunakan Bahasa Indonesia</span>
-                      </label>
-                    </div>
-                  )}
-
                   {/* Editor Bahasa Indonesia */}
-                  <Controller
-                    control={control}
-                    name="description"
-                    render={({ field }) => (
-                      <CustomEditor
-                        onChange={field.onChange}
-                        initialData={field.value}
-                      />
-                    )}
-                  />
+                  <div className="mt-3">
+                    <Label className="text-sm font-semibold">
+                      Indonesian Version
+                    </Label>
+                    <Controller
+                      control={control}
+                      name="description"
+                      render={({ field }) => (
+                        <CustomEditor
+                          onChange={field.onChange}
+                          initialData={field.value}
+                        />
+                      )}
+                    />
+                  </div>
 
-                  {/* Editor Bahasa Inggris */}
+                  {/* Editor Bahasa Inggris (muncul setelah klik translate) */}
                   {translatedContent && (
-                    <div className="mt-4">
-                      <div className="flex flex-col">
-                        <Label className="text-[15px]">English Version</Label>
-                        <label className="flex items-center gap-2">
-                          <input
-                            type="radio"
-                            value="en"
-                            checked={selectedLang === "en"}
-                            onChange={() => setSelectedLang("en")}
-                            disabled={!translatedContent}
-                          />
-                          <span>Gunakan Bahasa Inggris</span>
-                        </label>
-                      </div>
-
+                    <div className="mt-5">
+                      <Label className="text-sm font-semibold">
+                        English Version
+                      </Label>
                       <CustomEditor
                         onChange={(val: any) => setTranslatedContent(val)}
                         initialData={translatedContent}
@@ -1723,6 +1788,7 @@ export default function FormImageUpdate() {
                     </p>
                   )}
                 </div>
+
                 {/* <div className="py-3 space-y-2">
                   <Label>
                     {t("description", { defaultValue: "Description" })}
diff --git a/components/form/content/spit-convert-form.tsx b/components/form/content/spit-convert-form.tsx
index 842338fa..b14a392e 100644
--- a/components/form/content/spit-convert-form.tsx
+++ b/components/form/content/spit-convert-form.tsx
@@ -253,7 +253,7 @@ export default function FormConvertSPIT() {
 
   const loadCategories = async () => {
     try {
-      const response = await listEnableCategory("1");
+      const response = await listEnableCategory("1", true);
       const categories = response?.data?.data?.content || [];
       setCategories(categories);
 
@@ -375,6 +375,7 @@ export default function FormConvertSPIT() {
       };
 
       const response = await generateDataRewrite(request);
+      console.log("REWRITE RESPONSE:", response);
 
       if (response?.error) {
         throw new Error(response.message);
@@ -550,7 +551,6 @@ export default function FormConvertSPIT() {
       }
     } else {
       for (let i = 0; i < files.length; i++) {
-        
         placementData.push({
           mediaFileId: files[i].contentId,
           placements: "polda",
diff --git a/lib/menus.ts b/lib/menus.ts
index 416db307..b9f472dd 100644
--- a/lib/menus.ts
+++ b/lib/menus.ts
@@ -3021,20 +3021,20 @@ export function getMenuList(pathname: string, t: any): Group[] {
             },
           ],
         },
-        {
-          groupLabel: "",
-          id: "task",
-          menus: [
-            {
-              id: "task",
-              href: "/contributor/task",
-              label: t("task"),
-              active: pathname.includes("/task"),
-              icon: "fluent:clipboard-task-add-24-regular",
-              submenus: [],
-            },
-          ],
-        },
+        // {
+        //   groupLabel: "",
+        //   id: "task",
+        //   menus: [
+        //     {
+        //       id: "task",
+        //       href: "/contributor/task",
+        //       label: t("task"),
+        //       active: pathname.includes("/task"),
+        //       icon: "fluent:clipboard-task-add-24-regular",
+        //       submenus: [],
+        //     },
+        //   ],
+        // },
         {
           groupLabel: "",
           id: "schedule",
@@ -3141,42 +3141,42 @@ export function getMenuList(pathname: string, t: any): Group[] {
             },
           ],
         },
-        {
-          groupLabel: "",
-          id: "settings",
-          menus: [
-            {
-              id: "settings",
-              href: "/admin/settings",
-              label: t("settings"),
-              active: pathname.includes("/settinng"),
-              icon: "material-symbols:settings",
-              submenus: [
-                {
-                  href: "/admin/settings/banner",
-                  label: "Banner",
-                  active: pathname === "/admin/settings/banner",
-                  icon: "heroicons:arrow-trending-up",
-                  children: [],
-                },
-                {
-                  href: "/admin/settings/popup",
-                  label: "Pop Up",
-                  active: pathname === "/admin/settings/popup",
-                  icon: "heroicons:arrow-trending-up",
-                  children: [],
-                },
-                {
-                  href: "/admin/settings/iklan",
-                  label: "Iklan",
-                  active: pathname === "/admin/settings/iklan",
-                  icon: "heroicons:arrow-trending-up",
-                  children: [],
-                },
-              ],
-            },
-          ],
-        },
+        // {
+        //   groupLabel: "",
+        //   id: "settings",
+        //   menus: [
+        //     {
+        //       id: "settings",
+        //       href: "/admin/settings",
+        //       label: t("settings"),
+        //       active: pathname.includes("/settinng"),
+        //       icon: "material-symbols:settings",
+        //       submenus: [
+        //         {
+        //           href: "/admin/settings/banner",
+        //           label: "Banner",
+        //           active: pathname === "/admin/settings/banner",
+        //           icon: "heroicons:arrow-trending-up",
+        //           children: [],
+        //         },
+        //         {
+        //           href: "/admin/settings/popup",
+        //           label: "Pop Up",
+        //           active: pathname === "/admin/settings/popup",
+        //           icon: "heroicons:arrow-trending-up",
+        //           children: [],
+        //         },
+        //         {
+        //           href: "/admin/settings/iklan",
+        //           label: "Iklan",
+        //           active: pathname === "/admin/settings/iklan",
+        //           icon: "heroicons:arrow-trending-up",
+        //           children: [],
+        //         },
+        //       ],
+        //     },
+        //   ],
+        // },
       ];
     }
   } else if (Number(roleId) == 9) {
diff --git a/service/content/content.ts b/service/content/content.ts
index 7aad0296..5fd82b8d 100644
--- a/service/content/content.ts
+++ b/service/content/content.ts
@@ -156,8 +156,8 @@ export async function getTagsBySubCategoryId(subCategory: any) {
   );
 }
 
-export async function listEnableCategory(type: any) {
-  const url = `media/categories/list?enablePage=0&sort=desc&sortBy=id&type=${type}&isInt=true`;
+export async function listEnableCategory(type: any, status?: boolean) {
+  const url = `media/categories/list?enablePage=0&sort=desc&sortBy=id&type=${type}&isInt=true&isPublish=${status || ""}`;
   return httpGetInterceptor(url);
 }
 
diff --git a/service/landing/landing.ts b/service/landing/landing.ts
index 004eba65..8a6eb00b 100644
--- a/service/landing/landing.ts
+++ b/service/landing/landing.ts
@@ -63,7 +63,7 @@ export async function getPublicCategoryData(
   page: number = 1
 ) {
   return await httpGetInterceptor(
-    `media/categories/list/publish?enablePage=1&size=12&sort=desc&sortBy=id&page=${
+    `media/categories/list?enablePage=1&size=12&sort=desc&sortBy=id&page=${
       page - 1
     }&group=${group}&type=${type}&isInt=${isInt}`
   );