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
Perbaikan untuk apple store dan push notifikasi ke preview
2026-01-13 17:41:30 +08:00 · 2026-01-12 17:40:15 +08:00 · 2026-01-09 17:44:13 +08:00 · 2026-01-09 14:46:21 +08:00 · 2026-01-08 17:48:53 +08:00 · 2026-01-08 10:12:53 +08:00
49 changed files with 1017 additions and 303 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/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,4 @@
-<manifest 
-xmlns:android="http://schemas.android.com/apk/res/android" 
-xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
  <uses-permission android:name="android.permission.CAMERA"/>
@@ -17,36 +15,13 @@ xmlns:tools="http://schemas.android.com/tools">
      <data android:scheme="https"/>
    </intent>
  </queries>
-  <application 
-  android:name=".MainApplication" 
-  android:label="@string/app_name" 
-  android:icon="@mipmap/ic_launcher" 
-  android:roundIcon="@mipmap/ic_launcher_round" 
-  android:allowBackup="true" 
-  android:theme="@style/AppTheme" 
-  android:supportsRtl="true" 
-  android:enableOnBackInvokedCallback="false" 
-  android:fullBackupContent="@xml/secure_store_backup_rules" 
-  android:dataExtractionRules="@xml/secure_store_data_extraction_rules">
-    <meta-data 
-    android:name="com.google.firebase.messaging.default_notification_color" 
-    android:resource="@color/notification_icon_color" 
-    tools:replace="android:resource"/>
-    <meta-data 
-    android:name="com.google.firebase.messaging.default_notification_icon" 
-    android:resource="@drawable/notification_icon"/>
-    <meta-data 
-    android:name="expo.modules.notifications.default_notification_color" 
-    android:resource="@color/notification_icon_color"/>
-    <meta-data 
-    android:name="expo.modules.notifications.default_notification_icon" 
-    android:resource="@drawable/notification_icon"/>
-    <meta-data 
-    android:name="expo.modules.updates.ENABLED" 
-    android:value="false"/>
-    <meta-data 
-    android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" 
-    android:value="ALWAYS"/>
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:enableOnBackInvokedCallback="false" android:fullBackupContent="@xml/secure_store_backup_rules" android:dataExtractionRules="@xml/secure_store_data_extraction_rules">
+    <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/notification_icon_color" tools:replace="android:resource"/>
+    <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/notification_icon"/>
+    <meta-data android:name="expo.modules.notifications.default_notification_color" android:resource="@color/notification_icon_color"/>
+    <meta-data android:name="expo.modules.notifications.default_notification_icon" android:resource="@drawable/notification_icon"/>
+    <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
+    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
    <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
      <intent-filter>
