diff --git a/src/app/dev/donasi/main/galang_dana/[id]/page.tsx b/src/app/dev/donasi/main/galang_dana/[id]/page.tsx
new file mode 100644
index 00000000..e663633a
--- /dev/null
+++ b/src/app/dev/donasi/main/galang_dana/[id]/page.tsx
@@ -0,0 +1,23 @@
+import { PostingDonasi } from "@/app_modules/donasi";
+import { donasi_funGetAllStatusById } from "@/app_modules/donasi/fun";
+import { donasi_funMasterStatusDonasi } from "@/app_modules/donasi/fun/master/get_status_donasi";
+
+export default async function Page({ params }: { params: { id: string } }) {
+  const statusId = params.id;
+
+  const listStatus = await donasi_funMasterStatusDonasi();
+  const dataDonasi = await donasi_funGetAllStatusById({
+    page: 1,
+    statusId: statusId,
+  });
+
+  return (
+    <>
+      <PostingDonasi
+        statusId={statusId}
+        dataStatus={dataDonasi}
+        listStatus={listStatus}
+      />
+    </>
+  );
+}
diff --git a/src/app/dev/donasi/main/galang_dana/page.tsx b/src/app/dev/donasi/main/galang_dana/page.tsx
deleted file mode 100644
index 26f936c1..00000000
--- a/src/app/dev/donasi/main/galang_dana/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { PostingDonasi } from "@/app_modules/donasi";
-import { donasi_funGetAllStatusDraft } from "@/app_modules/donasi/fun/get/status/get_all_status_draft";
-import { donasi_funGetAllStatusPublish } from "@/app_modules/donasi/fun/get/status/get_all_status_publish";
-import { donasi_funGetAllStatusReject } from "@/app_modules/donasi/fun/get/status/get_all_status_reject";
-import { donasi_funGetAllStatusReview } from "@/app_modules/donasi/fun/get/status/get_all_status_review";
-
-export default async function Page() {
-  const listPublish = await donasi_funGetAllStatusPublish({ page: 1 });
-  const listReview = await donasi_funGetAllStatusReview({ page: 1 });
-  const listDraft = await donasi_funGetAllStatusDraft({ page: 1 });
-  const listReject = await donasi_funGetAllStatusReject({ page: 1 });
-
-  // console.log(listPublish, "ini publish")
-  // console.log(listReview, "ini review")
-  // console.log(listDraft, "ini draft")
-  // console.log(listReject, "ini reject")
-
-  return (
-    <>
-      <PostingDonasi
-        listPublish={listPublish}
-        listReview={listReview}
-        listDraft={listDraft}
-        listReject={listReject}
-      />
-    </>
-  );
-}
diff --git a/src/app/dev/donasi/main/layout.tsx b/src/app/dev/donasi/main/layout.tsx
index 2a1803f9..cfe3f834 100644
--- a/src/app/dev/donasi/main/layout.tsx
+++ b/src/app/dev/donasi/main/layout.tsx
@@ -1,6 +1,4 @@
-import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
 import { LayoutDonasi } from "@/app_modules/donasi";
