Fix job notifikasi

###  No Issue

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

@@ -519,7 +519,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

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

@@ -1,34 +1,72 @@
+import { BackButton } from "@/components";
 import { IconHome, IconStatus } from "@/components/_Icon";
 import { TabsStyles } from "@/styles/tabs-styles";
 import { Ionicons } from "@expo/vector-icons";
-import { Tabs } from "expo-router";
+import {
+  Stack,
+  Tabs,
+  useLocalSearchParams,
+  router,
+  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: () => (
+        <BackButton
+          onPress={() => {
+            if (from === "notifications") {
+              router.replace(`/notifications?category=${category}`);
+            } else {
+              if (from) {
+                router.replace(`/${from}` as any);
+              } else {
+                router.back();
+              }
+            }
+          }}
+        />
+      ),
+    });
+  }, [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>
+    </>
   );
 }

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>
+    </>
   );
 }

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} />
                 )}
                 

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);

app/(application)/(user)/notifications/index.tsx

@@ -3,24 +3,41 @@ import {
   NewWrapper,
   ScrollableCustom,
   StackCustom,
-  TextCustom
+  TextCustom,
 } from "@/components";
 import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
 import { AccentColor } from "@/constants/color-palet";
 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 { router, 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;
+}) => {
+  const fixPath =
+    deepLink + "&from=notifications&category=" + _.lowerCase(categoryApp);
+
+  return fixPath;
+};
+
 const BoxNotification = ({
   data,
   activeCategory,
@@ -28,18 +45,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,7 +87,10 @@ 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);
@@ -83,7 +113,8 @@ export default function Notifications() {
         id: user?.id as any,
         category: activeCategory as any,
       });
-      // console.log("Response Notification", JSON.stringify(response, null, 2));
+
+      console.log("Response Notification", JSON.stringify(response, null, 2));
       if (response.success) {
         setListData(response.data);
       } else {
@@ -120,7 +151,9 @@ export default function Notifications() {
       }
     >
       {loading ? (
-        <ListSkeletonComponent/>
+        <ListSkeletonComponent />
+      ) : _.isEmpty(listData) ? (
+        <NoDataText text="Belum ada notifikasi" />
       ) : (
         listData.map((e, i) => (
           <View key={i}>

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";

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

app/(application)/admin/notification/index.tsx

@@ -7,6 +7,8 @@ import {
   TextCustom,
 } from "@/components";
 import { IconPlus } from "@/components/_Icon";
+import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import { useNotificationStore } from "@/hooks/use-notification-store";
@@ -14,6 +16,7 @@ import { apiGetNotificationsById } from "@/service/api-notifications";
 import { listOfcategoriesAppNotification } from "@/types/type-notification-category";
 import { formatChatTime } from "@/utils/formatChatTime";
 import { router, Stack, useFocusEffect } from "expo-router";
+import _ from "lodash";
 import { useCallback, useState } from "react";
 import { RefreshControl, View } from "react-native";
 
@@ -66,6 +69,7 @@ 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 handlePress = (item: any) => {
     setActiveCategory(item.value);
@@ -80,6 +84,7 @@ export default function AdminNotification() {
 
   const fecthData = async () => {
     try {
+      setLoading(true);
       const response = await apiGetNotificationsById({
         id: user?.id as any,
         category: activeCategory as any,
@@ -92,6 +97,8 @@ export default function AdminNotification() {
       }
     } catch (error) {
       console.log("Error Notification", error);
+    } finally {
+      setLoading(false);
     }
   };
 
@@ -132,11 +139,20 @@ 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>
     </>
   );

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) {

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);

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())}
         />
       )}
     </>

context/AuthContext.tsx

@@ -7,10 +7,10 @@ import {
 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 = {
@@ -105,18 +105,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 +197,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 +226,7 @@ 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 +236,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");

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`,
+};

screens/Admin/Job/funUpdateStatus.ts

@@ -7,7 +7,7 @@ const funUpdateStatusJob = async ({
 }: {
   id: string;
   changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data?: any;
 }) => {
   try {
     const response = await apiAdminJobUpdate({

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",

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,

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);

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,11 @@ export async function apiNotificationUnreadCount({ id, role }: { id: string, rol
   }
 }
 
-
-export async function apiNotificationMarkAsRead({id}: {id: string}) {
+export async function apiNotificationMarkAsRead({ id }: { id: string }) {
   try {
     const response = await apiConfig.put(`/mobile/notification/${id}`);
     return response.data;
   } catch (error) {
     throw error;
   }
-}
+}

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" },
+];