--- 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: "17",
+    buildNumber: "18",
  },

  android: {
@@ -32,7 +32,7 @@ export default {
    },
    edgeToEdgeEnabled: true,
    package: "com.bip.hipmimobileapp",
-    versionCode: 3,
+    versionCode: 4,
    // softwareKeyboardLayoutMode: 'resize', // option: untuk mengatur keyboard pada room chst collaboration
    intentFilters: [
      {
--- a/app/(application)/(user)/_layout.tsx
+++ b/app/(application)/(user)/_layout.tsx
@@ -53,30 +53,35 @@ export default function UserLayout() {
        />

        {/* ========== Notification Section ========= */}
-        <Stack.Screen
+
+        {/* DIPINDAH DI FILE NOTIFICATION USER */}
+        {/* <Stack.Screen
          name="notifications/index"
          options={{
            title: "Notifikasi",
            headerLeft: () => <BackButton />,
-            headerRight: () => (
-              <IconPlus
-                color={MainColor.yellow}
-                onPress={() => router.push("/test-notifications")}
-              />
-            ),
+            // headerRight: () => (
+            //   <IconPlus
+            //     color={MainColor.yellow}
+            //     onPress={() => router.push("/test-notifications")}
+            //   />
+            // ),
          }}
-        />
+        /> */}

        {/* ========== 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={{
@@ -519,7 +524,8 @@ export default function UserLayout() {
          name="job/(tabs)"
          options={{
            title: "Job Vacancy",
-            headerLeft: () => <BackButton path="/home" />,
+            // headerLeft: () => <BackButton path="/home" />,
+            // NOTE: headerLeft di pindahkan ke Tabs Layout
          }}
        />
        <Stack.Screen
--- 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/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 {
--- a/app/(application)/(user)/home.tsx
+++ b/app/(application)/(user)/home.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable react-hooks/exhaustive-deps */
-import { ButtonCustom, StackCustom, ViewWrapper } from "@/components";
+import { StackCustom, ViewWrapper } from "@/components";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import { useNotificationStore } from "@/hooks/use-notification-store";
@@ -23,14 +23,12 @@ export default function Application() {
  const [refreshing, setRefreshing] = useState(false);
  const { syncUnreadCount } = useNotificationStore();

-
-
  useFocusEffect(
    useCallback(() => {
      onLoadData();
      checkVersion();
      userData(token as string);
-      syncUnreadCount()
+      syncUnreadCount();
    }, [user?.id, token])
  );

@@ -56,10 +54,10 @@ export default function Application() {
    setRefreshing(false);
  }, []);

-  if (user && user?.termsOfServiceAccepted === false) {
-    console.log("User is not accept term service");
-    return <Redirect href={`/terms-agreement`} />;
-  }
+  // if (user && user?.termsOfServiceAccepted === false) {
+  //   console.log("User is not accept term service");
+  //   return <Redirect href={`/terms-agreement`} />;
+  // }

  if (data && data?.active === false) {
    console.log("User is not active");
--- a/app/(application)/(user)/job/(tabs)/_layout.tsx
+++ b/app/(application)/(user)/job/(tabs)/_layout.tsx
@@ -1,34 +1,61 @@
+/* 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 { Tabs } from "expo-router";
+import {
+  router,
+  Tabs,
+  useLocalSearchParams,
+  useNavigation
+} from "expo-router";
+import { useLayoutEffect } from "react";

 export default function JobTabsLayout() {
+  const navigation = useNavigation();
+
+  const { from, category } = useLocalSearchParams<{
+    from?: string;
+    category?: string;
+  }>();
+
+  // 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
-        name="index"
-        options={{
-          title: "Beranda",
-          tabBarIcon: ({ color }) => <IconHome color={color} />,
-        }}
-      />
-      <Tabs.Screen
-        name="status"
-        options={{
-          title: "Status",
-          tabBarIcon: ({ color }) => <IconStatus color={color} />,
-        }}
-      />
-      <Tabs.Screen
-        name="archive"
-        options={{
-          title: "Arsip",
-          tabBarIcon: ({ color }) => (
-            <Ionicons size={20} name="archive" color={color} />
-          ),
-        }}
-      />
-    </Tabs>
+    <>
+      <Tabs screenOptions={TabsStyles}>
+        <Tabs.Screen
+          name="index"
+          options={{
+            title: "Beranda",
+            tabBarIcon: ({ color }) => <IconHome color={color} />,
+          }}
+        />
+        <Tabs.Screen
+          name="status"
+          options={{
+            title: "Status",
+            tabBarIcon: ({ color }) => <IconStatus color={color} />,
+          }}
+        />
+        <Tabs.Screen
+          name="archive"
+          options={{
+            title: "Arsip",
+            tabBarIcon: ({ color }) => (
+              <Ionicons size={20} name="archive" color={color} />
+            ),
+          }}
+        />
+      </Tabs>
+    </>
  );
 }
--- a/app/(application)/(user)/job/(tabs)/status.tsx
+++ b/app/(application)/(user)/job/(tabs)/status.tsx
@@ -9,14 +9,17 @@ import {
 import { useAuth } from "@/hooks/use-auth";
 import { dummyMasterStatus } from "@/lib/dummy-data/_master/status";
 import { apiJobGetByStatus } from "@/service/api-client/api-job";
-import { useFocusEffect } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";

 export default function JobStatus() {
  const { user } = useAuth();
+  const { status } = useLocalSearchParams<{ status?: string }>();
+  console.log("STATUS", status);
+
  const [activeCategory, setActiveCategory] = useState<string | null>(
-    "publish"
+    status || "publish"
  );
  const [listData, setListData] = useState<any[]>([]);
  const [isLoadList, setIsLoadList] = useState(false);
@@ -60,25 +63,29 @@ export default function JobStatus() {
  );

  return (
-    <ViewWrapper headerComponent={scrollComponent} hideFooter>
-      {isLoadList ? (
-        <LoaderCustom />
-      ) : _.isEmpty(listData) ? (
-        <TextCustom align="center">Tidak ada data {activeCategory}</TextCustom>
-      ) : (
-        listData.map((e, i) => (
-          <BaseBox
-            key={i}
-            paddingTop={20}
-            paddingBottom={20}
-            href={`/job/${e?.id}/${activeCategory}/detail`}
-          >
-            <TextCustom align="center" bold truncate size="large">
-              {e?.title}
-            </TextCustom>
-          </BaseBox>
-        ))
-      )}
-    </ViewWrapper>
+    <>
+      <ViewWrapper headerComponent={scrollComponent} hideFooter>
+        {isLoadList ? (
+          <LoaderCustom />
+        ) : _.isEmpty(listData) ? (
+          <TextCustom align="center">
+            Tidak ada data {activeCategory}
+          </TextCustom>
+        ) : (
+          listData.map((e, i) => (
+            <BaseBox
+              key={i}
+              paddingTop={20}
+              paddingBottom={20}
+              href={`/job/${e?.id}/${activeCategory}/detail`}
+            >
+              <TextCustom align="center" bold truncate size="large">
+                {e?.title}
+              </TextCustom>
+            </BaseBox>
+          ))
+        )}
+      </ViewWrapper>
+    </>
  );
 }
--- a/app/(application)/(user)/job/[id]/[status]/detail.tsx
+++ b/app/(application)/(user)/job/[id]/[status]/detail.tsx
@@ -74,7 +74,7 @@ export default function JobDetailStatus() {
            <StackCustom gap={"xs"}>
              {data &&
                data?.catatan &&
-                (status === "draft" || status === "rejected") && (
+                (status === "draft" || status === "reject") && (
                  <ReportBox text={data?.catatan} />
                )}
                
--- a/app/(application)/(user)/job/[id]/index.tsx
+++ b/app/(application)/(user)/job/[id]/index.tsx
@@ -25,6 +25,8 @@ export default function JobDetail() {
      setIsLoading(true);
      const response = await apiJobGetOne({ id: id as string });

+      console.log("DATA", JSON.stringify(response.data, null,2));
+
      setData(response.data);
    } catch (error) {
      console.log("[ERROR]", error);
--- a/app/(application)/(user)/job/create.tsx
+++ b/app/(application)/(user)/job/create.tsx
@@ -19,7 +19,7 @@ import { useState } from "react";
 import Toast from "react-native-toast-message";

 export default function JobCreate() {
-  const nextUrl = "/(application)/(user)/job/(tabs)/status";
+  const nextUrl = "/(application)/(user)/job/(tabs)/status?status=review";
  const { user } = useAuth();
  const [isLoading, setIsLoading] = useState(false);
  const [image, setImage] = useState<string | null>(null);
--- a/app/(application)/(user)/notifications/index.tsx
+++ b/app/(application)/(user)/notifications/index.tsx
@@ -1,26 +1,60 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import {
+  AlertDefaultSystem,
+  BackButton,
  BaseBox,
+  DrawerCustom,
+  MenuDrawerDynamicGrid,
  NewWrapper,
  ScrollableCustom,
  StackCustom,
-  TextCustom
+  TextCustom,
 } from "@/components";
+import { IconDot } from "@/components/_Icon/IconComponent";
 import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
-import { AccentColor } from "@/constants/color-palet";
+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 { router, useFocusEffect } 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";

 const selectedCategory = (value: string) => {
-  const category = listOfcategoriesAppNotification.find((c) => c.value === value);
+  const category = listOfcategoriesAppNotification.find(
+    (c) => c.value === value
+  );
  return category?.label;
 };

+const fixPath = ({
+  deepLink,
+  categoryApp,
+}: {
+  deepLink: string;
+  categoryApp: string;
+}) => {
+  if (categoryApp === "OTHER") {
+    return deepLink;
+  }
+
+  const separator = deepLink.includes("?") ? "&" : "?";
+
+  const fixedPath = `${deepLink}${separator}from=notifications&category=${_.lowerCase(
+    categoryApp
+  )}`;
+
+  console.log("Fix Path", fixedPath);
+
+  return fixedPath;
+};
+
 const BoxNotification = ({
  data,
  activeCategory,
@@ -28,18 +62,28 @@ const BoxNotification = ({
  data: any;
  activeCategory: string | null;
 }) => {
+  // console.log("DATA NOTIFICATION", JSON.stringify(data, null, 2));
  const { markAsRead } = useNotificationStore();
  return (
    <>
      <BaseBox
        backgroundColor={data.isRead ? AccentColor.darkblue : AccentColor.blue}
        onPress={() => {
-          console.log(
-            "Notification >",
-            selectedCategory(activeCategory as string)
-          );
-          router.push(data.deepLink);
-          markAsRead(data.id);
+          // console.log(
+          //   "Notification >",
+          //   selectedCategory(activeCategory as string)
+          // );
+          const newPath = fixPath({
+            deepLink: data.deepLink,
+            categoryApp: data.kategoriApp,
+          });
+
+          router.replace(newPath as any);
+          selectedCategory(activeCategory as string);
+
+          if (!data.isRead) {
+            markAsRead(data.id);
+          }
        }}
      >
        <StackCustom>
@@ -60,10 +104,16 @@ const BoxNotification = ({

 export default function Notifications() {
  const { user } = useAuth();
-  const [activeCategory, setActiveCategory] = useState<string | null>("event");
+  const { category } = useLocalSearchParams<{ category?: string }>();
+  const [activeCategory, setActiveCategory] = useState<string | null>(
+    category || "event"
+  );
  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);
@@ -83,7 +133,7 @@ export default function Notifications() {
        id: user?.id as any,
        category: activeCategory as any,
      });
-      // console.log("Response Notification", JSON.stringify(response, null, 2));
+
      if (response.success) {
        setListData(response.data);
      } else {
@@ -103,31 +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/>
-      ) : (
-        listData.map((e, i) => (
-          <View key={i}>
-            <BoxNotification data={e} activeCategory={activeCategory as any} />
-          </View>
-        ))
-      )}
-    </NewWrapper>
+      </DrawerCustom>
+    </>
  );
 }
--- a/app/(application)/(user)/profile/[id]/index.tsx
+++ b/app/(application)/(user)/profile/[id]/index.tsx
@@ -139,7 +139,9 @@ const ButtonnDot = ({
  isUserCheck: boolean;
  logout: () => Promise<void>;
 }) => {
-  const isId = id === undefined || id === null;
+  console.log("[ID] >>", id);
+
+  const isId = id === undefined || id === "undefined";

  if (isId) {
    return (
--- a/app/(application)/(user)/waiting-room.tsx
+++ b/app/(application)/(user)/waiting-room.tsx
@@ -1,12 +1,10 @@
 import {
  AlertDefaultSystem,
  BoxButtonOnFooter,
-  ButtonCenteredOnly,
  ButtonCustom,
  InformationBox,
  NewWrapper,
-  StackCustom,
-  ViewWrapper,
+  StackCustom
 } from "@/components";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import { useAuth } from "@/hooks/use-auth";
--- a/app/(application)/admin/event/[id]/[status]/index.tsx
+++ b/app/(application)/admin/event/[id]/[status]/index.tsx
@@ -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/job/[id]/[status]/index.tsx
+++ b/app/(application)/admin/job/[id]/[status]/index.tsx
@@ -15,6 +15,7 @@ import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
 import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
 import ReportBox from "@/components/Box/ReportBox";
 import { MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
 import funUpdateStatusJob from "@/screens/Admin/Job/funUpdateStatus";
 import { apiAdminJobGetById } from "@/service/api-admin/api-admin-job";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
@@ -23,8 +24,10 @@ import { useCallback, useState } from "react";
 import Toast from "react-native-toast-message";

 export default function AdminJobDetailStatus() {
+  const { user } = useAuth();
  const { id, status } = useLocalSearchParams();
  const [data, setData] = useState<any | null>(null);
+  const [isLoading, setIsLoading] = useState(false);

  useFocusEffect(
    useCallback(() => {
@@ -92,6 +95,9 @@ export default function AdminJobDetailStatus() {
      const response = await funUpdateStatusJob({
        id: id as string,
        changeStatus,
+        data: {
+          senderId: user?.id as string,
+        },
      });

      if (!response.success) {
@@ -142,12 +148,15 @@ export default function AdminJobDetailStatus() {
          </StackCustom>
        </BaseBox>

-        {data && data?.catatan && (status === "reject" || status === "review") && (
-          <ReportBox text={data?.catatan}/>
-        )}
+        {data &&
+          data?.catatan &&
+          (status === "reject" || status === "review") && (
+            <ReportBox text={data?.catatan} />
+          )}

        {status === "review" && (
          <AdminButtonReview
+            isLoading={isLoading}
            onPublish={() => {
              AlertDefaultSystem({
                title: "Publish",
@@ -156,6 +165,7 @@ export default function AdminJobDetailStatus() {
                textRight: "Ya",
                onPressRight: () => {
                  handleUpdate({ changeStatus: "publish" });
+                  setIsLoading(true);
                },
              });
            }}
--- a/app/(application)/admin/job/[id]/[status]/reject-input.tsx
+++ b/app/(application)/admin/job/[id]/[status]/reject-input.tsx
@@ -15,7 +15,10 @@ import Toast from "react-native-toast-message";

 export default function AdminJobRejectInput() {
  const { id, status } = useLocalSearchParams();
-  const [data, setData] = useState<any | null>(null);
+  const [data, setData] = useState({
+    catatan: "",
+    senderId: ""
+  });
  const [isLoading, setIsLoading] = useState(false);

  useFocusEffect(
@@ -48,7 +51,7 @@ export default function AdminJobRejectInput() {
      const response = await funUpdateStatusJob({
        id: id as string,
        changeStatus,
-        data: data,
+        data: data ,
      });

      if (!response.success) {
@@ -102,8 +105,8 @@ export default function AdminJobRejectInput() {
        headerComponent={<AdminBackButtonAntTitle title="Penolakan Job" />}
      >
        <TextAreaCustom
-          value={data}
-          onChangeText={setData}
+          value={data?.catatan}
+          onChangeText={(text) => setData({ ...data, catatan: text })}
          placeholder="Masukan alasan"
          required
          showCount
--- a/app/(application)/admin/notification/index.tsx
+++ b/app/(application)/admin/notification/index.tsx
@@ -1,19 +1,28 @@
 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";
 import { RefreshControl, View } from "react-native";

@@ -66,6 +75,10 @@ export default function AdminNotification() {
  const [activeCategory, setActiveCategory] = useState<string | null>("event");
  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);
@@ -80,11 +93,12 @@ export default function AdminNotification() {

  const fecthData = async () => {
    try {
+      setLoading(true);
      const response = await apiGetNotificationsById({
        id: user?.id as any,
        category: activeCategory as any,
      });
-      // console.log("Response Notification", JSON.stringify(response, null, 2));
+
      if (response.success) {
        setListData(response.data);
      } else {
@@ -92,6 +106,8 @@ export default function AdminNotification() {
      }
    } catch (error) {
      console.log("Error Notification", error);
+    } finally {
+      setLoading(false);
    }
  };

@@ -108,9 +124,9 @@ export default function AdminNotification() {
          title: "Admin Notifikasi",
          headerLeft: () => <BackButton />,
          headerRight: () => (
-            <IconPlus
+            <IconDot
              color={MainColor.yellow}
-              onPress={() => router.push("/test-notifications")}
+              onPress={() => setOpenDrawer(true)}
            />
          ),
        }}
@@ -132,12 +148,66 @@ export default function AdminNotification() {
          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
        }
      >
-        {listData.map((e, i) => (
-          <View key={i}>
-            <BoxNotification data={e} activeCategory={activeCategory as any} />
-          </View>
-        ))}
+        {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);
+                },
+              });
+            }
+          }}
+        />
+      </DrawerCustom>
    </>
  );
 }
--- a/app/(application)/admin/super-admin/[id]/index.tsx
+++ b/app/(application)/admin/super-admin/[id]/index.tsx
@@ -48,6 +48,7 @@ export default function SuperAdminDetail() {
      const response = await apiAdminUserAccessUpdateStatus({
        id: id as string,
        role: data?.masterUserRoleId === "2" ? "user" : "admin",
+        category: "role"
      });

      if (!response.success) {
--- a/app/(application)/admin/user-access/[id]/index.tsx
+++ b/app/(application)/admin/user-access/[id]/index.tsx
@@ -9,15 +9,21 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import GridTwoView from "@/components/_ShareComponent/GridTwoView";
+import { useAuth } from "@/hooks/use-auth";
+import { routeUser } from "@/lib/routeApp";
 import {
  apiAdminUserAccessGetById,
  apiAdminUserAccessUpdateStatus,
 } from "@/service/api-admin/api-admin-user-access";
+import {
+  apiNotificationsSendById
+} from "@/service/api-notifications";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import { useCallback, useState } from "react";
 import Toast from "react-native-toast-message";

 export default function AdminUserAccessDetail() {
+  const { user } = useAuth();
  const { id } = useLocalSearchParams();
  const [data, setData] = useState<any | null>(null);
  const [loadData, setLoadData] = useState(false);
@@ -33,6 +39,7 @@ export default function AdminUserAccessDetail() {
    try {
      setLoadData(true);
      const response = await apiAdminUserAccessGetById({ id: id as string });
+      console.log("[DATA]", JSON.stringify(response.data, null, 2));

      setData(response.data);
    } catch (error) {
@@ -48,6 +55,7 @@ export default function AdminUserAccessDetail() {
      const response = await apiAdminUserAccessUpdateStatus({
        id: id as string,
        active: !data?.active,
+        category: "access",
      });

      if (!response.success) {
@@ -61,6 +69,21 @@ export default function AdminUserAccessDetail() {
        type: "success",
        text1: "Update aktifasi berhasil ",
      });
+
+      if (data.active === false) {
+        await apiNotificationsSendById({
+          data: {
+            title: "Akun anda telah diaktifkan",
+            body: "Selamat menjelajahi HIConnect",
+            userLoginId: user?.id || "",
+            kategoriApp: "OTHER",
+            type: "announcement",
+            deepLink: routeUser.home,
+          },
+          id: id as string,
+        });
+      }
+
      router.back();
    } catch (error) {
      console.log("[ERROR UPDATE STATUS]", error);
--- a/app/+not-found.tsx
+++ b/app/+not-found.tsx
@@ -1,10 +1,19 @@
-import { StackCustom, TextCustom, ViewWrapper } from "@/components";
+import { BackButton, StackCustom, TextCustom, ViewWrapper } from "@/components";
+import { Stack } from "expo-router";

 export default function NotFoundScreen() {
-    return (
+  return (
+    <>
+      <Stack.Screen
+        options={{ headerShown: false, headerLeft: () => <BackButton /> }}
+      />
      <ViewWrapper>
-        <StackCustom align="center" gap={0} style={{justifyContent: "center", alignItems: "center", flex: 1}}>
-          <TextCustom size="large" bold style={{fontSize: 100}}>
+        <StackCustom
+          align="center"
+          gap={0}
+          style={{ justifyContent: "center", alignItems: "center", flex: 1 }}
+        >
+          <TextCustom size="large" bold style={{ fontSize: 100 }}>
            404
          </TextCustom>
          <TextCustom size="large" bold>
@@ -12,5 +21,6 @@ export default function NotFoundScreen() {
          </TextCustom>
        </StackCustom>
      </ViewWrapper>
-    );
-}
+    </>
+  );
+}
--- a/app/eula.tsx
+++ b/app/eula.tsx
@@ -0,0 +1,9 @@
+import EULAView from "@/screens/Authentication/EULAView";
+
+export default function EULA() {
+  return (
+    <>
+      <EULAView />
+    </>
+  );
+}
--- a/components/Button/BackButton.tsx
+++ b/components/Button/BackButton.tsx
@@ -12,10 +12,12 @@ const LeftButtonCustom = ({
  path,
  icon = "arrow-back",
  iconCustom,
+  onPress,
 }: {
  path?: Href;
  icon?: React.ReactNode | any;
  iconCustom?: React.ReactNode;
+  onPress?: () => void;
 }) => {
  return (
    <>
@@ -26,7 +28,7 @@ const LeftButtonCustom = ({
          name={icon}
          size={20}
          color={MainColor.yellow}
-          onPress={() => (path ? router.replace(path) : router.back())}
+          onPress={() => (onPress ? onPress() : path ? router.replace(path) : router.back())}
        />
      )}
    </>
--- 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/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/context/AuthContext.tsx
+++ b/context/AuthContext.tsx
@@ -2,15 +2,16 @@ import {
  apiConfig,
  apiLogin,
  apiRegister,
+  apiUpdatedTermCondition,
  apiValidationCode,
 } from "@/service/api-config";
 import { apiDeviceTokenDeleted } from "@/service/api-device-token";
 import { IUser } from "@/types/User";
 import AsyncStorage from "@react-native-async-storage/async-storage";
+import * as Device from "expo-device";
 import { router } from "expo-router";
 import { createContext, useEffect, useState } from "react";
 import Toast from "react-native-toast-message";
-import * as Device from "expo-device";

 // --- Types ---
 type AuthContextType = {
@@ -29,6 +30,7 @@ type AuthContextType = {
    termsOfServiceAccepted: boolean;
  }) => Promise<void>;
  userData: (token: string) => Promise<any>;
+  acceptedTerms: (nomor: string) => Promise<any>;
 };

 // --- Create Context ---
@@ -74,28 +76,32 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
  const loginWithNomor = async (nomor: string) => {
    setIsLoading(true);
    try {
-      console.log("[Masuk provider]", nomor);
      const response = await apiLogin({ nomor: nomor });
-      console.log("[RESPONSE AUTH]", JSON.stringify(response));
+      console.log("[RESPONSE AUTH]", JSON.stringify(response, null, 2));

      if (response.success) {
-        console.log("[Keluar provider]", nomor);
-        Toast.show({
-          type: "success",
-          text1: "Sukses",
-          text2: "Kode OTP berhasil dikirim",
-        });
+        if (response.isAcceptTerms) {
+          Toast.show({
+            type: "success",
+            text1: "Sukses",
+            text2: "Kode OTP berhasil dikirim",
+          });

-        await AsyncStorage.setItem("kode_otp", response.kodeId);
-        router.push(`/verification?nomor=${nomor}`);
-        return;
+          await AsyncStorage.setItem("kode_otp", response.kodeId);
+          router.push(`/verification?nomor=${nomor}`);
+          return;
+        } else {
+          router.push(`/eula?nomor=${nomor}`);
+          return;
+        }
      } else {
-        router.push(`/register?nomor=${nomor}`);
-        Toast.show({
-          type: "info",
-          text1: "Info",
-          text2: "Silahkan mendaftar",
-        });
+        router.push(`/eula?nomor=${nomor}`);
+
+        // Toast.show({
+        //   type: "info",
+        //   text1: "Info",
+        //   text2: "Silahkan mendaftar",
+        // });
        return;
      }
    } catch (error: any) {
@@ -105,18 +111,6 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
    }
  };

-  // const loginWithNomor = async (nomor: string) => {
-  //   setIsLoading(true);
-  //   try {
-  //     const response = await apiLogin({ nomor: nomor });
-  //     await AsyncStorage.setItem("kode_otp", response.kodeId);
-  //   } catch (error: any) {
-  //     throw new Error(error.response?.data?.message || "Gagal kirim OTP");
-  //   } finally {
-  //     setIsLoading(false);
-  //   }
-  // };
-
  // --- 2. Validasi OTP & cek user ---
  const validateOtp = async (nomor: string) => {
    try {
@@ -209,7 +203,6 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
    setIsLoading(true);
    try {
      const response = await apiRegister({ data: userData });
-      console.log("[REGISTER FETCH]", JSON.stringify(response, null, 2));

      if (!response.success) {
        Toast.show({
@@ -239,42 +232,6 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
      setIsLoading(false);
    }
  };
-  // const registerUser = async (userData: {
-  //   username: string;
-  //   nomor: string;
-  //   termsOfServiceAccepted: boolean;
-  // }) => {
-  //   setIsLoading(true);
-  //   try {
-  //     const response = await apiRegister({ data: userData });
-  //     console.log("response", response);
-
-  //     const { token } = response;
-  //     if (!response.success) {
-  //       Toast.show({
-  //         type: "info",
-  //         text1: "Info",
-  //         text2: response.message,
-  //       });
-
-  //       return;
-  //     }
-
-  //     setToken(token);
-  //     await AsyncStorage.setItem("authToken", token);
-  //     Toast.show({
-  //       type: "success",
-  //       text1: "Sukses",
-  //       text2: "Anda berhasil terdaftar",
-  //     });
-  //     router.replace("/(application)/(user)/waiting-room");
-  //     return;
-  //   } catch (error: any) {
-  //     console.log("Error register", error);
-  //   } finally {
-  //     setIsLoading(false);
-  //   }
-  // };

  // --- 5. Logout ---

@@ -284,7 +241,8 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
      setToken(null);
      setUser(null);

-      const deviceId = Device.osInternalBuildId || Device.modelName || "unknown";
+      const deviceId =
+        Device.osInternalBuildId || Device.modelName || "unknown";

      await AsyncStorage.removeItem("authToken");
      await AsyncStorage.removeItem("userData");
@@ -303,6 +261,31 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
    }
  };

+  const acceptedTerms = async (nomor: string) => {
+    try {
+      setIsLoading(true);
+      const response = await apiUpdatedTermCondition({ nomor: nomor });
+
+      if (response.success) {
+        router.replace(`/verification?nomor=${nomor}`);
+      } else {
+        if (response.status === 404) {
+          router.replace(`/register?nomor=${nomor}`);
+        } else {
+          Toast.show({
+            type: "error",
+            text1: "Error",
+            text2: response.message,
+          });
+        }
+      }
+    } catch (error) {
+      console.log("Error accept terms", error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
  return (
    <>
      <AuthContext.Provider
@@ -318,6 +301,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
          logout,
          registerUser,
          userData,
+          acceptedTerms,
        }}
      >
        {children}
--- a/eas.json
+++ b/eas.json
@@ -11,7 +11,7 @@
    "preview": {
      "distribution": "internal",
      "android": {
-        "buildType": "app-bundle"
+        "buildType": "apk"
      },
      "ios": {
        "simulator": false
--- 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-foreground-notifications.ts
+++ b/hooks/use-foreground-notifications.ts
@@ -4,6 +4,7 @@ import {
  onMessage,
  FirebaseMessagingTypes,
 } from "@react-native-firebase/messaging";
+import { useAuth } from "./use-auth";

 // Gunakan tipe resmi dari library
 type RemoteMessage = FirebaseMessagingTypes.RemoteMessage;
@@ -11,17 +12,26 @@ type RemoteMessage = FirebaseMessagingTypes.RemoteMessage;
 export function useForegroundNotifications(
  onMessageReceived: (message: RemoteMessage) => void
 ) {
+  const { user } = useAuth();
+
  useEffect(() => {
    const messaging = getMessaging();

    const unsubscribe = onMessage(messaging, (remoteMessage) => {
+      const data = remoteMessage.data;
+      // console.log("DATA NOTIFIKASI DARI SERVER", data)
+      if (data?.recipientId && data?.recipientId !== user?.id) {
+        console.log("📵 Notification untuk user lain", data);
+        return;
+      }
+
      console.log(
        "🔔 Notifikasi diterima saat app aktif:",
-        JSON.stringify(remoteMessage, null, 2)
+        JSON.stringify(data, null, 2)
      );
      onMessageReceived(remoteMessage);
    });

    return unsubscribe;
-  }, [onMessageReceived]);
-}
+  }, [user?.id, onMessageReceived]);
+}
--- 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>17</string>
+    <string>18</string>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSMinimumSystemVersion</key>
--- a/lib/routeApp.ts
+++ b/lib/routeApp.ts
@@ -0,0 +1,9 @@
+export { routeAdmin, routeUser };
+
+const routeAdmin = {
+  userAccess: ({ id }: { id: string }) => `/admin/user-access/${id}`,
+};
+
+const routeUser = {
+  home: `/(user)/home`,
+};
--- 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 { RejectedData } 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?: RejectedData;
 }) => {
  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/Job/funUpdateStatus.ts
+++ b/screens/Admin/Job/funUpdateStatus.ts
@@ -7,13 +7,17 @@ const funUpdateStatusJob = async ({
 }: {
  id: string;
  changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data: {
+    catatan?: string;
+    senderId: string;
+  };
 }) => {
  try {
+    const fixData = data;
    const response = await apiAdminJobUpdate({
      id: id,
      status: changeStatus as any,
-      data: data,
+      data: fixData as any,
    });

    return response;
--- a/screens/Authentication/EULAView.tsx
+++ b/screens/Authentication/EULAView.tsx
@@ -0,0 +1,278 @@
+// app/syarat-dan-ketentuan.tsx
+import {
+  View,
+  Text,
+  ScrollView,
+  TouchableOpacity,
+  StyleSheet,
+} from "react-native";
+import { useState, useRef } from "react";
+import { useLocalSearchParams, useRouter } from "expo-router";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { AccentColor, MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
+
+// Ganti dengan API call ke backend Anda
+// const acceptEula = async (): Promise<boolean> => {
+//   try {
+//     const response = await fetch("/api/user/update-eula", {
+//       method: "PATCH",
+//       headers: { "Content-Type": "application/json" },
+//       credentials: "include",
+//       body: JSON.stringify({
+//         eulaAcceptedAt: new Date().toISOString(),
+//         eulaVersion: "2026-01-v1", // sesuaikan versi Anda
+//       }),
+//     });
+//     return response.ok;
+//   } catch (error) {
+//     console.error("Gagal menyimpan persetujuan EULA:", error);
+//     return false;
+//   }
+// };
+
+export default function EULAView() {
+  const { acceptedTerms } = useAuth();
+  const { nomor } = useLocalSearchParams();
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [isAtBottom, setIsAtBottom] = useState(false);
+  const scrollViewRef = useRef<ScrollView>(null);
+
+  const handleScroll = (event: any) => {
+    const { layoutMeasurement, contentOffset, contentSize } = event.nativeEvent;
+    const paddingToBottom = 20;
+    const isCloseToBottom =
+      layoutMeasurement.height + contentOffset.y >=
+      contentSize.height - paddingToBottom;
+    setIsAtBottom(isCloseToBottom);
+  };
+
+  const handleAccept = async () => {
+    try {
+      if (!isAtBottom) return;
+
+      setIsLoading(true);
+      await acceptedTerms(nomor as string);
+    } catch (error) {
+      console.log("Error accept terms", error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <SafeAreaView edges={["bottom"]} style={styles.container}>
+      <Text style={styles.title}>
+        Syarat & Ketentuan Penggunaan HIPMI Badung Connect
+      </Text>
+
+      <ScrollView
+        ref={scrollViewRef}
+        onScroll={handleScroll}
+        scrollEventThrottle={16}
+        style={styles.scrollView}
+        contentContainerStyle={styles.scrollContent}
+      >
+        <Text style={styles.paragraph}>
+          Dengan menggunakan aplikasi{" "}
+          <Text style={styles.bold}>HIPMI Badung Connect</Text> (“Aplikasi”),
+          Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan
+          berikut. Jika Anda tidak setuju dengan ketentuan ini, harap jangan
+          gunakan Aplikasi.
+        </Text>
+
+        <Text style={styles.heading}>1. Definisi</Text>
+        <Text style={styles.paragraph}>
+          <Text style={styles.bold}>HIPMI Badung Connect</Text> adalah platform
+          digital resmi untuk anggota Himpunan Pengusaha Muda Indonesia (HIPMI)
+          Kabupaten Badung, yang bertujuan memfasilitasi jaringan, kolaborasi,
+          dan pertumbuhan bisnis para pengusaha muda.
+        </Text>
+
+        <Text style={styles.heading}>2. Larangan Konten Tidak Pantas</Text>
+        <Text style={styles.paragraph}>
+          Anda <Text style={styles.bold}>dilarang keras</Text> memposting,
+          mengirim, membagikan, atau mengunggah konten apa pun yang mengandung:
+        </Text>
+        <View style={styles.list}>
+          <Text style={styles.listItem}>
+            • Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama,
+            Ras, Antar-golongan)
+          </Text>
+          <Text style={styles.listItem}>
+            • Pornografi, konten seksual eksplisit, atau gambar tidak senonoh
+          </Text>
+          <Text style={styles.listItem}>
+            • Ancaman, pelecehan, bullying, atau perilaku melecehkan
+          </Text>
+          <Text style={styles.listItem}>
+            • Informasi palsu, hoaks, spam, atau konten menyesatkan
+          </Text>
+          <Text style={styles.listItem}>
+            • Konten ilegal, melanggar hukum, atau melanggar hak kekayaan
+            intelektual pihak lain
+          </Text>
+          <Text style={styles.listItem}>
+            • Promosi narkoba, perjudian, atau aktivitas ilegal lainnya
+          </Text>
+        </View>
+
+        <Text style={styles.heading}>3. Tanggung Jawab Pengguna</Text>
+        <Text style={styles.paragraph}>
+          Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau
+          bagikan melalui fitur-fitur berikut:
+        </Text>
+        <View style={styles.list}>
+          <Text style={styles.listItem}>• Profil (bio, foto, portofolio)</Text>
+          <Text style={styles.listItem}>• Forum diskusi</Text>
+          <Text style={styles.listItem}>• Chat pribadi atau grup</Text>
+          <Text style={styles.listItem}>
+            • Lowongan kerja, investasi, dan donasi
+          </Text>
+        </View>
+        <Text style={styles.paragraph}>
+          Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa
+          pemberitahuan.
+        </Text>
+
+        <Text style={styles.heading}>4. Tindakan terhadap Pelanggaran</Text>
+        <Text style={styles.paragraph}>
+          Jika kami menerima laporan atau menemukan konten yang melanggar
+          ketentuan ini, kami akan:
+        </Text>
+        <View style={styles.list}>
+          <Text style={styles.listItem}>
+            • Segera menghapus konten tersebut
+          </Text>
+          <Text style={styles.listItem}>
+            • Memberikan peringatan atau memblokir akun pengguna
+          </Text>
+          <Text style={styles.listItem}>
+            • Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang
+            berlaku
+          </Text>
+        </View>
+        <Text style={styles.paragraph}>
+          Tim kami berkomitmen untuk menanggapi laporan konten tidak pantas{" "}
+          <Text style={styles.bold}>dalam waktu 24 jam</Text>.
+        </Text>
+
+        <Text style={styles.heading}>5. Mekanisme Pelaporan</Text>
+        <Text style={styles.paragraph}>
+          Anda dapat melaporkan konten atau pengguna yang mencurigakan melalui:
+        </Text>
+        <View style={styles.list}>
+          <Text style={styles.listItem}>
+            • Tombol <Text style={styles.bold}>“Laporkan”</Text> di setiap
+            posting forum atau pesan chat
+          </Text>
+          <Text style={styles.listItem}>
+            • Tombol <Text style={styles.bold}>“Blokir Pengguna”</Text> di
+            profil pengguna
+          </Text>
+        </View>
+        <Text style={styles.paragraph}>
+          Setiap laporan akan ditangani secara rahasia dan segera.
+        </Text>
+
+        <Text style={styles.heading}>6. Perubahan Ketentuan</Text>
+        <Text style={styles.paragraph}>
+          Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi
+          terbaru akan dipublikasikan di halaman ini dengan tanggal revisi yang
+          diperbarui.
+        </Text>
+
+        <Text style={styles.heading}>7. Kontak</Text>
+        <Text style={styles.paragraph}>
+          Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi
+          kami di:{"\n"}
+          <Text style={[styles.bold, { color: "#1E90FF" }]}>
+            bip.baliinteraktifperkasa@gmail.com
+          </Text>
+        </Text>
+
+        <Text style={styles.footer}>
+          © 2026 Bali Interaktif Perkasa. All rights reserved.
+        </Text>
+      </ScrollView>
+
+      <TouchableOpacity
+        onPress={handleAccept}
+        disabled={!isAtBottom || isLoading}
+        style={[styles.button, { opacity: !isAtBottom || isLoading ? 0.6 : 1 }]}
+      >
+        <Text style={styles.buttonText}>
+          {isLoading ? "Menyimpan..." : "Saya Setuju"}
+        </Text>
+      </TouchableOpacity>
+    </SafeAreaView>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: MainColor.darkblue,
+    padding: 16,
+  },
+  title: {
+    fontSize: 20,
+    fontWeight: "bold",
+    textAlign: "center",
+    marginBottom: 16,
+    color: MainColor.white,
+  },
+  scrollView: {
+    flex: 1,
+    marginBottom: 20,
+  },
+  scrollContent: {
+    paddingBottom: 30,
+  },
+  heading: {
+    fontSize: 16,
+    fontWeight: "600",
+    marginTop: 16,
+    marginBottom: 8,
+    color: MainColor.white,
+  },
+  paragraph: {
+    fontSize: 14,
+    lineHeight: 22,
+    color: MainColor.white,
+    marginBottom: 12,
+  },
+  bold: {
+    fontWeight: "600",
+  },
+  list: {
+    marginLeft: 8,
+    marginBottom: 12,
+  },
+  listItem: {
+    fontSize: 14,
+    lineHeight: 22,
+    color: MainColor.white,
+    marginBottom: 6,
+  },
+  footer: {
+    fontSize: 12,
+    color: MainColor.white,
+    textAlign: "center",
+    marginTop: 20,
+    paddingTop: 10,
+    borderTopWidth: 2,
+    borderTopColor: AccentColor.blue,
+  },
+  button: {
+    backgroundColor: MainColor.yellow,
+    paddingVertical: 14,
+    borderRadius: 8,
+    alignItems: "center",
+  },
+  buttonText: {
+    color: "#fff",
+    fontSize: 16,
+    fontWeight: "600",
+  },
+});
--- a/screens/Authentication/RegisterView.tsx
+++ b/screens/Authentication/RegisterView.tsx
@@ -1,4 +1,3 @@
-import { CheckboxCustom } from "@/components";
 import Spacing from "@/components/_ShareComponent/Spacing";
 import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
 import ButtonCustom from "@/components/Button/ButtonCustom";
@@ -7,7 +6,6 @@ import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import { BASE_URL } from "@/service/api-config";
 import { GStyles } from "@/styles/global-styles";
-import { openBrowser } from "@/utils/openBrower";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useState } from "react";
@@ -17,7 +15,7 @@ import Toast from "react-native-toast-message";
 export default function RegisterView() {
  const { nomor } = useLocalSearchParams();
  const [username, setUsername] = useState("");
-  const [term, setTerm] = useState(false);
+  // const [term, setTerm] = useState(false);
  const url = BASE_URL;
  const { registerUser, isLoading } = useAuth();

@@ -65,7 +63,7 @@ export default function RegisterView() {
    await registerUser({
      nomor: nomor as string,
      username: usernameLower,
-      termsOfServiceAccepted: term,
+      termsOfServiceAccepted: true,
    });
  }

@@ -106,12 +104,12 @@ export default function RegisterView() {
                flexDirection: "row",
                alignItems: "center",
                marginTop: 16,
-                marginBottom: 16,
+                // marginBottom: 16,
              }}
            >
-              <CheckboxCustom value={term} onChange={() => setTerm(!term)} />
+              {/* <CheckboxCustom value={term} onChange={() => setTerm(!term)} /> */}

-              <Text style={GStyles.textLabel}>
+              {/* <Text style={GStyles.textLabel}>
                Saya setuju dengan{" "}
                <Text
                  style={{
@@ -126,11 +124,11 @@ export default function RegisterView() {
                  Syarat & Ketentuan
                </Text>{" "}
                yang melarang konten tidak pantas dan perilaku merugikan.
-              </Text>
+              </Text> */}
            </View>

            <ButtonCustom
-              disabled={!term}
+              disabled={isLoading}
              isLoading={isLoading}
              onPress={handleRegister}
            >
--- a/screens/Home/bottomFeatureSection.tsx
+++ b/screens/Home/bottomFeatureSection.tsx
@@ -17,7 +17,12 @@ export default function Home_BottomFeatureSection() {
      });

      // console.log("[DATA JOB]", JSON.stringify(response.data, null, 2));
-      const result = response.data.slice(-2);
+      const result = response.data
+        .sort(
+          (a: any, b: any) =>
+            new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
+        )
+        .slice(0, 2);
      setListData(result);
    } catch (error) {
      console.log("[ERROR]", error);
--- a/screens/Home/tabsList.ts
+++ b/screens/Home/tabsList.ts
@@ -1,6 +1,13 @@
 import { ITabs } from "@/components/_Interface/types";
+import { Platform } from "react-native";

-export const tabsHome: any = ({acceptedForumTermsAt, profileId}: {acceptedForumTermsAt: Date, profileId: string}) => [
+export const tabsHome: any = ({
+  acceptedForumTermsAt,
+  profileId,
+}: {
+  acceptedForumTermsAt: Date;
+  profileId: string;
+}) => [
  {
    id: "forum",
    icon: "chatbubble-ellipses-outline",
@@ -25,8 +32,8 @@ export const tabsHome: any = ({acceptedForumTermsAt, profileId}: {acceptedForumT
    activeIcon: "map",
    label: "Maps",
    path: "/maps",
-    isActive: true,
-    disabled: false,
+    isActive: Platform.OS === "ios" ? true : false,
+    disabled: Platform.OS === "ios" ? false : true,
  },
  {
    id: "profile",
--- a/screens/RootLayout/AppRoot.tsx
+++ b/screens/RootLayout/AppRoot.tsx
@@ -15,6 +15,7 @@ export default function AppRoot() {
          name="index"
          options={{ title: "", headerBackVisible: false }}
        />
+        <Stack.Screen name="eula" options={{ title: "Terms & Conditions", headerBackVisible: false }} />
        <Stack.Screen name="+not-found" options={{ title: "" }} />
        <Stack.Screen
          name="verification"
--- a/service/api-admin/api-admin-user-access.ts
+++ b/service/api-admin/api-admin-user-access.ts
@@ -28,13 +28,15 @@ export const apiAdminUserAccessUpdateStatus = async ({
  id,
  active,
  role,
+  category,
 }: {
  id: string;
  active?: boolean;
  role?: "user" | "admin" | "super_admin";
+  category: "access" | "role";
 }) => {
  try {
-    const response = await apiConfig.put(`/mobile/admin/user/${id}`, {
+    const response = await apiConfig.put(`/mobile/admin/user/${id}?category=${category}`, {
      data: {
        active,
        role,
--- a/service/api-config.ts
+++ b/service/api-config.ts
@@ -74,3 +74,10 @@ export async function apiAcceptTermService({
  return response.data;
 }

+
+export async function apiUpdatedTermCondition({nomor}: {nomor: string}) {
+  const response = await apiConfig.post(`/auth/mobile-eula`, {
+    nomor: nomor,
+  });
+  return response.data;
+}
--- a/service/api-device-token.ts
+++ b/service/api-device-token.ts
@@ -31,7 +31,7 @@ export async function apiDeviceTokenDeleted({ userId, deviceId }: { userId: stri
    const response = await apiConfig.delete(
      `/mobile/auth/device-tokens/${userId}?deviceId=${deviceId}`
    );
-    console.log("Device token deleted:", response.data);
+
    return response.data;
  } catch (error) {
    console.error("Failed to delete device token:", error);
@@ -42,7 +42,7 @@ export async function apiDeviceTokenDeleted({ userId, deviceId }: { userId: stri
 export async function apiGetAllTokenDevice() {
  try {
    const response = await apiConfig.get(`/mobile/auth/device-tokens`);
-    console.log("Device token deleted:", response.data);
+
    return response.data;
  } catch (error) {
    console.error("Failed to delete device token:", error);
--- a/service/api-notifications.ts
+++ b/service/api-notifications.ts
@@ -1,17 +1,9 @@
-import { TypeNotificationCategoryApp } from "@/types/type-notification-category";
+import {
+  NotificationProp,
+  TypeNotificationCategoryApp,
+} from "@/types/type-notification-category";
 import { apiConfig } from "./api-config";

-type NotificationProp = {
-  title: string;
-  body: string;
-  userLoginId: string;
-  appId?: string;
-  status?: string;
-  type?: "announcement" | "trigger";
-  deepLink?: string;
-  kategoriApp?: TypeNotificationCategoryApp
-};
-
 export async function apiNotificationsSend({
  data,
 }: {
@@ -28,12 +20,30 @@ export async function apiNotificationsSend({
  }
 }

+export async function apiNotificationsSendById({
+  data,
+  id,
+}: {
+  data: NotificationProp;
+  id: string;
+}) {
+  try {
+    const response = await apiConfig.post(`/mobile/notification/${id}`, {
+      data: data,
+    });
+
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
 export async function apiGetNotificationsById({
  id,
  category,
 }: {
  id: string;
-  category: TypeNotificationCategoryApp
+  category: TypeNotificationCategoryApp;
 }) {
  console.log("ID", id);
  console.log("Category", category);
@@ -49,7 +59,13 @@ export async function apiGetNotificationsById({
  }
 }

-export async function apiNotificationUnreadCount({ id, role }: { id: string, role: "user" | "admin" }) {
+export async function apiNotificationUnreadCount({
+  id,
+  role,
+}: {
+  id: string;
+  role: "user" | "admin";
+}) {
  try {
    const response = await apiConfig.get(
      `/mobile/notification/${id}/unread-count?role=${role}`
@@ -62,12 +78,24 @@ export async function apiNotificationUnreadCount({ id, role }: { id: string, rol
  }
 }

-
-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 RejectedData = {
+  catatan?: string;
+  senderId: string;
+};
--- a/types/type-notification-category.ts
+++ b/types/type-notification-category.ts
@@ -1,3 +1,16 @@
+export type NotificationProp = {
+  title: TypeOfTilteCategoryApp | string
+  body: string;
+  userLoginId?: string;
+  appId?: string;
+  status?: string;
+  type?: "announcement" | "trigger";
+  deepLink?: string;
+  kategoriApp?: TypeNotificationCategoryApp
+};
+
+
+
 export type TypeNotificationCategoryApp =
  | "EVENT"
  | "JOB"
@@ -6,9 +19,11 @@ export type TypeNotificationCategoryApp =
  | "INVESTASI"
  | "COLLABORATION"
  | "FORUM"
-  | "ACCESS";
+  | "OTHER";

-  export const listOfcategoriesAppNotification = [
+export type TypeOfTilteCategoryApp = "Pendaftaran User Baru" | "Other"
+
+export const listOfcategoriesAppNotification = [
  { value: "event", label: "Event" },
  { value: "job", label: "Job" },
  { value: "voting", label: "Voting" },
@@ -16,4 +31,5 @@ export type TypeNotificationCategoryApp =
  { value: "investasi", label: "Investasi" },
  { value: "forum", label: "Forum" },
  { value: "collaboration", label: "Collaboration" },
-];
+  { value: "other", label: "Lainnya" },
+];
--- 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	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
bagasbanuna	ca33dd83bb	Perbaikan untuk apple store dan push notifikasi ke preview Fix: - app.config.js - app/(application)/(user)/_layout.tsx - app/(application)/admin/notification/index.tsx - eas.json - ios/HIPMIBadungConnect.xcodeproj/project.pbxproj - ios/HIPMIBadungConnect/Info.plist ### No Issue	2026-01-12 17:40:15 +08:00
bagasbanuna	ea3fbdc541	Penambahan metode login dengan menerapkan EULA di awal Add: app/eula.tsx screens/Authentication/EULAView.tsx Fix: - context/AuthContext.tsx - screens/Authentication/RegisterView.tsx - screens/RootLayout/AppRoot.tsx - service/api-config.ts ### No Issue	2026-01-09 17:44:13 +08:00
bagasbanuna	33cd47aaed	Fix mobile notification: > - Bug penerima pesan 2 kali Fix: modified: hooks/use-foreground-notifications.ts ### No Issue	2026-01-09 14:46:21 +08:00
Bagasbanuna02	57ac1eb45e	Notifikasi admin to user Fix: - android/app/src/main/AndroidManifest.xml - app/(application)/(user)/job/(tabs)/_layout.tsx - app/(application)/(user)/job/[id]/index.tsx - app/(application)/(user)/notifications/index.tsx - app/(application)/(user)/profile/[id]/index.tsx - app/(application)/admin/job/[id]/[status]/index.tsx - app/(application)/admin/notification/index.tsx - app/+not-found.tsx - ios/HIPMIBadungConnect.xcodeproj/project.pbxproj - screens/Admin/Job/funUpdateStatus.ts - screens/Home/bottomFeatureSection.tsx ### No Issue	2026-01-08 17:48:53 +08:00
bagasbanuna	145ad73616	Fix job notifikasi ### No Issue	2026-01-08 10:12:53 +08:00
bagasbanuna	7c85e35c61	Note: - Fitur notifikasi ke admin dari user baru - Notifikasi ke user bahwa akunnya telah terverifikasi Fix: - app/(application)/(user)/notifications/index.tsx - app/(application)/(user)/waiting-room.tsx - app/(application)/admin/super-admin/[id]/index.tsx - app/(application)/admin/user-access/[id]/index.tsx - context/AuthContext.tsx - screens/Home/tabsList.ts - service/api-admin/api-admin-user-access.ts - service/api-device-token.ts - service/api-notifications.ts - types/type-notification-category.ts Add: - lib/routeApp.ts ### No Issue	2026-01-06 12:27:30 +08:00
bagasbanuna	d098b8ca16	Setup notifikasi untuk android Fix: - modified: service/api-notifications.ts - modified: types/type-notification-category.ts ### No Issue	2026-01-05 12:27:23 +08:00