Fix notification to report comment

Fix: User – Forum (Reporting & Preview) app/(application)/(user)/forum/[id]/other-report-commentar.tsx app/(application)/(user)/forum/[id]/other-report-posting.tsx app/(application)/(user)/forum/[id]/preview-report-posting.tsx app/(application)/(user)/forum/[id]/report-commentar.tsx app/(application)/(user)/forum/[id]/report-posting.tsx Admin – Forum Moderation app/(application)/admin/forum/[id]/list-report-comment.tsx app/(application)/admin/forum/report-posting.tsx Layout app/(application)/(user)/_layout.tsx API Client & Admin service/api-admin/api-admin-forum.ts service/api-client/api-forum.ts service/api-client/api-master.ts Utils utils/badWordsIndonesia.ts ### No Issue
Fix notifikasi forum
2026-01-19 17:46:54 +08:00 · 2026-01-17 15:59:00 +08:00 · 2026-01-15 17:39:39 +08:00 · 2026-01-15 13:54:14 +08:00 · 2026-01-14 17:41:20 +08:00 · 2026-01-13 17:41:30 +08:00
53 changed files with 930 additions and 322 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -100,7 +100,7 @@ packagingOptions {
        applicationId 'com.bip.hipmimobileapp'
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3
+        versionCode 4
        versionName "1.0.1"

        buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
--- a/app.config.js
+++ b/app.config.js
@@ -21,7 +21,7 @@ export default {
        "Aplikasi membutuhkan akses lokasi untuk menampilkan peta.",
    },
    associatedDomains: ["applinks:cld-dkr-staging-hipmi.wibudev.com"],
-    buildNumber: "18",
+    buildNumber: "19",
  },

  android: {
--- a/app/(application)/(user)/_layout.tsx
+++ b/app/(application)/(user)/_layout.tsx
@@ -53,7 +53,9 @@ export default function UserLayout() {
        />

        {/* ========== Notification Section ========= */}
-        <Stack.Screen
+
+        {/* DIPINDAH DI FILE NOTIFICATION USER */}
+        {/* <Stack.Screen
          name="notifications/index"
          options={{
            title: "Notifikasi",
@@ -65,18 +67,21 @@ export default function UserLayout() {
            //   />
            // ),
          }}
-        />
+        /> */}

        {/* ========== Event Section ========= */}
+
        <Stack.Screen
          name="event/(tabs)"
          options={{
            title: "Event",
-            headerLeft: () => (
-              <LeftButtonCustom path="/(application)/(user)/home" />
-            ),
+            // NOTE: DIPINDAH DI FILE /Event/(Tabs)/_layout.tsx
+            // headerLeft: () => (
+            //   <LeftButtonCustom path="/(application)/(user)/home" />
+            // ),
          }}
        />
+
        <Stack.Screen
          name="event/create"
          options={{
@@ -520,7 +525,7 @@ export default function UserLayout() {
          options={{
            title: "Job Vacancy",
            // headerLeft: () => <BackButton path="/home" />,
-            // Note: headerLeft di pindahkan ke Tabs Layout
+            // NOTE: headerLeft di pindahkan ke Tabs Layout
          }}
        />
        <Stack.Screen
@@ -611,6 +616,20 @@ export default function UserLayout() {
            headerLeft: () => <BackButton />,
          }}
        />
+        <Stack.Screen
+          name="forum/[id]/preview-report-posting"
+          options={{
+            title: "Laporan Postingan",
+            headerLeft: () => <BackButton />,
+          }}
+        />
+        <Stack.Screen
+          name="forum/[id]/preview-report-comment"
+          options={{
+            title: "Laporan Komentar",
+            headerLeft: () => <BackButton />,
+          }}
+        />

        {/* ========== Maps Section ========= */}
        <Stack.Screen
--- a/app/(application)/(user)/donation/[id]/[status]/detail.tsx
+++ b/app/(application)/(user)/donation/[id]/[status]/detail.tsx
@@ -16,6 +16,7 @@ import Donation_ComponentBoxDetailData from "@/screens/Donation/ComponentBoxDeta
 import Donation_ComponentStoryFunrising from "@/screens/Donation/ComponentStoryFunrising";
 import Donation_ProgressSection from "@/screens/Donation/ProgressSection";
 import { apiDonationGetOne } from "@/service/api-client/api-donation";
+import { countDownAndCondition } from "@/utils/countDownAndCondition";
 import { FontAwesome6 } from "@expo/vector-icons";
 import {
  router,
@@ -24,7 +25,7 @@ import {
  useLocalSearchParams,
 } from "expo-router";
 import _ from "lodash";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";

 export default function DonasiDetailStatus() {
  const { id, status } = useLocalSearchParams();
@@ -58,6 +59,27 @@ export default function DonasiDetailStatus() {
    setOpenDrawer(false);
  };

+  const [value, setValue] = useState({
+    sisa: 0,
+    reminder: false,
+  });
+
+  useEffect(() => {
+    updateCountDown();
+  }, [data]);
+
+  const updateCountDown = () => {
+    const countDown = countDownAndCondition({
+      duration: data?.DonasiMaster_Durasi?.name,
+      publishTime: data?.publishTime,
+    });
+
+    setValue({
+      sisa: countDown.durationDay,
+      reminder: countDown.reminder,
+    });
+  };
+
  return (
    <>
      <Stack.Screen
@@ -74,10 +96,15 @@ export default function DonasiDetailStatus() {
      />
      <ViewWrapper>
        <Donation_ComponentBoxDetailData
+          sisaHari={value.sisa}
+          reminder={value.reminder}
          data={data}
          bottomSection={
            status === "publish" && (
-              <Donation_ProgressSection id={id as string} />
+              <Donation_ProgressSection
+                id={id as string}
+                progres={Number(data?.progres) || 0}
+              />
            )
          }
        />
--- a/app/(application)/(user)/event/(tabs)/_layout.tsx
+++ b/app/(application)/(user)/event/(tabs)/_layout.tsx
@@ -4,10 +4,34 @@ import {
  IconHome,
  IconStatus,
 } from "@/components/_Icon";
+import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification";
 import { TabsStyles } from "@/styles/tabs-styles";
-import { Tabs } from "expo-router";
+import { router, Tabs, useLocalSearchParams, useNavigation } from "expo-router";
+import { useLayoutEffect } from "react";

 export default function EventTabsLayout() {
+  const navigation = useNavigation();
+
+  const { from, category } = useLocalSearchParams<{
+    from?: string;
+    category?: string;
+  }>();
+
+  console.log("from", from);
+  console.log("category", category);
+
+  // Atur header secara dinamis
+  useLayoutEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => (
+        <BackButtonFromNotification
+          from={from as string}
+          category={category as string}
+        />
+      ),
+    });
+  }, [from, router, navigation]);
+
  return (
    <Tabs screenOptions={TabsStyles}>
      <Tabs.Screen
--- a/app/(application)/(user)/event/(tabs)/status.tsx
+++ b/app/(application)/(user)/event/(tabs)/status.tsx
@@ -11,15 +11,17 @@ import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
 import { useAuth } from "@/hooks/use-auth";
 import { dummyMasterStatus } from "@/lib/dummy-data/_master/status";
 import { apiEventGetByStatus } from "@/service/api-client/api-event";
-import { useFocusEffect } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";

 export default function EventStatus() {
  const { user } = useAuth();
+  const { status } = useLocalSearchParams<{ status?: string }>();
+
  const id = user?.id || "";
  const [activeCategory, setActiveCategory] = useState<string | null>(
-    "publish"
+    status || "publish"
  );
  const [listData, setListData] = useState([]);
  const [loadingGetData, setLoadingGetData] = useState(false);
@@ -73,7 +75,7 @@ export default function EventStatus() {
        listData.map((item: any, i) => (
          <BoxWithHeaderSection
            key={i}
-            href={`/event/${item.id }/${activeCategory}/detail-event`}
+            href={`/event/${item.id}/${activeCategory}/detail-event`}
          >
            <StackCustom gap={"xs"}>
              <Grid>
--- 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 })}
--- 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,23 +19,26 @@ import {
  apiEventGetOne,
  apiEventJoin,
 } from "@/service/api-client/api-event";
+import dayjs from "dayjs";
 import {
+  Redirect,
  router,
  Stack,
  useFocusEffect,
  useLocalSearchParams,
 } from "expo-router";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import Toast from "react-native-toast-message";

 export default function EventDetailPublish() {
-  const { id } = useLocalSearchParams();
+  const now = new Date().toISOString();
  const { user } = useAuth();
+  const { id } = useLocalSearchParams();
  const [openDrawer, setOpenDrawer] = useState(false);
  const [isLoadingData, setIsLoadingData] = useState(false);
  const [isLoadingJoin, setIsLoadingJoin] = useState(false);

-  const [data, setData] = useState();
+  const [data, setData] = useState<any>();
  const [isParticipant, setIsParticipant] = useState<boolean | null>(null);

  useFocusEffect(
@@ -55,8 +59,6 @@ export default function EventDetailPublish() {
          userId: user?.id as string,
        });

-        console.log("[RES CHECK PARTICIPANTS]", responseCheckParticipants);
-
        if (
          responseCheckParticipants.success &&
          responseCheckParticipants.data
@@ -108,7 +110,24 @@ export default function EventDetailPublish() {
    }
  };

-  const footerButton = () => {
+  const isEventFinished =
+    id && data?.tanggalSelesai && dayjs(data.tanggalSelesai).isBefore(now);
+
+  useEffect(() => {
+    if (isEventFinished) {
+      router.replace(`/(application)/(user)/event/${id}/history`);
+    }
+  }, [isEventFinished, id]);
+
+  if (isEventFinished) {
+    return (
+      <ViewWrapper>
+        <CustomSkeleton />
+      </ViewWrapper>
+    );
+  }
+
+  const FooterButton = () => {
    return (
      <>
        <ButtonCustom
@@ -138,17 +157,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>
--- a/app/(application)/(user)/event/create.tsx
+++ b/app/(application)/(user)/event/create.tsx
@@ -14,7 +14,7 @@ import { apiEventCreate } from "@/service/api-client/api-event";
 import { apiMasterEventType } from "@/service/api-client/api-master";
 import { DateTimePickerEvent } from "@react-native-community/datetimepicker";
 import { router } from "expo-router";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import Toast from "react-native-toast-message";

 interface EventCreateProps {
@@ -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 {
--- a/app/(application)/(user)/forum/[id]/index.tsx
+++ b/app/(application)/(user)/forum/[id]/index.tsx
@@ -19,34 +19,20 @@ import {
  apiForumGetOne,
  apiForumUpdateStatus,
 } from "@/service/api-client/api-forum";
+import { TypeForum_CommentProps } from "@/types/type-forum";
 import { isBadContent } from "@/utils/badWordsIndonesia";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useEffect, useState } from "react";
-import { Alert } from "react-native";

-interface CommentProps {
-  id: string;
-  isActive: boolean;
-  komentar: string;
-  createdAt: Date;
-  authorId: string;
-  Author: {
-    id: string;
-    username: string;
-    Profile: {
-      id: string;
-      imageId: string;
-    };
-  };
-}
+

 export default function ForumDetail() {
  const { id } = useLocalSearchParams();
  const { user } = useAuth();
  const [openDrawer, setOpenDrawer] = useState(false);
  const [data, setData] = useState<any | null>(null);
-  const [listComment, setListComment] = useState<CommentProps[] | null>(null);
+  const [listComment, setListComment] = useState<TypeForum_CommentProps[] | null>(null);
  const [isLoadingComment, setLoadingComment] = useState(false);

  // Status
@@ -122,6 +108,7 @@ export default function ForumDetail() {
      comment: text,
      authorId: user?.id,
    };
+    
    try {
      setLoadingComment(true);
      const response = await apiForumCreateComment({
--- a/app/(application)/(user)/forum/[id]/other-report-commentar.tsx
+++ b/app/(application)/(user)/forum/[id]/other-report-commentar.tsx
@@ -6,7 +6,7 @@ import {
 } from "@/components";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
-import { apiForumCreateReportCommentar } from "@/service/api-client/api-master";
+import { apiForumCreateReportCommentar } from "@/service/api-client/api-forum";
 import { router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import Toast from "react-native-toast-message";
--- a/app/(application)/(user)/forum/[id]/other-report-posting.tsx
+++ b/app/(application)/(user)/forum/[id]/other-report-posting.tsx
@@ -6,7 +6,7 @@ import {
 } from "@/components";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
-import { apiForumCreateReportPosting } from "@/service/api-client/api-master";
+import { apiForumCreateReportPosting } from "@/service/api-client/api-forum";
 import { router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import Toast from "react-native-toast-message";
--- a/app/(application)/(user)/forum/[id]/preview-report-comment.tsx
+++ b/app/(application)/(user)/forum/[id]/preview-report-comment.tsx
@@ -0,0 +1,91 @@
+import {
+  BaseBox,
+  NewWrapper,
+  Spacing,
+  StackCustom,
+  TextCustom,
+} from "@/components";
+import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
+import { apiForumGetReportComment } from "@/service/api-client/api-forum";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import _ from "lodash";
+import { useCallback, useState } from "react";
+
+export default function ForumPreviewReportComment() {
+  const { id } = useLocalSearchParams();
+  const [data, setData] = useState<any | null>(null);
+  const [listData, setListData] = useState<any | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+  // Status
+
+  useFocusEffect(
+    useCallback(() => {
+      onLoadData(id as string);
+    }, [id])
+  );
+
+  const onLoadData = async (id: string) => {
+    try {
+      setLoading(true);
+      const response = await apiForumGetReportComment({ id });
+      setData(response.data);
+      setListData(response?.data?.Forum_ReportKomentar);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <NewWrapper>
+        <StackCustom>
+          <TextCustom color="red" bold>
+            Komentar anda telah melanggar aturan forum ! Admin mengambil
+            tindakan untuk menghapus komentar anda!
+          </TextCustom>
+          {loading ? (
+            <CustomSkeleton height={100} />
+          ) : (
+            <BaseBox>
+              <TextCustom>"{data?.komentar ? data?.komentar : "-"}"</TextCustom>
+            </BaseBox>
+          )}
+        </StackCustom>
+
+        <Spacing height={10} />
+        <TextCustom bold>Beberapa laporan yang telah diterima</TextCustom>
+        <Spacing height={10} />
+
+        {loading ? (
+          <ListSkeletonComponent />
+        ) : _.isEmpty(listData) ? (
+          <NoDataText />
+        ) : (
+          listData?.map((e: any, index: number) => (
+             <BaseBox key={index}>
+                {e?.deskripsi ? (
+                  <StackCustom gap={"sm"}>
+                    <TextCustom bold>Laporan Lainnya</TextCustom>
+                    <TextCustom>{e?.deskripsi}</TextCustom>
+                  </StackCustom>
+                ) : (
+                  <StackCustom gap={"sm"}>
+                    <TextCustom bold>
+                      {e?.ForumMaster_KategoriReport?.title}
+                    </TextCustom>
+                    <TextCustom>
+                      {e?.ForumMaster_KategoriReport?.deskripsi}
+                    </TextCustom>
+                  </StackCustom>
+                )}
+              </BaseBox>
+          ))
+        )}
+      </NewWrapper>
+    </>
+  );
+}
--- a/app/(application)/(user)/forum/[id]/preview-report-posting.tsx
+++ b/app/(application)/(user)/forum/[id]/preview-report-posting.tsx
@@ -0,0 +1,91 @@
+import {
+  BaseBox,
+  NewWrapper,
+  Spacing,
+  StackCustom,
+  TextCustom,
+} from "@/components";
+import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
+import { apiForumGetReportPosting } from "@/service/api-client/api-forum";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
+import _ from "lodash";
+import { useCallback, useState } from "react";
+
+export default function ForumPreviewReportPosting() {
+  const { id } = useLocalSearchParams();
+  const [data, setData] = useState<any | null>(null);
+  const [listData, setListData] = useState<any | null>(null);
+  const [loading, setLoading] = useState<boolean>(false);
+  // Status
+
+  useFocusEffect(
+    useCallback(() => {
+      onLoadData(id as string);
+    }, [id])
+  );
+
+  const onLoadData = async (id: string) => {
+    try {
+      setLoading(true);
+      const response = await apiForumGetReportPosting({ id });
+      setData(response.data);
+      setListData(response?.data?.Forum_ReportPosting);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <NewWrapper>
+        <StackCustom>
+          <TextCustom color="red" bold>
+            Postingan anda telah melanggar aturan forum ! Admin mengambil
+            tindakan untuk menghapus komentar anda!
+          </TextCustom>
+          {loading ? (
+            <CustomSkeleton height={100} />
+          ) : (
+            <BaseBox>
+              <TextCustom>"{data?.diskusi ? data?.diskusi : "-"}"</TextCustom>
+            </BaseBox>
+          )}
+        </StackCustom>
+
+        <Spacing height={10} />
+        <TextCustom bold>Beberapa laporan yang telah diterima</TextCustom>
+        <Spacing height={10} />
+
+        {loading ? (
+          <ListSkeletonComponent />
+        ) : _.isEmpty(listData) ? (
+          <NoDataText />
+        ) : (
+          listData?.map((e: any) => (
+            <BaseBox key={e?.id}>
+              {e?.deskripsi ? (
+                <StackCustom gap={"sm"}>
+                  <TextCustom bold>Laporan Lainnya</TextCustom>
+                  <TextCustom>{e?.deskripsi}</TextCustom>
+                </StackCustom>
+              ) : (
+                <StackCustom gap={"sm"}>
+                  <TextCustom bold>
+                    {e?.ForumMaster_KategoriReport?.title}
+                  </TextCustom>
+                  <TextCustom>
+                    {e?.ForumMaster_KategoriReport?.deskripsi}
+                  </TextCustom>
+                </StackCustom>
+              )}
+            </BaseBox>
+          ))
+        )}
+      </NewWrapper>
+    </>
+  );
+}
--- a/app/(application)/(user)/forum/[id]/report-commentar.tsx
+++ b/app/(application)/(user)/forum/[id]/report-commentar.tsx
@@ -8,7 +8,8 @@ import {
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import Forum_ReportListSection from "@/screens/Forum/ReportListSection";
-import { apiForumCreateReportCommentar, apiMasterForumReportList } from "@/service/api-client/api-master";
+import { apiForumCreateReportCommentar } from "@/service/api-client/api-forum";
+import { apiMasterForumReportList } from "@/service/api-client/api-master";
 import { router, useLocalSearchParams } from "expo-router";
 import { useState, useEffect } from "react";
 import Toast from "react-native-toast-message";
--- a/app/(application)/(user)/forum/[id]/report-posting.tsx
+++ b/app/(application)/(user)/forum/[id]/report-posting.tsx
@@ -9,8 +9,8 @@ import {
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import Forum_ReportListSection from "@/screens/Forum/ReportListSection";
+import { apiForumCreateReportPosting } from "@/service/api-client/api-forum";
 import {
-  apiForumCreateReportPosting,
  apiMasterForumReportList,
 } from "@/service/api-client/api-master";
 import { router, useLocalSearchParams } from "expo-router";
--- a/app/(application)/(user)/forum/create.tsx
+++ b/app/(application)/(user)/forum/create.tsx
@@ -2,15 +2,14 @@ import {
  BoxButtonOnFooter,
  ButtonCustom,
  TextAreaCustom,
-  ViewWrapper
+  ViewWrapper,
 } from "@/components";
 import AlertWarning from "@/components/Alert/AlertWarning";
 import { useAuth } from "@/hooks/use-auth";
 import { apiForumCreate } from "@/service/api-client/api-forum";
-import { isBadContent } from "@/utils/badWordsIndonesia";
+import { censorText, isBadContent } from "@/utils/badWordsIndonesia";
 import { router } from "expo-router";
 import { useState } from "react";
-import { Alert } from "react-native";
 import Toast from "react-native-toast-message";

 export default function ForumCreate() {
@@ -19,16 +18,22 @@ export default function ForumCreate() {
  const [isLoading, setIsLoading] = useState(false);

  const handlerSubmit = async () => {
-    
-    if (isBadContent(text)) {
-      AlertWarning({})
+    if (text.trim() === "") {
+      AlertWarning({
+        title: "Lengkapi Data",
+        description: "Postingan tidak boleh kosong",
+      });
      return;
    }
-    
+
+    // Bisa di sensor atau return dan tidak bisa di post
+    const cencorContent = censorText(text)
+
    const newData = {
-      diskusi: text,
+      diskusi: cencorContent,
      authorId: user?.id,
    };
+
    try {
      setIsLoading(true);
      const response = await apiForumCreate({ data: newData });
@@ -50,6 +55,7 @@ export default function ForumCreate() {
  const buttonFooter = (
    <BoxButtonOnFooter>
      <ButtonCustom
+        disabled={!text.trim() || isLoading}
        isLoading={isLoading}
        onPress={() => {
          handlerSubmit();
--- a/app/(application)/(user)/investment/(tabs)/my-holding.tsx
+++ b/app/(application)/(user)/investment/(tabs)/my-holding.tsx
@@ -11,9 +11,7 @@ import {
 } from "@/components";
 import NoDataText from "@/components/_ShareComponent/NoDataText";
 import { useAuth } from "@/hooks/use-auth";
-import {
-  apiInvestmentGetAll
-} from "@/service/api-client/api-investment";
+import { apiInvestmentGetAll } from "@/service/api-client/api-investment";
 import { formatCurrencyDisplay } from "@/utils/formatCurrencyDisplay";
 import { router, useFocusEffect } from "expo-router";
 import _ from "lodash";
@@ -63,37 +61,20 @@ export default function InvestmentMyHolding() {
              router.push(`/investment/${item?.id}/(my-holding)/${item?.id}`)
            }
          >
-            <Grid>
-              <Grid.Col span={6}>
-                <StackCustom gap={"xs"}>
-                  <TextCustom truncate={2}>{item?.title}</TextCustom>
-
-                  <Spacing height={5} />
-                  <TextCustom size="small">
-                    Rp. {formatCurrencyDisplay(item?.nominal)}
-                  </TextCustom>
-                  <TextCustom size="small">
-                    {item?.lembarTerbeli} Lembar
-                  </TextCustom>
-                </StackCustom>
-              </Grid.Col>
-              <Grid.Col span={1}>
-                <View />
-              </Grid.Col>
-              <Grid.Col
-                span={5}
-                style={{
-                  justifyContent: "center",
-                  alignItems: "center",
-                }}
-              >
-                <ProgressCustom
-                  value={item?.progress}
-                  label={`${item?.progress}%`}
-                  size="lg"
-                />
-              </Grid.Col>
-            </Grid>
+            <StackCustom>
+              <TextCustom truncate={2}>{item?.title}</TextCustom>
+              <TextCustom>
+                Rp. {formatCurrencyDisplay(item?.nominal)}
+              </TextCustom>
+              <TextCustom>{item?.lembarTerbeli} Lembar</TextCustom>
+              <ProgressCustom
+                label={`${item.progress}%`}
+                value={Number(item.progress)}
+                size="lg"
+                animated
+                color="primary"
+              />
+            </StackCustom>
          </BaseBox>
        ))
      )}
--- a/app/(application)/(user)/investment/[id]/[status]/detail.tsx
+++ b/app/(application)/(user)/investment/[id]/[status]/detail.tsx
@@ -15,6 +15,7 @@ import Investment_ButtonInvestasiSection from "@/screens/Invesment/ButtonInvesta
 import Invesment_ComponentBoxOnBottomDetail from "@/screens/Invesment/ComponentBoxOnBottomDetail";
 import Invesment_DetailDataPublishSection from "@/screens/Invesment/DetailDataPublishSection";
 import { apiInvestmentGetOne } from "@/service/api-client/api-investment";
+import { countDownAndCondition } from "@/utils/countDownAndCondition";
 import { AntDesign, MaterialIcons } from "@expo/vector-icons";
 import {
  router,
@@ -23,7 +24,7 @@ import {
  useLocalSearchParams,
 } from "expo-router";
 import _ from "lodash";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";

 export default function InvestmentDetailStatus() {
  const { user } = useAuth();
@@ -63,6 +64,29 @@ export default function InvestmentDetailStatus() {
    setOpenDrawerPublish(false);
  };

+  const [value, setValue] = useState({
+    sisa: 0,
+    reminder: false,
+  });
+
+  useEffect(() => {
+    updateCountDown();
+  }, [data]);
+
+  console.log("[DATA DETAIL]", JSON.stringify(data, null, 2));
+
+  const updateCountDown = () => {
+    const countDown = countDownAndCondition({
+      duration: data?.MasterPencarianInvestor.name,
+      publishTime: data?.countDown,
+    });
+
+    setValue({
+      sisa: countDown.durationDay,
+      reminder: countDown.reminder,
+    });
+  };
+
  const bottomSection = (
    <Invesment_ComponentBoxOnBottomDetail
      id={data?.id}
@@ -72,7 +96,11 @@ export default function InvestmentDetailStatus() {
  );

  const buttonSection = (
-    <Investment_ButtonInvestasiSection id={id as string} isMine={user?.id === data?.author?.id} />
+    <Investment_ButtonInvestasiSection
+      id={id as string}
+      isMine={user?.id === data?.author?.id}
+      reminder={value.reminder}
+    />
  );

  return (
--- a/app/(application)/(user)/investment/[id]/index.tsx
+++ b/app/(application)/(user)/investment/[id]/index.tsx
@@ -63,30 +63,28 @@ export default function InvestmentDetail() {
    setOpenDrawerPublish(false);
  };

-    const [value, setValue] = useState({
-      sisa: 0,
-      reminder: false,
+  const [value, setValue] = useState({
+    sisa: 0,
+    reminder: false,
+  });
+
+  useEffect(() => {
+    updateCountDown();
+  }, [data]);
+
+  console.log("[DATA DETAIL]", JSON.stringify(data, null, 2));
+
+  const updateCountDown = () => {
+    const countDown = countDownAndCondition({
+      duration: data?.MasterPencarianInvestor.name,
+      publishTime: data?.countDown,
    });
-  
-    useEffect(() => {
-      updateCountDown();
-    }, [data]);
-
-    console.log("[DATA DETAIL]", JSON.stringify(data, null, 2));
-  
-    const updateCountDown = () => {
-      const countDown = countDownAndCondition({
-        duration: data?.MasterPencarianInvestor.name,
-        publishTime: data?.countDown,
-      });
-  
-      setValue({
-        sisa: countDown.durationDay,
-        reminder: countDown.reminder,
-      });
-    };
-

+    setValue({
+      sisa: countDown.durationDay,
+      reminder: countDown.reminder,
+    });
+  };

  const bottomSection = (
    <Invesment_ComponentBoxOnBottomDetail
@@ -97,7 +95,11 @@ export default function InvestmentDetail() {
  );

  const buttonSection = (
-    <Investment_ButtonInvestasiSection id={id as string} isMine={user?.id === data?.author?.id} reminder={value.reminder} />
+    <Investment_ButtonInvestasiSection
+      id={id as string}
+      isMine={user?.id === data?.author?.id}
+      reminder={value.reminder}
+    />
  );

  return (
--- a/app/(application)/(user)/job/(tabs)/_layout.tsx
+++ b/app/(application)/(user)/job/(tabs)/_layout.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { BackButton } from "@/components";
 import { IconHome, IconStatus } from "@/components/_Icon";
+import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification";
 import { TabsStyles } from "@/styles/tabs-styles";
 import { Ionicons } from "@expo/vector-icons";
 import {
@@ -23,19 +24,7 @@ export default function JobTabsLayout() {
  useLayoutEffect(() => {
    navigation.setOptions({
      headerLeft: () => (
-        <BackButton
-          onPress={() => {
-            if (from === "notifications") {
-              router.replace(`/notifications?category=${category}`);
-            } else {
-              if (from) {
-                router.replace(`/${from}` as any);
-              } else {
-                router.navigate("/home");
-              }
-            }
-          }}
-        />
+       <BackButtonFromNotification from={from as string} category={category as string} />
      ),
    });
  }, [from, router, navigation]);
--- a/app/(application)/(user)/notifications/index.tsx
+++ b/app/(application)/(user)/notifications/index.tsx
@@ -1,20 +1,27 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
+  AlertDefaultSystem,
+  BackButton,
  BaseBox,
+  DrawerCustom,
+  MenuDrawerDynamicGrid,
  NewWrapper,
  ScrollableCustom,
  StackCustom,
  TextCustom,
 } from "@/components";
+import { IconDot } from "@/components/_Icon/IconComponent";
 import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
 import NoDataText from "@/components/_ShareComponent/NoDataText";
-import { AccentColor } from "@/constants/color-palet";
+import { AccentColor, MainColor } from "@/constants/color-palet";
+import { ICON_SIZE_SMALL } from "@/constants/constans-value";
 import { useAuth } from "@/hooks/use-auth";
 import { useNotificationStore } from "@/hooks/use-notification-store";
 import { apiGetNotificationsById } from "@/service/api-notifications";
 import { listOfcategoriesAppNotification } from "@/types/type-notification-category";
 import { formatChatTime } from "@/utils/formatChatTime";
-import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
+import { Ionicons } from "@expo/vector-icons";
+import { router, Stack, useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
 import { RefreshControl, View } from "react-native";
@@ -39,8 +46,9 @@ const fixPath = ({

  const separator = deepLink.includes("?") ? "&" : "?";

-  const fixedPath =
-    `${deepLink}${separator}from=notifications&category=${_.lowerCase(categoryApp)}`;
+  const fixedPath = `${deepLink}${separator}from=notifications&category=${_.lowerCase(
+    categoryApp
+  )}`;

  console.log("Fix Path", fixedPath);

@@ -70,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) {
@@ -103,6 +111,9 @@ export default function Notifications() {
  const [listData, setListData] = useState<any[]>([]);
  const [refreshing, setRefreshing] = useState(false);
  const [loading, setLoading] = useState(false);
+  const [openDrawer, setOpenDrawer] = useState(false);
+
+  const { markAsReadAll } = useNotificationStore();

  const handlePress = (item: any) => {
    setActiveCategory(item.value);
@@ -142,33 +153,96 @@ export default function Notifications() {
  };

  return (
-    <NewWrapper
-      headerComponent={
-        <ScrollableCustom
-          data={listOfcategoriesAppNotification.map((e, i) => ({
-            id: i,
-            label: e.label,
-            value: e.value,
-          }))}
-          onButtonPress={handlePress}
-          activeId={activeCategory as string}
+    <>
+     <Stack.Screen
+        options={{
+          title: "Notifikasi",
+          headerLeft: () => <BackButton />,
+          headerRight: () => (
+            <IconDot
+              color={MainColor.yellow}
+              onPress={() => setOpenDrawer(true)}
+            />
+          ),
+        }}
+      />
+
+      <NewWrapper
+        headerComponent={
+          <ScrollableCustom
+            data={listOfcategoriesAppNotification.map((e, i) => ({
+              id: i,
+              label: e.label,
+              value: e.value,
+            }))}
+            onButtonPress={handlePress}
+            activeId={activeCategory as string}
+          />
+        }
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+      >
+        {loading ? (
+          <ListSkeletonComponent />
+        ) : _.isEmpty(listData) ? (
+          <NoDataText text="Belum ada notifikasi" />
+        ) : (
+          listData.map((e, i) => (
+            <View key={i}>
+              <BoxNotification
+                data={e}
+                activeCategory={activeCategory as any}
+              />
+            </View>
+          ))
+        )}
+      </NewWrapper>
+
+      <DrawerCustom
+        isVisible={openDrawer}
+        closeDrawer={() => setOpenDrawer(false)}
+        height={"auto"}
+      >
+        <MenuDrawerDynamicGrid
+          data={[
+            {
+              label: "Tandai Semua Dibaca",
+              value: "read-all",
+              icon: (
+                <Ionicons
+                  name="reader-outline"
+                  size={ICON_SIZE_SMALL}
+                  color={MainColor.white}
+                />
+              ),
+              path: "",
+            },
+          ]}
+          onPressItem={(item: any) => {
+            console.log("Item", item.value);
+            if (item.value === "read-all") {
+              AlertDefaultSystem({
+                title: "Tandai Semua Dibaca",
+                message:
+                  "Apakah Anda yakin ingin menandai semua notifikasi dibaca?",
+                textLeft: "Batal",
+                textRight: "Ya",
+                onPressRight: () => {
+                  markAsReadAll(user?.id as any);
+                  const data = _.cloneDeep(listData);
+                  data.forEach((e) => {
+                    e.isRead = true;
+                  });
+                  setListData(data);
+                  onRefresh();
+                  setOpenDrawer(false);
+                },
+              });
+            }
+          }}
        />
-      }
-      refreshControl={
-        <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
-      }
-    >
-      {loading ? (
-        <ListSkeletonComponent />
-      ) : _.isEmpty(listData) ? (
-        <NoDataText text="Belum ada notifikasi" />
-      ) : (
-        listData.map((e, i) => (
-          <View key={i}>
-            <BoxNotification data={e} activeCategory={activeCategory as any} />
-          </View>
-        ))
-      )}
-    </NewWrapper>
+      </DrawerCustom>
+    </>
  );
 }
--- a/app/(application)/(user)/voting/(tabs)/_layout.tsx
+++ b/app/(application)/(user)/voting/(tabs)/_layout.tsx
@@ -1,13 +1,37 @@
 import {
-    IconContribution,
-    IconHistory,
-    IconHome,
-    IconStatus,
+  IconContribution,
+  IconHistory,
+  IconHome,
+  IconStatus,
 } from "@/components/_Icon";
+import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification";
 import { TabsStyles } from "@/styles/tabs-styles";
-import { Tabs } from "expo-router";
+import { Tabs, useLocalSearchParams, useNavigation, router } from "expo-router";
+import { useLayoutEffect } from "react";

 export default function VotingTabsLayout() {
+  const navigation = useNavigation();
+
+  const { from, category } = useLocalSearchParams<{
+    from?: string;
+    category?: string;
+  }>();
+
+  console.log("from", from);
+  console.log("category", category);
+
+  // Atur header secara dinamis
+  useLayoutEffect(() => {
+    navigation.setOptions({
+      headerLeft: () => (
+        <BackButtonFromNotification
+          from={from as string}
+          category={category as string}
+        />
+      ),
+    });
+  }, [from, router, navigation]);
+
  return (
    <Tabs screenOptions={TabsStyles}>
      <Tabs.Screen
--- a/app/(application)/(user)/voting/(tabs)/status.tsx
+++ b/app/(application)/(user)/voting/(tabs)/status.tsx
@@ -12,15 +12,17 @@ import { useAuth } from "@/hooks/use-auth";
 import { dummyMasterStatus } from "@/lib/dummy-data/_master/status";
 import { apiVotingGetByStatus } from "@/service/api-client/api-voting";
 import { dateTimeView } from "@/utils/dateTimeView";
-import { useFocusEffect } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";

 export default function VotingStatus() {
  const { user } = useAuth();
+  const { status } = useLocalSearchParams<{ status?: string }>();
+
  const id = user?.id || "";
  const [activeCategory, setActiveCategory] = useState<string | null>(
-    "publish"
+    status || "publish"
  );

  const [listData, setListData] = useState([]);
@@ -86,8 +88,14 @@ export default function VotingStatus() {
                style={{ width: "70%", alignSelf: "center" }}
                variant="light"
              >
-                {item?.awalVote && dateTimeView({date: item?.awalVote, withoutTime: true})} -{" "}
-                {item?.akhirVote && dateTimeView({date: item?.akhirVote, withoutTime: true})}
+                {item?.awalVote &&
+                  dateTimeView({
+                    date: item?.awalVote,
+                    withoutTime: true,
+                  })}{" "}
+                -{" "}
+                {item?.akhirVote &&
+                  dateTimeView({ date: item?.akhirVote, withoutTime: true })}
              </BadgeCustom>
            </StackCustom>
          </BaseBox>
--- a/app/(application)/(user)/voting/[id]/index.tsx
+++ b/app/(application)/(user)/voting/[id]/index.tsx
@@ -13,6 +13,7 @@ import {
 } from "@/components";
 import { IconArchive, IconContribution } from "@/components/_Icon";
 import { IMenuDrawerItem } from "@/components/_Interface/types";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
 import { useAuth } from "@/hooks/use-auth";
 import Voting_BoxDetailHasilVotingSection from "@/screens/Voting/BoxDetailHasilVotingSection";
 import { Voting_BoxDetailPublishSection } from "@/screens/Voting/BoxDetailPublishSection";
@@ -22,13 +23,14 @@ import {
  apiVotingUpdateData,
 } from "@/service/api-client/api-voting";
 import { today } from "@/utils/dateTimeView";
+import dayjs from "dayjs";
 import {
  router,
  Stack,
  useFocusEffect,
  useLocalSearchParams,
 } from "expo-router";
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
 import Toast from "react-native-toast-message";

 export default function VotingDetail() {
@@ -119,6 +121,23 @@ export default function VotingDetail() {
    setOpenDrawerPublish(false);
  };

+  const now = new Date().toISOString();
+  const isEventFinished = id && data?.akhirVote && dayjs(data.akhirVote).isBefore(now);
+
+  useEffect(() => {
+    if (isEventFinished) {
+      router.replace(`/(application)/(user)/voting/${id}/history`);
+    }
+  }, [isEventFinished, id]);
+
+  if (isEventFinished) {
+    return (
+      <ViewWrapper>
+        <CustomSkeleton />
+      </ViewWrapper>
+    );
+  }
+
  return (
    <>
      <Stack.Screen
--- a/app/(application)/(user)/voting/create.tsx
+++ b/app/(application)/(user)/voting/create.tsx
@@ -79,7 +79,7 @@ export default function VotingCreate() {
          type: "success",
          text1: "Data berhasil disimpan",
        });
-        router.replace("/(application)/(user)/voting/(tabs)/status");
+        router.replace("/(application)/(user)/voting/(tabs)/status?status=review");
      } else {
        Toast.show({
          type: "error",
--- a/app/(application)/admin/event/[id]/[status]/index.tsx
+++ b/app/(application)/admin/event/[id]/[status]/index.tsx
@@ -41,8 +41,8 @@ export default function AdminEventDetail() {
  const deepLinkURL = `${DEEP_LINK_URL}/event/${id}/confirmation?userId=${user?.id}`;
  const deepLinkURLDEV = `${DEEP_LINK_URL}/--/event/${id}/confirmation?userId=${user?.id}`;

-  const isDevLink = process.env.NODE_ENV === "development" ? deepLinkURLDEV : deepLinkURL;
-
+  const isDevLink =
+    process.env.NODE_ENV === "development" ? deepLinkURLDEV : deepLinkURL;

  useFocusEffect(
    useCallback(() => {
@@ -126,6 +126,7 @@ export default function AdminEventDetail() {
      const response = await funUpdateStatusEvent({
        id: id as string,
        changeStatus: "publish",
+        data: { catatan: "", senderId: user?.id as string },
      });

      if (!response.success) {
--- a/app/(application)/admin/event/[id]/reject-input.tsx
+++ b/app/(application)/admin/event/[id]/reject-input.tsx
@@ -7,6 +7,7 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
+import { useAuth } from "@/hooks/use-auth";
 import { funUpdateStatusEvent } from "@/screens/Admin/Event/funUpdateStatus";
 import { apiAdminEventById } from "@/service/api-admin/api-admin-event";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
@@ -14,9 +15,13 @@ import { useCallback, useState } from "react";
 import Toast from "react-native-toast-message";

 export default function AdminEventRejectInput() {
+  const { user } = useAuth();
  const { id, status } = useLocalSearchParams();

-  const [data, setData] = useState<any>("");
+  const [data, setData] = useState<any>({
+    catatan: "",
+    senderId: "",
+  });
  const [isLoading, setIsLoading] = useState(false);

  useFocusEffect(
@@ -45,10 +50,16 @@ export default function AdminEventRejectInput() {
  }) => {
    try {
      setIsLoading(true);
+
+      const newData = {
+        catatan: data,
+        senderId: user?.id as string,
+      };
+
      const response = await funUpdateStatusEvent({
        id: id as string,
        changeStatus,
-        data: data,
+        data: newData,
      });

      if (!response.success) {
--- a/app/(application)/admin/forum/[id]/list-report-comment.tsx
+++ b/app/(application)/admin/forum/[id]/list-report-comment.tsx
@@ -15,12 +15,11 @@ import { IconDot, IconView } from "@/components/_Icon/IconComponent";
 import { IconTrash } from "@/components/_Icon/IconTrash";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
-import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
-import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
+import { useAuth } from "@/hooks/use-auth";
 import {
  apiAdminForumCommentById,
  apiAdminForumDeactivateComment,
@@ -35,6 +34,7 @@ import Toast from "react-native-toast-message";

 export default function AdminForumReportComment() {
  const { id } = useLocalSearchParams();
+  const { user } = useAuth();
  const [data, setData] = useState<any | null>(null);
  const [listReport, setListReport] = useState<any[] | null>(null);
  const [loadList, setLoadList] = useState(false);
@@ -111,9 +111,13 @@ export default function AdminForumReportComment() {

        <AdminComp_BoxTitle title="Daftar Report Komentar" />

-        <StackCustom  gap={"sm"}>
+        <StackCustom gap={"sm"}>
          <GridSpan_NewComponent
-            text1={<TextCustom bold align="center">Aksi</TextCustom>}
+            text1={
+              <TextCustom bold align="center">
+                Aksi
+              </TextCustom>
+            }
            text2={<TextCustom bold>Pelapor</TextCustom>}
            text3={<TextCustom bold>Kategori Report</TextCustom>}
          />
@@ -129,22 +133,24 @@ export default function AdminForumReportComment() {
              <View key={index}>
                <GridSpan_NewComponent
                  text1={
-                   <CenterCustom>
-                     <ActionIcon
-                      icon={<IconView size={ICON_SIZE_BUTTON} color="black" />}
-                      onPress={() => {
-                        setOpenDrawerAction(true);
-                        setSelectedReport({
-                          id: item.id,
-                          username: item.User?.username,
-                          kategori: item.ForumMaster_KategoriReport?.title,
-                          keterangan:
-                            item.ForumMaster_KategoriReport?.deskripsi,
-                          deskripsi: item.deskripsi,
-                        });
-                      }}
-                    />
-                   </CenterCustom>
+                    <CenterCustom>
+                      <ActionIcon
+                        icon={
+                          <IconView size={ICON_SIZE_BUTTON} color="black" />
+                        }
+                        onPress={() => {
+                          setOpenDrawerAction(true);
+                          setSelectedReport({
+                            id: item.id,
+                            username: item.User?.username,
+                            kategori: item.ForumMaster_KategoriReport?.title,
+                            keterangan:
+                              item.ForumMaster_KategoriReport?.deskripsi,
+                            deskripsi: item.deskripsi,
+                          });
+                        }}
+                      />
+                    </CenterCustom>
                  }
                  text2={
                    <TextCustom truncate={1}>
@@ -188,15 +194,18 @@ export default function AdminForumReportComment() {
              onPressRight: async () => {
                const deleteComment = await apiAdminForumDeactivateComment({
                  id: id as string,
+                  data: {
+                    senderId: user?.id as string,
+                  },
                });

-                if (!deleteComment.success) {
-                  Toast.show({
-                    type: "error",
-                    text1: "Komentar gagal dihapus",
-                  });
-                  return;
-                }
+                // if (!deleteComment.success) {
+                //   Toast.show({
+                //     type: "error",
+                //     text1: "Komentar gagal dihapus",
+                //   });
+                //   return;
+                // }

                setOpenDrawer(false);
                Toast.show({
--- a/app/(application)/admin/forum/[id]/list-report-posting.tsx
+++ b/app/(application)/admin/forum/[id]/list-report-posting.tsx
@@ -16,12 +16,11 @@ import { IconDot, IconView } from "@/components/_Icon/IconComponent";
 import { IconTrash } from "@/components/_Icon/IconTrash";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
-import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
-import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
+import { useAuth } from "@/hooks/use-auth";
 import {
  apiAdminForumDeactivatePosting,
  apiAdminForumListReportPostingById,
@@ -35,6 +34,7 @@ import { Divider } from "react-native-paper";
 import Toast from "react-native-toast-message";

 export default function AdminForumReportPosting() {
+  const { user } = useAuth();
  const { id } = useLocalSearchParams();
  const [openDrawerPage, setOpenDrawerPage] = useState(false);
  const [openDrawerAction, setOpenDrawerAction] = useState(false);
@@ -215,6 +215,9 @@ export default function AdminForumReportPosting() {
              onPressRight: async () => {
                const response = await apiAdminForumDeactivatePosting({
                  id: id as string,
+                  data: {
+                    senderId: user?.id as string,
+                  },
                });

                if (!response.success) {
--- a/app/(application)/admin/forum/report-posting.tsx
+++ b/app/(application)/admin/forum/report-posting.tsx
@@ -73,7 +73,7 @@ export default function AdminForumReportPosting() {
        <GridSpan_NewComponent
          text1={
            <TextCustom bold truncate>
-              Username
+              Pelapor
            </TextCustom>
          }
          text2={
--- a/app/(application)/admin/notification/index.tsx
+++ b/app/(application)/admin/notification/index.tsx
@@ -1,20 +1,26 @@
 import {
+  AlertDefaultSystem,
  BackButton,
  BaseBox,
+  DrawerCustom,
+  MenuDrawerDynamicGrid,
  NewWrapper,
  ScrollableCustom,
  StackCustom,
  TextCustom,
 } from "@/components";
 import { IconPlus } from "@/components/_Icon";
+import { IconDot } from "@/components/_Icon/IconComponent";
 import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
 import NoDataText from "@/components/_ShareComponent/NoDataText";
 import { AccentColor, MainColor } from "@/constants/color-palet";
+import { ICON_SIZE_SMALL } from "@/constants/constans-value";
 import { useAuth } from "@/hooks/use-auth";
 import { useNotificationStore } from "@/hooks/use-notification-store";
 import { apiGetNotificationsById } from "@/service/api-notifications";
 import { listOfcategoriesAppNotification } from "@/types/type-notification-category";
 import { formatChatTime } from "@/utils/formatChatTime";
+import { Ionicons } from "@expo/vector-icons";
 import { router, Stack, useFocusEffect } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
@@ -70,6 +76,9 @@ export default function AdminNotification() {
  const [listData, setListData] = useState<any[]>([]);
  const [refreshing, setRefreshing] = useState(false);
  const [loading, setLoading] = useState(false);
+  const [openDrawer, setOpenDrawer] = useState(false);
+
+  const { markAsReadAll } = useNotificationStore();

  const handlePress = (item: any) => {
    setActiveCategory(item.value);
@@ -89,7 +98,7 @@ export default function AdminNotification() {
        id: user?.id as any,
        category: activeCategory as any,
      });
-      
+
      if (response.success) {
        setListData(response.data);
      } else {
@@ -114,12 +123,12 @@ export default function AdminNotification() {
        options={{
          title: "Admin Notifikasi",
          headerLeft: () => <BackButton />,
-          // headerRight: () => (
-          //   <IconPlus
-          //     color={MainColor.yellow}
-          //     onPress={() => router.push("/test-notifications")}
-          //   />
-          // ),
+          headerRight: () => (
+            <IconDot
+              color={MainColor.yellow}
+              onPress={() => setOpenDrawer(true)}
+            />
+          ),
        }}
      />

@@ -154,6 +163,51 @@ export default function AdminNotification() {
          ))
        )}
      </NewWrapper>
+
+      <DrawerCustom
+        isVisible={openDrawer}
+        closeDrawer={() => setOpenDrawer(false)}
+        height={"auto"}
+      >
+        <MenuDrawerDynamicGrid
+          data={[
+            {
+              label: "Tandai Semua Dibaca",
+              value: "read-all",
+              icon: (
+                <Ionicons
+                  name="reader-outline"
+                  size={ICON_SIZE_SMALL}
+                  color={MainColor.white}
+                />
+              ),
+              path: "",
+            },
+          ]}
+          onPressItem={(item: any) => {
+            console.log("Item", item.value);
+            if (item.value === "read-all") {
+              AlertDefaultSystem({
+                title: "Tandai Semua Dibaca",
+                message:
+                  "Apakah Anda yakin ingin menandai semua notifikasi dibaca?",
+                textLeft: "Batal",
+                textRight: "Ya",
+                onPressRight: () => {
+                  markAsReadAll(user?.id as any);
+                  const data = _.cloneDeep(listData);
+                  data.forEach((e) => {
+                    e.isRead = true;
+                  });
+                  setListData(data);
+                  onRefresh();
+                  setOpenDrawer(false);
+                },
+              });
+            }
+          }}
+        />
+      </DrawerCustom>
    </>
  );
 }
--- a/app/(application)/admin/voting/[id]/[status]/index.tsx
+++ b/app/(application)/admin/voting/[id]/[status]/index.tsx
@@ -16,6 +16,7 @@ import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
 import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import ReportBox from "@/components/Box/ReportBox";
 import { MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
 import funUpdateStatusVoting from "@/screens/Admin/Voting/funUpdateStatus";
 import { apiAdminVotingById } from "@/service/api-admin/api-admin-voting";
 import { colorBadgeStatus } from "@/utils/colorBadge";
@@ -29,6 +30,7 @@ import { List } from "react-native-paper";
 import Toast from "react-native-toast-message";

 export default function AdminVotingDetail() {
+  const { user } = useAuth();
  const { id, status } = useLocalSearchParams();
  const [data, setData] = useState<any | null>(null);
  const [isLoading, setIsLoading] = useState(false);
@@ -139,6 +141,10 @@ export default function AdminVotingDetail() {
      const response = await funUpdateStatusVoting({
        id: id as string,
        changeStatus,
+        data: {
+          senderId: user?.id as string,
+          catatan: "",
+        },
      });

      if (!response.success) {
--- a/app/(application)/admin/voting/[id]/[status]/reject-input.tsx
+++ b/app/(application)/admin/voting/[id]/[status]/reject-input.tsx
@@ -7,6 +7,7 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
+import { useAuth } from "@/hooks/use-auth";
 import funUpdateStatusVoting from "@/screens/Admin/Voting/funUpdateStatus";
 import { apiAdminVotingById } from "@/service/api-admin/api-admin-voting";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
@@ -14,6 +15,7 @@ import { useCallback, useState } from "react";
 import Toast from "react-native-toast-message";

 export default function AdminVotingRejectInput() {
+  const { user } = useAuth()
  const { id, status } = useLocalSearchParams();
  const [data, setData] = useState("");
  const [isLoading, setIsLoading] = useState(false);
@@ -48,7 +50,10 @@ export default function AdminVotingRejectInput() {
      const response = await funUpdateStatusVoting({
        id: id as string,
        changeStatus,
-        data: data,
+        data: {
+          catatan: data,
+          senderId: user?.id as string,
+        },
      });

      if (!response.success) {
--- a/components/Button/BackButtonFromNotification.tsx
+++ b/components/Button/BackButtonFromNotification.tsx
@@ -0,0 +1,29 @@
+import { useRouter } from "expo-router";
+import { BackButton } from "..";
+
+export default function BackButtonFromNotification({
+  from,
+  category,
+}: {
+  from: string;
+  category?: string;
+}) {
+  const router = useRouter();
+  return (
+    <>
+      <BackButton
+        onPress={() => {
+          if (from === "notifications") {
+            router.replace(`/notifications?category=${category}`);
+          } else {
+            if (from) {
+              router.replace(`/${from}` as any);
+            } else {
+              router.navigate("/home");
+            }
+          }
+        }}
+      />
+    </>
+  );
+}
--- a/components/DateInput/DateTimePickerCustom.tsx
+++ b/components/DateInput/DateTimePickerCustom.tsx
@@ -24,8 +24,6 @@ const DateTimePickerCustom: React.FC<Props> = ({
  disabled = false,
 }) => {

-  console.log("Date Android Comp", value)
-
  return (
    <>
      {Platform.OS === "ios" ? (
--- a/components/Notification/NotificationInitializer.tsx
+++ b/components/Notification/NotificationInitializer.tsx
@@ -49,7 +49,8 @@ export default function NotificationInitializer() {

        const fcmToken = await getToken(messagingInstance);
        if (!fcmToken) {
-          logout();
+           console.warn("Tidak bisa mendapatkan FCM token");
+          // logout();
          return;
        }

--- a/hipmi-note.md
+++ b/hipmi-note.md
@@ -13,3 +13,13 @@ Exp: open ios/HIPMIBADUNG.xcworkspace
 perubahan versi : npm version patch
 ios: bunx expo prebuild --platform ios
 android: bunx expo prebuild --platform android
+
+### Android
+adb devices : cek device yang terhubung
+Note: izinkan perangkat dulu agar statusnya tidak unauthorized
+
+adb install android/app/build/outputs/apk/debug/app-debug.apk : install apk ke device
+Note:
+Gunakan flag -s (serial) di perintah adb untuk menentukan target 
+adb -s <0G52319V261040B2 ini adalah id nya> install android/app/build/outputs/apk/debug/app-debug.apk
+
--- a/hooks/use-notification-store.tsx
+++ b/hooks/use-notification-store.tsx
@@ -40,6 +40,7 @@ type NotificationContextType = {
    notif: Omit<AppNotification, "id" | "isRead" | "timestamp">
  ) => void;
  markAsRead: (id: string) => void;
+  markAsReadAll: (id: string) => void;
  syncUnreadCount: () => Promise<void>;
 };

@@ -48,6 +49,7 @@ const NotificationContext = createContext<NotificationContextType>({
  unreadCount: 0,
  addNotification: () => {},
  markAsRead: () => {},
+  markAsReadAll: () => {},
  syncUnreadCount: async () => {},
 });

@@ -98,7 +100,7 @@ export const NotificationProvider = ({ children }: { children: ReactNode }) => {

  const markAsRead = async (id: string) => {
    try {
-      const response = await apiNotificationMarkAsRead({ id });
+      const response = await apiNotificationMarkAsRead({ id, category: "one" });
      console.log("🚀 Response Mark As Read:", response);

      if (response.success) {
@@ -114,6 +116,25 @@ export const NotificationProvider = ({ children }: { children: ReactNode }) => {
    }
  };

+  const markAsReadAll = async (id: string) => {
+    try {
+      const response = await apiNotificationMarkAsRead({ id, category: "all" });
+      console.log("🚀 Response Mark As Read All:", response);
+
+      if (response.success) {
+        const cloneNotifications = [...notifications];
+        const index = cloneNotifications.findIndex((n) => n?.data?.id === id);
+        if (index !== -1) {
+          cloneNotifications[index].isRead = true;
+          setNotifications(cloneNotifications);
+        }
+      }
+    } catch (error) {
+      console.error("Gagal mark as read:", error);
+    }
+  };
+
+
  const syncUnreadCount = async () => {
    try {
      const count = await apiNotificationUnreadCount({
@@ -133,8 +154,9 @@ export const NotificationProvider = ({ children }: { children: ReactNode }) => {
      value={{
        notifications,
        addNotification,
-        markAsRead,
        unreadCount,
+        markAsRead,
+        markAsReadAll,
        syncUnreadCount,
      }}
    >
--- a/ios/HIPMIBadungConnect/Info.plist
+++ b/ios/HIPMIBadungConnect/Info.plist
@@ -39,7 +39,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>18</string>
+    <string>19</string>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSMinimumSystemVersion</key>
--- a/screens/Admin/Event/funUpdateStatus.ts
+++ b/screens/Admin/Event/funUpdateStatus.ts
@@ -1,4 +1,5 @@
 import { apiAdminEventUpdateStatus } from "@/service/api-admin/api-admin-event";
+import { typeRejectedData } from "@/types/type-collect-other";

 export const funUpdateStatusEvent = async ({
  id,
@@ -7,17 +8,19 @@ export const funUpdateStatusEvent = async ({
 }: {
  id: string;
  changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data?: typeRejectedData;
 }) => {
  try {
+    console.log("[DATA]", data);
    const response = await apiAdminEventUpdateStatus({
      id: id,
      changeStatus: changeStatus as any,
-      data: data,
+      data: data as any,
    });
    return response;
+
  } catch (error) {
    console.log("[ERROR]", error);
    throw error;
  }
-};
+};
--- a/screens/Admin/Voting/funUpdateStatus.ts
+++ b/screens/Admin/Voting/funUpdateStatus.ts
@@ -1,4 +1,5 @@
 import { apiAdminVotingUpdateStatus } from "@/service/api-admin/api-admin-voting";
+import { typeRejectedData } from "@/types/type-collect-other";

 const funUpdateStatusVoting = async ({
  id,
@@ -7,7 +8,7 @@ const funUpdateStatusVoting = async ({
 }: {
  id: string;
  changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data?: typeRejectedData;
 }) => {
  try {
    const response = await apiAdminVotingUpdateStatus({
--- a/screens/Home/tabsList.ts
+++ b/screens/Home/tabsList.ts
@@ -13,7 +13,8 @@ export const tabsHome: any = ({
    icon: "chatbubble-ellipses-outline",
    activeIcon: "chatbubble-ellipses",
    label: "Forum",
-    path: acceptedForumTermsAt ? "/forum" : "/forum/terms",
+    // path: acceptedForumTermsAt ? "/forum" : "/forum/terms",
+    path: "/forum",
    isActive: true,
    disabled: false,
  },
--- a/screens/Invesment/BoxProgressSection.tsx
+++ b/screens/Invesment/BoxProgressSection.tsx
@@ -1,16 +1,28 @@
 import { BaseBox, StackCustom, TextCustom, ProgressCustom } from "@/components";

-export default function Invesment_BoxProgressSection({progress, status}: {progress: number, status: string}) {
-    return (
-      <>
-        {status === "publish" && (
-          <BaseBox>
-            <StackCustom>
-              <TextCustom bold>Progress Saham</TextCustom>
-              <ProgressCustom label={(progress || 0) + "%"} value={progress || 0} size="lg" />
-            </StackCustom>
-          </BaseBox>
-        )}
-      </>
-    );
-}
+export default function Invesment_BoxProgressSection({
+  progress,
+  status,
+}: {
+  progress: number;
+  status: string;
+}) {
+  return (
+    <>
+      {status === "publish" && (
+        <BaseBox>
+          <StackCustom>
+            <TextCustom bold>Progress Saham</TextCustom>
+            <ProgressCustom
+              label={(progress || 0) + "%"}
+              value={progress || 0}
+              size="lg"
+              animated
+              color="primary"
+            />
+          </StackCustom>
+        </BaseBox>
+      )}
+    </>
+  );
+}
--- a/service/api-admin/api-admin-forum.ts
+++ b/service/api-admin/api-admin-forum.ts
@@ -57,9 +57,19 @@ export async function apiAdminForumListReportCommentById({
  }
 }

-export async function apiAdminForumDeactivateComment({ id }: { id: string }) {
+export async function apiAdminForumDeactivateComment({
+  id,
+  data,
+}: {
+  id: string;
+  data: { senderId: string };
+}) {
+
+  console.log("data", data)
  try {
-    const response = await apiConfig.put(`/mobile/admin/forum/${id}/comment`);
+    const response = await apiConfig.put(`/mobile/admin/forum/${id}/comment`, {
+      data: data,
+    });
    return response.data;
  } catch (error) {
    throw error;
@@ -81,9 +91,17 @@ export async function apiAdminForumListReportPostingById({
  }
 }

-export async function apiAdminForumDeactivatePosting({ id }: { id: string }) {
+export async function apiAdminForumDeactivatePosting({
+  id,
+  data,
+}: {
+  id: string;
+  data: { senderId: string };
+}) {
  try {
-    const response = await apiConfig.put(`/mobile/admin/forum/${id}`);
+    const response = await apiConfig.put(`/mobile/admin/forum/${id}`, {
+      data: data,
+    });
    return response.data;
  } catch (error) {
    throw error;
--- a/service/api-admin/api-admin-voting.ts
+++ b/service/api-admin/api-admin-voting.ts
@@ -1,3 +1,4 @@
+import { typeRejectedData } from "@/types/type-collect-other";
 import { apiConfig } from "../api-config";

 export async function apiAdminVoting({
@@ -32,7 +33,7 @@ export async function apiAdminVotingUpdateStatus({
  status,
 }: {
  id: string;
-  data?: string;
+  data?: typeRejectedData;
  status: "publish" | "review" | "reject";
 }) {
  try {
--- a/service/api-client/api-forum.ts
+++ b/service/api-client/api-forum.ts
@@ -119,3 +119,62 @@ export async function apiForumDeleteComment({ id }: { id: string }) {
    throw error;
  }
 }
+
+export async function  apiForumGetReportPosting({id}: {id:string}) {
+   try {
+    const response = await apiConfig.get(`/mobile/forum/${id}/preview-report-posting`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function  apiForumGetReportComment({id}: {id:string}) {
+   try {
+    const response = await apiConfig.get(`/mobile/forum/${id}/preview-report-comment`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+
+export async function apiForumCreateReportPosting({
+  id,
+  data,
+}: {
+  id: string;
+  data: any;
+}) {
+  try {
+    const response = await apiConfig.post(
+      `/mobile/forum/${id}/report-posting`,
+      {
+        data: data,
+      }
+    );
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiForumCreateReportCommentar({
+  id,
+  data,
+}: {
+  id: string;
+  data: any;
+}) {
+  try {
+    const response = await apiConfig.post(
+      `/mobile/forum/${id}/report-commentar`,
+      {
+        data: data,
+      }
+    );
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
--- a/service/api-client/api-master.ts
+++ b/service/api-client/api-master.ts
@@ -77,46 +77,6 @@ export async function apiMasterForumReportList() {

 // ================== END MASTER FORUM ================== //

-export async function apiForumCreateReportPosting({
-  id,
-  data,
-}: {
-  id: string;
-  data: any;
-}) {
-  try {
-    const response = await apiConfig.post(
-      `/mobile/forum/${id}/report-posting`,
-      {
-        data: data,
-      }
-    );
-    return response.data;
-  } catch (error) {
-    throw error;
-  }
-}
-
-export async function apiForumCreateReportCommentar({
-  id,
-  data,
-}: {
-  id: string;
-  data: any;
-}) {
-  try {
-    const response = await apiConfig.post(
-      `/mobile/forum/${id}/report-commentar`,
-      {
-        data: data,
-      }
-    );
-    return response.data;
-  } catch (error) {
-    throw error;
-  }
-}
-
 // ================== START MASTER INVESTMENT ================== //

 export async function apiMasterInvestment({
--- a/service/api-notifications.ts
+++ b/service/api-notifications.ts
@@ -1,6 +1,6 @@
 import {
  NotificationProp,
-  TypeNotificationCategoryApp
+  TypeNotificationCategoryApp,
 } from "@/types/type-notification-category";
 import { apiConfig } from "./api-config";

@@ -78,9 +78,22 @@ export async function apiNotificationUnreadCount({
  }
 }

-export async function apiNotificationMarkAsRead({ id }: { id: string }) {
+/**
+ * @param id | notification id atau user id
+ * @param category | "all" | "one" , jika "all" id yang harus di masukan adalah user id, jika "one" id yang harus di masukan adalah notification id
+ * @type {string}
+ */
+export async function apiNotificationMarkAsRead({
+  id,
+  category,
+}: {
+  id: string;
+  category: "all" | "one";
+}) {
  try {
-    const response = await apiConfig.put(`/mobile/notification/${id}`);
+    const response = await apiConfig.put(
+      `/mobile/notification/${id}?category=${category}`
+    );
    return response.data;
  } catch (error) {
    throw error;
--- a/types/type-collect-other.ts
+++ b/types/type-collect-other.ts
@@ -0,0 +1,4 @@
+export type typeRejectedData = {
+  catatan?: string;
+  senderId: string;
+};
--- a/types/type-forum.ts
+++ b/types/type-forum.ts
@@ -0,0 +1,15 @@
+export interface TypeForum_CommentProps {
+  id: string;
+  isActive: boolean;
+  komentar: string;
+  createdAt: Date;
+  authorId: string;
+  Author: {
+    id: string;
+    username: string;
+    Profile: {
+      id: string;
+      imageId: string;
+    };
+  };
+}
--- a/utils/badWordsIndonesia.ts
+++ b/utils/badWordsIndonesia.ts
@@ -5,11 +5,11 @@ const badWordsIndonesia = [
  'anjing', 'babi', 'bangsat', 'bodoh', 'goblok', 'idiot', 'jancok', 'jembut', 'kampret',
  'kontol', 'memek', 'ngentot', 'peler', 'puki', 'sialan', 'tai', 'tolol', 'wibu',
  'anjingg', 'babbii', 'bangsaat', 'gobllokk', 'jancokk', 'kontoll', 'memekk', 'ngentott',
-  'pelerr', 'puuki', 'sialann', 'taii', 'tololl', 'wibuu',
+  'pelerr', 'puuki', 'sialann', 'taii', 'tololl', 'wibuu', 'cicing',

  // 🔥 Kata Sindiran & Penghinaan
  'bego', 'dungu', 'edan', 'gila', 'goblog', 'kampang', 'kampret', 'keparat', 'lonte',
-  'main mata', 'monyet', 'najis', 'ngeyel', 'ngibul', 'ngomong seenaknya', 'ngurangin',
+  'monyet', 'najis', 'ngeyel', 'ngibul', 'ngomong seenaknya', 'ngurangin',
  'ngutang', 'ngurusin urusan orang', 'pemalas', 'pengecut', 'penipu', 'sinting',
  'begoo', 'dunguu', 'goblogg', 'kampangg', 'keparatt', 'lontee', 'monyyet', 'najiss',
  'ngeyell', 'ngibull', 'ngomongg seenaknya', 'nguranginn', 'ngutangg', 'pemalass',
@@ -23,18 +23,17 @@ const badWordsIndonesia = [

  // 💸 Kata Spam / Promosi Ilegal
  'judi', 'togel', 'slot', 'casino', 'poker', 'qq', 'bandar', 'agen', 'link', 'wa',
-  'whatsapp', 'telepon', 'nomor', 'hp', 'sms', 'grup', 'join', 'daftar', 'bonus',
-  'deposit', 'withdraw', 'uang', 'duit', 'rp', 'ratusan', 'juta', 'milyar',
+  'deposit', 'withdraw',
  'judii', 'togell', 'slotss', 'casinoo', 'pokerr', 'qqq', 'bandarr', 'agenn', 'linkk',
-  'waa', 'whatsappp', 'teleponn', 'nomorr', 'hpp', 'smss', 'grupp', 'jooin', 'daftarr',
-  'bonuss', 'depositt', 'withdraww', 'uangs', 'duitt', 'rpp', 'ratusann', 'jutaa', 'milyarr',
+  'waa',
+  'depositt', 'withdraww', 'rpp',

  // 🧩 Variasi Penulisan (Bypass Filter)
  'a*njing', 'b*b*i', 'b*ngsat', 'g*blok', 'k*nt*l', 'm*m*k', 'n*g*nt*t', 'p*l*r',
-  't*i', 't*l*l', 'j*n*c*k', 'j*m*b*t', 'k*m*p*r*t', 's*i*l*a*n', 'w*b*u',
+  't*i', 't*l*l', 'j*n*c*k', 'j*m*b*t', 'k*m*p*r*t', 's*i*l*a*n', 'w*b*u', 
  'a.n.j.i.n.g', 'b.a.b.i', 'b.a.n.g.s.a.t', 'g.o.b.l.o.k', 'k.o.n.t.o.l', 'm.e.m.e.k',
  'n.g.e.n.t.o.t', 'p.e.l.e.r', 't.a.i', 't.o.l.o.l', 'j.a.n.c.o.k', 'j.e.m.b.u.t',
-  'k.a.m.p.r.e.t', 's.i.a.l.a.n', 'w.i.b.u',
+  'k.a.m.p.r.e.t', 's.i.a.l.a.n', 'w.i.b.u', 'c.i.c.i.n.g',

  // 📱 Variasi dengan Angka & Simbol
  '4nj1ng', 'b4b1', 'b4ngs4t', 'g0bl0k', 'k0nt0l', 'm3m3k', 'ng3nt0t', 'p3l3r',
@@ -43,8 +42,6 @@ const badWordsIndonesia = [
  'p3l3rr', 't4ii', 't0l0ll', 'j4nc0kk', 'j3mbutt', 'k4mpr3tt', 's14l4nn', 'w1buu',

  // 🗣️ Kata yang Sering Digunakan dalam Konteks Negatif
-  'dasar', 'kamu', 'kau', 'lu', 'lo', 'gue', 'gua', 'kita', 'kami', 'mereka',
-  'dasarr', 'kamuu', 'kauu', 'luu', 'loo', 'guee', 'guua', 'kitaa', 'kamii', 'merekaa',
  'dasar bodoh', 'dasar goblok', 'dasar bangsat', 'dasar idiot', 'dasar sialan',
  'dasar bego', 'dasar dungu', 'dasar edan', 'dasar gila', 'dasar sinting',
  'dasar pemalas', 'dasar pengecut', 'dasar penipu', 'dasar najis', 'dasar kampret',
--- a/utils/formatChatTime.ts
+++ b/utils/formatChatTime.ts
@@ -15,21 +15,21 @@ export const formatChatTime = (date: string | Date): string => {
  const messageDate = dayjs(date);
  const now = dayjs();

-  // Jika hari ini
+  // Hari ini
  if (messageDate.isSame(now, 'day')) {
-    return messageDate.format('HH:mm'); // contoh: "14.30"
+    return messageDate.format('HH.mm'); // "14.30"
  }

-  // Jika kemarin
+  // Kemarin
  if (messageDate.isSame(now.subtract(1, 'day'), 'day')) {
-    return messageDate.format('dddd HH:mm');
+    return `Kemarin, ${messageDate.format('HH.mm')}`; // "Kemarin, 14.30"
  }

-  // Jika dalam 7 hari terakhir (tapi bukan kemarin/ hari ini)
+  // Dalam 7 hari terakhir (termasuk hari ini & kemarin sudah di-handle, jadi aman)
  if (now.diff(messageDate, 'day') < 7) {
-    return messageDate.format('dddd HH:mm'); // contoh: "Senin 14:30"
+    return `${messageDate.format('dddd')}, ${messageDate.format('HH.mm')}`; // "Senin, 13.00"
  }

-  // Lebih dari seminggu lalu → tampilkan tanggal
-  return messageDate.format('D MMM YYYY HH:mm'); // contoh: "12 Mei 2024 14:30"
-};
+  // Lebih dari 7 hari lalu
+  return messageDate.format('DD - MM - YYYY, HH.mm'); // "05 - 11 - 2025, 14.00"
+};
Author	SHA1	Message	Date
bagasbanuna	0262423c50	Fix notification to report comment Fix: User – Forum (Reporting & Preview) app/(application)/(user)/forum/[id]/other-report-commentar.tsx app/(application)/(user)/forum/[id]/other-report-posting.tsx app/(application)/(user)/forum/[id]/preview-report-posting.tsx app/(application)/(user)/forum/[id]/report-commentar.tsx app/(application)/(user)/forum/[id]/report-posting.tsx Admin – Forum Moderation app/(application)/admin/forum/[id]/list-report-comment.tsx app/(application)/admin/forum/report-posting.tsx Layout app/(application)/(user)/_layout.tsx API Client & Admin service/api-admin/api-admin-forum.ts service/api-client/api-forum.ts service/api-client/api-master.ts Utils utils/badWordsIndonesia.ts ### No Issue	2026-01-19 17:46:54 +08:00
bagasbanuna	c2682246d6	Fix notifikasi forum FixL modified: app/(application)/(user)/_layout.tsx modified: app/(application)/(user)/forum/[id]/index.tsx modified: app/(application)/(user)/forum/create.tsx modified: app/(application)/admin/forum/[id]/list-report-posting.tsx modified: screens/Home/tabsList.ts modified: service/api-admin/api-admin-forum.ts modified: service/api-client/api-forum.ts Add: app/(application)/(user)/forum/[id]/preview-report-posting.tsx types/type-forum.ts ### No Issue	2026-01-17 15:59:00 +08:00
bagasbanuna	465e01015e	Penambahan notifikasi untuk fitur voting Fix: - app/(application)/(user)/event/[id]/publish.tsx - app/(application)/(user)/voting/(tabs)/_layout.tsx - app/(application)/(user)/voting/(tabs)/status.tsx - app/(application)/(user)/voting/[id]/index.tsx - app/(application)/(user)/voting/create.tsx - app/(application)/admin/voting/[id]/[status]/index.tsx - app/(application)/admin/voting/[id]/[status]/reject-input.tsx - screens/Admin/Event/funUpdateStatus.ts - screens/Admin/Voting/funUpdateStatus.ts - service/api-admin/api-admin-voting.ts - types/type-collect-other.ts ### No Issue	2026-01-15 17:39:39 +08:00
bagasbanuna	3b15871ad4	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	2026-01-15 13:54:14 +08:00
bagasbanuna	9123e73606	Fix bug pada beberapa halaman Fix: modified: app.config.js modified: app/(application)/(user)/donation/[id]/[status]/detail.tsx modified: app/(application)/(user)/investment/(tabs)/my-holding.tsx modified: app/(application)/(user)/investment/[id]/[status]/detail.tsx modified: app/(application)/(user)/investment/[id]/index.tsx modified: app/(application)/admin/event/[id]/[status]/index.tsx modified: components/DateInput/DateTimePickerCustom.tsx modified: ios/HIPMIBadungConnect/Info.plist modified: screens/Invesment/BoxProgressSection.tsx ### No Issue	2026-01-14 17:41:20 +08:00
bagasbanuna	6e2046467f	Penerapan notifikasi di event Add: components/Button/BackButtonFromNotification.tsx types/type-collect-other.ts Fix: - android/app/build.gradle - app/(application)/(user)/_layout.tsx - app/(application)/(user)/event/(tabs)/_layout.tsx - app/(application)/(user)/event/(tabs)/status.tsx - app/(application)/(user)/event/create.tsx - app/(application)/(user)/job/(tabs)/_layout.tsx - app/(application)/(user)/notifications/index.tsx - app/(application)/admin/event/[id]/[status]/index.tsx - app/(application)/admin/event/[id]/reject-input.tsx - app/(application)/admin/notification/index.tsx - components/Notification/NotificationInitializer.tsx - hipmi-note.md - hooks/use-notification-store.tsx - screens/Admin/Event/funUpdateStatus.ts - service/api-notifications.ts - utils/formatChatTime.ts ### No Issue	2026-01-13 17:41:30 +08:00