diff --git a/package.json b/package.json
index f3b6bbd9..58607d04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hipmi",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": true,
   "prisma": {
     "seed": "npx tsx prisma/seed.ts"
diff --git a/src/app/dev/admin/investasi/konfirmasi/[id]/page.tsx b/src/app/dev/admin/investasi/konfirmasi/[id]/page.tsx
index ebac8439..96111822 100644
--- a/src/app/dev/admin/investasi/konfirmasi/[id]/page.tsx
+++ b/src/app/dev/admin/investasi/konfirmasi/[id]/page.tsx
@@ -1,8 +1,9 @@
 import { Admin_KonfirmasiInvestasi } from "@/app_modules/admin/investasi";
-import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id";
+import { adminInvestasi_getOneById } from "@/app_modules/admin/investasi/fun";
 
 export default async function Page({ params }: { params: { id: string } }) {
-  const dataInvestasi = await getOneInvestasiById(params.id);
+  const investasiId = params.id;
+  const dataInvestasi = await adminInvestasi_getOneById({investasiId});
   // console.log(dataUser)
 
   return (
diff --git a/src/app/dev/admin/layout.tsx b/src/app/dev/admin/layout.tsx
index 5f99cd73..40feb1d4 100644
--- a/src/app/dev/admin/layout.tsx
+++ b/src/app/dev/admin/layout.tsx
@@ -1,9 +1,8 @@
 import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
+import { funGlobal_getUserById } from "@/app_modules/_global/fun/get/fun_get_user_by_id";
 import { Admin_NewLayout } from "@/app_modules/admin";
-import { AdminLayout } from "@/app_modules/admin/main_dashboard";
 import adminNotifikasi_countNotifikasi from "@/app_modules/admin/notifikasi/fun/count/count_is_read";
 import adminNotifikasi_getByUserId from "@/app_modules/admin/notifikasi/fun/get/get_notifikasi_by_user_id";
-import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import React from "react";
 
 export default async function Layout({
@@ -13,7 +12,7 @@ export default async function Layout({
 }) {
   const userLoginId = await funGetUserIdByToken();
 
-  const dataUser = await user_getOneByUserId(userLoginId);
+  const dataUser = await funGlobal_getUserById({ userId: userLoginId });
   const listNotif = await adminNotifikasi_getByUserId();
   const countNotifikasi = await adminNotifikasi_countNotifikasi();
 
diff --git a/src/app/dev/admin/preview-image/[id]/page.tsx b/src/app/dev/admin/preview-image/[id]/page.tsx
new file mode 100644
index 00000000..341d5396
--- /dev/null
+++ b/src/app/dev/admin/preview-image/[id]/page.tsx
@@ -0,0 +1,14 @@
+import { Admin_UiImagePreview } from "@/app_modules/admin/_admin_global";
+import React from "react";
+
+async function Page({ params }: { params: { id: string } }) {
+  const fileId = params.id;
+
+  return (
+    <>
+      <Admin_UiImagePreview fileId={fileId} />
+    </>
+  );
+}
+
+export default Page;
diff --git a/src/app/dev/investasi/detail/portofolio/[id]/page.tsx b/src/app/dev/investasi/detail/portofolio/[id]/page.tsx
index 286d1a78..d2c0c681 100644
--- a/src/app/dev/investasi/detail/portofolio/[id]/page.tsx
+++ b/src/app/dev/investasi/detail/portofolio/[id]/page.tsx
@@ -13,7 +13,7 @@ export default async function Page({ params }: { params: { id: string } }) {
   return (
     <>
       <Investasi_UiDetailPortofolio
-        data={dataPortofolio as any}
+        dataInvestasi={dataPortofolio as any}
         userLoginId={userLoginId}
       />
     </>
diff --git a/src/app/lib/index.ts b/src/app/lib/index.ts
index 1e89379c..4d002a66 100644
--- a/src/app/lib/index.ts
+++ b/src/app/lib/index.ts
@@ -3,6 +3,7 @@ import DIRECTORY_ID from "./id-derectory";
 import prisma from "./prisma";
 import { pathAssetImage } from "./path_asset_image";
 import { RouterImagePreview } from "./router_hipmi/router_image_preview";
+import { RouterAdminGlobal } from "./router_admin/router_admin_global";
 
 export { DIRECTORY_ID };
 export { prisma };
@@ -11,3 +12,4 @@ export { pathAssetImage };
 
 // Router
 export { RouterImagePreview };
+export { RouterAdminGlobal };
diff --git a/src/app/lib/router_admin/router_admin_global.ts b/src/app/lib/router_admin/router_admin_global.ts
new file mode 100644
index 00000000..ad55bea2
--- /dev/null
+++ b/src/app/lib/router_admin/router_admin_global.ts
@@ -0,0 +1,7 @@
+export const RouterAdminGlobal = {
+    /**
+     * @param fileId | file id from wibu storage , atau bisa diambil di DB
+     * @type {string}
+     */
+  preview_image: ({ id }: { id: string }) => `/dev/admin/preview-image/${id}`,
+};
diff --git a/src/app_modules/_global/fun/get/fun_get_user_by_id.ts b/src/app_modules/_global/fun/get/fun_get_user_by_id.ts
new file mode 100644
index 00000000..10fe6c38
--- /dev/null
+++ b/src/app_modules/_global/fun/get/fun_get_user_by_id.ts
@@ -0,0 +1,16 @@
+"use server";
+
+import { prisma } from "@/app/lib";
+
+export async function funGlobal_getUserById({ userId }: { userId: string }) {
+  const data = await prisma.user.findFirst({
+    where: {
+      id: userId,
+    },
+    include: {
+      Profile: true,
+    },
+  });
+
+  return data;
+}
diff --git a/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx b/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx
new file mode 100644
index 00000000..ffe21d3b
--- /dev/null
+++ b/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx
@@ -0,0 +1,92 @@
+"use client";
+
+import { APIs, RouterAdminGlobal } from "@/app/lib";
+import { pathAssetImage } from "@/app/lib/path_asset_image";
+import { Center, Image, Skeleton } from "@mantine/core";
+import { useShallowEffect } from "@mantine/hooks";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+
+export function Admin_ComponentLoadImageLandscape({
+  fileId,
+}: {
+  fileId: string;
+}) {
+  const router = useRouter();
+  const [isImage, setIsImage] = useState<boolean | null>(null);
+  const [isLoading, setLoading] = useState(false);
+  const url = APIs.GET({ fileId: fileId });
+
+  useShallowEffect(() => {
+    onLoadImage();
+  }, []);
+
+  async function onLoadImage() {
+    try {
+      const res = await fetch(url);
+      if (res.ok) {
+        return setIsImage(true);
+      }
+      setIsImage(false);
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
+  if (isImage === null) return <Skeleton h={200} w={"100%"} />;
+
+  if (!isImage)
+    return (
+      <>
+        <Center h={200} bg={"white"} style={{ borderRadius: "5px" }}>
+          <Image
+            alt="No Image"
+            maw={150}
+            m={"auto"}
+            p={"xs"}
+            src={pathAssetImage.no_image}
+          />
+        </Center>
+      </>
+    );
+
+  return (
+    <>
+      <Center>
+        <Image
+          onClick={() => {
+            setLoading(true);
+
+            router.push(RouterAdminGlobal.preview_image({ id: fileId }), {
+              scroll: false,
+            });
+          }}
+          style={{
+            borderColor: "white",
+            borderStyle: "solid",
+            borderWidth: "1px",
+            borderRadius: "5px",
+          }}
+          radius={"4px"}
+          height={200}
+          alt="Image"
+          opacity={isLoading ? 0.5 : 1}
+          src={url}
+        />
+        {isLoading ? (
+          <Image
+            alt="Loader"
+            src={pathAssetImage.new_loader}
+            height={50}
+            width={50}
+            style={{
+              position: "absolute",
+            }}
+          />
+        ) : (
+          ""
+        )}
+      </Center>
+    </>
+  );
+}
diff --git a/src/app_modules/admin/_admin_global/_component/comp_admin_modal_report.tsx b/src/app_modules/admin/_admin_global/_component/comp_admin_modal_report.tsx
new file mode 100644
index 00000000..c908e25c
--- /dev/null
+++ b/src/app_modules/admin/_admin_global/_component/comp_admin_modal_report.tsx
@@ -0,0 +1,47 @@
+"use client";
+
+import { Modal, Stack, Textarea, Group, Button } from "@mantine/core";
+import React from "react";
+
+export function Admin_ComponentModalReport({
+  opened,
+  onClose,
+  title,
+  onHandlerChange,
+  buttonKanan,
+  buttonKiri,
+}: {
+  opened: any;
+  onClose: () => void;
+  title: string;
+  onHandlerChange: (val: any) => void;
+  buttonKanan: React.ReactNode;
+  buttonKiri: React.ReactNode;
+}) {
+  return (
+    <>
+      <Modal
+        opened={opened}
+        onClose={onClose}
+        title={title}
+        size={"sm"}
+        centered
+        withCloseButton={false}
+      >
+        <Stack>
+          <Textarea
+            autosize
+            minRows={3}
+            maxRows={5}
+            placeholder="Masukan alasan penolakan"
+            onChange={onHandlerChange}
+          />
+          <Group position="right">
+            {buttonKiri}
+            {buttonKanan}
+          </Group>
+        </Stack>
+      </Modal>
+    </>
+  );
+}
diff --git a/src/app_modules/admin/_admin_global/_component/index.ts b/src/app_modules/admin/_admin_global/_component/index.ts
index f3daef24..bc8cb4e2 100644
--- a/src/app_modules/admin/_admin_global/_component/index.ts
+++ b/src/app_modules/admin/_admin_global/_component/index.ts
@@ -1,5 +1,7 @@
 import { ComponentAdminGlobal_TitlePage } from "./title_page";
 import { ComponentAdminGlobal_TampilanRupiah } from "./comp_admin_tampilan_rupiah";
+import { Admin_ComponentModalReport } from "./comp_admin_modal_report";
 
 export { ComponentAdminGlobal_TampilanRupiah };
 export { ComponentAdminGlobal_TitlePage };
+export { Admin_ComponentModalReport };
diff --git a/src/app_modules/admin/_admin_global/_ui/ui_admin_image_preview.tsx b/src/app_modules/admin/_admin_global/_ui/ui_admin_image_preview.tsx
new file mode 100644
index 00000000..be99384b
--- /dev/null
+++ b/src/app_modules/admin/_admin_global/_ui/ui_admin_image_preview.tsx
@@ -0,0 +1,71 @@
+"use client";
+
+import { APIs, pathAssetImage } from "@/app/lib";
+import { Box, Center, Image, ScrollArea, Skeleton, Stack } from "@mantine/core";
+import { useShallowEffect } from "@mantine/hooks";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import AdminGlobal_ComponentBackButton from "../back_button";
+
+export function Admin_UiImagePreview({ fileId }: { fileId: string }) {
+  const router = useRouter();
+  const [isImage, setIsImage] = useState<boolean | null>(null);
+  const [isLoading, setIsLoading] = useState(false);
+
+  const url = APIs.GET({ fileId: fileId });
+
+  useShallowEffect(() => {
+    onLoadImage();
+  }, []);
+
+  async function onLoadImage() {
+    const res = await fetch(url);
+    try {
+      if (res.ok) {
+        return setIsImage(true);
+      }
+      setIsImage(false);
+    } catch (error) {
+      console.log(error);
+    }
+  }
+  return (
+    <>
+      <Stack>
+        <AdminGlobal_ComponentBackButton />
+
+        <Box style={{ zIndex: 0 }} h={"90vh"} pos={"static"} px={"lg"}>
+          {isImage === null ? (
+            <Skeleton height={200} radius={"sm"} />
+          ) : isImage ? (
+            <ScrollArea h={"100%"}>
+              <Center>
+                <Image alt="Image" src={url} maw={500} miw={200} />
+              </Center>
+            </ScrollArea>
+          ) : (
+            <Box
+              bg={"gray"}
+              style={{
+                borderColor: "white",
+                borderStyle: "solid",
+                borderWidth: "0.5px",
+                borderRadius: "5px",
+                height: 300,
+              }}
+            >
+              <Center h={"100%"}>
+                <Image
+                  alt="Image"
+                  height={100}
+                  width={100}
+                  src={pathAssetImage.no_image}
+                />
+              </Center>
+            </Box>
+          )}
+        </Box>
+      </Stack>
+    </>
+  );
+}
diff --git a/src/app_modules/admin/_admin_global/back_button.tsx b/src/app_modules/admin/_admin_global/back_button.tsx
index 6d606134..3012652a 100644
--- a/src/app_modules/admin/_admin_global/back_button.tsx
+++ b/src/app_modules/admin/_admin_global/back_button.tsx
@@ -5,7 +5,7 @@ import { IconChevronLeft } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 
-export default function ComponentAdminGlobal_BackButton({
+export default function AdminGlobal_ComponentBackButton({
   path,
 }: {
   path?: string;
diff --git a/src/app_modules/admin/_admin_global/index.ts b/src/app_modules/admin/_admin_global/index.ts
new file mode 100644
index 00000000..f6c4b988
--- /dev/null
+++ b/src/app_modules/admin/_admin_global/index.ts
@@ -0,0 +1,5 @@
+import { Admin_ComponentLoadImageLandscape } from "./_component/comp_admin_load_image";
+import { Admin_UiImagePreview } from "./_ui/ui_admin_image_preview";
+
+export { Admin_ComponentLoadImageLandscape };
+export { Admin_UiImagePreview };
diff --git a/src/app_modules/admin/donasi/detail/detail_reject.tsx b/src/app_modules/admin/donasi/detail/detail_reject.tsx
index d6b35486..339e8d98 100644
--- a/src/app_modules/admin/donasi/detail/detail_reject.tsx
+++ b/src/app_modules/admin/donasi/detail/detail_reject.tsx
@@ -20,7 +20,7 @@ import {
 import { useDisclosure } from "@mantine/hooks";
 import { useState } from "react";
 import { ComponentAdminGlobal_NotifikasiBerhasil } from "../../_admin_global/admin_notifikasi/notifikasi_berhasil";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import ComponentAdminDonasi_CeritaPenggalangDana from "../component/tampilan_detail_cerita";
 import ComponentAdminDonasi_TampilanDetailDonasi from "../component/tampilan_detail_donasi";
 import { AdminDonasi_getOneById } from "../fun/get/get_one_by_id";
@@ -92,7 +92,7 @@ function ButtonOnHeader({
     <>
       <Stack>
         <Group position="apart">
-          <ComponentAdminGlobal_BackButton />
+          <AdminGlobal_ComponentBackButton />
           <Button radius={"xl"} bg={"orange"} color="orange" onClick={open}>
             Tambah catatan
           </Button>
diff --git a/src/app_modules/admin/donasi/detail/detail_review.tsx b/src/app_modules/admin/donasi/detail/detail_review.tsx
index 08680856..03af72fd 100644
--- a/src/app_modules/admin/donasi/detail/detail_review.tsx
+++ b/src/app_modules/admin/donasi/detail/detail_review.tsx
@@ -32,7 +32,7 @@ import ComponentAdminDonasi_TombolKembali from "../component/tombol_kembali";
 import { AdminDonasi_getOneById } from "../fun/get/get_one_by_id";
 import { AdminDonasi_funUpdateStatusPublish } from "../fun/update/fun_status_publish";
 import { AdminDonasi_funUpdateStatusReject } from "../fun/update/fun_status_reject";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import ComponentAdminDonasi_TampilanDetailDonasi from "../component/tampilan_detail_donasi";
 import ComponentAdminDonasi_CeritaPenggalangDana from "../component/tampilan_detail_cerita";
 import mqtt_client from "@/util/mqtt_client";
@@ -159,7 +159,7 @@ function ButtonOnHeader({
   return (
     <>
       <Group position="apart">
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         {donasi.donasiMaster_StatusDonasiId === "2" ? (
           <Group>
             <Button
diff --git a/src/app_modules/admin/donasi/detail/publish/detail_publish.tsx b/src/app_modules/admin/donasi/detail/publish/detail_publish.tsx
index 86c0ad58..cb011944 100644
--- a/src/app_modules/admin/donasi/detail/publish/detail_publish.tsx
+++ b/src/app_modules/admin/donasi/detail/publish/detail_publish.tsx
@@ -48,7 +48,7 @@ import { useRouter } from "next/navigation";
 import { useDisclosure, useInterval, useShallowEffect } from "@mantine/hooks";
 import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id";
 import { AdminDonasi_getOneById } from "../../fun/get/get_one_by_id";
-import ComponentAdminGlobal_BackButton from "@/app_modules/admin/_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "@/app_modules/admin/_admin_global/back_button";
 import { MODEL_NEW_DEFAULT_MASTER } from "@/app_modules/model_global/interface";
 import { adminDonasi_getListDonatur } from "../../fun/get/get_list_donatur_by_id";
 import { RouterAdminDonasi } from "@/app/lib/router_admin/router_admin_donasi";
@@ -88,7 +88,7 @@ export default function AdminDonasi_DetailPublish({
     <>
       {/* <pre>{JSON.stringify(pencairan, null, 2)}</pre> */}
       <Stack>
-        <ComponentAdminGlobal_BackButton path={RouterAdminDonasi.table_publish} />
+        <AdminGlobal_ComponentBackButton path={RouterAdminDonasi.table_publish} />
         <TampilanDetailDonasi donasi={dataDonasi} countDonatur={countDonatur} />
         <TampilanListDonatur
           donatur={listDonatur}
diff --git a/src/app_modules/admin/donasi/sub-detail/bukti_transfer.tsx b/src/app_modules/admin/donasi/sub-detail/bukti_transfer.tsx
index 20cf92e2..07f6c2e8 100644
--- a/src/app_modules/admin/donasi/sub-detail/bukti_transfer.tsx
+++ b/src/app_modules/admin/donasi/sub-detail/bukti_transfer.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { AspectRatio, Box, Image, Paper, Stack } from "@mantine/core";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import { RouterAdminDonasi_OLD } from "@/app/lib/router_hipmi/router_admin";
 
 export default function AdminDonasi_BuktiTransfer({
@@ -12,7 +12,7 @@ export default function AdminDonasi_BuktiTransfer({
   return (
     <>
       <Stack>
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         <BuktiTransfer imageId={imageId} />
       </Stack>
     </>
diff --git a/src/app_modules/admin/donasi/sub-detail/bukti_transfer_pencairan.tsx b/src/app_modules/admin/donasi/sub-detail/bukti_transfer_pencairan.tsx
index 1b241fd0..435c0344 100644
--- a/src/app_modules/admin/donasi/sub-detail/bukti_transfer_pencairan.tsx
+++ b/src/app_modules/admin/donasi/sub-detail/bukti_transfer_pencairan.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { AspectRatio, Box, Image, Paper, Stack } from "@mantine/core";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import { RouterAdminDonasi_OLD } from "@/app/lib/router_hipmi/router_admin";
 import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
 
@@ -13,7 +13,7 @@ export default function AdminDonasi_BuktiTransferPencairan({
   return (
     <>
       <Stack>
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         <BuktiTransfer imageId={imageId} />
       </Stack>
     </>
diff --git a/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx b/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx
index 783d0ccc..a291c2f4 100644
--- a/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx
+++ b/src/app_modules/admin/event/_ui/ui_detail_peserta.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { Stack } from "@mantine/core";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import { AdminEvent_ViewDetailPeserta } from "../_view";
 import { MODEL_EVENT_PESERTA } from "@/app_modules/event/model/interface";
 import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component";
@@ -16,7 +16,7 @@ export function AdminEvent_UiDetailPeserta({
   return (
     <>
       <Stack>
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         <ComponentAdminGlobal_TitlePage name="Detail Peserta" />
         <AdminEvent_ViewDetailPeserta
           dataPeserta={dataPeserta as any}
diff --git a/src/app_modules/admin/forum/detail/detail_posting.tsx b/src/app_modules/admin/forum/detail/detail_posting.tsx
index b936f8f5..3fc2fd87 100644
--- a/src/app_modules/admin/forum/detail/detail_posting.tsx
+++ b/src/app_modules/admin/forum/detail/detail_posting.tsx
@@ -36,7 +36,7 @@ import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_glo
 import { useDisclosure } from "@mantine/hooks";
 import ComponentAdminGlobal_IsEmptyData from "../../_admin_global/is_empty_data";
 import { adminForum_getListKomentarById } from "../fun/get/get_list_komentar_by_id";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import ComponentAdminForum_ViewOneDetailPosting from "../component/detail_one_posting";
 
 export default function AdminForum_DetailPosting({
@@ -53,7 +53,7 @@ export default function AdminForum_DetailPosting({
       {/* <pre>{JSON.stringify(listKomentar, null, 2)}</pre> */}
       <Stack>
         <ComponentAdminGlobal_HeaderTamplate name="Forum: Detail Posting" />
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         <ComponentAdminForum_ViewOneDetailPosting dataPosting={dataPosting} />
         <TableKomentar
           listKomentar={listKomentar}
diff --git a/src/app_modules/admin/forum/sub_detail/hasil_report_komentar.tsx b/src/app_modules/admin/forum/sub_detail/hasil_report_komentar.tsx
index d46d99e2..6c506cca 100644
--- a/src/app_modules/admin/forum/sub_detail/hasil_report_komentar.tsx
+++ b/src/app_modules/admin/forum/sub_detail/hasil_report_komentar.tsx
@@ -29,7 +29,7 @@ import {
 import _ from "lodash";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import ComponentAdminGlobal_IsEmptyData from "../../_admin_global/is_empty_data";
 import adminNotifikasi_funCreateToUser from "../../notifikasi/fun/create/fun_create_notif_user";
 import ComponentAdminForum_ViewOneDetailKomentar from "../component/detail_one_komentar";
@@ -54,7 +54,7 @@ export default function AdminForum_HasilReportKomentar({
       <Stack>
         <ComponentAdminGlobal_HeaderTamplate name="Forum: Hasil Report Komentar" />
         <Group position="apart">
-          <ComponentAdminGlobal_BackButton />
+          <AdminGlobal_ComponentBackButton />
           <ButtonDeleteKomentar
             komentarId={komentarId}
             data={data}
diff --git a/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx b/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx
index 497a63d1..64cc7eae 100644
--- a/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx
+++ b/src/app_modules/admin/forum/sub_detail/hasil_report_posting.tsx
@@ -26,7 +26,7 @@ import { IconTrash } from "@tabler/icons-react";
 import _ from "lodash";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import ComponentAdminGlobal_IsEmptyData from "../../_admin_global/is_empty_data";
 import { adminForum_funDeletePostingById } from "../fun/delete/fun_delete_posting_by_id";
 import { adminForum_getListReportPostingById } from "../fun/get/get_list_report_posting_by_id";
@@ -46,7 +46,7 @@ export default function AdminForum_HasilReportPosting({
       <Stack>
         <ComponentAdminGlobal_HeaderTamplate name="Forum: Hasil Report Posting" />
         <Group position="apart">
-          <ComponentAdminGlobal_BackButton />
+          <AdminGlobal_ComponentBackButton />
           <ButtonDeletePosting dataPosting={dataPosting} />
         </Group>
         <ComponentAdminForum_ViewOneDetailPosting dataPosting={dataPosting} />
diff --git a/src/app_modules/admin/investasi/_component/button/button_cek_bukti_transaksi.tsx b/src/app_modules/admin/investasi/_component/button/button_cek_bukti_transaksi.tsx
index d9e1de14..238e5da7 100644
--- a/src/app_modules/admin/investasi/_component/button/button_cek_bukti_transaksi.tsx
+++ b/src/app_modules/admin/investasi/_component/button/button_cek_bukti_transaksi.tsx
@@ -1,15 +1,15 @@
-import { RouterAdminInvestasi } from "@/app/lib/router_admin/router_admin_investasi";
+import { RouterAdminGlobal } from "@/app/lib";
 import { Button } from "@mantine/core";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 
 export function AdminInvestasi_ComponentCekBuktiTransfer({
-  imagesId,
+  imageId,
 }: {
-  imagesId: string;
+  imageId: string;
 }) {
   const router = useRouter();
-  const [isLoading, setLoading] = useState(false)
+  const [isLoading, setLoading] = useState(false);
   return (
     <>
       <Button
@@ -18,10 +18,10 @@ export function AdminInvestasi_ComponentCekBuktiTransfer({
         radius={"xl"}
         onClick={() => {
           setLoading(true);
-          router.push(RouterAdminInvestasi.bukti_transfer + `${imagesId}`);
+          router.push(RouterAdminGlobal.preview_image({ id: imageId }));
         }}
       >
-        Cek
+        Cek Transaksi
       </Button>
     </>
   );
diff --git a/src/app_modules/admin/investasi/_component/detail_gambar_investasi.tsx b/src/app_modules/admin/investasi/_component/detail_gambar_investasi.tsx
index 526f1853..42ff54bc 100644
--- a/src/app_modules/admin/investasi/_component/detail_gambar_investasi.tsx
+++ b/src/app_modules/admin/investasi/_component/detail_gambar_investasi.tsx
@@ -1,5 +1,5 @@
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
-import { Paper, Stack, Title, AspectRatio, Center, Image } from "@mantine/core";
+import { Paper, Stack, Title } from "@mantine/core";
+import { Admin_ComponentLoadImageLandscape } from "../../_admin_global";
 
 export function ComponentAdminInvestasi_DetailGambar({imagesId}: {imagesId: any}) {
     return (
@@ -10,7 +10,9 @@ export function ComponentAdminInvestasi_DetailGambar({imagesId}: {imagesId: any}
               Gambar Proyek
             </Title>
 
-            <AspectRatio ratio={1 / 1} mah={300}>
+            <Admin_ComponentLoadImageLandscape fileId={imagesId} />
+
+            {/* <AspectRatio ratio={1 / 1} mah={300}>
               <Center>
                 <Image
                   style={{ borderRadius: "10px" }}
@@ -20,7 +22,7 @@ export function ComponentAdminInvestasi_DetailGambar({imagesId}: {imagesId: any}
                   src={RouterInvestasi_OLD.api_gambar + `${imagesId}`}
                 />
               </Center>
-            </AspectRatio>
+            </AspectRatio> */}
           </Stack>
         </Paper>
       </>
diff --git a/src/app_modules/admin/investasi/_component/ui_detail_file.tsx b/src/app_modules/admin/investasi/_component/ui_detail_file.tsx
index ccafb4fa..a2dcb554 100644
--- a/src/app_modules/admin/investasi/_component/ui_detail_file.tsx
+++ b/src/app_modules/admin/investasi/_component/ui_detail_file.tsx
@@ -1,4 +1,6 @@
+import { APIs } from "@/app/lib";
 import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
+import { MODEL_INVESTASI_DOKUMEN } from "@/app_modules/investasi/_lib/interface";
 import {
   SimpleGrid,
   Paper,
@@ -17,10 +19,12 @@ export function ComponentAdminInvestasi_UIDetailFile({
   title,
   dataProspektus,
   listDokumen,
+  prospektusFileId,
 }: {
   title: string;
   dataProspektus: any;
   listDokumen: any[];
+  prospektusFileId: string;
 }) {
   return (
     <>
@@ -49,10 +53,7 @@ export function ComponentAdminInvestasi_UIDetailFile({
                     <Text>Prospek {title}</Text>
                     <Link
                       target="_blank"
-                      href={
-                        RouterInvestasi_OLD.api_file_prospektus +
-                        `${dataProspektus === null ? "" : dataProspektus.id}`
-                      }
+                      href={APIs.GET({ fileId: prospektusFileId })}
                     >
                       <Button radius={50}>Lihat</Button>
                     </Link>
@@ -70,16 +71,14 @@ export function ComponentAdminInvestasi_UIDetailFile({
                     {_.isEmpty(listDokumen) ? (
                       <Text>-</Text>
                     ) : (
-                      listDokumen.map((e: any) => (
+                      listDokumen.map((e: MODEL_INVESTASI_DOKUMEN) => (
                         <Paper key={e.id}>
                           <Group>
                             <IconFileTypePdf />
                             <Text>{e.title}</Text>
                             <Link
                               target="_blank"
-                              href={
-                                RouterInvestasi_OLD.api_file_dokumen + `${e.id}`
-                              }
+                              href={APIs.GET({ fileId: e.fileId })}
                             >
                               <Button radius={50}>Lihat</Button>
                             </Link>
diff --git a/src/app_modules/admin/investasi/_view/detail/view_daftar_transaksi.tsx b/src/app_modules/admin/investasi/_view/detail/view_daftar_transaksi.tsx
index 5cd26fd7..0aa1a94f 100644
--- a/src/app_modules/admin/investasi/_view/detail/view_daftar_transaksi.tsx
+++ b/src/app_modules/admin/investasi/_view/detail/view_daftar_transaksi.tsx
@@ -125,7 +125,7 @@ export function AdminInvestasi_ViewDaftarTransaksi({
       <td>
         <Center>
           {e?.statusInvoiceId !== "3" ? (
-            <AdminInvestasi_ComponentCekBuktiTransfer imagesId={e?.imagesId} />
+            <AdminInvestasi_ComponentCekBuktiTransfer imageId={e?.imageId} />
           ) : (
             "-"
           )}
diff --git a/src/app_modules/admin/investasi/_view/detail/view_detail_data.tsx b/src/app_modules/admin/investasi/_view/detail/view_detail_data.tsx
index 86ef258f..7761be7c 100644
--- a/src/app_modules/admin/investasi/_view/detail/view_detail_data.tsx
+++ b/src/app_modules/admin/investasi/_view/detail/view_detail_data.tsx
@@ -25,7 +25,7 @@ export function AdminInvestasi_ViewDetailData({
         <ComponentAdminInvestasi_DetailDataAuthor data={data.author} />
 
         {/* Data Foto */}
-        <ComponentAdminInvestasi_DetailGambar imagesId={data.imagesId} />
+        <ComponentAdminInvestasi_DetailGambar imagesId={data.imageId} />
 
         {/* Data Detail */}
         <ComponentAdminInvestasi_DetailData data={data} />
@@ -34,6 +34,7 @@ export function AdminInvestasi_ViewDetailData({
         title={data.title}
         dataProspektus={data.ProspektusInvestasi}
         listDokumen={data.DokumenInvestasi}
+        prospektusFileId={data.prospektusFileId}
       />
     </>
   );
diff --git a/src/app_modules/admin/investasi/detail/detail_bukti_transfer.tsx b/src/app_modules/admin/investasi/detail/detail_bukti_transfer.tsx
index 23f7843c..3532579c 100644
--- a/src/app_modules/admin/investasi/detail/detail_bukti_transfer.tsx
+++ b/src/app_modules/admin/investasi/detail/detail_bukti_transfer.tsx
@@ -1,14 +1,14 @@
 "use client";
 
 import { Stack } from "@mantine/core";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import { AdminInvestasi_ViewBuktiTransfer } from "../_view";
 import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component";
 
 export function AdminInvestasi_DetailBuktiTransfer({ imageId }: { imageId: string }) {
   return (
     <Stack>
-      <ComponentAdminGlobal_BackButton />
+      <AdminGlobal_ComponentBackButton />
       <ComponentAdminGlobal_TitlePage name="Bukti Transfer" />
       <AdminInvestasi_ViewBuktiTransfer imageId={imageId} />
     </Stack>
diff --git a/src/app_modules/admin/investasi/detail/detail_publish.tsx b/src/app_modules/admin/investasi/detail/detail_publish.tsx
index fdcdd12d..141d562c 100644
--- a/src/app_modules/admin/investasi/detail/detail_publish.tsx
+++ b/src/app_modules/admin/investasi/detail/detail_publish.tsx
@@ -4,7 +4,7 @@ import { MODEL_INVESTASI } from "@/app_modules/investasi/_lib/interface";
 import { Button, Group, Stack } from "@mantine/core";
 import { IconCircleCheck } from "@tabler/icons-react";
 import { useState } from "react";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import {
   AdminInvestasi_ViewDaftarInvestor,
   AdminInvestasi_ViewDaftarTransaksi,
@@ -46,7 +46,7 @@ export function AdminInvestasi_DetailPublish({
   return (
     <>
       <Stack >
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
 
         <Group>
           {listPage.map((e) => (
diff --git a/src/app_modules/admin/investasi/detail/detail_reject.tsx b/src/app_modules/admin/investasi/detail/detail_reject.tsx
index afcc7ff2..81976beb 100644
--- a/src/app_modules/admin/investasi/detail/detail_reject.tsx
+++ b/src/app_modules/admin/investasi/detail/detail_reject.tsx
@@ -8,7 +8,7 @@ import {
   Text,
   Title
 } from "@mantine/core";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import { ComponentAdminInvestasi_DetailDataAuthor } from "../_component/detail_data_author";
 import { ComponentAdminInvestasi_DetailData } from "../_component/detail_data_investasi";
 import { ComponentAdminInvestasi_DetailGambar } from "../_component/detail_gambar_investasi";
@@ -18,7 +18,7 @@ export function AdminInvestasi_DetailReject({ data }: { data: MODEL_INVESTASI })
   return (
     <>
       <Stack px={"lg"}>
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         <SimpleGrid
           cols={3}
           spacing="lg"
@@ -54,7 +54,7 @@ export function AdminInvestasi_DetailReject({ data }: { data: MODEL_INVESTASI })
           <ComponentAdminInvestasi_DetailDataAuthor data={data.author} />
 
           {/* Data Foto */}
-          <ComponentAdminInvestasi_DetailGambar imagesId={data.imagesId} />
+          <ComponentAdminInvestasi_DetailGambar imagesId={data.imageId}  />
 
           {/* Data Detail */}
           <ComponentAdminInvestasi_DetailData data={data} />
@@ -64,6 +64,7 @@ export function AdminInvestasi_DetailReject({ data }: { data: MODEL_INVESTASI })
           title={data.title}
           dataProspektus={data.ProspektusInvestasi}
           listDokumen={data.DokumenInvestasi}
+          prospektusFileId={data.prospektusFileId}
         />
         {/* <pre>{JSON.stringify(data, null, 2)}</pre> */}
       </Stack>
diff --git a/src/app_modules/admin/investasi/detail/detail_review.tsx b/src/app_modules/admin/investasi/detail/detail_review.tsx
index 21d19bdd..15ed666a 100644
--- a/src/app_modules/admin/investasi/detail/detail_review.tsx
+++ b/src/app_modules/admin/investasi/detail/detail_review.tsx
@@ -3,7 +3,14 @@
 import { MODEL_INVESTASI } from "@/app_modules/investasi/_lib/interface";
 import getOneInvestasiById from "@/app_modules/investasi/fun/get_one_investasi_by_id";
 import mqtt_client from "@/util/mqtt_client";
-import { Button, Group, SimpleGrid, Stack } from "@mantine/core";
+import {
+  Button,
+  Group,
+  Modal,
+  SimpleGrid,
+  Stack,
+  Textarea,
+} from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
 import _ from "lodash";
 import { useRouter } from "next/navigation";
@@ -11,7 +18,7 @@ import { useState } from "react";
 import { ComponentAdminGlobal_NotifikasiBerhasil } from "../../_admin_global/admin_notifikasi/notifikasi_berhasil";
 import { ComponentAdminGlobal_NotifikasiGagal } from "../../_admin_global/admin_notifikasi/notifikasi_gagal";
 import { ComponentAdminGlobal_NotifikasiPeringatan } from "../../_admin_global/admin_notifikasi/notifikasi_peringatan";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import adminNotifikasi_funCreateToUser from "../../notifikasi/fun/create/fun_create_notif_user";
 import { ComponentAdminInvestasi_DetailDataAuthor } from "../_component/detail_data_author";
 import { ComponentAdminInvestasi_DetailData } from "../_component/detail_data_investasi";
@@ -19,6 +26,7 @@ import { ComponentAdminInvestasi_DetailGambar } from "../_component/detail_gamba
 import { ComponentAdminInvestasi_UIDetailFile } from "../_component/ui_detail_file";
 import { adminInvestasi_funEditStatusPublishById } from "../fun/edit/fun_status_publish_by_id";
 import Admin_funRejectInvestasi from "../fun/fun_reject_investasi";
+import { Admin_ComponentModalReport } from "../../_admin_global/_component";
 
 export default function AdminInvestasi_DetailReview({
   dataInvestasi,
@@ -31,6 +39,7 @@ export default function AdminInvestasi_DetailReview({
   const [openModal, setOpenModal] = useState(false);
   const [isLoadingPublish, setIsLoadingPublish] = useState(false);
   const [isLoadingReject, setIsLoadingReject] = useState(false);
+  const [report, setReport] = useState("");
 
   useShallowEffect(() => {
     cekStatusPublish();
@@ -43,13 +52,16 @@ export default function AdminInvestasi_DetailReview({
   async function onReject() {
     const body = {
       id: data.id,
-      catatan: data.catatan,
+      catatan: report,
       status: "4",
     };
     if (_.isEmpty(body.catatan))
       return ComponentAdminGlobal_NotifikasiPeringatan("Lengkapi alasan");
+
     const res = await Admin_funRejectInvestasi(body);
     if (res.status === 200) {
+      setIsLoadingReject(true);
+
       const dataNotif = {
         appId: res.data?.id,
         userId: res.data?.authorId,
@@ -75,8 +87,11 @@ export default function AdminInvestasi_DetailReview({
 
       ComponentAdminGlobal_NotifikasiBerhasil(res.message);
       router.back();
+      setOpenModal(false);
+      setIsLoadingReject(false);
     } else {
       ComponentAdminGlobal_NotifikasiGagal(res.message);
+      setOpenModal(false);
     }
   }
 
@@ -127,7 +142,7 @@ export default function AdminInvestasi_DetailReview({
     <>
       <Stack px={"lg"}>
         <Group position="apart">
-          <ComponentAdminGlobal_BackButton />
+          <AdminGlobal_ComponentBackButton />
 
           {data.masterStatusInvestasiId === "2" ? (
             <Group>
@@ -141,11 +156,9 @@ export default function AdminInvestasi_DetailReview({
                 Publish
               </Button>
               <Button
-                loaderPosition="center"
-                loading={isLoadingReject}
                 radius={"xl"}
                 color="red"
-                onClick={() => onReject()}
+                onClick={() => setOpenModal(true)}
               >
                 Reject
               </Button>
@@ -168,7 +181,7 @@ export default function AdminInvestasi_DetailReview({
           <ComponentAdminInvestasi_DetailDataAuthor data={data.author} />
 
           {/* Data Foto */}
-          <ComponentAdminInvestasi_DetailGambar imagesId={data.imagesId} />
+          <ComponentAdminInvestasi_DetailGambar imagesId={data.imageId} />
 
           {/* Data Detail */}
           <ComponentAdminInvestasi_DetailData data={data} />
@@ -178,8 +191,53 @@ export default function AdminInvestasi_DetailReview({
           title={data.title}
           dataProspektus={data.ProspektusInvestasi}
           listDokumen={data.DokumenInvestasi}
+          prospektusFileId={data.prospektusFileId}
         />
       </Stack>
+
+      <Admin_ComponentModalReport
+        opened={openModal}
+        onClose={() => setOpenModal(false)}
+        title="Alasan Penolakan"
+        onHandlerChange={(val) => setReport(val.target.value)}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModal(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            loaderPosition="center"
+            loading={isLoadingReject}
+            radius={"xl"}
+            onClick={() => {
+              onReject();
+            }}
+          >
+            Simpan
+          </Button>
+        }
+      />
+
+      {/* <Modal
+        opened={openModal}
+        onClose={() => setOpenModal(false)}
+        title="Alasan Penolakan"
+        size={"sm"}
+        centered
+        withCloseButton={false}
+      >
+        <Stack>
+          <Textarea
+            autosize
+            minRows={3}
+            maxRows={5}
+            placeholder="Masukan alasan penolakan"
+            onChange={(val) => setReport(val.target.value)}
+          />
+          <Group position="right"></Group>
+        </Stack>
+      </Modal> */}
     </>
   );
 }
diff --git a/src/app_modules/admin/investasi/fun/edit/fun_reject_invoice_by_id.ts b/src/app_modules/admin/investasi/fun/edit/fun_reject_invoice_by_id.ts
index 398b5c51..1facc575 100644
--- a/src/app_modules/admin/investasi/fun/edit/fun_reject_invoice_by_id.ts
+++ b/src/app_modules/admin/investasi/fun/edit/fun_reject_invoice_by_id.ts
@@ -9,6 +9,9 @@ export async function adminInvestasi_funRejectInvoiceById({
 }: {
   invoiceId: string;
 }) {
+  
+
+
   const updt = await prisma.investasi_Invoice.update({
     where: {
       id: invoiceId,
diff --git a/src/app_modules/admin/investasi/fun/edit/fun_status_publish_by_id.ts b/src/app_modules/admin/investasi/fun/edit/fun_status_publish_by_id.ts
index b1277e7b..c7c5f4a2 100644
--- a/src/app_modules/admin/investasi/fun/edit/fun_status_publish_by_id.ts
+++ b/src/app_modules/admin/investasi/fun/edit/fun_status_publish_by_id.ts
@@ -13,6 +13,22 @@ export async function adminInvestasi_funEditStatusPublishById({
   statusId: string;
   progesInvestasiId: string;
 }) {
+  const cekStatus = await prisma.investasi.findFirst({
+    where: {
+      id: investasiId,
+    },
+    select: {
+      masterStatusInvestasiId: true,
+    },
+  });
+
+  if (cekStatus?.masterStatusInvestasiId !== "2") {
+    return {
+      status: 400,
+      message: "User membatalkan review",
+    };
+  }
+
   const publishTime = new Date();
   const res = await prisma.investasi.update({
     where: {
@@ -31,8 +47,8 @@ export async function adminInvestasi_funEditStatusPublishById({
         select: {
           name: true,
         },
-      },    
-    }
+      },
+    },
   });
 
   if (!res) return { status: 400, message: "Gagal Update" };
diff --git a/src/app_modules/admin/investasi/fun/fun_reject_investasi.ts b/src/app_modules/admin/investasi/fun/fun_reject_investasi.ts
index 8f313aac..40d3081e 100644
--- a/src/app_modules/admin/investasi/fun/fun_reject_investasi.ts
+++ b/src/app_modules/admin/investasi/fun/fun_reject_investasi.ts
@@ -6,6 +6,21 @@ import { revalidatePath } from "next/cache";
 
 export default async function Admin_funRejectInvestasi(data: any) {
   // console.log(data)
+   const cekStatus = await prisma.investasi.findFirst({
+     where: {
+       id: data.id,
+     },
+     select: {
+       masterStatusInvestasiId: true,
+     },
+   });
+
+   if (cekStatus?.masterStatusInvestasiId !== "2") {
+     return {
+       status: 400,
+       message: "User membatalkan review",
+     };
+   }
 
   const res = await prisma.investasi.update({
     where: { id: data.id },
diff --git a/src/app_modules/admin/investasi/fun/get/fun_get_investasi_by_id.ts b/src/app_modules/admin/investasi/fun/get/fun_get_investasi_by_id.ts
new file mode 100644
index 00000000..486f4d2f
--- /dev/null
+++ b/src/app_modules/admin/investasi/fun/get/fun_get_investasi_by_id.ts
@@ -0,0 +1,58 @@
+"use server";
+import prisma from "@/app/lib/prisma";
+
+export default async function adminInvestasi_getOneById({
+  investasiId,
+}: {
+  investasiId: string;
+}) {
+  const data = await prisma.investasi.findUnique({
+    where: {
+      id: investasiId,
+    },
+    select: {
+      imageId: true,
+      prospektusFileId: true,
+      id: true,
+      author: {
+        select: {
+          id: true,
+          username: true,
+          nomor: true,
+          Profile: true,
+        },
+      },
+      title: true,
+      authorId: true,
+      hargaLembar: true,
+      targetDana: true,
+      totalLembar: true,
+      sisaLembar: true,
+      lembarTerbeli: true,
+      progress: true,
+      roi: true,
+      active: true,
+      createdAt: true,
+      updatedAt: true,
+      catatan: true,
+      imagesId: true,
+      MasterStatusInvestasi: true,
+      BeritaInvestasi: true,
+      DokumenInvestasi: true,
+      ProspektusInvestasi: true,
+      MasterPembagianDeviden: true,
+      MasterPencarianInvestor: true,
+      MasterPeriodeDeviden: true,
+      MasterProgresInvestasi: true,
+      masterStatusInvestasiId: true,
+      Investasi_Invoice: {
+        where: {
+          statusInvoiceId: "1",
+        },
+      },
+      countDown: true,
+    },
+  });
+
+  return data;
+}
diff --git a/src/app_modules/admin/investasi/fun/index.ts b/src/app_modules/admin/investasi/fun/index.ts
index 6a10aa52..840a4d0b 100644
--- a/src/app_modules/admin/investasi/fun/index.ts
+++ b/src/app_modules/admin/investasi/fun/index.ts
@@ -1,9 +1,11 @@
 import { adminInvestasi_funAcceptTransaksiById } from "./edit/fun_accept_invoice_by_id";
 import { adminInvestasi_funRejectInvoiceById } from "./edit/fun_reject_invoice_by_id";
 import { adminInvestasi_funGetAllTransaksiById } from "./get/fun_get_all_transaksi_by_id";
+import adminInvestasi_getOneById from "./get/fun_get_investasi_by_id";
 import { adminInvestasi_getStatusInvestasi } from "./get/fun_get_status_transaksi";
 
 export { adminInvestasi_getStatusInvestasi };
 export { adminInvestasi_funGetAllTransaksiById };
 export { adminInvestasi_funRejectInvoiceById };
 export { adminInvestasi_funAcceptTransaksiById };
+export { adminInvestasi_getOneById };
diff --git a/src/app_modules/admin/job/detail/detail_poster.tsx b/src/app_modules/admin/job/detail/detail_poster.tsx
index 80583337..1aa1602a 100644
--- a/src/app_modules/admin/job/detail/detail_poster.tsx
+++ b/src/app_modules/admin/job/detail/detail_poster.tsx
@@ -2,7 +2,7 @@
 
 import { RouterJob } from "@/app/lib/router_hipmi/router_job";
 import { Center, Image, Stack } from "@mantine/core";
-import ComponentAdminGlobal_BackButton from "../../_admin_global/back_button";
+import AdminGlobal_ComponentBackButton from "../../_admin_global/back_button";
 import { APIs } from "@/app/lib";
 import { useState } from "react";
 import ComponentGlobal_Loader from "@/app_modules/_global/component/loader";
@@ -17,7 +17,7 @@ export default function AdminJob_DetailPoster({
   return (
     <>
       <Stack>
-        <ComponentAdminGlobal_BackButton />
+        <AdminGlobal_ComponentBackButton />
         <Center>
           <Image
             onLoad={() => setLoading(false)}
diff --git a/src/app_modules/admin/new_layout.tsx b/src/app_modules/admin/new_layout.tsx
index e08946aa..50f2dbfd 100644
--- a/src/app_modules/admin/new_layout.tsx
+++ b/src/app_modules/admin/new_layout.tsx
@@ -1,30 +1,30 @@
 "use client";
 
 import {
-    ActionIcon,
-    AppShell,
-    Box,
-    Center,
-    Divider,
-    Drawer,
-    Grid,
-    Group,
-    Menu,
-    Navbar,
-    NavLink,
-    ScrollArea,
-    Stack,
-    Text,
-    Title
+  ActionIcon,
+  AppShell,
+  Box,
+  Center,
+  Divider,
+  Drawer,
+  Grid,
+  Group,
+  Menu,
+  Navbar,
+  NavLink,
+  ScrollArea,
+  Stack,
+  Text,
+  Title,
 } from "@mantine/core";
 import { useMediaQuery } from "@mantine/hooks";
 import {
-    IconBell,
-    IconCircleDot,
-    IconCircleDotFilled,
-    IconPhone,
-    IconUser,
-    IconUserCircle
+  IconBell,
+  IconCircleDot,
+  IconCircleDotFilled,
+  IconPhone,
+  IconUser,
+  IconUserCircle,
 } from "@tabler/icons-react";
 import { useAtom } from "jotai";
 import _ from "lodash";
@@ -34,9 +34,9 @@ import { AccentColor, MainColor } from "../_global/color";
 import { MODEL_USER } from "../home/model/interface";
 import Admin_Logout from "./_admin_global/logout";
 import {
-    gs_admin_navbar_isActive_dropdown,
-    gs_admin_navbar_menu,
-    gs_admin_navbar_subMenu,
+  gs_admin_navbar_isActive_dropdown,
+  gs_admin_navbar_menu,
+  gs_admin_navbar_subMenu,
 } from "./_admin_global/new_global_state";
 import { newListAdminPage } from "./new_list_page";
 import { ComponentAdmin_UIDrawerNotifikasi } from "./notifikasi/ui_drawer_notifikasi";
@@ -60,9 +60,9 @@ export function Admin_NewLayout({
   return (
     <>
       <AppShell
+        h={"100vh"}
         padding="md"
         navbarOffsetBreakpoint={1024}
-        asideOffsetBreakpoint="sm"
         navbar={
           <Navbar
             width={{ lg: 250, md: 200, base: 250 }}
diff --git a/src/app_modules/investasi/_fun/edit/fun_edit_investasi.tsx b/src/app_modules/investasi/_fun/edit/fun_edit_investasi.tsx
index 580f143f..1ddd2312 100644
--- a/src/app_modules/investasi/_fun/edit/fun_edit_investasi.tsx
+++ b/src/app_modules/investasi/_fun/edit/fun_edit_investasi.tsx
@@ -1,10 +1,10 @@
 "use server";
 
 import { prisma } from "@/app/lib";
-import { MODEL_INVESTASI } from "../../_lib/interface";
+import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
 import _ from "lodash";
 import { revalidatePath } from "next/cache";
-import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
+import { MODEL_INVESTASI } from "../../_lib/interface";
 
 export async function investasi_funUpdateInvestasi({
   data,
@@ -39,7 +39,8 @@ export async function investasi_funUpdateInvestasi({
     });
 
     if (!updtWithImage) return { status: 400, message: "Gagal update data" };
-    revalidatePath(NEW_RouterInvestasi.detail_draft);
+    revalidatePath("/dev/investasi/detail/portofolio/");
+
     return { status: 200, message: "Berhasil update" };
   } else {
     const updtNoImage = await prisma.investasi.update({
@@ -61,7 +62,8 @@ export async function investasi_funUpdateInvestasi({
     });
 
     if (!updtNoImage) return { status: 400, message: "Gagal update data" };
-    revalidatePath(NEW_RouterInvestasi.detail_draft);
+    revalidatePath("/dev/investasi/detail/portofolio/");
+
     return { status: 200, message: "Berhasil update" };
   }
 }
diff --git a/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx b/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx
index 3d8692ff..aae4d214 100644
--- a/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx
+++ b/src/app_modules/investasi/_ui/detail/ui_detail_portofolio.tsx
@@ -3,10 +3,11 @@
 import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
 import {
   UIGlobal_Drawer,
+  UIGlobal_DrawerCustom,
   UIGlobal_LayoutHeaderTamplate,
   UIGlobal_LayoutTamplate,
 } from "@/app_modules/_global/ui";
-import { ActionIcon } from "@mantine/core";
+import { ActionIcon, Box, SimpleGrid, Stack, Text } from "@mantine/core";
 import {
   IconCategoryPlus,
   IconDotsVertical,
@@ -21,16 +22,20 @@ import {
   Investasi_ViewDetailReject,
   Investasi_ViewDetailReview,
 } from "../../_view";
+import ComponentGlobal_Loader from "@/app_modules/_global/component/loader";
 
 export function Investasi_UiDetailPortofolio({
-  data,
+  dataInvestasi,
   userLoginId,
 }: {
-  data: MODEL_INVESTASI;
+  dataInvestasi: MODEL_INVESTASI;
   userLoginId: string;
 }) {
   const router = useRouter();
+  const [isLoading, setLoading] = useState(false);
+  const [pageId, setPageId] = useState("");
   const [openDrawer, setOpenDrawer] = useState(false);
+  const [data, setData] = useState<any>(dataInvestasi);
   const listPage = [
     {
       id: "1",
@@ -70,13 +75,47 @@ export function Investasi_UiDetailPortofolio({
             />
           }
         >
-          <Investasi_ViewDetailDraft dataInvestasi={data} />
+          <Investasi_ViewDetailDraft dataInvestasi={dataInvestasi} />
         </UIGlobal_LayoutTamplate>
 
-        <UIGlobal_Drawer
+        {/* <UIGlobal_Drawer
           opened={openDrawer}
           close={() => setOpenDrawer(false)}
           component={listPage}
+        /> */}
+
+        <UIGlobal_DrawerCustom
+          opened={openDrawer}
+          close={() => setOpenDrawer(false)}
+          component={
+            <SimpleGrid cols={listPage.length}>
+              {listPage.map((e, i) => (
+                <Stack key={i} align="center" spacing={"xs"}>
+                  <ActionIcon
+                    variant="transparent"
+                    c="white"
+                    onClick={() => {
+                      setPageId(e?.id);
+                      setLoading(true);
+                      if (e.id === "1") {
+                        setData({});
+                      }
+                      router.push(e?.path, { scroll: false });
+                    }}
+                  >
+                    {isLoading && e?.id === pageId ? (
+                      <ComponentGlobal_Loader />
+                    ) : (
+                      e?.icon
+                    )}
+                  </ActionIcon>
+                  <Text fz={"sm"} align="center" color="white">
+                    {e?.name}
+                  </Text>
+                </Stack>
+              ))}
+            </SimpleGrid>
+          }
         />
       </>
     );
@@ -85,23 +124,16 @@ export function Investasi_UiDetailPortofolio({
     <UIGlobal_LayoutTamplate
       header={
         <UIGlobal_LayoutHeaderTamplate
-          title={`Detail ${data.MasterStatusInvestasi.name}`}
+          title={`Detail ${dataInvestasi.MasterStatusInvestasi.name}`}
         />
       }
     >
-      {/* {data.masterStatusInvestasiId === "1" && (
-        <Investasi_ViewDetailPublish
-          dataInvestasi={data}
-          userLoginId={userLoginId}
-        />
-      )} */}
-
-      {data.masterStatusInvestasiId === "2" && (
-        <Investasi_ViewDetailReview dataInvestasi={data} />
+      {dataInvestasi.masterStatusInvestasiId === "2" && (
+        <Investasi_ViewDetailReview dataInvestasi={dataInvestasi} />
       )}
 
-      {data.masterStatusInvestasiId === "4" && (
-        <Investasi_ViewDetailReject dataInvestasi={data} />
+      {dataInvestasi.masterStatusInvestasiId === "4" && (
+        <Investasi_ViewDetailReject dataInvestasi={dataInvestasi} />
       )}
     </UIGlobal_LayoutTamplate>
   );
diff --git a/src/app_modules/investasi/_ui/main/ui_portofolio.tsx b/src/app_modules/investasi/_ui/main/ui_portofolio.tsx
index 54715c0d..189d86af 100644
--- a/src/app_modules/investasi/_ui/main/ui_portofolio.tsx
+++ b/src/app_modules/investasi/_ui/main/ui_portofolio.tsx
@@ -18,7 +18,6 @@ export function Investasi_UiPortofolio({
 }) {
   const [activeTab, setActiveTab] = useState<string | null>(statusId);
   const router = useRouter();
-  const [data, setData] = useState(dataPortofolio);
 
   return (
     <>
@@ -61,7 +60,7 @@ export function Investasi_UiPortofolio({
 
           <Investasi_ViewPortofolio
             statusId={statusId}
-            dataPortofolio={data as any}
+            dataPortofolio={dataPortofolio as any}
           />
         </Stack>
       </Tabs>
diff --git a/src/app_modules/investasi/_view/create/view_create_document.tsx b/src/app_modules/investasi/_view/create/view_create_document.tsx
index 807fe19c..975f57d0 100644
--- a/src/app_modules/investasi/_view/create/view_create_document.tsx
+++ b/src/app_modules/investasi/_view/create/view_create_document.tsx
@@ -69,7 +69,7 @@ export function Investasi_ViewCreateDocument({
   return (
     <>
       <Stack spacing={"xl"}>
-        <ComponentGlobal_BoxInformation informasi="File dokumen bersifat opsional, jika memang ada file yang bisa membantu meyakinkan investor. Anda bisa mengupload nya disini !" />
+        <ComponentGlobal_BoxInformation informasi="File dokumen bersifat opsional, jika memang ada file yang bisa membantu meyakinkan investor. Anda bisa mengupload nya !" />
 
         <Stack>
           <TextInput
diff --git a/src/app_modules/investasi/_view/detail/portofolio/view_detail_draft.tsx b/src/app_modules/investasi/_view/detail/portofolio/view_detail_draft.tsx
index 16249f80..33df1681 100644
--- a/src/app_modules/investasi/_view/detail/portofolio/view_detail_draft.tsx
+++ b/src/app_modules/investasi/_view/detail/portofolio/view_detail_draft.tsx
@@ -3,34 +3,47 @@
 import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
 import { MainColor } from "@/app_modules/_global/color/color_pallet";
 import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information";
+import { funGlobal_DeleteFileById } from "@/app_modules/_global/fun";
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
+import { UIGlobal_Modal } from "@/app_modules/_global/ui";
+import { ComponentAdminGlobal_NotifikasiPeringatan } from "@/app_modules/admin/_admin_global/admin_notifikasi/notifikasi_peringatan";
 import { Investasi_ComponentDetailDataNonPublish } from "@/app_modules/investasi/_component";
 import { MODEL_INVESTASI } from "@/app_modules/investasi/_lib/interface";
 import { investasi_funEditStatusById } from "@/app_modules/investasi/fun/edit/fun_edit_status_by_id";
-import { gs_investasi_status } from "@/app_modules/investasi/g_state";
+import funDeleteInvestasi from "@/app_modules/investasi/fun/fun_delete_investasi";
 import notifikasiToAdmin_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_admin";
 import mqtt_client from "@/util/mqtt_client";
-import { Button, Stack } from "@mantine/core";
-import { useAtom } from "jotai";
+import { Button, Group, Stack } from "@mantine/core";
+import _ from "lodash";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 
 export default function Investasi_ViewDetailDraft({
   dataInvestasi,
 }: {
-  dataInvestasi: MODEL_INVESTASI;
+  dataInvestasi: any;
 }) {
   const router = useRouter();
   const [isLoading, setIsLoading] = useState(false);
+  const [data, setData] = useState<MODEL_INVESTASI>(dataInvestasi);
+  const [openModal, setOpenModal] = useState(false);
 
-  async function onAjukanReview() {
+  // Delete
+  const [isLoadingDelete, setIsLoadingDelete] = useState(false);
+  const [openModalDelete, setOpenModalDelete] = useState(false);
+
+  async function onChangeStatus() {
     const res = await investasi_funEditStatusById({
-      investasiId: dataInvestasi.id,
+      investasiId: data.id,
       statusId: "2",
     });
 
     if (res.status === 200) {
+      setIsLoading(true);
+      ComponentGlobal_NotifikasiBerhasil("Review Berhasil Diajukan");
+      router.replace(NEW_RouterInvestasi.portofolio({ id: "2" }));
+
       const dataNotif = {
         appId: res.data?.id,
         userId: res.data?.authorId,
@@ -46,41 +59,138 @@ export default function Investasi_ViewDetailDraft({
 
       if (notif.status === 201) {
         mqtt_client.publish("ADMIN", JSON.stringify({ count: 1 }));
-
-        setIsLoading(true);
-        ComponentGlobal_NotifikasiBerhasil("Review Berhasil Diajukan");
-        router.push(NEW_RouterInvestasi.portofolio({ id: "2" }));
       }
     } else {
       ComponentGlobal_NotifikasiGagal(res.message);
     }
   }
 
+  async function onDelete() {
+    const res = await funDeleteInvestasi(data.id);
+    if (res.status === 200) {
+      setIsLoadingDelete(true);
+
+      const delImage = await funGlobal_DeleteFileById({
+        fileId: data.imageId,
+      });
+      if (!delImage.success) {
+        ComponentAdminGlobal_NotifikasiPeringatan("Gagal hapus image ");
+      }
+
+      const delFileProspektus = await funGlobal_DeleteFileById({
+        fileId: data.prospektusFileId,
+      });
+      if (!delFileProspektus.success) {
+        ComponentAdminGlobal_NotifikasiPeringatan("Gagal hapus prospektus ");
+      }
+
+      if (!_.isEmpty(data.DokumenInvestasi)) {
+        for (let i of data.DokumenInvestasi) {
+          const delFileDokumen = await funGlobal_DeleteFileById({
+            fileId: i.fileId,
+          });
+
+          if (!delFileDokumen.success) {
+            ComponentAdminGlobal_NotifikasiPeringatan(
+              "Gagal hapus prospektus "
+            );
+          }
+        }
+      }
+
+      ComponentGlobal_NotifikasiBerhasil(res.message);
+      setOpenModal(false);
+      router.replace(NEW_RouterInvestasi.portofolio({ id: "3" }));
+      setIsLoadingDelete(false);
+    } else {
+      ComponentGlobal_NotifikasiGagal(res.message);
+      setIsLoadingDelete(false);
+    }
+  }
+
   return (
     <>
       <Stack mb={"lg"}>
-        {dataInvestasi.catatan && (
-          <ComponentGlobal_BoxInformation
-            informasi={dataInvestasi.catatan}
-            isReport
-          />
+        {data.catatan && (
+          <ComponentGlobal_BoxInformation informasi={data.catatan} isReport />
         )}
-        <Investasi_ComponentDetailDataNonPublish data={dataInvestasi} />
+        <Investasi_ComponentDetailDataNonPublish data={data} />
 
-        <Stack>
+        <Group position="apart" grow>
           <Button
-            loaderPosition="center"
-            loading={isLoading}
             radius={50}
             bg={MainColor.yellow}
             color="yellow"
             c={"black"}
-            onClick={() => onAjukanReview()}
+            onClick={() => setOpenModal(true)}
           >
             Ajukan Review
           </Button>
-        </Stack>
+
+          <Button
+            radius={50}
+            color="red"
+            c={"black"}
+            onClick={() => setOpenModalDelete(true)}
+          >
+            Hapus
+          </Button>
+        </Group>
       </Stack>
+
+      {/* Ajukan Kembali */}
+      <UIGlobal_Modal
+        opened={openModal}
+        close={() => setOpenModal(false)}
+        title={"Anda yakin ingin mengajukan review ?"}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModal(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            style={{
+              transition: "0.5s",
+            }}
+            loaderPosition="center"
+            loading={isLoading}
+            radius={"xl"}
+            color={"orange"}
+            onClick={() => onChangeStatus()}
+          >
+            Simpan
+          </Button>
+        }
+      />
+
+      {/* Hapus */}
+      <UIGlobal_Modal
+        opened={openModalDelete}
+        close={() => setOpenModalDelete(false)}
+        title={"Anda yakin ingin menghapus ?"}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModalDelete(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            style={{
+              transition: "0.5s",
+            }}
+            loaderPosition="center"
+            loading={isLoadingDelete}
+            radius={"xl"}
+            color={"red"}
+            onClick={() => {
+              onDelete();
+            }}
+          >
+            Hapus
+          </Button>
+        }
+      />
     </>
   );
 }
diff --git a/src/app_modules/investasi/_view/detail/portofolio/view_detail_reject.tsx b/src/app_modules/investasi/_view/detail/portofolio/view_detail_reject.tsx
index 362b34ac..17f9f89a 100644
--- a/src/app_modules/investasi/_view/detail/portofolio/view_detail_reject.tsx
+++ b/src/app_modules/investasi/_view/detail/portofolio/view_detail_reject.tsx
@@ -1,20 +1,18 @@
 "use client";
 
-import {
-  NEW_RouterInvestasi,
-  RouterInvestasi_OLD,
-} from "@/app/lib/router_hipmi/router_investasi";
+import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
 import ComponentGlobal_BoxInformation from "@/app_modules/_global/component/box_information";
+import { funGlobal_DeleteFileById } from "@/app_modules/_global/fun";
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
 import UIGlobal_Modal from "@/app_modules/_global/ui/ui_modal";
+import { ComponentAdminGlobal_NotifikasiPeringatan } from "@/app_modules/admin/_admin_global/admin_notifikasi/notifikasi_peringatan";
 import { Investasi_ComponentDetailDataNonPublish } from "@/app_modules/investasi/_component";
 import { MODEL_INVESTASI } from "@/app_modules/investasi/_lib/interface";
 import { investasi_funEditStatusById } from "@/app_modules/investasi/fun/edit/fun_edit_status_by_id";
 import funDeleteInvestasi from "@/app_modules/investasi/fun/fun_delete_investasi";
-import { gs_investasi_status } from "@/app_modules/investasi/g_state";
 import { Button, Group, Stack } from "@mantine/core";
-import { useAtom } from "jotai";
+import _ from "lodash";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 
@@ -24,36 +22,65 @@ export default function Investasi_ViewDetailReject({
   dataInvestasi: MODEL_INVESTASI;
 }) {
   const router = useRouter();
-  const [investasi, setInvestasi] = useState(dataInvestasi);
-  const [activeTab, setActiveTab] = useAtom(gs_investasi_status);
+  const [data, setData] = useState(dataInvestasi);
   const [openModal, setOpenModal] = useState(false);
+  const [isLoading, setLoading] = useState(false);
 
   async function onAjukan() {
     const res = await investasi_funEditStatusById({
-      investasiId: dataInvestasi.id,
+      investasiId: data.id,
       statusId: "3",
     });
 
     if (res.status === 200) {
       ComponentGlobal_NotifikasiBerhasil("Project Diajukan Kembali");
-      setActiveTab("Draft");
-      router.push(RouterInvestasi_OLD.portofolio);
+      router.replace(NEW_RouterInvestasi.portofolio({ id: "3" }));
     } else {
       ComponentGlobal_NotifikasiGagal("Gagal Pengajuan");
     }
   }
 
   async function onDelete() {
-    await funDeleteInvestasi(investasi.id).then((res) => {
-      if (res.status === 200) {
-        ComponentGlobal_NotifikasiBerhasil(res.message);
-        setOpenModal(false);
-        router.push(NEW_RouterInvestasi.portofolio({ id: "3" }));
-      } else {
-        ComponentGlobal_NotifikasiGagal(res.message);
+    const res = await funDeleteInvestasi(data.id);
+    if (res.status === 200) {
+      setLoading(true);
+
+      const delImage = await funGlobal_DeleteFileById({
+        fileId: data.imageId,
+      });
+      if (!delImage.success) {
+        ComponentAdminGlobal_NotifikasiPeringatan("Gagal hapus image ");
       }
-    });
-    // setActiveTab("Reject");
+
+      const delFileProspektus = await funGlobal_DeleteFileById({
+        fileId: data.prospektusFileId,
+      });
+      if (!delFileProspektus.success) {
+        ComponentAdminGlobal_NotifikasiPeringatan("Gagal hapus prospektus ");
+      }
+
+      if (!_.isEmpty(data.DokumenInvestasi)) {
+        for (let i of data.DokumenInvestasi) {
+          const delFileDokumen = await funGlobal_DeleteFileById({
+            fileId: i.fileId,
+          });
+
+          if (!delFileDokumen.success) {
+            ComponentAdminGlobal_NotifikasiPeringatan(
+              "Gagal hapus prospektus "
+            );
+          }
+        }
+      }
+
+      ComponentGlobal_NotifikasiBerhasil(res.message);
+      setOpenModal(false);
+      router.replace(NEW_RouterInvestasi.portofolio({ id: "4" }));
+      setLoading(false);
+    } else {
+      ComponentGlobal_NotifikasiGagal(res.message);
+      setLoading(false);
+    }
   }
 
   return (
@@ -69,7 +96,14 @@ export default function Investasi_ViewDetailReject({
           </Button>
         }
         buttonKanan={
-          <Button bg={"red"} radius={"xl"} onClick={() => onDelete()}>
+          <Button
+            loaderPosition="center"
+            loading={isLoading}
+            color="red"
+            bg={"red"}
+            radius={"xl"}
+            onClick={() => onDelete()}
+          >
             Hapus
           </Button>
         }
@@ -77,18 +111,14 @@ export default function Investasi_ViewDetailReject({
 
       <Stack>
         {/* Alasan */}
-        <ComponentGlobal_BoxInformation
-          informasi={investasi.catatan}
-          isReport
-        />
+        <ComponentGlobal_BoxInformation informasi={data.catatan} isReport />
 
         <Investasi_ComponentDetailDataNonPublish data={dataInvestasi} />
 
-        <Group position="apart" grow>
+        <Group position="apart" grow mb={"xl"}>
           {/* Tombol Ajukan */}
           <Button
-            mb={"xl"}
-            radius={50}
+            radius={"xl"}
             bg={"orange.7"}
             color="yellow"
             onClick={() => onAjukan()}
@@ -98,10 +128,9 @@ export default function Investasi_ViewDetailReject({
 
           {/* Tombol Hapus */}
           <Button
-            mb={"xl"}
-            radius={50}
+            radius={"xl"}
             bg={"red.7"}
-            color="yellow"
+            color="red"
             onClick={() => setOpenModal(true)}
           >
             Hapus
diff --git a/src/app_modules/investasi/_view/detail/portofolio/view_detail_review.tsx b/src/app_modules/investasi/_view/detail/portofolio/view_detail_review.tsx
index 0b6cca44..688dde83 100644
--- a/src/app_modules/investasi/_view/detail/portofolio/view_detail_review.tsx
+++ b/src/app_modules/investasi/_view/detail/portofolio/view_detail_review.tsx
@@ -1,19 +1,15 @@
 "use client";
 
-import {
-  NEW_RouterInvestasi,
-  RouterInvestasi_OLD,
-} from "@/app/lib/router_hipmi/router_investasi";
+import { NEW_RouterInvestasi } from "@/app/lib/router_hipmi/router_investasi";
 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 { Investasi_ComponentDetailDataNonPublish } from "@/app_modules/investasi/_component";
 import { MODEL_INVESTASI } from "@/app_modules/investasi/_lib/interface";
 import { investasi_funEditStatusById } from "@/app_modules/investasi/fun/edit/fun_edit_status_by_id";
-import { gs_investasi_status } from "@/app_modules/investasi/g_state";
 import notifikasiToAdmin_funCreate from "@/app_modules/notifikasi/fun/create/create_notif_to_admin";
 import mqtt_client from "@/util/mqtt_client";
 import { Button, Stack } from "@mantine/core";
-import { useAtom } from "jotai";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 
@@ -25,13 +21,18 @@ export default function Investasi_ViewDetailReview({
   const router = useRouter();
   const [isLoading, setLoading] = useState(false);
   const [data, setData] = useState<MODEL_INVESTASI>(dataInvestasi);
+  const [openModal, setOpenModal] = useState(false);
 
-  async function onCancleReview() {
+  async function onChangeStatus() {
     const res = await investasi_funEditStatusById({
       investasiId: data.id,
       statusId: "3",
     });
     if (res.status === 200) {
+      setLoading(true);
+      ComponentGlobal_NotifikasiBerhasil("Review Dibatalkan");
+      router.replace(NEW_RouterInvestasi.portofolio({ id: "3" }));
+
       const dataNotif = {
         appId: res.data?.id,
         userId: res.data?.authorId,
@@ -47,13 +48,11 @@ export default function Investasi_ViewDetailReview({
 
       if (notif.status === 201) {
         mqtt_client.publish("ADMIN", JSON.stringify({ count: 1 }));
-
-        setLoading(true);
-        ComponentGlobal_NotifikasiBerhasil("Review Dibatalkan");
-        router.push(NEW_RouterInvestasi.portofolio({ id: "3" }));
       }
+      setLoading(false);
     } else {
       ComponentGlobal_NotifikasiPeringatan(res.message);
+      setLoading(false);
     }
   }
 
@@ -65,20 +64,41 @@ export default function Investasi_ViewDetailReview({
         <Stack>
           <Button
             mb={"xl"}
-            style={{
-              transition: "0.5s",
-            }}
-            loaderPosition="center"
-            loading={isLoading ? true : false}
             radius={50}
             bg={"orange"}
             color="yellow"
-            onClick={() => onCancleReview()}
+            c={"black"}
+            onClick={() => setOpenModal(true)}
           >
             Batalkan Review
           </Button>
         </Stack>
       </Stack>
+
+      <UIGlobal_Modal
+        opened={openModal}
+        close={() => setOpenModal(false)}
+        title={"Anda yakin ingin batalkan review?"}
+        buttonKiri={
+          <Button radius={"xl"} onClick={() => setOpenModal(false)}>
+            Batal
+          </Button>
+        }
+        buttonKanan={
+          <Button
+            style={{
+              transition: "0.5s",
+            }}
+            loaderPosition="center"
+            loading={isLoading}
+            radius={"xl"}
+            color={"orange"}
+            onClick={() => onChangeStatus()}
+          >
+            Simpan
+          </Button>
+        }
+      />
     </>
   );
 }
diff --git a/src/app_modules/investasi/_view/edit/view_edit_investasi.tsx b/src/app_modules/investasi/_view/edit/view_edit_investasi.tsx
index 56d9f9b8..6380a47c 100644
--- a/src/app_modules/investasi/_view/edit/view_edit_investasi.tsx
+++ b/src/app_modules/investasi/_view/edit/view_edit_investasi.tsx
@@ -1,11 +1,9 @@
-import { APIs, DIRECTORY_ID } from "@/app/lib";
 import { MainColor } from "@/app_modules/_global/color";
 import {
   ComponentGlobal_BoxInformation,
   ComponentGlobal_BoxUploadImage,
   ComponentGlobal_LoadImage,
 } from "@/app_modules/_global/component";
-import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global";
 import { MODEL_DEFAULT_MASTER_OLD } from "@/app_modules/model_global/interface";
 import {
   AspectRatio,
@@ -22,11 +20,8 @@ import {
 import { IconCamera } from "@tabler/icons-react";
 import _ from "lodash";
 import { useState } from "react";
-import { MODEL_INVESTASI } from "../../_lib/interface";
-import { investasi_funUpdateInvestasi } from "../../_fun";
-import { funGlobal_UploadToStorage } from "@/app_modules/_global/fun";
 import { Investasi_ComponentButtonUpdateDataInvestasi } from "../../_component";
-import { useShallowEffect } from "@mantine/hooks";
+import { MODEL_INVESTASI } from "../../_lib/interface";
 
 export function Investasi_ViewEditInvestasi({
   dataInvestasi,
diff --git a/src/app_modules/investasi/fun/fun_delete_investasi.ts b/src/app_modules/investasi/fun/fun_delete_investasi.ts
index 59f9c1a8..95c211d9 100644
--- a/src/app_modules/investasi/fun/fun_delete_investasi.ts
+++ b/src/app_modules/investasi/fun/fun_delete_investasi.ts
@@ -1,8 +1,9 @@
 "use server";
 
 import prisma from "@/app/lib/prisma";
-import { RouterAdminInvestasi_OLD } from "@/app/lib/router_hipmi/router_admin";
-import { RouterInvestasi_OLD } from "@/app/lib/router_hipmi/router_investasi";
+import {
+  NEW_RouterInvestasi
+} from "@/app/lib/router_hipmi/router_investasi";
 import { revalidatePath } from "next/cache";
 
 export default async function funDeleteInvestasi(id: string) {
@@ -14,7 +15,8 @@ export default async function funDeleteInvestasi(id: string) {
 
   if (!res) return { status: 400, message: "Gagal Hapus Data" };
 
-  revalidatePath(RouterInvestasi_OLD.portofolio);
+  revalidatePath(NEW_RouterInvestasi.portofolio({ id: "3" }));
+  revalidatePath(NEW_RouterInvestasi.portofolio({ id: "4" }));
 
   return {
     status: 200,
diff --git a/src/app_modules/investasi/fun/get_one_investasi_by_id.ts b/src/app_modules/investasi/fun/get_one_investasi_by_id.ts
index 5798493e..b5070f83 100644
--- a/src/app_modules/investasi/fun/get_one_investasi_by_id.ts
+++ b/src/app_modules/investasi/fun/get_one_investasi_by_id.ts
@@ -47,6 +47,7 @@ export default async function getOneInvestasiById(id: string) {
         },
       },
       countDown: true,
+      
     },
   });