-import { Donasi_getNotifByUserId } from "@/app_modules/donasi/fun/get/get_notif_by_user_id";
 import React from "react";
 
 export default async function Layout({
@@ -8,17 +6,9 @@ export default async function Layout({
 }: {
   children: React.ReactNode;
 }) {
-  const userLoginId = await funGetUserIdByToken();
-
-  const isRead = await Donasi_getNotifByUserId(userLoginId).then((res: any) =>
-    res.map((val: any) => val.isRead)
-  );
-
   return (
     <>
-      <LayoutDonasi userId={userLoginId} isRead={isRead as any}>
-        {children}
-      </LayoutDonasi>
+      <LayoutDonasi>{children}</LayoutDonasi>
     </>
   );
 }
diff --git a/src/app/lib/router_hipmi/router_donasi.ts b/src/app/lib/router_hipmi/router_donasi.ts
index a213ae10..4042ce42 100644
--- a/src/app/lib/router_hipmi/router_donasi.ts
+++ b/src/app/lib/router_hipmi/router_donasi.ts
@@ -9,7 +9,7 @@ export const RouterDonasi = {
 
   //main
   main_beranda: "/dev/donasi/main/beranda",
-  main_galang_dana: "/dev/donasi/main/galang_dana",
+  status_galang_dana: ({ id }: { id: string }) => `/dev/donasi/main/galang_dana/${id}`,
   main_donasi_saya: "/dev/donasi/main/donasi_saya",
 
   // create
diff --git a/src/app_modules/donasi/component/button/comp_button_delete_donasi_by_id.tsx b/src/app_modules/donasi/component/button/comp_button_delete_donasi_by_id.tsx
index 8072067e..6ec7bb58 100644
--- a/src/app_modules/donasi/component/button/comp_button_delete_donasi_by_id.tsx
+++ b/src/app_modules/donasi/component/button/comp_button_delete_donasi_by_id.tsx
@@ -48,7 +48,7 @@ export function Donasi_ComponentButtonDeleteDonasiById({
         ComponentGlobal_NotifikasiPeringatan("Gagal hapus gambar ");
       }
 
-      router.push(RouterDonasi.main_galang_dana);
+      router.replace(RouterDonasi.status_galang_dana({ id: "3" }));
       setTabsPostingDonasi("Draft");
       ComponentGlobal_NotifikasiBerhasil(del.message);
     } else {
diff --git a/src/app_modules/donasi/create/create_cerita_penggalang.tsx b/src/app_modules/donasi/create/create_cerita_penggalang.tsx
index 0ebc38a6..c9099cfc 100644
--- a/src/app_modules/donasi/create/create_cerita_penggalang.tsx
+++ b/src/app_modules/donasi/create/create_cerita_penggalang.tsx
@@ -6,9 +6,7 @@ import { MainColor } from "@/app_modules/_global/color/color_pallet";
 import { ComponentGlobal_BoxUploadImage } from "@/app_modules/_global/component";
 import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information";
 import ComponentGlobal_InputCountDown from "@/app_modules/_global/component/input_countdown";
-import {
-  funGlobal_UploadToStorage
-} from "@/app_modules/_global/fun";
+import { funGlobal_UploadToStorage } from "@/app_modules/_global/fun";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global";
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
@@ -43,10 +41,6 @@ export default function CreateCeritaPenggalangDonasi({
 }) {
   const router = useRouter();
   const [isLoading, setLoading] = useState(false);
-
-  const [tabsPostingDonasi, setTabsPostingDonasi] = useAtom(
-    gs_donasi_tabs_posting
-  );
   const [donasiHotMenu, setDonasiHotMenu] = useAtom(gs_donasi_hot_menu);
 
   const [data, setData] = useState({
@@ -116,10 +110,11 @@ export default function CreateCeritaPenggalangDonasi({
               count: 1,
             })
           );
-          setTabsPostingDonasi("Review");
           setDonasiHotMenu(1);
           ComponentGlobal_NotifikasiBerhasil(res.message);
-          router.push(RouterDonasi.main_galang_dana, { scroll: false });
+          router.push(RouterDonasi.status_galang_dana({ id: "2" }), {
+            scroll: false,
+          });
         }
         setLoading(false);
       } else {
diff --git a/src/app_modules/donasi/detail/detail_draft/index.tsx b/src/app_modules/donasi/detail/detail_draft/index.tsx
index b114be0c..20761adb 100644
--- a/src/app_modules/donasi/detail/detail_draft/index.tsx
+++ b/src/app_modules/donasi/detail/detail_draft/index.tsx
@@ -3,35 +3,36 @@
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan";
+import { UIGlobal_Modal } from "@/app_modules/_global/ui";
 import notifikasiToAdmin_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_admin";
 import mqtt_client from "@/util/mqtt_client";
 import { Button, Group, Stack } from "@mantine/core";
-import { useAtom } from "jotai";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
+import { Donasi_ComponentButtonDeleteDonasiById } from "../../component";
 import ComponentDonasi_DetailDataGalangDana from "../../component/detail_galang_dana/detail_data_donasi";
 import ComponentDonasi_CeritaPenggalangMain from "../../component/detail_main/cerita_penggalang";
 import { Donasi_funGantiStatus } from "../../fun/update/fun_ganti_status";
-import { gs_donasi_tabs_posting } from "../../global_state";
 import { MODEL_DONASI } from "../../model/interface";
-import { Donasi_ComponentButtonDeleteDonasiById } from "../../component";
 
 export default function DetailDraftDonasi({
   dataDonasi,
 }: {
   dataDonasi: MODEL_DONASI;
 }) {
+  const [data, setData] = useState(dataDonasi);
+
   return (
     <>
       <Stack spacing={"xl"} py={"md"}>
-        <ComponentDonasi_DetailDataGalangDana donasi={dataDonasi} />
-        <ComponentDonasi_CeritaPenggalangMain donasi={dataDonasi} />
+        <ComponentDonasi_DetailDataGalangDana donasi={data} />
+        <ComponentDonasi_CeritaPenggalangMain donasi={data} />
         <Group position="apart" grow mt={"lg"}>
-          <ButtonAjukanPenggalangan dataDonasi={dataDonasi} />
+          <ButtonAjukanPenggalangan dataDonasi={data} />
           <Donasi_ComponentButtonDeleteDonasiById
-            donasiId={dataDonasi.id}
-            imageCeritaId={dataDonasi.CeritaDonasi.imageId}
-            imageId={dataDonasi.imageId}
+            donasiId={data.id}
+            imageCeritaId={data.CeritaDonasi.imageId}
+            imageId={data.imageId}
           />
         </Group>
       </Stack>
@@ -45,12 +46,10 @@ function ButtonAjukanPenggalangan({
   dataDonasi: MODEL_DONASI;
 }) {
   const router = useRouter();
-  const [tabsPostingDonasi, setTabsPostingDonasi] = useAtom(
-    gs_donasi_tabs_posting
-  );
   const [isLoading, setLoading] = useState(false);
+  const [openModal, setOpenModal] = useState(false);
 
-  async function onCLick() {
+  async function onChangeStatus() {
     const res = await Donasi_funGantiStatus(dataDonasi.id, "2");
     if (res.status === 200) {
       const dataNotif = {
@@ -70,9 +69,8 @@ function ButtonAjukanPenggalangan({
         mqtt_client.publish("ADMIN", JSON.stringify({ count: 1 }));
 
         setLoading(true);
-        setTabsPostingDonasi("Review");
         ComponentGlobal_NotifikasiBerhasil("Berhasil Diajukan");
-        router.push(RouterDonasi.main_galang_dana);
+        router.push(RouterDonasi.status_galang_dana({ id: "2" }));
       }
     } else {
       ComponentGlobal_NotifikasiPeringatan(res.message);
@@ -81,60 +79,36 @@ function ButtonAjukanPenggalangan({
   return (
     <>
       <Button
-        loaderPosition="center"
-        loading={isLoading ? true : false}
         radius={"xl"}
         bg={"orange"}
         color="orange"
-        onClick={() => onCLick()}
+        onClick={() => setOpenModal(true)}
       >
         Ajukan Kembali
       </Button>
+
+      <UIGlobal_Modal
+        title={"Anda yakin ingin mengajukan kembali ?"}
+        opened={openModal}
+        close={() => setOpenModal(false)}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModal(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            loaderPosition="center"
+            loading={isLoading}
+            radius={"xl"}
+            bg={"orange"}
+            color="orange"
+            onClick={() => onChangeStatus()}
+          >
+            Ajukan
+          </Button>
+        }
+      />
     </>
   );
 }
-
-// function DetailDonasi({ dataDonasi }: { dataDonasi: MODEL_DONASI }) {
-//   const [donasi, setDonasi] = useState(dataDonasi);
-//   useShallowEffect(() => {
-//     setDonasi(dataDonasi);
-//   }, [dataDonasi]);
-//   return (
-//     <>
-//       <Stack>
-//         <Stack>
-//           <AspectRatio ratio={16 / 9}>
-//             <Paper radius={"md"}>
-//               <Image
-//                 alt="Foto"
-//                 src={RouterDonasi.api_image + `${donasi.imageDonasi.url}`}
-//               />
-//             </Paper>
-//           </AspectRatio>
-//           <Stack spacing={0}>
-//             <Title order={4}>{donasi.title}</Title>
-//             <Text fz={"xs"}>
-//               Durasi: {donasi.DonasiMaster_Durasi.name} hari
-//             </Text>
-//           </Stack>
-//           <Stack spacing={0}>
-//             <Group position="apart">
-//               <Stack spacing={0}>
-//                 <Text fz={12}>Dana dibutuhkan</Text>
-//                 <Title order={4} c="blue">
-//                   <TampilanRupiahDonasi nominal={+donasi.target} />
-//                 </Title>
-//               </Stack>
-//               <Stack spacing={0}>
-//                 <Text fz={12}>Kategori</Text>
-//                 <Title order={4} c="blue">
-//                   {donasi.DonasiMaster_Ketegori.name}
-//                 </Title>
-//               </Stack>
-//             </Group>
-//           </Stack>
-//         </Stack>
-//       </Stack>
-//     </>
-//   );
-// }
diff --git a/src/app_modules/donasi/detail/detail_reject/index.tsx b/src/app_modules/donasi/detail/detail_reject/index.tsx
index e8808726..88df30d8 100644
--- a/src/app_modules/donasi/detail/detail_reject/index.tsx
+++ b/src/app_modules/donasi/detail/detail_reject/index.tsx
@@ -2,23 +2,21 @@
 
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
 import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information";
+import { funGlobal_DeleteFileById } from "@/app_modules/_global/fun";
+import {
+  ComponentGlobal_NotifikasiBerhasil,
+  ComponentGlobal_NotifikasiGagal,
+  ComponentGlobal_NotifikasiPeringatan,
+} from "@/app_modules/_global/notif_global";
 import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal";
-import { Button, Group, Paper, Spoiler, Stack, Title } from "@mantine/core";
-import { useAtom } from "jotai";
+import { Button, Group, Stack } from "@mantine/core";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import ComponentDonasi_DetailDataGalangDana from "../../component/detail_galang_dana/detail_data_donasi";
 import ComponentDonasi_CeritaPenggalangMain from "../../component/detail_main/cerita_penggalang";
 import { Donasi_funDeleteDonasiById } from "../../fun/delete/fin_delete_donasi_by_id";
 import { Donasi_funGantiStatus } from "../../fun/update/fun_ganti_status";
-import { gs_donasi_tabs_posting } from "../../global_state";
 import { MODEL_DONASI } from "../../model/interface";
-import {
-  ComponentGlobal_NotifikasiBerhasil,
-  ComponentGlobal_NotifikasiGagal,
-  ComponentGlobal_NotifikasiPeringatan,
-} from "@/app_modules/_global/notif_global";
-import { funGlobal_DeleteFileById } from "@/app_modules/_global/fun";
 
 export default function DetailRejectDonasi({
   dataReject,
@@ -30,7 +28,7 @@ export default function DetailRejectDonasi({
   const [data, setData] = useState(dataReject);
   return (
     <>
-      <Stack spacing={"xl"} py={"md"}>
+      <Stack spacing={"xl"} pb={"md"}>
         <ComponentGlobal_BoxInformation isReport informasi={data.catatan} />
         <ComponentDonasi_DetailDataGalangDana donasi={data} />
         <ComponentDonasi_CeritaPenggalangMain donasi={data} />
@@ -53,33 +51,35 @@ function ButtonAction({
   fileIdImageCerita: string;
   imageId: string;
 }) {
-  const [tabsPostingDonasi, setTabsPostingDonasi] = useAtom(
-    gs_donasi_tabs_posting
-  );
   const router = useRouter();
-  // const [opened, { open, close }] = useDisclosure(false);
-  const [openModal, setOpenModal] = useState(false);
+  const [openModaEdit, setOpenModalEdit] = useState(false);
+  const [openModalDelete, setOpenModalDelete] = useState(false);
+  const [isLoadingEdit, setLoadingEdit] = useState(false);
+  const [isLoadingDelete, setLoadingDelete] = useState(false);
 
-  async function onCLick() {
+  async function onChangeStatus() {
     await Donasi_funGantiStatus(donasiId, "3").then((res) => {
       if (res.status === 200) {
+        setLoadingEdit(true);
         ComponentGlobal_NotifikasiBerhasil(res.message);
-        router.push(RouterDonasi.main_galang_dana);
+        router.replace(RouterDonasi.status_galang_dana({ id: "3" }));
       } else {
         ComponentGlobal_NotifikasiGagal(res.message);
+        setLoadingEdit(true);
       }
     });
-    setTabsPostingDonasi("Draft");
   }
   async function onDelete() {
     const del = await Donasi_funDeleteDonasiById(donasiId);
     if (del.status === 200) {
+      setLoadingDelete(true);
       const deleteImageDonasi = await funGlobal_DeleteFileById({
         fileId: imageId as any,
       });
 
       if (!deleteImageDonasi.success) {
         ComponentGlobal_NotifikasiPeringatan("Gagal hapus gambar ");
+        setLoadingDelete(false);
       }
 
       const deleteImageCerita = await funGlobal_DeleteFileById({
@@ -88,13 +88,15 @@ function ButtonAction({
 
       if (!deleteImageCerita.success) {
         ComponentGlobal_NotifikasiPeringatan("Gagal hapus gambar ");
+        setLoadingDelete(false);
       }
 
-      router.push(RouterDonasi.main_galang_dana);
-      setTabsPostingDonasi("Reject");
+      router.replace(RouterDonasi.status_galang_dana({ id: "4" }));
       ComponentGlobal_NotifikasiBerhasil(del.message);
+      setLoadingDelete(false);
     } else {
       ComponentGlobal_NotifikasiGagal(del.message);
+      setLoadingDelete(false);
     }
   }
   return (
@@ -104,31 +106,61 @@ function ButtonAction({
           radius={"xl"}
           bg={"orange"}
           color="orange"
-          onClick={() => onCLick()}
+          onClick={() => setOpenModalEdit(true)}
         >
-          Edit Donasi
+          Edit Kembali
         </Button>
         <Button
           radius={"xl"}
           bg={"red"}
           color="red"
-          onClick={() => setOpenModal(true)}
+          onClick={() => setOpenModalDelete(true)}
         >
           Hapus Donasi
         </Button>
       </Group>
 
+      {/* MODAL EDIT */}
       <UIGlobal_Modal
-        title={"Anda yakin ingin menghapus donasi ini ?"}
-        opened={openModal}
-        close={() => setOpenModal(false)}
+        title={"Anda yakin ingin mengedit donasi ini ?"}
+        opened={openModaEdit}
+        close={() => setOpenModalEdit(false)}
         buttonKiri={
-          <Button radius={"xl"} onClick={() => setOpenModal(false)}>
+          <Button radius={"xl"} onClick={() => setOpenModalEdit(false)}>
             Batal
           </Button>
         }
         buttonKanan={
-          <Button radius={"xl"} color="red" onClick={() => onDelete()}>
+          <Button
+            loaderPosition="center"
+            loading={isLoadingEdit}
+            radius={"xl"}
+            color="orange"
+            onClick={() => onChangeStatus()}
+          >
+            Edit
+          </Button>
+        }
+      />
+
+      {/* HAPUS */}
+      <UIGlobal_Modal
+        title={"Anda yakin ingin menghapus donasi ini ?"}
+        opened={openModalDelete}
+        close={() => setOpenModalDelete(false)}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModalDelete(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            loaderPosition="center"
+            loading={isLoadingDelete}
+            radius={"xl"}
+            color="red"
+            onClick={() => onDelete()}
+          >
             Hapus
           </Button>
         }
diff --git a/src/app_modules/donasi/detail/detail_review/index.tsx b/src/app_modules/donasi/detail/detail_review/index.tsx
index d821a714..c6b471ff 100644
--- a/src/app_modules/donasi/detail/detail_review/index.tsx
+++ b/src/app_modules/donasi/detail/detail_review/index.tsx
@@ -14,6 +14,7 @@ import { gs_donasi_tabs_posting } from "../../global_state";
 import { MODEL_DONASI } from "../../model/interface";
 import notifikasiToAdmin_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_admin";
 import mqtt_client from "@/util/mqtt_client";
+import { UIGlobal_Modal } from "@/app_modules/_global/ui";
 
 export default function DetailReviewDonasi({
   dataDonasi,
@@ -24,7 +25,7 @@ export default function DetailReviewDonasi({
 
   return (
     <>
-      <Stack spacing={"xl"} py={"md"}>
+      <Stack spacing={"xl"} pb={"md"}>
         <ComponentDonasi_DetailDataGalangDana donasi={donasi} />
         <ComponentDonasi_CeritaPenggalangMain donasi={donasi} />
         <ButtonBatalReview donasi={donasi} />
@@ -35,11 +36,9 @@ export default function DetailReviewDonasi({
 function ButtonBatalReview({ donasi }: { donasi: MODEL_DONASI }) {
   const router = useRouter();
   const [isLoading, setLoading] = useState(false);
-  const [tabsPostingDonasi, setTabsPostingDonasi] = useAtom(
-    gs_donasi_tabs_posting
-  );
+  const [openModal, setOpenModal] = useState(false);
 
-  async function onCLick() {
+  async function onChangeStatus() {
     const res = await Donasi_funGantiStatus(donasi.id, "3");
     if (res.status === 200) {
       const dataNotif = {
@@ -50,7 +49,7 @@ function ButtonBatalReview({ donasi }: { donasi: MODEL_DONASI }) {
         kategoriApp: "DONASI",
         title: "Membatalkan review",
       };
-      
+
       const notif = await notifikasiToAdmin_funCreate({
         data: dataNotif as any,
       });
@@ -58,10 +57,9 @@ function ButtonBatalReview({ donasi }: { donasi: MODEL_DONASI }) {
       if (notif.status === 201) {
         mqtt_client.publish("ADMIN", JSON.stringify({ count: 1 }));
 
-        setTabsPostingDonasi("Draft");
         ComponentGlobal_NotifikasiBerhasil("Berhasil Dibatalkan");
         setLoading(true);
-        router.push(RouterDonasi.main_galang_dana);
+        router.push(RouterDonasi.status_galang_dana({ id: "3" }));
       }
     } else {
       ComponentGlobal_NotifikasiPeringatan(res.message);
@@ -70,18 +68,41 @@ function ButtonBatalReview({ donasi }: { donasi: MODEL_DONASI }) {
   return (
     <>
       <Button
+        mt={"lg"}
         style={{
           transition: "0.5s",
         }}
-        loaderPosition="center"
-        loading={isLoading ? true : false}
         radius={"xl"}
         bg={"orange"}
         color="orange"
-        onClick={() => onCLick()}
+        onClick={() => setOpenModal(true)}
       >
         Batalkan Review
       </Button>
+
+      <UIGlobal_Modal
+        title={"Anda yakin ingin batalkan review ?"}
+        opened={openModal}
+        close={() => setOpenModal(false)}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModal(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            loaderPosition="center"
+            loading={isLoading ? true : false}
+            radius={"xl"}
+            color="orange"
+            onClick={() => {
+              onChangeStatus();
+            }}
+          >
+            Simpan
+          </Button>
+        }
+      />
     </>
   );
 }
diff --git a/src/app_modules/donasi/edit/edit_donasi/index.tsx b/src/app_modules/donasi/edit/edit_donasi/index.tsx
index a5878f23..42398608 100644
--- a/src/app_modules/donasi/edit/edit_donasi/index.tsx
+++ b/src/app_modules/donasi/edit/edit_donasi/index.tsx
@@ -27,7 +27,7 @@ import {
   TextInput,
 } from "@mantine/core";
 import { IconCamera } from "@tabler/icons-react";
-import _ from "lodash";
+import _, { set } from "lodash";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { Donasi_funUpdateDonasi } from "../../fun/update/fun_update_donasi";
@@ -49,6 +49,7 @@ export default function EditDonasi({
   const [durasi, setDurasi] = useState(masterDurasi);
   const [file, setFile] = useState<File | null>(null);
   const [updateImage, setUpdateImage] = useState<any | null>();
+  const [newTarget, setNewTarget] = useState("");
 
   async function onUpdate() {
     setLoading(true);
@@ -114,7 +115,7 @@ export default function EditDonasi({
 
   return (
     <>
-      <Stack spacing={"md"} px={"md"}>
+      <Stack spacing={"md"} px={"sm"}>
         <Select
           styles={{
             label: {
@@ -218,7 +219,7 @@ export default function EditDonasi({
               })
             }
           />
-          
+
           <TextInput
             styles={{
               label: {
@@ -230,7 +231,7 @@ export default function EditDonasi({
             withAsterisk
             label="Target Dana"
             placeholder="0"
-            value={data.target}
+            value={newTarget ? newTarget : data.target}
             error={
               data.target === "" || data.target === "0" ? (
                 <ComponentGlobal_ErrorInput text="Masukan target dana" />
@@ -243,19 +244,24 @@ export default function EditDonasi({
                 .replace(/\./g, "")
                 .match(/^[0-9]+$/);
 
-              if (val.currentTarget.value === "")
-                return setData({
+              if (val.currentTarget.value === "") {
+                setData({
                   ...data,
                   target: 0 + "",
                 });
+                setNewTarget("0");
+              }
+
               if (!match?.[0]) return null;
 
               const nilai = val.currentTarget.value.replace(/\./g, "");
               const target = Intl.NumberFormat("id-ID").format(+nilai);
 
+              setNewTarget(target);
+
               setData({
                 ...data,
-                target: target,
+                target: nilai,
               });
             }}
           />
@@ -294,6 +300,7 @@ export default function EditDonasi({
           radius={"xl"}
           onClick={() => {
             onUpdate();
+            // console.log(data);
           }}
           bg={MainColor.yellow}
           color="yellow"
diff --git a/src/app_modules/donasi/fun/get/status/get_all_by_status_id.ts b/src/app_modules/donasi/fun/get/status/get_all_by_status_id.ts
new file mode 100644
index 00000000..17d26311
--- /dev/null
+++ b/src/app_modules/donasi/fun/get/status/get_all_by_status_id.ts
@@ -0,0 +1,59 @@
+"use server";
+
+import { prisma } from "@/app/lib";
+import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
+
+export async function donasi_funGetAllStatusById({
+  page,
+  statusId,
+}: {
+  page: number;
+  statusId: string;
+}) {
+  const userLoginId = await funGetUserIdByToken();
+
+  const takeData = 5;
+  const skipData = page * takeData - takeData;
+
+  if (statusId === "1") {
+    const data = await prisma.donasi.findMany({
+      take: takeData,
+      skip: skipData,
+      orderBy: {
+        publishTime: "desc",
+      },
+      where: {
+        authorId: userLoginId,
+        donasiMaster_StatusDonasiId: "1",
+        active: true,
+      },
+      select: {
+        id: true,
+        title: true,
+        imagesId: true,
+        target: true,
+        progres: true,
+        publishTime: true,
+        DonasiMaster_Durasi: true,
+        terkumpul: true,
+        imageId: true,
+      },
+    });
+    return data;
+    
+  } else {
+    const data = await prisma.donasi.findMany({
+      take: takeData,
+      skip: skipData,
+      orderBy: {
+        updatedAt: "desc",
+      },
+      where: {
+        authorId: userLoginId,
+        donasiMaster_StatusDonasiId: statusId,
+      },
+    });
+
+    return data;
+  }
+}
diff --git a/src/app_modules/donasi/fun/index.ts b/src/app_modules/donasi/fun/index.ts
index 5575bc07..c37d08b6 100644
--- a/src/app_modules/donasi/fun/index.ts
+++ b/src/app_modules/donasi/fun/index.ts
@@ -1,6 +1,8 @@
 import { Donasi_getMasterKategori } from "./master/get_ketegori";
 import { Donasi_getMasterDurasi } from "./master/get_durasi";
 import { donasi_funUpdateKabar } from "./update/fun_update_kabar";
+import { donasi_funGetAllStatusById } from "./get/status/get_all_by_status_id";
 
 export { Donasi_getMasterKategori, Donasi_getMasterDurasi };
 export { donasi_funUpdateKabar };
+export { donasi_funGetAllStatusById };
diff --git a/src/app_modules/donasi/fun/master/get_status_donasi.ts b/src/app_modules/donasi/fun/master/get_status_donasi.ts
new file mode 100644
index 00000000..57f85486
--- /dev/null
+++ b/src/app_modules/donasi/fun/master/get_status_donasi.ts
@@ -0,0 +1,9 @@
+"use server";
+
+import { prisma } from "@/app/lib";
+
+export async function donasi_funMasterStatusDonasi() {
+  const data = await prisma.donasiMaster_StatusDonasi.findMany({});
+
+  return data;
+}
diff --git a/src/app_modules/donasi/fun/update/fun_ganti_status.ts b/src/app_modules/donasi/fun/update/fun_ganti_status.ts
index 19e70d97..5e63414b 100644
--- a/src/app_modules/donasi/fun/update/fun_ganti_status.ts
+++ b/src/app_modules/donasi/fun/update/fun_ganti_status.ts
@@ -5,7 +5,7 @@ import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
 import { revalidatePath } from "next/cache";
 
 /**
- * 
+ *
  * @param donasiId | string
  * @param statusId | string | 1 - 4
  * @tutorial id_and_statusName | Publish "1", Review "2, Draft "3", Reject "4"
@@ -31,13 +31,12 @@ export async function Donasi_funGantiStatus(
           name: true,
         },
       },
-    }
+    },
   });
 
-
   if (!data) return { status: 400, message: "Data tidak ditemukan" };
 
-  revalidatePath(RouterDonasi.main_galang_dana)
+  revalidatePath(RouterDonasi.status_galang_dana({ id: "" }));
   return {
     data: data,
     status: 200,
diff --git a/src/app_modules/donasi/fun/update/fun_update_cerita_donasi.ts b/src/app_modules/donasi/fun/update/fun_update_cerita_donasi.ts
index 8622cfad..0c9199c4 100644
--- a/src/app_modules/donasi/fun/update/fun_update_cerita_donasi.ts
+++ b/src/app_modules/donasi/fun/update/fun_update_cerita_donasi.ts
@@ -36,7 +36,7 @@ export async function Donasi_funUpdateCerita({
   });
 
   if (!update) return { status: 400, message: "Gagal update cerita" };
-  revalidatePath(RouterDonasi.detail_draft + data.id);
+  revalidatePath(RouterDonasi.detail_draft);
 
   return {
     status: 200,
diff --git a/src/app_modules/donasi/fun/update/fun_update_donasi.ts b/src/app_modules/donasi/fun/update/fun_update_donasi.ts
index e0a74985..a9d3ac58 100644
--- a/src/app_modules/donasi/fun/update/fun_update_donasi.ts
+++ b/src/app_modules/donasi/fun/update/fun_update_donasi.ts
@@ -38,7 +38,7 @@ export async function Donasi_funUpdateDonasi({
   });
 
   if (!update) return { status: 400, message: "Gagal update" };
-  revalidatePath(RouterDonasi.detail_draft + data.id);
+  revalidatePath(RouterDonasi.detail_draft);
 
   return {
     status: 200,
diff --git a/src/app_modules/donasi/main/galang_dana/ui_galang_dana.tsx b/src/app_modules/donasi/main/galang_dana/ui_galang_dana.tsx
index 3c790a1b..60b68322 100644
--- a/src/app_modules/donasi/main/galang_dana/ui_galang_dana.tsx
+++ b/src/app_modules/donasi/main/galang_dana/ui_galang_dana.tsx
@@ -1,10 +1,6 @@
 "use client";
 
-import {
-  Stack,
-  Tabs,
-  Text
-} from "@mantine/core";
+import { Stack, Tabs, Text } from "@mantine/core";
 import { useAtom } from "jotai";
 import { useRouter } from "next/navigation";
 import { gs_donasi_tabs_posting } from "../../global_state";
@@ -12,50 +8,60 @@ import PostingDraftDonasi from "./draft";
 import PostingPublishDonasi from "./publish";
 import PostingRejectDonasi from "./reject";
 import PostingReviewDonasi from "./review";
-import { AccentColor, MainColor } from "@/app_modules/_global/color/color_pallet";
+import {
+  AccentColor,
+  MainColor,
+} from "@/app_modules/_global/color/color_pallet";
+import { useState } from "react";
+import { MODEL_NEW_DEFAULT_MASTER } from "@/app_modules/model_global/interface";
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
 
 export default function GalangDanaDonasi({
-  listPublish,
-  listReview,
-  listDraft,
-  listReject,
+  statusId,
+  dataStatus,
+  listStatus,
 }: {
-  listPublish: any;
-  listReview: any;
-  listDraft: any;
-  listReject: any;
+  statusId: string;
+  dataStatus: any[];
+  listStatus: MODEL_NEW_DEFAULT_MASTER[];
 }) {
   const router = useRouter();
+  const [changeStatus, setChangeStatus] = useState(statusId);
+
   const [tabsPostingDonasi, setTabsPostingDonasi] = useAtom(
     gs_donasi_tabs_posting
   );
 
-  const listPosting = [
-    {
-      id: 1,
-      value: "Publish",
-      path: <PostingPublishDonasi listPublish={listPublish} />,
-      color: "green",
-    },
-    {
-      id: 2,
-      value: "Review",
-      path: <PostingReviewDonasi listReview={listReview} />,
-      color: "yellow",
-    },
-    {
-      id: 3,
-      value: "Draft",
-      path: <PostingDraftDonasi listDraft={listDraft} />,
-      color: "red",
-    },
-    {
-      id: 4,
-      value: "Reject",
-      path: <PostingRejectDonasi listReject={listReject} />,
-      color: "red",
-    },
-  ];
+  // const listPosting = [
+  //   {
+  //     id: 1,
+  //     value: "Publish",
+  //     path: <PostingPublishDonasi listPublish={listPublish} />,
+  //     color: "green",
+  //   },
+  //   {
+  //     id: 2,
+  //     value: "Review",
+  //     path: <PostingReviewDonasi listReview={listReview} />,
+  //     color: "yellow",
+  //   },
+  //   {
+  //     id: 3,
+  //     value: "Draft",
+  //     path: <PostingDraftDonasi listDraft={listDraft} />,
+  //     color: "red",
+  //   },
+  //   {
+  //     id: 4,
+  //     value: "Reject",
+  //     path: <PostingRejectDonasi listReject={listReject} />,
+  //     color: "red",
+  //   },
+  // ];
+
+  async function onChangeStatus({ statusId }: { statusId: string }) {
+    router.replace(RouterDonasi.status_galang_dana({ id: statusId }));
+  }
 
   return (
     <>
@@ -63,9 +69,11 @@ export default function GalangDanaDonasi({
         color="orange"
         variant="pills"
         radius="xl"
-        defaultValue="Publish"
-        value={tabsPostingDonasi}
-        onTabChange={setTabsPostingDonasi}
+        value={changeStatus}
+        onTabChange={(val: any) => {
+          setChangeStatus(val);
+          onChangeStatus({ statusId: val });
+        }}
         styles={{
           tabsList: {
             backgroundColor: MainColor.darkblue,
@@ -75,33 +83,36 @@ export default function GalangDanaDonasi({
           },
         }}
       >
-        <Stack >
+        <Stack>
           <Tabs.List grow>
-            {listPosting.map((e, i) => (
+            {listStatus.map((e, i) => (
               <Tabs.Tab
                 key={e.id}
-                value={e.value}
+                value={e.id}
                 fw={"bold"}
                 c={"black"}
                 style={{
                   transition: "0.5s",
                   backgroundColor:
-                    tabsPostingDonasi === e.value ? MainColor.yellow : "white",
+                    changeStatus === e.id ? MainColor.yellow : "white",
                   border:
-                    tabsPostingDonasi === e.value
+                    changeStatus === e.id
                       ? `1px solid ${AccentColor.yellow}`
                       : `1px solid white`,
                 }}
               >
-                {e.value}
+                {e.name}
               </Tabs.Tab>
             ))}
           </Tabs.List>
-          {listPosting.map((e, i) => (
-            <Tabs.Panel key={e.id} value={e.value} >
-              {e.path}
-            </Tabs.Panel>
-          ))}
+
+          {statusId == "1" && <PostingPublishDonasi listPublish={dataStatus} />}
+
+          {statusId == "2" && <PostingReviewDonasi listReview={dataStatus} />}
+
+          {statusId == "3" && <PostingDraftDonasi listDraft={dataStatus} />}
+
+          {statusId == "4" && <PostingRejectDonasi listReject={dataStatus} />}
         </Stack>
       </Tabs>
     </>
diff --git a/src/app_modules/donasi/main/layout.tsx b/src/app_modules/donasi/main/layout.tsx
index 3112a147..b5097454 100644
--- a/src/app_modules/donasi/main/layout.tsx
+++ b/src/app_modules/donasi/main/layout.tsx
@@ -14,22 +14,16 @@ import {
 } from "@tabler/icons-react";
 import { useAtom } from "jotai";
 import { useRouter } from "next/navigation";
-import React, { useState } from "react";
+import React from "react";
 import { gs_donasi_hot_menu } from "../global_state";
 
 export default function LayoutDonasi({
   children,
-  userId,
-  isRead,
 }: {
   children: React.ReactNode;
-  userId: string;
-  isRead: boolean[];
 }) {
   const router = useRouter();
   const [active, setActive] = useAtom(gs_donasi_hot_menu);
-  const [isLoading, setLoading] = useState(false);
-  const [isRightLoading, setRightLoading] = useState(false);
 
   const listFooter = [
     {
@@ -41,7 +35,7 @@ export default function LayoutDonasi({
     {
       id: 2,
       name: "Galang Dana",
-      path: RouterDonasi.main_galang_dana,
+      path: RouterDonasi.status_galang_dana({ id: "1" }),
       icon: <IconMoneybag />,
     },
     {
diff --git a/src/app_modules/investasi/create/view.tsx b/src/app_modules/investasi/create/view.tsx
index f0fd82e2..057162b4 100644
--- a/src/app_modules/investasi/create/view.tsx
+++ b/src/app_modules/investasi/create/view.tsx
@@ -21,7 +21,13 @@ import {
   Text,
   TextInput,
 } from "@mantine/core";
-import { IconCamera, IconCircleCheck, IconUpload } from "@tabler/icons-react";
+import {
+  IconCamera,
+  IconCircleCheck,
+  IconFileTypePdf,
+  IconPdf,
+  IconUpload,
+} from "@tabler/icons-react";
 import _ from "lodash";
 import { useState } from "react";
 import { Investasi_ComponentButtonCreateNewInvestasi } from "../_component";
@@ -169,7 +175,7 @@ export default function InvestasiCreate({
             >
               {(props) => (
                 <Button
-                  leftIcon={<IconCamera />}
+                  leftIcon={<IconFileTypePdf />}
                   {...props}
                   radius={"xl"}
                   bg={MainColor.yellow}
diff --git a/src/app_modules/notifikasi/component/path/donasi.ts b/src/app_modules/notifikasi/component/path/donasi.ts
index de287858..479c229b 100644
--- a/src/app_modules/notifikasi/component/path/donasi.ts
+++ b/src/app_modules/notifikasi/component/path/donasi.ts
@@ -12,7 +12,7 @@ export function redirectDonasiPage({
   router: AppRouterInstance;
   onSetPage: (val: any) => void;
 }) {
-  const path = RouterDonasi.main_galang_dana;
+  const path = RouterDonasi.status_galang_dana({ id: "" });
 
   if (data.status === "Publish") {
     onSetPage({
@@ -21,7 +21,6 @@ export function redirectDonasiPage({
     });
     router.push(path, { scroll: false });
   }
-  //   console.log(data)
 
   if (data.status === "Reject") {
     onSetPage({
@@ -52,8 +51,8 @@ export function redirectDonasiPage({
     router.push(pathKabar, { scroll: false });
   }
 
-   if (data.status === "Pencairan Dana") {
-     const pathPencairan = RouterDonasi.pencairan_dana + data.appId;
-     router.push(pathPencairan, { scroll: false });
-   }
+  if (data.status === "Pencairan Dana") {
+    const pathPencairan = RouterDonasi.pencairan_dana + data.appId;
+    router.push(pathPencairan, { scroll: false });
+  }
 }