From 3b15871ad4fa291ed17c09ad3ef9551d7281e464 Mon Sep 17 00:00:00 2001
From: bagasbanuna <bagasbanuna02@gmail.com>
Date: Thu, 15 Jan 2026 13:54:14 +0800
Subject: [PATCH] Notifikasi join event Fix: modified:  
 app/(application)/(user)/event/[id]/history.tsx         modified:  
 app/(application)/(user)/event/[id]/publish.tsx         modified:  
 app/(application)/(user)/event/create.tsx         modified:  
 app/(application)/(user)/notifications/index.tsx

### No Issue
---
 .../(user)/event/[id]/history.tsx             |  2 +-
 .../(user)/event/[id]/publish.tsx             | 26 ++++++++++++++-----
 app/(application)/(user)/event/create.tsx     | 19 +-------------
 .../(user)/notifications/index.tsx            |  2 +-
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/app/(application)/(user)/event/[id]/history.tsx b/app/(application)/(user)/event/[id]/history.tsx
index a96a189..30ad6b3 100644
--- a/app/(application)/(user)/event/[id]/history.tsx
+++ b/app/(application)/(user)/event/[id]/history.tsx
@@ -56,7 +56,7 @@ export default function EventDetailHistory() {
       <DrawerCustom
         isVisible={openDrawer}
         closeDrawer={() => setOpenDrawer(false)}
-        height={250}
+        height={"auto"}
       >
         <MenuDrawerDynamicGrid
           data={menuDrawerPublishEvent({ id: id as string })}
diff --git a/app/(application)/(user)/event/[id]/publish.tsx b/app/(application)/(user)/event/[id]/publish.tsx
index 103c4e4..250e532 100644
--- a/app/(application)/(user)/event/[id]/publish.tsx
+++ b/app/(application)/(user)/event/[id]/publish.tsx
@@ -1,14 +1,15 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
   AlertDefaultSystem,
+  BackButton,
   ButtonCustom,
   DotButton,
   DrawerCustom,
-  LoaderCustom,
   MenuDrawerDynamicGrid,
   ViewWrapper,
 } from "@/components";
 import { IMenuDrawerItem } from "@/components/_Interface/types";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
 import LeftButtonCustom from "@/components/Button/BackButton";
 import { useAuth } from "@/hooks/use-auth";
 import Event_BoxDetailPublishSection from "@/screens/Event/BoxDetailPublishSection";
@@ -18,6 +19,7 @@ import {
   apiEventGetOne,
   apiEventJoin,
 } from "@/service/api-client/api-event";
+import dayjs from "dayjs";
 import {
   router,
   Stack,
@@ -34,7 +36,9 @@ export default function EventDetailPublish() {
   const [isLoadingData, setIsLoadingData] = useState(false);
   const [isLoadingJoin, setIsLoadingJoin] = useState(false);
 
-  const [data, setData] = useState();
+  const now = new Date().toISOString();
+
+  const [data, setData] = useState<any>();
   const [isParticipant, setIsParticipant] = useState<boolean | null>(null);
 
   useFocusEffect(
@@ -108,7 +112,17 @@ export default function EventDetailPublish() {
     }
   };
 
-  const footerButton = () => {
+  if (
+    id &&
+    data &&
+    data?.tanggalSelesai &&
+    dayjs(data?.tanggalSelesai).isBefore(now)
+  ) {
+    console.log("Event sudah selesai");
+    return router.replace(`/event/${id}/history`);
+  }
+
+  const FooterButton = () => {
     return (
       <>
         <ButtonCustom
@@ -138,17 +152,17 @@ export default function EventDetailPublish() {
       <Stack.Screen
         options={{
           title: `Event Publish`,
-          headerLeft: () => <LeftButtonCustom />,
+          headerLeft: () => <BackButton onPress={() => router.back()} />,
           headerRight: () => <DotButton onPress={() => setOpenDrawer(true)} />,
         }}
       />
       <ViewWrapper>
         {isLoadingData ? (
-          <LoaderCustom />
+          <CustomSkeleton height={400} />
         ) : (
           <Event_BoxDetailPublishSection
             data={data}
-            footerButton={footerButton()}
+            footerButton={FooterButton()}
           />
         )}
       </ViewWrapper>
diff --git a/app/(application)/(user)/event/create.tsx b/app/(application)/(user)/event/create.tsx
index 3c98340..aa746a0 100644
--- a/app/(application)/(user)/event/create.tsx
+++ b/app/(application)/(user)/event/create.tsx
@@ -78,23 +78,6 @@ export default function EventCreate() {
       return;
     }
 
-    // if (selectedDate) {
-    //   console.log("Tanggal yang dipilih:", selectedDate);
-    //   console.log(`ISO Format ${Platform.OS}:`, selectedDate.toString());
-
-    //   // Kirim ke API atau proses lanjutan
-    // } else {
-    //   console.log("Tanggal belum dipilih");
-    // }
-
-    // if (selectedEndDate) {
-    //   console.log("Tanggal yang dipilih:", selectedEndDate);
-    //   console.log(`ISO Format ${Platform.OS}:`, selectedEndDate.toString());
-    //   // Kirim ke API atau proses lanjutan
-    // } else {
-    //   console.log("Tanggal berakhir belum dipilih");
-    // }
-
     try {
       setIsLoading(true);
 
@@ -110,7 +93,7 @@ export default function EventCreate() {
       const response = await apiEventCreate(newData);
       console.log("Response", JSON.stringify(response, null, 2));
 
-      router.replace("/event/status");
+      router.replace("/event/status?status=review");
     } catch (error) {
       console.log(error);
     } finally {
diff --git a/app/(application)/(user)/notifications/index.tsx b/app/(application)/(user)/notifications/index.tsx
index 37ff3ac..dbec998 100644
--- a/app/(application)/(user)/notifications/index.tsx
+++ b/app/(application)/(user)/notifications/index.tsx
@@ -78,7 +78,7 @@ const BoxNotification = ({
             categoryApp: data.kategoriApp,
           });
 
-          router.replace(newPath as any);
+          router.navigate(newPath as any);
           selectedCategory(activeCategory as string);
 
           if (!data.isRead) {