app/(application)/(user)/_layout.tsx

@@ -214,13 +214,6 @@ export default function UserLayout() {
             headerLeft: () => <BackButton />,
           }}
         />
-        <Stack.Screen
-          name="investment/[id]/list-of-document"
-          options={{
-            title: "Daftar Dokumen",
-            headerLeft: () => <BackButton />,
-          }}
-        />
         <Stack.Screen
           name="investment/[id]/edit"
           options={{
@@ -228,27 +221,36 @@ export default function UserLayout() {
             headerLeft: () => <BackButton />,
           }}
         />
+
         <Stack.Screen
-          name="investment/[id]/add-document"
+          name="investment/[id]/edit-prospectus"
+          options={{
+            title: "Edit Prospektus",
+            headerLeft: () => <BackButton />,
+          }}
+        />
+
+        <Stack.Screen
+          name="investment/[id]/(document)/list-of-document"
+          options={{
+            title: "Daftar Dokumen",
+            headerLeft: () => <BackButton />,
+          }}
+        />
+        <Stack.Screen
+          name="investment/[id]/(document)/add-document"
           options={{
             title: "Tambah Dokumen",
             headerLeft: () => <BackButton />,
           }}
         />
         <Stack.Screen
-          name="investment/[id]/edit-document"
+          name="investment/[id]/(document)/edit-document"
           options={{
             title: "Edit Dokumen",
             headerLeft: () => <BackButton />,
           }}
         />
-        <Stack.Screen
-          name="investment/[id]/edit-prospectus"
-          options={{
-            title: "Edit Prospektus",
-            headerLeft: () => <BackButton />,
-          }}
-        />
 
         <Stack.Screen
           name="investment/[id]/(news)/add-news"

app/(application)/(user)/investment/[id]/(document)/recap-of-document.tsx

@@ -75,7 +75,7 @@ export default function InvestmentRecapOfDocument() {
                 />
               ),
               label: "Tambah Dokumen",
-              path: `/investment/${id}/add-document`,
+              path: `/investment/${id}/(document)/add-document`,
             },
           ]}
           onPressItem={(item) => {
@@ -96,7 +96,7 @@ export default function InvestmentRecapOfDocument() {
             {
               icon: <IconEdit />,
               label: "Edit Dokumen",
-              path: `/investment/${id}/edit-document`,
+              path: `/investment/${id}/(document)/edit-document`,
             },
             {
               icon: (

app/(application)/(user)/investment/[id]/[status]/detail.tsx

@@ -101,7 +101,7 @@ export default function InvestmentDetailStatus() {
                 />
               ),
               label: "Update Dokumen",
-              path: `/investment/${id}/recap-of-document`,
+              path: `/investment/${id}/(document)/recap-of-document`,
             },
           ]}
           columns={4}
@@ -120,7 +120,7 @@ export default function InvestmentDetailStatus() {
             {
               icon: <IconDocument />,
               label: "Update Dokumen",
-              path: `/investment/${id}/recap-of-document`,
+              path: `/investment/${id}/(document)/recap-of-document`,
             },
             {
               icon: <IconNews />,

app/(application)/(user)/investment/[id]/index.tsx

@@ -37,7 +37,7 @@ export default function InvestmentDetail() {
   const bottomSection = (
     <Invesment_ComponentBoxOnBottomDetail
       id={id as string}
-      status={status as string}
+      status={'publish'}
     />
   );
 

components/Grid/GridCustom.tsx

@@ -90,8 +90,8 @@ const Col: React.FC<ColProps> = ({ children, span, style }) => {
     col: {
       flexBasis: `${(100 / columns) * colSpan}%`,
       paddingVertical: margin,
-      marginBottom: gap,
-      // marginBlock: gap,
+      // marginBottom: gap,
+      marginBlock: gap,
     },
   });
 

screens/Authentication/LoginView.tsx

@@ -32,13 +32,13 @@ export default function LoginView() {
 
     // router.navigate("/verification");
     // router.navigate(`/(application)/(user)/profile/${id}`);
-    // router.navigate("/(application)/(user)/home");
+    router.navigate("/(application)/(user)/home");
     // router.navigate(`/(application)/profile/${id}/edit`);
     // router.navigate(`/(application)/(user)/portofolio/${id}`)
     // router.navigate(`/(application)/(image)/preview-image/${id}`);
     // router.replace("/(application)/(user)/event/(tabs)");
     // router.replace("/(application)/coba");
-    router.navigate("/investment/(tabs)")
+    // router.navigate("/investment/(tabs)")
   }
 
   return (

screens/Invesment/ComponentBoxOnBottomDetail.tsx

@@ -21,7 +21,7 @@ export default function Invesment_ComponentBoxOnBottomDetail({
       {status === "publish" ? (
         <>
           <Grid>
-            <Grid.Col span={6} style={{ paddingInline: 5 }}>
+            <Grid.Col span={6} style={{ paddingInline: 5, marginBlock: 0 }}>
               <BaseBox
                 backgroundColor={AccentColor.blue}
                 style={{ borderColor: AccentColor.softblue, borderWidth: 1 }}
@@ -36,11 +36,11 @@ export default function Invesment_ComponentBoxOnBottomDetail({
               </BaseBox>
             </Grid.Col>
 
-            <Grid.Col span={6} style={{ paddingInline: 5 }}>
+            <Grid.Col span={6} style={{ paddingInline: 5, marginBlock: 0 }}>
               <BaseBox
                 backgroundColor={AccentColor.blue}
                 style={{ borderColor: AccentColor.softblue, borderWidth: 1 }}
-                href={`/investment/${id}/list-of-document`}
+                href={`/investment/${id}/(document)/list-of-document`}
               >
                 <StackCustom>
                   <TextCustom align="center">Dokumen</TextCustom>
@@ -53,7 +53,7 @@ export default function Invesment_ComponentBoxOnBottomDetail({
           </Grid>
 
           <Grid>
-            <Grid.Col span={6} style={{ paddingInline: 5 }}>
+            <Grid.Col span={6} style={{ paddingInline: 5, marginBlock: 0 }}>
               <BaseBox
                 backgroundColor={AccentColor.blue}
                 style={{ borderColor: AccentColor.softblue, borderWidth: 1 }}
@@ -72,7 +72,7 @@ export default function Invesment_ComponentBoxOnBottomDetail({
               </BaseBox>
             </Grid.Col>
 
-            <Grid.Col span={6} style={{ paddingInline: 5 }}>
+            <Grid.Col span={6} style={{ paddingInline: 5, marginBlock: 0 }}>
               <BaseBox
                 backgroundColor={AccentColor.blue}
                 style={{ borderColor: AccentColor.softblue, borderWidth: 1 }}
@@ -109,7 +109,7 @@ export default function Invesment_ComponentBoxOnBottomDetail({
             <BaseBox
               backgroundColor={AccentColor.blue}
               style={{ borderColor: AccentColor.softblue, borderWidth: 1 }}
-              href={`/investment/${id}/list-of-document`}
+              href={`/investment/${id}/(document)/list-of-document`}
             >
               <StackCustom>
                 <TextCustom align="center">Dokumen</TextCustom>

screens/Invesment/DetailDataPublishSection.tsx

@@ -1,35 +1,38 @@
 import { Spacing, StackCustom } from "@/components";
-import { listDataNotPublishInvesment, listDataPublishInvesment } from "@/lib/dummy-data/investment/dummy-data-not-publish";
+import {
+  listDataNotPublishInvesment,
+  listDataPublishInvesment,
+} from "@/lib/dummy-data/investment/dummy-data-not-publish";
 import React from "react";
 import Invesment_BoxDetailDataSection from "./BoxDetailDataSection";
 import Invesment_BoxProgressSection from "./BoxProgressSection";
 import Investment_ButtonStatusSection from "./ButtonStatusSection";
 
 export default function Invesment_DetailDataPublishSection({
-    status,
-    bottomSection,
-    buttonSection,
+  status,
+  bottomSection,
+  buttonSection,
 }: {
-    status: string;
-    bottomSection: React.ReactNode;
-    buttonSection: React.ReactNode
+  status: string;
+  bottomSection: React.ReactNode;
+  buttonSection: React.ReactNode;
 }) {
-    return (
-      <>
-        <StackCustom gap={"sm"}>
-          <Invesment_BoxProgressSection status={status as string} />
-          <Invesment_BoxDetailDataSection
-            data={
-              status === "publish"
-                ? listDataPublishInvesment
-                : listDataNotPublishInvesment
-            }
-            bottomSection={bottomSection}
-          />
-          <Investment_ButtonStatusSection status={status as string} />
-          {buttonSection}
-        </StackCustom>
-        <Spacing />
-      </>
-    );
-}
+  return (
+    <>
+      <StackCustom gap={"sm"}>
+        <Invesment_BoxProgressSection status={status as string} />
+        <Invesment_BoxDetailDataSection
+          data={
+            status === "publish"
+              ? listDataPublishInvesment
+              : listDataNotPublishInvesment
+          }
+          bottomSection={bottomSection}
+        />
+        <Investment_ButtonStatusSection status={status as string} />
+        {buttonSection}
+      </StackCustom>
+      <Spacing />
+    </>
+  );
+}