diff --git a/src/app_modules/investasi/_ui/transaksi/ui_invoice.tsx b/src/app_modules/investasi/_ui/transaksi/ui_invoice.tsx
index d943bcca..cce2b04d 100644
--- a/src/app_modules/investasi/_ui/transaksi/ui_invoice.tsx
+++ b/src/app_modules/investasi/_ui/transaksi/ui_invoice.tsx
@@ -1,27 +1,51 @@
 "use client";
 
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
-import { Investasi_ViewInvoice } from "../../_view";
 import { useAtom } from "jotai";
+import { Investasi_ViewInvoice } from "../../_view";
 
-import { useState } from "react";
-import { gs_investas_menu } from "../../g_state";
-import { useRouter } from "next/navigation";
+import { Component_Header } from "@/app_modules/_global/component/new/component_header";
+import UI_NewLayoutTamplate, {
+  UI_NewChildren,
+  UI_NewHeader,
+} from "@/app_modules/_global/ui/V2_layout_tamplate";
 import { RouterInvestasi_OLD } from "@/lib/router_hipmi/router_investasi";
 import { ActionIcon, Loader } from "@mantine/core";
 import { IconX } from "@tabler/icons-react";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import { gs_investas_menu } from "../../g_state";
 
-export function Investasi_UiInvoice({ dataInvoice }: { dataInvoice : any}) {
+export function Investasi_UiInvoice({ dataInvoice }: { dataInvoice: any }) {
   const router = useRouter();
   const [hotMenu, setHotMenu] = useAtom(gs_investas_menu);
   const [isLoading, setLoading] = useState(false);
 
-
   return (
-    <UIGlobal_LayoutTamplate
-      header={
-        <UIGlobal_LayoutHeaderTamplate
+    // <UIGlobal_LayoutTamplate
+    //   header={
+    //     <UIGlobal_LayoutHeaderTamplate
+    //       title="Invoice"
+    //       customButtonLeft={
+    //         <ActionIcon
+    //           variant="transparent"
+    //           onClick={() => {
+    //             setHotMenu(3);
+    //             setLoading(true);
+    //             router.push(RouterInvestasi_OLD.main_transaksi);
+    //           }}
+    //         >
+    //           {isLoading ? <Loader color="yellow" /> : <IconX />}
+    //         </ActionIcon>
+    //       }
+    //     />
+    //   }
+    // >
+    //   <Investasi_ViewInvoice dataInvoice={dataInvoice} />
+    // </UIGlobal_LayoutTamplate>
+
+    <UI_NewLayoutTamplate>
+      <UI_NewHeader>
+        <Component_Header
           title="Invoice"
           customButtonLeft={
             <ActionIcon
@@ -36,9 +60,10 @@ export function Investasi_UiInvoice({ dataInvoice }: { dataInvoice : any}) {
             </ActionIcon>
           }
         />
-      }
-    >
-      <Investasi_ViewInvoice dataInvoice={dataInvoice} />
-    </UIGlobal_LayoutTamplate>
+      </UI_NewHeader>
+      <UI_NewChildren>
+        <Investasi_ViewInvoice dataInvoice={dataInvoice} />
+      </UI_NewChildren>
+    </UI_NewLayoutTamplate>
   );
 }
diff --git a/src/app_modules/investasi/_ui/transaksi/ui_metode_pembayaran.tsx b/src/app_modules/investasi/_ui/transaksi/ui_metode_pembayaran.tsx
index f0504984..68b8b276 100644
--- a/src/app_modules/investasi/_ui/transaksi/ui_metode_pembayaran.tsx
+++ b/src/app_modules/investasi/_ui/transaksi/ui_metode_pembayaran.tsx
@@ -1,7 +1,10 @@
 "use client";
 
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { Component_Header } from "@/app_modules/_global/component/new/component_header";
+import UI_NewLayoutTamplate, {
+  UI_NewChildren,
+  UI_NewHeader,
+} from "@/app_modules/_global/ui/V2_layout_tamplate";
 import { Investasi_ViewMetodePembayaran } from "../../_view";
 
 export function Investasi_UiMetodePembayaran({
@@ -9,18 +12,30 @@ export function Investasi_UiMetodePembayaran({
   investasiId,
 }: {
   listBank: any[];
-  investasiId: string
+  investasiId: string;
 }) {
   return (
     <>
-      <UIGlobal_LayoutTamplate
+      {/* <UIGlobal_LayoutTamplate
         header={<UIGlobal_LayoutHeaderTamplate title="Metode Pembayaran" />}
       >
         <Investasi_ViewMetodePembayaran
           listBank={listBank}
           investasiId={investasiId}
         />
-      </UIGlobal_LayoutTamplate>
+      </UIGlobal_LayoutTamplate> */}
+
+      <UI_NewLayoutTamplate>
+        <UI_NewHeader>
+          <Component_Header title="Metode Pembayaran" />
+        </UI_NewHeader>
+        <UI_NewChildren>
+          <Investasi_ViewMetodePembayaran
+            listBank={listBank}
+            investasiId={investasiId}
+          />
+        </UI_NewChildren>
+      </UI_NewLayoutTamplate>
     </>
   );
 }
diff --git a/src/app_modules/investasi/_ui/transaksi/ui_proses_pembelian.tsx b/src/app_modules/investasi/_ui/transaksi/ui_proses_pembelian.tsx
index e2de8d5c..b03f0ef1 100644
--- a/src/app_modules/investasi/_ui/transaksi/ui_proses_pembelian.tsx
+++ b/src/app_modules/investasi/_ui/transaksi/ui_proses_pembelian.tsx
@@ -1,7 +1,10 @@
 "use client";
 
-import UIGlobal_LayoutHeaderTamplate from "@/app_modules/_global/ui/ui_header_tamplate";
-import UIGlobal_LayoutTamplate from "@/app_modules/_global/ui/ui_layout_tamplate";
+import { Component_Header } from "@/app_modules/_global/component/new/component_header";
+import UI_NewLayoutTamplate, {
+  UI_NewChildren,
+  UI_NewHeader,
+} from "@/app_modules/_global/ui/V2_layout_tamplate";
 import { Investasi_ViewProsesPembelian } from "../../_view";
 
 export function Investasi_UiProsesPembelian({
@@ -11,11 +14,20 @@ export function Investasi_UiProsesPembelian({
 }) {
   return (
     <>
-      <UIGlobal_LayoutTamplate
+      {/* <UIGlobal_LayoutTamplate
         header={<UIGlobal_LayoutHeaderTamplate title="Pembelian Saham" />}
       >
         <Investasi_ViewProsesPembelian dataInvestasi={dataInvestasi} />
-      </UIGlobal_LayoutTamplate>
+      </UIGlobal_LayoutTamplate> */}
+
+      <UI_NewLayoutTamplate>
+        <UI_NewHeader>
+          <Component_Header title="Pembelian Saham" />
+        </UI_NewHeader>
+        <UI_NewChildren>
+          <Investasi_ViewProsesPembelian dataInvestasi={dataInvestasi} />
+        </UI_NewChildren>
+      </UI_NewLayoutTamplate>
     </>
   );
 }
diff --git a/src/app_modules/investasi/_view/transaksi/view_invoice.tsx b/src/app_modules/investasi/_view/transaksi/view_invoice.tsx
index 13b3712c..964513d9 100644
--- a/src/app_modules/investasi/_view/transaksi/view_invoice.tsx
+++ b/src/app_modules/investasi/_view/transaksi/view_invoice.tsx
@@ -166,7 +166,7 @@ export function Investasi_ViewInvoice({
                           color={copied ? "teal" : "yellow"}
                           c={"black"}
                         >
-                          {copied ? "Berhasil" : "Salin"}
+                          {copied ? "Disalin" : "Salin"}
                         </Button>
                       )}
                     </CopyButton>
@@ -224,7 +224,7 @@ export function Investasi_ViewInvoice({
                           c={"black"}
                           onClick={copy}
                         >
-                          {copied ? "Berhasil" : "Salin"}
+                          {copied ? "Disalin" : "Salin"}
                         </Button>
                       )}
                     </CopyButton>
diff --git a/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx b/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx
index 19d144a6..3eb00487 100644
--- a/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx
+++ b/src/app_modules/investasi/_view/transaksi/view_metode_pembayaran.tsx
@@ -1,5 +1,3 @@
-import { IRealtimeData } from "@/lib/global_state";
-import { NEW_RouterInvestasi } from "@/lib/router_hipmi/router_investasi";
 import {
   AccentColor,
   MainColor,
@@ -7,6 +5,8 @@ import {
 import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
 import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan";
 import { notifikasiToAdmin_funCreate } from "@/app_modules/notifikasi/fun";
+import { IRealtimeData } from "@/lib/global_state";
+import { NEW_RouterInvestasi } from "@/lib/router_hipmi/router_investasi";
 import { clientLogger } from "@/util/clientLogger";
 import { Button, Paper, Radio, Stack, Title } from "@mantine/core";
 import { useLocalStorage } from "@mantine/hooks";
@@ -38,6 +38,7 @@ export function Investasi_ViewMetodePembayaran({
 
   async function onProses() {
     try {
+      setLoading(true);
       const res = await investasi_funCreateInvoice({
         data: {
           total: total,
@@ -48,6 +49,7 @@ export function Investasi_ViewMetodePembayaran({
       });
 
       if (res.status != 201) {
+        setLoading(false);
         ComponentGlobal_NotifikasiPeringatan(res.message);
         return;
       }
@@ -73,13 +75,13 @@ export function Investasi_ViewMetodePembayaran({
         });
 
         ComponentGlobal_NotifikasiBerhasil(res.message);
-        setLoading(true);
         router.push(NEW_RouterInvestasi.invoice + res.data?.id, {
           scroll: false,
         });
       }
     } catch (error) {
       clientLogger.error("Error create invoice:", error);
+      setLoading(false);
     }
   }
 
@@ -108,7 +110,8 @@ export function Investasi_ViewMetodePembayaran({
               <Radio
                 styles={{
                   radio: {
-                    color: "yellow", backgroundColor: MainColor.white
+                    color: "yellow",
+                    backgroundColor: MainColor.white,
                   },
                 }}
                 value={e.id}