Merge pull request 'Checkpoint 2' (#28) from checkpoint-2/12-dec-25 into main

Reviewed-on: http://wibugit.wibudev.com/wibu/hipmi-mobile/pulls/28

android/app/build.gradle

@@ -82,6 +82,14 @@ def enableMinifyInReleaseBuilds = (findProperty('android.enableMinifyInReleaseBu
 def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 android {
+// @generated begin @rnmapbox/maps-libcpp - expo prebuild (DO NOT MODIFY) sync-e24830a5a3e854b398227dfe9630aabfaa1cadd1
+packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+    }
+// @generated end @rnmapbox/maps-libcpp
     ndkVersion rootProject.ext.ndkVersion
 
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -92,8 +100,8 @@ android {
         applicationId 'com.bip.hipmimobileapp'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
+        versionCode 3
-        versionName "1.0.0"
+        versionName "1.0.1"
 
         buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
     }
@@ -180,3 +188,5 @@ dependencies {
         implementation jscFlavor
     }
 }
+
+apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "608461535079",
+    "project_id": "hipmi-badung-connect",
+    "storage_bucket": "hipmi-badung-connect.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:608461535079:android:4ff12ddc283fb3746761c2",
+        "android_client_info": {
+          "package_name": "com.bip.hipmimobileapp"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBiDtIk3Q9zffFwIdJ5cjqY7e4390JGSkM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,6 @@
 <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"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -14,6 +16,10 @@
     </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">
+    <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/notification_icon_color"/>
+    <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"/>
@@ -29,6 +35,12 @@
         <data android:scheme="hipmimobile"/>
         <data android:scheme="exp+hipmi-mobile"/>
       </intent-filter>
+      <intent-filter android:autoVerify="true" data-generated="true">
+        <action android:name="android.intent.action.VIEW"/>
+        <data android:scheme="https" android:host="cld-dkr-staging-hipmi.wibudev.com" android:pathPrefix="/"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
     </activity>
   </application>
 </manifest>

android/app/src/main/res/values/colors.xml

@@ -3,4 +3,5 @@
   <color name="iconBackground">#ffffff</color>
   <color name="colorPrimary">#023c69</color>
   <color name="colorPrimaryDark">#ffffff</color>
+  <color name="notification_icon_color">#ffffff</color>
 </resources>

android/build.gradle

@@ -6,6 +6,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
+        classpath 'com.google.gms:google-services:4.4.1'
     classpath('com.android.tools.build:gradle')
     classpath('com.facebook.react:react-native-gradle-plugin')
     classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
@@ -22,3 +23,25 @@ allprojects {
 
 apply plugin: "expo-root-project"
 apply plugin: "com.facebook.react.rootproject"
+// @generated begin @rnmapbox/maps-v2-maven - expo prebuild (DO NOT MODIFY) sync-d4ccbfdff48fdba3138b02a8ba41b9722af001d8
+
+allprojects {
+  repositories {
+    maven {
+      url 'https://api.mapbox.com/downloads/v2/releases/maven'
+      // Authentication is no longer required as per Mapbox's removal of download token requirement
+      // See: https://github.com/mapbox/mapbox-maps-flutter/issues/775
+      // Keeping this as optional for backward compatibility
+      def token = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: System.getenv('RNMAPBOX_MAPS_DOWNLOAD_TOKEN')
+      if (token) {
+        authentication { basic(BasicAuthentication) }
+        credentials {
+          username = 'mapbox'
+          password = token
+        }
+      }
+    }
+  }
+}
+
+// @generated end @rnmapbox/maps-v2-maven

app.config.js

@@ -4,7 +4,7 @@ require("dotenv").config();
 export default {
   name: "HIPMI Badung Connect",
   slug: "hipmi-mobile",
-  version: "1.0.0",
+  version: "1.0.1",
   orientation: "portrait",
   icon: "./assets/images/icon.png",
   scheme: "hipmimobile",
@@ -14,19 +14,25 @@ export default {
   ios: {
     supportsTablet: true,
     bundleIdentifier: "com.anonymous.hipmi-mobile",
+    googleServicesFile: "./ios/HIPMIBadungConnect/GoogleService-Info.plist",
     infoPlist: {
       ITSAppUsesNonExemptEncryption: false,
+      NSLocationWhenInUseUsageDescription:
+        "Aplikasi membutuhkan akses lokasi untuk menampilkan peta.",
     },
     associatedDomains: ["applinks:cld-dkr-staging-hipmi.wibudev.com"],
+    buildNumber: "15",
   },
 
   android: {
+    googleServicesFile: "./google-services.json",
     adaptiveIcon: {
       foregroundImage: "./assets/images/splash-icon.png",
       backgroundColor: "#ffffff",
     },
     edgeToEdgeEnabled: true,
     package: "com.bip.hipmimobileapp",
+    versionCode: 3,
     // softwareKeyboardLayoutMode: 'resize', // option: untuk mengatur keyboard pada room chst collaboration
     intentFilters: [
       {
@@ -36,7 +42,7 @@ export default {
           {
             scheme: "https",
             host: "cld-dkr-staging-hipmi.wibudev.com",
-            pathPrefix: "/app",
+            pathPrefix: "/",
           },
         ],
         category: ["BROWSABLE", "DEFAULT"],
@@ -71,6 +77,16 @@ export default {
       },
     ],
     "expo-font",
+    "@rnmapbox/maps",
+    "@react-native-firebase/app",
+    [
+      "expo-notifications",
+      {
+        icon: "./assets/images/icon.png",
+        color: "#ffffff",
+        iosDisplayInForeground: true,
+      },
+    ],
   ],
 
   experiments: {

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

@@ -10,6 +10,13 @@ export default function UserLayout() {
   return (
     <>
       <Stack screenOptions={HeaderStyles}>
+        <Stack.Screen
+          name="delete-account"
+          options={{
+            title: "Hapus Akun",
+            headerLeft: () => <BackButton />,
+          }}
+        />
         <Stack.Screen
           name="waiting-room"
           options={{
@@ -588,6 +595,13 @@ export default function UserLayout() {
             headerLeft: () => <BackButton />,
           }}
         />
+        <Stack.Screen
+          name="forum/terms"
+          options={{
+            title: "Syarat & Ketentuan Forum",
+            headerLeft: () => <BackButton />,
+          }}
+        />
 
         {/* ========== Maps Section ========= */}
         <Stack.Screen

app/(application)/(user)/collaboration/create.tsx

@@ -155,7 +155,7 @@ export default function CollaborationCreate() {
           <TextAreaCustom
             required
             label="Keuntungan Proyek"
-            placeholder="Masukan keuntungan proyek"
+            placeholder="Masukan keuntungan proyek, contoh: Meningkatkan relasi bisnis , menjamin kualitas produk, meningkatkan kinerja dan lain lain"
             showCount
             maxLength={1000}
             value={data?.benefit}

app/(application)/(user)/delete-account.tsx

@@ -0,0 +1,111 @@
+import {
+  AlertDefaultSystem,
+  BaseBox,
+  ButtonCustom,
+  CenterCustom,
+  StackCustom,
+  TextCustom,
+  TextInputCustom,
+  ViewWrapper,
+} from "@/components";
+import { useAuth } from "@/hooks/use-auth";
+import { apiDeleteUser } from "@/service/api-client/api-user";
+import { Image } from "expo-image";
+import { useLocalSearchParams } from "expo-router/build/hooks";
+import { useState } from "react";
+import Toast from "react-native-toast-message";
+
+export default function DeleteAccount() {
+  const { token, logout, user } = useAuth();
+  const { phone } = useLocalSearchParams();
+  const [text, setText] = useState("");
+  const [isLoading, setLoading] = useState(false);
+
+  const deleteAccount = async () => {
+    if (text !== "Delete Account") {
+      return Toast.show({
+        type: "error",
+        text1: "Ketik 'Delete Account' untuk menghapus akun",
+      });
+    }
+
+    AlertDefaultSystem({
+      title: "Anda yakin akan menghapus akun ini?",
+      message:
+        "Semua data yang pernah anda buat akan terhapus secara permanen !",
+      textLeft: "Batal",
+      textRight: "Ya",
+      onPressRight: async () => {
+        try {
+          setLoading(true);
+          const response = await apiDeleteUser({ id: user?.id as string });
+
+          if (response.success) {
+            console.log("RESPONSE >> ", response);
+            Toast.show({
+              type: "success",
+              text1: "Akun berhasil dihapus",
+            });
+
+            setTimeout(() => {
+              logout();
+              setLoading(false);
+            }, 2000);
+          } else {
+            Toast.show({
+              type: "error",
+              text1: "Gagal menghapus akun",
+            });
+            setLoading(false);
+          }
+        } catch (error) {
+          console.log("ERROR >> ", error);
+          setLoading(false);
+        }
+      },
+    });
+  };
+
+  return (
+    <>
+      <ViewWrapper>
+        <StackCustom>
+          <BaseBox>
+            <StackCustom>
+              <CenterCustom>
+                <Image
+                  source={require("@/assets/images/constants/logo-hipmi.png")}
+                  style={{
+                    width: 150,
+                    height: 150,
+                  }}
+                />
+              </CenterCustom>
+              <TextCustom align="center">
+                Anda akan menghapus akun dengan nomor +{phone}
+              </TextCustom>
+              <TextCustom align="center">
+                Ketik 'Delete Account' untuk menghapus akun
+              </TextCustom>
+              <TextInputCustom
+                value={text}
+                onChangeText={setText}
+                placeholder="Ketik 'Delete Account'"
+              />
+
+              <ButtonCustom
+                backgroundColor="red"
+                textColor="white"
+                onPress={deleteAccount}
+                isLoading={isLoading}
+                disabled={isLoading}
+              >
+                Submit
+              </ButtonCustom>
+            </StackCustom>
+          </BaseBox>
+        </StackCustom>
+      </ViewWrapper>
+    </>
+  );
+}

app/(application)/(user)/event/[id]/edit.tsx

@@ -18,7 +18,7 @@ import {
 import { apiMasterEventType } from "@/service/api-client/api-master";
 import { DateTimePickerEvent } from "@react-native-community/datetimepicker";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
-import React, { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import Toast from "react-native-toast-message";
 
 export default function EventEdit() {
@@ -55,6 +55,7 @@ export default function EventEdit() {
     try {
       setIsLoadData(true);
       const response = await apiEventGetOne({ id: id as string });
+      console.log("[DATA BY ID]", JSON.stringify(response, null, 2));
       if (response.success) {
         setData(response.data);
         setSelectedDate(new Date(response.data.tanggal));
@@ -209,7 +210,7 @@ export default function EventEdit() {
               minimumDate={new Date(Date.now())}
               label="Tanggal & Waktu Mulai"
               required
-              value={selectedDate as any}
+              value={selectedDate}
               onChange={(date: any) => {
                 setSelectedDate(date as any);
               }}
@@ -254,7 +255,6 @@ export default function EventEdit() {
               placeholder="Masukkan deskripsi event"
               required
               showCount
-              maxLength={100}
               value={data?.deskripsi}
               onChangeText={(value) => setData({ ...data, deskripsi: value })}
             />

app/(application)/(user)/event/[id]/publish.tsx

@@ -71,8 +71,6 @@ export default function EventDetailPublish() {
     }
   }
 
-  console.log("[participans]", isParticipant);
-
   const handlePress = (item: IMenuDrawerItem) => {
     console.log("PATH ", item.path);
     router.navigate(item.path as any);
@@ -139,7 +137,7 @@ export default function EventDetailPublish() {
     <>
       <Stack.Screen
         options={{
-          title: `Event publish`,
+          title: `Event Publish`,
           headerLeft: () => <LeftButtonCustom />,
           headerRight: () => <DotButton onPress={() => setOpenDrawer(true)} />,
         }}

app/(application)/(user)/event/create.tsx

@@ -110,13 +110,14 @@ export default function EventCreate() {
       const response = await apiEventCreate(newData);
       console.log("Response", JSON.stringify(response, null, 2));
 
-      router.navigate("/event/status");
+      router.replace("/event/status");
     } catch (error) {
       console.log(error);
     } finally {
       setIsLoading(false);
     }
   };
+  
 
   const buttonSubmit = (
     <ButtonCustom
@@ -144,7 +145,7 @@ export default function EventCreate() {
               label: item.name,
               value: item.id,
             }))}
-            value={data?.eventMaster_TipeAcaraId || ""}
+            value={data?.eventMaster_TipeAcaraId || null}
             onChange={(value: any) =>
               setData({ ...data, eventMaster_TipeAcaraId: value })
             }
@@ -191,7 +192,7 @@ export default function EventCreate() {
             placeholder="Masukkan deskripsi event"
             required
             showCount
-            maxLength={1000}
+            value={data?.deskripsi || ""}
             onChangeText={(value: any) =>
               setData({ ...data, deskripsi: value })
             }

app/(application)/(user)/forum/[id]/edit.tsx

@@ -5,9 +5,12 @@ import {
   TextAreaCustom,
   ViewWrapper,
 } from "@/components";
+import AlertWarning from "@/components/Alert/AlertWarning";
 import { apiForumGetOne, apiForumUpdate } from "@/service/api-client/api-forum";
+import { isBadContent } from "@/utils/badWordsIndonesia";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import { useCallback, useState } from "react";
+import { Alert } from "react-native";
 import Toast from "react-native-toast-message";
 
 export default function ForumEdit() {
@@ -43,6 +46,12 @@ export default function ForumEdit() {
       });
       return;
     }
+
+    if (isBadContent(text)) {
+      AlertWarning({});
+      return;
+    }
+
     try {
       setIsLoading(true);
       const response = await apiForumUpdate({

app/(application)/(user)/forum/[id]/forumku.tsx

@@ -1,142 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import {
+import View_Forumku from "@/screens/Forum/ViewForumku";
-  AvatarComp,
+import View_Forumku2 from "@/screens/Forum/ViewForumku2";
-  ButtonCustom,
-  CenterCustom,
-  DrawerCustom,
-  FloatingButton,
-  Grid,
-  LoaderCustom,
-  StackCustom,
-  TextCustom,
-  ViewWrapper,
-} from "@/components";
-import { useAuth } from "@/hooks/use-auth";
-import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
-import Forum_MenuDrawerBerandaSection from "@/screens/Forum/MenuDrawerSection.tsx/MenuBeranda";
-import { apiForumGetAll } from "@/service/api-client/api-forum";
-import { apiUser } from "@/service/api-client/api-user";
-import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
-import _ from "lodash";
-import { useCallback, useState } from "react";
 
 export default function Forumku() {
-  const { id } = useLocalSearchParams();
-  const { user } = useAuth();
-  const [openDrawer, setOpenDrawer] = useState(false);
-  const [status, setStatus] = useState("");
-  const [listData, setListData] = useState<any | null>(null);
-  const [dataUser, setDataUser] = useState<any | null>(null);
-  const [loadingGetList, setLoadingGetList] = useState(false);
-
-  useFocusEffect(
-    useCallback(() => {
-      onLoadData();
-      onLoadDataProfile(id as string);
-    }, [id])
-  );
-
-  const onLoadDataProfile = async (id: string) => {
-    try {
-      const response = await apiUser(id);
-
-      setDataUser(response.data);
-    } catch (error) {
-      console.log("[ERROR]", error);
-    } finally {
-    }
-  };
-
-  const onLoadData = async () => {
-    try {
-      setLoadingGetList(true);
-      const response = await apiForumGetAll({
-        search: "",
-        authorId: id as string,
-      });
-
-      setListData(response.data);
-    } catch (error) {
-      console.log("[ERROR]", error);
-    } finally {
-      setLoadingGetList(false);
-    }
-  };
-
   return (
     <>
-      <ViewWrapper
+      {/* <View_Forumku />  */}
-        floatingButton={
+      <View_Forumku2 />
-          user?.id === id && (
-            <FloatingButton
-              onPress={() =>
-                router.navigate("/(application)/(user)/forum/create")
-              }
-            />
-          )
-        }
-      >
-        <StackCustom>
-          <CenterCustom>
-            <AvatarComp
-              fileId={dataUser?.Profile?.imageId}
-              href={`/(application)/(image)/preview-image/${dataUser?.Profile?.imageId}`}
-              size="xl"
-            />
-          </CenterCustom>
-
-          <Grid>
-            <Grid.Col span={6}>
-              <TextCustom bold truncate>
-                @{dataUser?.username || "-"}
-              </TextCustom>
-              <TextCustom>{listData?.length || "0"} postingan</TextCustom>
-            </Grid.Col>
-            <Grid.Col span={6} style={{ alignItems: "flex-end" }}>
-              <ButtonCustom href={`/profile/${dataUser?.Profile?.id}`}>
-                Kunjungi Profile
-              </ButtonCustom>
-            </Grid.Col>
-          </Grid>
-          {loadingGetList ? (
-            <LoaderCustom />
-          ) : _.isEmpty(listData) ? (
-            <TextCustom> Tidak ada diskusi</TextCustom>
-          ) : (
-            <>
-              {listData?.map((item: any, index: number) => (
-                <Forum_BoxDetailSection
-                  isRightComponent={false}
-                  key={index}
-                  data={item}
-                  isTruncate={true}
-                  href={`/forum/${item.id}`}
-                  onSetData={(value) => {
-                    setOpenDrawer(value.setOpenDrawer);
-                    setStatus(value.setStatus);
-                  }}
-                />
-              ))}
-            </>
-          )}
-        </StackCustom>
-      </ViewWrapper>
-
-      {/* Drawer Komponen Eksternal */}
-      <DrawerCustom
-        height={"auto"}
-        isVisible={openDrawer}
-        closeDrawer={() => setOpenDrawer(false)}
-      >
-        <Forum_MenuDrawerBerandaSection
-          id={id as string}
-          status={status}
-          setIsDrawerOpen={() => {
-            setOpenDrawer(false);
-          }}
-          authorId={id as string}
-        />
-      </DrawerCustom>
     </>
   );
 }

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

@@ -7,6 +7,7 @@ import {
   TextCustom,
   ViewWrapper,
 } from "@/components";
+import AlertWarning from "@/components/Alert/AlertWarning";
 import { useAuth } from "@/hooks/use-auth";
 import Forum_CommentarBoxSection from "@/screens/Forum/CommentarBoxSection";
 import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
@@ -18,9 +19,11 @@ import {
   apiForumGetOne,
   apiForumUpdateStatus,
 } from "@/service/api-client/api-forum";
+import { isBadContent } from "@/utils/badWordsIndonesia";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useEffect, useState } from "react";
+import { Alert } from "react-native";
 
 interface CommentProps {
   id: string;
@@ -110,11 +113,15 @@ export default function ForumDetail() {
 
   // Create Commentar
   const handlerCreateCommentar = async () => {
+    if (isBadContent(text)) {
+      AlertWarning({});
+      return;
+    }
+    
     const newData = {
       comment: text,
       authorId: user?.id,
     };
-
     try {
       setLoadingComment(true);
       const response = await apiForumCreateComment({
@@ -223,6 +230,7 @@ export default function ForumDetail() {
       >
         <Forum_MenuDrawerBerandaSection
           id={dataId}
+          authorUsername={data?.Author?.username as string}
           status={status}
           setIsDrawerOpen={() => {
             setOpenDrawer(false);

app/(application)/(user)/forum/create.tsx

@@ -2,12 +2,15 @@ import {
   BoxButtonOnFooter,
   ButtonCustom,
   TextAreaCustom,
-  ViewWrapper,
+  ViewWrapper
 } from "@/components";
+import AlertWarning from "@/components/Alert/AlertWarning";
 import { useAuth } from "@/hooks/use-auth";
 import { apiForumCreate } from "@/service/api-client/api-forum";
+import { isBadContent } from "@/utils/badWordsIndonesia";
 import { router } from "expo-router";
 import { useState } from "react";
+import { Alert } from "react-native";
 import Toast from "react-native-toast-message";
 
 export default function ForumCreate() {
@@ -16,11 +19,16 @@ export default function ForumCreate() {
   const [isLoading, setIsLoading] = useState(false);
 
   const handlerSubmit = async () => {
+    
+    if (isBadContent(text)) {
+      AlertWarning({})
+      return;
+    }
+    
     const newData = {
       diskusi: text,
       authorId: user?.id,
     };
-
     try {
       setIsLoading(true);
       const response = await apiForumCreate({ data: newData });

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

@@ -1,129 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import {
+import Forum_ViewBeranda from "@/screens/Forum/ViewBeranda";
-  AvatarComp,
+import Forum_ViewBeranda2 from "@/screens/Forum/ViewBeranda2";
-  BackButton,
-  DrawerCustom,
-  LoaderCustom,
-  SearchInput,
-  TextCustom,
-  ViewWrapper,
-} from "@/components";
-import FloatingButton from "@/components/Button/FloatingButton";
-import { useAuth } from "@/hooks/use-auth";
-import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
-import Forum_MenuDrawerBerandaSection from "@/screens/Forum/MenuDrawerSection.tsx/MenuBeranda";
-import { apiForumGetAll } from "@/service/api-client/api-forum";
-import { apiUser } from "@/service/api-client/api-user";
-import { router, Stack, useFocusEffect } from "expo-router";
-import _ from "lodash";
-import { useCallback, useState } from "react";
 
 export default function Forum() {
-  const [openDrawer, setOpenDrawer] = useState(false);
-  const [status, setStatus] = useState("");
-  const { user } = useAuth();
-  const [dataUser, setDataUser] = useState<any>();
-  const [listData, setListData] = useState<any[]>();
-  const [loadingGetList, setLoadingGetList] = useState(false);
-  const [search, setSearch] = useState("");
-  const [dataId, setDataId] = useState("");
-  const [authorId, setAuthorId] = useState("");
-
-  useFocusEffect(
-    useCallback(() => {
-      onLoadData();
-      onLoadDataProfile(user?.id as string);
-    }, [user?.id, search])
-  );
-
-  const onLoadDataProfile = async (id: string) => {
-    const response = await apiUser(id);
-    setDataUser(response.data);
-  };
-
-  const onLoadData = async () => {
-    try {
-      setLoadingGetList(true);
-      const response = await apiForumGetAll({ search: search });
-
-      setListData(response.data);
-    } catch (error) {
-      console.log("[ERROR]", error);
-    } finally {
-      setLoadingGetList(false);
-    }
-  };
-
   return (
     <>
-      <Stack.Screen
+      {/* <Forum_ViewBeranda /> */}
-        options={{
+      <Forum_ViewBeranda2 />
-          title: "Forum",
-          headerLeft: () => <BackButton />,
-          headerRight: () => (
-            <AvatarComp
-              fileId={dataUser?.Profile?.imageId}
-              size="base"
-              href={`/forum/${user?.id}/forumku`}
-            />
-          ),
-        }}
-      />
-
-      <ViewWrapper
-        headerComponent={
-          <SearchInput
-            placeholder="Cari topik diskusi"
-            onChangeText={(e) => setSearch(e)}
-          />
-        }
-        floatingButton={
-          <FloatingButton
-            onPress={() =>
-              router.navigate("/(application)/(user)/forum/create")
-            }
-          />
-        }
-      >
-        {loadingGetList ? (
-          <LoaderCustom />
-        ) : _.isEmpty(listData) ? (
-          <TextCustom align="center" color="gray">
-            Tidak ada diskusi
-          </TextCustom>
-        ) : (
-          listData?.map((e: any, i: number) => (
-            <Forum_BoxDetailSection
-              key={i}
-              data={e}
-              onSetData={() => {
-                setDataId(e.id);
-                setOpenDrawer(true);
-                setStatus(e.ForumMaster_StatusPosting?.status);
-                setAuthorId(e.Author?.id);
-              }}
-              isTruncate={true}
-              href={`/forum/${e.id}`}
-              isRightComponent={false}
-            />
-          ))
-        )}
-      </ViewWrapper>
-
-      <DrawerCustom
-        height={"auto"}
-        isVisible={openDrawer}
-        closeDrawer={() => setOpenDrawer(false)}
-      >
-        <Forum_MenuDrawerBerandaSection
-          id={dataId}
-          authorId={authorId}
-          status={status}
-          setIsDrawerOpen={() => {
-            setOpenDrawer(false);
-          }}
-        />
-      </DrawerCustom>
     </>
   );
 }

app/(application)/(user)/forum/terms.tsx

@@ -0,0 +1,202 @@
+import {
+    BaseBox,
+    ButtonCustom,
+    CheckboxCustom,
+    NewWrapper,
+    StackCustom,
+    TextCustom,
+} from "@/components";
+import { useAuth } from "@/hooks/use-auth";
+import { apiAcceptForumTerms } from "@/service/api-client/api-user";
+import { GStyles } from "@/styles/global-styles";
+import { Ionicons } from "@expo/vector-icons";
+import { router } from "expo-router";
+import { useState } from "react";
+import { View } from "react-native";
+import { Text } from "react-native-paper";
+import Toast from "react-native-toast-message";
+
+export default function ForumSplash() {
+  const { user } = useAuth();
+  const [term, setTerm] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const handleSubmit = async () => {
+    try {
+      setLoading(true);
+      const respone = await apiAcceptForumTerms({
+        category: "Forum",
+        userId: user?.id as any,
+      });
+
+      if (respone.success) {
+        Toast.show({
+          type: "success",
+          text1: "Berhasil",
+          text2: "Terima kasih telah menerima syarat & ketentuan forum ini",
+        });
+
+        router.replace("/(application)/forum");
+
+        return;
+      }
+
+      Toast.show({
+        type: "error",
+        text1: "Gagal",
+        text2: "Terjadi kesalahan, silahkan coba lagi",
+      });
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <NewWrapper>
+      {/* <TextCustom bold>HIPMI Badung Connect</TextCustom> . */}
+
+      <BaseBox>
+        <StackCustom>
+          <TextCustom>
+            Dengan mengakses dan menggunakan Forum HIPMI Badung Connect, Anda
+            secara sadar menyetujui ketentuan berikut:
+          </TextCustom>
+
+          <TextCustom bold>
+            1. Dilarang keras memposting konten yang mengandung:
+          </TextCustom>
+          <View style={{ paddingInline: 10 }}>
+            {forumTerms1.map((term, index) => (
+              <View
+                key={index}
+                style={{
+                  flexDirection: "row",
+                  alignItems: "center",
+                  gap: 10,
+                  paddingBottom: 10,
+                }}
+              >
+                <Ionicons name="radio-button-on" color={"white"} />
+                <TextCustom>{term.text}</TextCustom>
+              </View>
+            ))}
+          </View>
+
+          <TextCustom bold>
+            2. Setiap pengguna bertanggung jawab penuh atas konten yang
+            diunggah. Konten yang melanggar ketentuan ini dapat dihapus kapan
+            saja tanpa pemberitahuan.
+          </TextCustom>
+
+          <TextCustom bold>
+            3. Jika Anda menemukan konten tidak pantas, segera:
+          </TextCustom>
+          <View style={{ paddingInline: 10 }}>
+            {forumTerms2.map((term, index) => (
+              <View
+                key={index}
+                style={{
+                  flexDirection: "row",
+                  alignItems: "center",
+                  gap: 10,
+                  paddingBottom: 10,
+                }}
+              >
+                <Ionicons name="radio-button-on" color={"white"} />
+                <TextCustom>{term.text}</TextCustom>
+              </View>
+            ))}
+          </View>
+
+          <TextCustom bold>
+            4. Gunakan fitur “Blokir Pengguna” di profil pengguna terkait
+          </TextCustom>
+          <View style={{ paddingInline: 10 }}>
+            {forumTerms3.map((term, index) => (
+              <View
+                key={index}
+                style={{
+                  flexDirection: "row",
+                  alignItems: "center",
+                  gap: 10,
+                  paddingBottom: 10,
+                }}
+              >
+                <Ionicons name="radio-button-on" color={"white"} />
+                <TextCustom>{term.text}</TextCustom>
+              </View>
+            ))}
+          </View>
+
+          <TextCustom>
+            Pelanggaran terhadap ketentuan ini berakibat{" "}
+            <TextCustom bold>pencabutan akses</TextCustom> ke Forum dan/atau{" "}
+            <TextCustom bold>pemblokiran akun secara permanen</TextCustom> tanpa
+            pemberitahuan lebih lanjut.
+          </TextCustom>
+
+          <View
+            style={{
+              flexDirection: "row",
+              alignItems: "center",
+              marginTop: 16,
+              marginBottom: 16,
+            }}
+          >
+            <CheckboxCustom value={term} onChange={() => setTerm(!term)} />
+
+            <Text style={GStyles.textLabel}>
+              Saya telah membaca dan menyetujui Syarat & Ketentuan Forum ini
+            </Text>
+          </View>
+
+          <ButtonCustom
+            disabled={!term || loading}
+            onPress={() => {
+              handleSubmit();
+            }}
+          >
+            Lanjut
+          </ButtonCustom>
+        </StackCustom>
+      </BaseBox>
+    </NewWrapper>
+  );
+}
+
+// Data dalam format JSON (bisa juga diimpor dari file terpisah)
+interface Term {
+  text: string;
+}
+
+const forumTerms1: Term[] = [
+  {
+    text: "Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)",
+  },
+  { text: "Kata kasar, pelecehan, ancaman, atau bullying" },
+  { text: "Pornografi, hoaks, spam, atau informasi menyesatkan" },
+  { text: "Promosi aktivitas ilegal seperti perjudian atau narkoba" },
+];
+
+const forumTerms2: Term[] = [
+  {
+    text: "Gunakan tombol “Laporkan” di setiap postingan, atau",
+  },
+  {
+    text: "Gunakan fitur “Blokir Pengguna” di profil pengguna terkait.",
+  },
+];
+
+const forumTerms3: Term[] = [
+  {
+    text: "Meninjau setiap laporan dalam waktu 24 jam",
+  },
+  {
+    text: "Menghapus konten yang melanggar",
+  },
+  {
+    text: "Memblokir akun pelanggar sesuai tingkat pelanggaran",
+  },
+];

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

@@ -11,31 +11,52 @@ import Home_FeatureSection from "@/screens/Home/topFeatureSection";
 import { apiUser } from "@/service/api-client/api-user";
 import { apiVersion } from "@/service/api-config";
 import { Ionicons } from "@expo/vector-icons";
-import { Redirect, router, Stack } from "expo-router";
+import { Redirect, router, Stack, useFocusEffect } from "expo-router";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
+import { RefreshControl } from "react-native";
 
 export default function Application() {
-  const { token, user } = useAuth();
+  const { token, user, userData } = useAuth();
-
   const [data, setData] = useState<any>();
+  const [refreshing, setRefreshing] = useState(false);
+  console.log("[User] >>", JSON.stringify(user?.id, null, 2));
 
-  useEffect(() => {
+  // ‼️ Untuk cek apakah: 1. user ada, 2. user punya profile, 3. accept temrs of forum nya ada atau tidak
-    onLoadData();
+  useFocusEffect(
-    checkVersion();
+    useCallback(() => {
-  }, []);
+      onLoadData();
+      checkVersion();
+      userData(token as string);
+    }, [user?.id, token])
+  );
 
   async function onLoadData() {
     const response = await apiUser(user?.id as string);
-    console.log("Response profile >>", JSON.stringify(response?.data?.Profile, null, 2));
+    console.log(
+      "[Profile ID]>>",
+      JSON.stringify(response?.data?.Profile?.id, null, 2)
+    );
 
     setData(response.data);
   }
 
   const checkVersion = async () => {
     const response = await apiVersion();
-    console.log("Version >>", JSON.stringify(response.data, null, 2));
+    console.log("[Version] >>", JSON.stringify(response.data, null, 2));
   };
 
+  const onRefresh = useCallback(() => {
+    setRefreshing(true);
+    onLoadData();
+    checkVersion();
+    setRefreshing(false);
+  }, []);
+
+  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");
     return <Redirect href={`/waiting-room`} />;
@@ -63,9 +84,10 @@ export default function Application() {
           ),
           headerRight: () => (
             <Ionicons
+              disabled={true}
               name="notifications"
               size={20}
-              color={MainColor.yellow}
+              color={MainColor.placeholder}
               onPress={() => {
                 router.push("/notifications");
               }}
@@ -74,8 +96,16 @@ export default function Application() {
         }}
       />
       <ViewWrapper
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
         footerComponent={
-          <TabSection tabs={tabsHome(data?.Profile?.id as string)} />
+          <TabSection
+            tabs={tabsHome({
+              acceptedForumTermsAt: data?.acceptedForumTermsAt,
+              profileId: data?.Profile?.id,
+            })}
+          />
         }
       >
         <StackCustom>

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

@@ -15,6 +15,7 @@ import Investment_ButtonInvestasiSection from "@/screens/Invesment/ButtonInvesta
 import Invesment_ComponentBoxOnBottomDetail from "@/screens/Invesment/ComponentBoxOnBottomDetail";
 import Invesment_DetailDataPublishSection from "@/screens/Invesment/DetailDataPublishSection";
 import { apiInvestmentGetOne } from "@/service/api-client/api-investment";
+import { countDownAndCondition } from "@/utils/countDownAndCondition";
 import { AntDesign, MaterialIcons } from "@expo/vector-icons";
 import {
   router,
@@ -23,7 +24,7 @@ import {
   useLocalSearchParams,
 } from "expo-router";
 import _ from "lodash";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 export default function InvestmentDetail() {
   const { user } = useAuth();
@@ -62,6 +63,31 @@ export default function InvestmentDetail() {
     setOpenDrawerPublish(false);
   };
 
+    const [value, setValue] = useState({
+      sisa: 0,
+      reminder: false,
+    });
+  
+    useEffect(() => {
+      updateCountDown();
+    }, [data]);
+
+    console.log("[DATA DETAIL]", JSON.stringify(data, null, 2));
+  
+    const updateCountDown = () => {
+      const countDown = countDownAndCondition({
+        duration: data?.MasterPencarianInvestor.name,
+        publishTime: data?.countDown,
+      });
+  
+      setValue({
+        sisa: countDown.durationDay,
+        reminder: countDown.reminder,
+      });
+    };
+
+
+
   const bottomSection = (
     <Invesment_ComponentBoxOnBottomDetail
       id={id as string}
@@ -71,7 +97,7 @@ export default function InvestmentDetail() {
   );
 
   const buttonSection = (
-    <Investment_ButtonInvestasiSection id={id as string} isMine={user?.id === data?.author?.id} />
+    <Investment_ButtonInvestasiSection id={id as string} isMine={user?.id === data?.author?.id} reminder={value.reminder} />
   );
 
   return (

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

@@ -1,32 +1,6 @@
-import {
+import MapsView from "@/screens/Maps/MapsView";
-  ButtonCustom,
+import MapsView2 from "@/screens/Maps/MapsView2";
-  DrawerCustom,
+import { Text, View } from "react-native";
-  DummyLandscapeImage,
-  Grid,
-  Spacing,
-  StackCustom,
-  TextCustom,
-  ViewWrapper,
-} from "@/components";
-import GridTwoView from "@/components/_ShareComponent/GridTwoView";
-import API_IMAGE from "@/constants/api-storage";
-import { ICON_SIZE_SMALL } from "@/constants/constans-value";
-import { apiMapsGetAll } from "@/service/api-client/api-maps";
-import { openInDeviceMaps } from "@/utils/openInDeviceMaps";
-import { FontAwesome, Ionicons } from "@expo/vector-icons";
-import { Image } from "expo-image";
-import { router, useFocusEffect } from "expo-router";
-import { useCallback, useState } from "react";
-import { View } from "react-native";
-import MapView, { Marker } from "react-native-maps";
-
-const defaultRegion = {
-  latitude: -8.737109,
-  longitude: 115.1756897,
-  latitudeDelta: 0.1,
-  longitudeDelta: 0.1,
-  height: 300,
-};
 
 export interface LocationItem {
   id: string | number;
@@ -37,198 +11,11 @@ export interface LocationItem {
 }
 
 export default function Maps() {
-  const [list, setList] = useState<any[] | null>(null);
-  const [loadList, setLoadList] = useState(false);
-  const [openDrawer, setOpenDrawer] = useState(false);
-  const [selected, setSelected] = useState({
-    id: "",
-    bidangBisnis: "",
-    nomorTelepon: "",
-    alamatBisnis: "",
-    namePin: "",
-    imageId: "",
-    portofolioId: "",
-    latitude: 0,
-    longitude: 0,
-  });
-
-  useFocusEffect(
-    useCallback(() => {
-      handlerLoadList();
-    }, [])
-  );
-
-  const handlerLoadList = async () => {
-    try {
-      setLoadList(true);
-      const response = await apiMapsGetAll();
-
-      if (response.success) {
-        setList(response.data);
-      }
-    } catch (error) {
-      console.log("[ERROR]", error);
-    } finally {
-      setLoadList(false);
-    }
-  };
-
   return (
     <>
-      <ViewWrapper style={{ paddingInline: 0, paddingBlock: 0 }}>
+      <MapsView />
-        {/* <MapCustom height={"100%"} /> */}
+      {/* <MapsView2 />, */}
-        <View style={{ flex: 1 }}>
+      {/* <View style={{ flex: 1, backgroundColor: "gray" }}><Text style={{ color: "white" }}>Map disabled</Text></View> */}
-          {loadList ? (
-            <MapView
-              initialRegion={defaultRegion}
-              style={{
-                width: "100%",
-                height: "100%",
-              }}
-            />
-          ) : (
-            <MapView
-              initialRegion={defaultRegion}
-              style={{
-                width: "100%",
-                height: "100%",
-              }}
-            >
-              {list?.map((item: any, index: number) => {
-                return (
-                  <Marker
-                    key={item?.id}
-                    coordinate={{
-                      latitude: item?.latitude,
-                      longitude: item?.longitude,
-                    }}
-                    title={item?.namePin}
-                    onPress={() => {
-                      setOpenDrawer(true);
-                      setSelected({
-                        id: item?.id,
-                        bidangBisnis:
-                          item?.Portofolio?.MasterBidangBisnis?.name,
-                        nomorTelepon: item?.Portofolio?.tlpn,
-                        alamatBisnis: item?.Portofolio?.alamatKantor,
-                        namePin: item?.namePin,
-                        imageId: item?.imageId,
-                        portofolioId: item?.Portofolio?.id,
-                        latitude: item?.latitude,
-                        longitude: item?.longitude,
-                      });
-                    }}
-                    // Gunakan gambar kustom jika tersedia
-                  >
-                    <View style={{}}>
-                      <Image
-                        source={{
-                          uri: API_IMAGE.GET({
-                            fileId: item?.Portofolio?.logoId,
-                          }),
-                        }}
-                        style={{
-                          width: 30,
-                          height: 30,
-                          borderRadius: 100,
-                          borderWidth: 1,
-                        }}
-                      />
-                    </View>
-                  </Marker>
-                );
-              })}
-            </MapView>
-          )}
-        </View>
-      </ViewWrapper>
-
-      <DrawerCustom
-        isVisible={openDrawer}
-        closeDrawer={() => setOpenDrawer(false)}
-        height={"auto"}
-      >
-        <DummyLandscapeImage height={200} imageId={selected.imageId} />
-        <Spacing />
-        <StackCustom gap={"xs"}>
-          <GridTwoView
-            spanLeft={2}
-            spanRight={10}
-            leftIcon={
-              <FontAwesome
-                name="building-o"
-                size={ICON_SIZE_SMALL}
-                color="white"
-              />
-            }
-            rightIcon={<TextCustom>{selected.namePin}</TextCustom>}
-          />
-
-          <GridTwoView
-            spanLeft={2}
-            spanRight={10}
-            leftIcon={
-              <Ionicons
-                name="list-outline"
-                size={ICON_SIZE_SMALL}
-                color="white"
-              />
-            }
-            rightIcon={<TextCustom>{selected.bidangBisnis}</TextCustom>}
-          />
-
-          <GridTwoView
-            spanLeft={2}
-            spanRight={10}
-            leftIcon={
-              <Ionicons
-                name="call-outline"
-                size={ICON_SIZE_SMALL}
-                color="white"
-              />
-            }
-            rightIcon={<TextCustom>{selected.nomorTelepon}</TextCustom>}
-          />
-          <GridTwoView
-            spanLeft={2}
-            spanRight={10}
-            leftIcon={
-              <Ionicons
-                name="location-outline"
-                size={ICON_SIZE_SMALL}
-                color="white"
-              />
-            }
-            rightIcon={<TextCustom>{selected.alamatBisnis}</TextCustom>}
-          />
-
-          <Grid>
-            <Grid.Col span={6} style={{ paddingRight: 10 }}>
-              <ButtonCustom
-                onPress={() => {
-                  setOpenDrawer(false);
-                  router.push(`/portofolio/${selected.portofolioId}`);
-                }}
-              >
-                Detail
-              </ButtonCustom>
-            </Grid.Col>
-            <Grid.Col span={6} style={{ paddingLeft: 10 }}>
-              <ButtonCustom
-                onPress={() => {
-                  openInDeviceMaps({
-                    latitude: selected.latitude,
-                    longitude: selected.longitude,
-                    title: selected.namePin,
-                  });
-                }}
-              >
-                Buka Maps
-              </ButtonCustom>
-            </Grid.Col>
-          </Grid>
-        </StackCustom>
-      </DrawerCustom>
     </>
   );
 }

app/(application)/(user)/portofolio/[id]/create.tsx

@@ -31,9 +31,9 @@ import {
 import pickImage from "@/utils/pickImage";
 import { Ionicons } from "@expo/vector-icons";
 import { Image } from "expo-image";
-import { useLocalSearchParams } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 import PhoneInput, { ICountry } from "react-native-international-phone-number";
 import { Avatar } from "react-native-paper";
@@ -76,7 +76,7 @@ export default function PortofolioCreate() {
   function handleInputValue(phoneNumber: string) {
     setInputValue(phoneNumber);
     const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
-    const fixNumber = inputValue.replace(/\s+/g, "");
+    let fixNumber = inputValue.replace(/\s+/g, "").replace(/^0+/, "");
     const realNumber = callingCode + fixNumber;
     setData({ ...data, tlpn: realNumber });
   }
@@ -85,10 +85,12 @@ export default function PortofolioCreate() {
     setSelectedCountry(country);
   }
 
-  useEffect(() => {
+  useFocusEffect(
-    onLoadMaster();
+    useCallback(() => {
-    onLoadMasterSubBidangBisnis();
+      onLoadMaster();
-  }, []);
+      onLoadMasterSubBidangBisnis();
+    }, [])
+  );
 
   const onLoadMaster = async () => {
     try {

app/(application)/(user)/portofolio/[id]/edit.tsx

@@ -244,7 +244,7 @@ export default function PortofolioEdit() {
 
   const handleSubmitUpdate = async () => {
     const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
-    const fixNumber = data.tlpn.replace(/\s+/g, "");
+    let fixNumber = data.tlpn.replace(/\s+/g, "").replace(/^0+/, "");
     const realNumber = callingCode + fixNumber;
 
     const newData: IFormData = {

app/(application)/(user)/profile/[id]/blocked-list.tsx

@@ -0,0 +1,148 @@
+import {
+  AvatarUsernameAndOtherComponent,
+  BadgeCustom,
+  ClickableCustom,
+  Divider,
+  SelectCustom,
+  TextCustom,
+} from "@/components";
+import ListEmptyComponent from "@/components/_ShareComponent/ListEmptyComponent";
+import ListLoaderFooterComponent from "@/components/_ShareComponent/ListLoaderFooterComponent";
+import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent";
+import NewWrapper from "@/components/_ShareComponent/NewWrapper";
+import { MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
+import { usePaginatedApi } from "@/hooks/use-paginated-api";
+import { apiGetBlocked } from "@/service/api-client/api-blocked";
+import { apiMasterAppCategory } from "@/service/api-client/api-master";
+import { router, useFocusEffect } from "expo-router";
+import _ from "lodash";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { RefreshControl, View } from "react-native";
+
+const PAGE_SIZE = 10;
+export default function ProfileBlockedList() {
+  const { user } = useAuth();
+  const [masterApp, setMasterApp] = useState<any[]>([]);
+  const isInitialMount = useRef(true);
+
+  const {
+    data: listData,
+    loading,
+    refreshing,
+    hasMore,
+    search,
+    setSearch,
+    onRefresh,
+    loadMore,
+  } = usePaginatedApi({
+    fetcher: async (params: { page: number; search?: string }) => {
+      const response = await apiGetBlocked({
+        id: user?.id as any,
+        search: search,
+        page: String(params.page) as any,
+      });
+
+      return response.data;
+    },
+    initialSearch: "",
+    pageSize: PAGE_SIZE,
+    dependencies: [user?.id],
+  });
+
+  useEffect(() => {
+    fetchMasterApp();
+  }, []);
+
+  // 🔁 Refresh otomatis saat kembali ke halaman ini
+  useFocusEffect(
+    useCallback(() => {
+      if (isInitialMount.current) {
+        // Skip saat pertama kali mount
+        isInitialMount.current = false;
+        return;
+      }
+      // Hanya refresh saat kembali dari screen lain
+      onRefresh();
+    }, [onRefresh])
+  );
+
+  const fetchMasterApp = async () => {
+    const response = await apiMasterAppCategory();
+    setMasterApp(response.data);
+  };
+
+  const renderHeader = () => (
+    <SelectCustom
+      placeholder="Pilih Kategori Fitur"
+      data={masterApp.map((item) => ({
+        label: item.name,
+        value: item.id,
+      }))}
+      value={search === "" ? undefined : search}
+      onChange={(value) => {
+        setSearch(value as any);
+      }}
+    />
+  );
+
+  const renderItem = ({ item }: { item: any }) => (
+    <>
+      <ClickableCustom
+        onPress={() => {
+          router.push(`/profile/${item.id}/detail-blocked`);
+        }}
+      >
+        <View
+          style={{
+            paddingInline: 8,
+          }}
+        >
+          <AvatarUsernameAndOtherComponent
+            avatarHref={`/profile/${item?.blocked?.Profile?.id}`}
+            avatar={item?.blocked?.Profile?.imageId}
+            name={item?.blocked?.username}
+            rightComponent={
+              <View style={{ flexDirection: "row", gap: 4 }}>
+                <BadgeCustom>
+                  <TextCustom size={"small"} bold truncate>
+                    {item?.menuFeature?.name}
+                  </TextCustom>
+                </BadgeCustom>
+              </View>
+            }
+          />
+          <Divider color="gray" />
+        </View>
+      </ClickableCustom>
+    </>
+  );
+
+  return (
+    <>
+      <NewWrapper
+        // headerComponent={renderHeader()}
+        listData={listData}
+        renderItem={renderItem}
+        onEndReached={loadMore}
+        refreshControl={
+          <RefreshControl
+            progressBackgroundColor={MainColor.yellow}
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+          />
+        }
+        ListFooterComponent={
+          hasMore && !refreshing ? <ListLoaderFooterComponent /> : null
+        }
+        ListEmptyComponent={
+          !loading && _.isEmpty(listData) ? (
+            <ListSkeletonComponent />
+          ) : (
+            <ListEmptyComponent />
+          )
+        }
+      />
+    </>
+  );
+}

app/(application)/(user)/profile/[id]/detail-blocked.tsx

@@ -0,0 +1,93 @@
+import {
+  AlertDefaultSystem,
+  AvatarUsernameAndOtherComponent,
+  BaseBox,
+  BoxButtonOnFooter,
+  BoxWithHeaderSection,
+  ButtonCustom,
+  NewWrapper,
+  StackCustom,
+  TextCustom,
+} from "@/components";
+import AvatarAndBackground from "@/screens/Profile/AvatarAndBackground";
+import {
+  apiGetBlockedById,
+  apiUnblock,
+} from "@/service/api-client/api-blocked";
+import { router, useLocalSearchParams } from "expo-router";
+import _ from "lodash";
+import { useEffect, useState } from "react";
+
+export default function ProfileDetailBlocked() {
+  const { id } = useLocalSearchParams();
+  const [data, setData] = useState<any>(null);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    fetchData();
+  }, [id]);
+
+  const fetchData = async () => {
+    const response = await apiGetBlockedById({ id: String(id) });
+    // console.log("[RESPONSE >>]", JSON.stringify(response, null, 2));
+    setData(response.data);
+  };
+
+  const handleSubmit = async () => {
+    try {
+      setIsLoading(true);
+      await apiUnblock({ id: String(id) });
+      router.back();
+    } catch (error) {
+      console.log("[ERROR >>]", JSON.stringify(error, null, 2));
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <NewWrapper
+        footerComponent={
+          <BoxButtonOnFooter>
+            <ButtonCustom
+              isLoading={isLoading}
+              onPress={() => {
+                AlertDefaultSystem({
+                  title: "Buka Blokir",
+                  message: "Apakah anda yakin ingin membuka blokir ini?",
+                  textLeft: "Tidak",
+                  textRight: "Ya",
+                  onPressRight: () => {
+                    handleSubmit();
+                  },
+                });
+              }}
+            >
+              Buka Blokir
+            </ButtonCustom>
+          </BoxButtonOnFooter>
+        }
+      >
+        <BoxWithHeaderSection>
+          <StackCustom>
+            <AvatarUsernameAndOtherComponent
+              avatarHref={`/profile/${data?.blocked?.Profile?.id}`}
+              avatar={data?.blocked?.Profile?.imageId}
+              name={data?.blocked?.username}
+            />
+
+            <TextCustom align="center">
+              Jika anda membuka blokir ini maka semua postingan terkait user ini
+              akan muncul kembali di beranda
+              <TextCustom bold color="red">
+                {" "}
+                {_.upperCase(data?.menuFeature?.name)}
+              </TextCustom>
+            </TextCustom>
+          </StackCustom>
+        </BoxWithHeaderSection>
+      </NewWrapper>
+    </>
+  );
+}

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

@@ -64,14 +64,18 @@ export default function Profile() {
   };
 
   const onLoadPortofolio = async (id: string) => {
-    const response = await apiGetPortofolio({ id: id });
+    try {
-    const lastTwoByDate = response.data
+      const response = await apiGetPortofolio({ id: id });
-      .sort(
+      const lastTwoByDate = response.data
-        (a: any, b: any) =>
+        .sort(
-          new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
+          (a: any, b: any) =>
-      ) // urut desc
+            new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
-      .slice(0, 2);
+        ) // urut desc
-    setListPortofolio(lastTwoByDate);
+        .slice(0, 2);
+      setListPortofolio(lastTwoByDate);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    }
   };
 
   return (

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

@@ -33,6 +33,16 @@ export default function ProfileLayout() {
           name="create"
           options={{ title: "Buat Profile", headerBackVisible: false }}
         />
+
+        <Stack.Screen
+          name="[id]/blocked-list"
+          options={{ title: "Blocked List", headerLeft: () => <BackButton /> }}
+        />
+
+        <Stack.Screen
+          name="[id]/detail-blocked"
+          options={{ title: "Detail Blokir", headerLeft: () => <BackButton /> }}
+        />
       </Stack>
     </>
   );

app/(application)/(user)/voting/(tabs)/index.tsx

@@ -6,6 +6,7 @@ import {
   TextCustom,
   ViewWrapper,
 } from "@/components";
+import { useAuth } from "@/hooks/use-auth";
 import Voting_BoxPublishSection from "@/screens/Voting/BoxPublishSection";
 import { apiVotingGetAll } from "@/service/api-client/api-voting";
 import { router, useFocusEffect } from "expo-router";
@@ -13,6 +14,7 @@ import _ from "lodash";
 import { useCallback, useState } from "react";
 
 export default function VotingBeranda() {
+  const { user } = useAuth();
   const [listData, setListData] = useState<any>([]);
   const [loadingGetData, setLoadingGetData] = useState(false);
   const [search, setSearch] = useState("");
@@ -29,6 +31,7 @@ export default function VotingBeranda() {
       const response = await apiVotingGetAll({
         search,
         category: "beranda",
+        userLoginId: user?.id,
       });
       if (response.success) {
         setListData(response.data);

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

@@ -134,7 +134,7 @@ export default function VotingDetailStatus() {
 
             {data &&
               data?.catatan &&
-              (status === "draft" || status === "rejected") && (
+              (status === "draft" || status === "reject") && (
                 <ReportBox text={data?.catatan} />
               )}
 

app/(application)/(user)/voting/create.tsx

@@ -110,7 +110,7 @@ export default function VotingCreate() {
       <StackCustom gap={"xs"}>
         <TextInputCustom
           label="Judul Voting"
-          placeholder="MasukanJudul Voting"
+          placeholder="Masukan Judul Voting"
           required
           value={data.title}
           onChangeText={(value: any) => setData({ ...data, title: value })}

app/(application)/(user)/waiting-room.tsx

@@ -4,6 +4,7 @@ import {
   ButtonCenteredOnly,
   ButtonCustom,
   InformationBox,
+  NewWrapper,
   StackCustom,
   ViewWrapper,
 } from "@/components";
@@ -12,6 +13,7 @@ import { useAuth } from "@/hooks/use-auth";
 import { apiUser } from "@/service/api-client/api-user";
 import { Ionicons } from "@expo/vector-icons";
 import { router } from "expo-router";
+import { RefreshControl } from "react-native";
 import Toast from "react-native-toast-message";
 
 export default function WaitingRoom() {
@@ -33,7 +35,7 @@ export default function WaitingRoom() {
         } else {
           Toast.show({
             type: "success",
-            text1: "Akun anda telah aktif", // text2: "Anda berhasil login",
+            text1: "Selamat ! Akun anda telah aktif", // text2: "Anda berhasil login",
           });
           router.replace(`/(application)/(user)/profile/create`);
         }
@@ -82,10 +84,18 @@ export default function WaitingRoom() {
 
   return (
     <>
-      <ViewWrapper footerComponent={logoutButton()}>
+      <NewWrapper
+        footerComponent={logoutButton()}
+        refreshControl={
+          <RefreshControl refreshing={isLoading} onRefresh={handleCheck} />
+        }
+      >
         <StackCustom>
-          <InformationBox text="Permohonan akses Anda sedang dalam proses verifikasi oleh admin. Harap tunggu, Anda akan menerima pemberitahuan melalui Whatsapp setelah disetujui." />
+          <InformationBox
-          <ButtonCenteredOnly
+            text="Akun Anda sedang menunggu aktivasi.
+Silakan tunggu beberapa saat. Untuk memperbarui status, tarik layar ke bawah."
+          />
+          {/* <ButtonCenteredOnly
             isLoading={isLoading}
             onPress={() => {
               handleCheck();
@@ -93,9 +103,9 @@ export default function WaitingRoom() {
             icon="refresh-ccw"
           >
             Check
-          </ButtonCenteredOnly>
+          </ButtonCenteredOnly> */}
         </StackCustom>
-      </ViewWrapper>
+      </NewWrapper>
     </>
   );
 }

app/(application)/_layout.tsx

@@ -9,6 +9,7 @@ export default function ApplicationLayout() {
         <Stack.Screen name="(user)" options={{ headerShown: false }} />
         <Stack.Screen name="admin" options={{ headerShown: false }} />
         
+        
 
         {/* Take Picture */}
         <Stack.Screen

app/(application)/admin/app-information/business-field/[id]/bidang-update.tsx

@@ -0,0 +1,129 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import {
+  BoxButtonOnFooter,
+  ButtonCustom,
+  StackCustom,
+  TextCustom,
+  TextInputCustom,
+  ViewWrapper,
+} from "@/components";
+import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import {
+  apiAdminMasterBusinessFieldById,
+  apiAdminMasterBusinessFieldUpdate,
+} from "@/service/api-admin/api-master-admin";
+import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
+import { useCallback, useState } from "react";
+import { Switch } from "react-native-paper";
+import Toast from "react-native-toast-message";
+
+export default function AdminAppInformation_BusinessFieldDetail() {
+  const { id } = useLocalSearchParams();
+  const [data, setData] = useState<any | null>(null);
+  const [isLoading, setIsLoading] = useState(false);
+
+  useFocusEffect(
+    useCallback(() => {
+      onLoadDetail();
+    }, [id])
+  );
+
+  const onLoadDetail = async () => {
+    try {
+      const response = await apiAdminMasterBusinessFieldById({
+        id: id as string,
+        category: "bidang"
+      });
+
+      setData(response.data);
+    } catch (error) {
+      console.log("[ERROR]", error);
+      setData(null);
+    }
+  };
+
+  const handlerSubmit = async () => {
+    if (!data.name) {
+      Toast.show({
+        type: "error",
+        text1: "Lengkapi Data",
+      });
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      const response = await apiAdminMasterBusinessFieldUpdate({
+        id: id as string,
+        data: data,
+        category: "bidang",
+      });
+
+      if (!response.success) {
+        Toast.show({
+          type: "error",
+          text1: "Gagal update data",
+        });
+        return;
+      }
+
+      Toast.show({
+        type: "success",
+        text1: "Data berhasil di update",
+      });
+      router.back();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const buttonSubmit = (
+    <BoxButtonOnFooter>
+      <ButtonCustom
+        disabled={!data?.name}
+        isLoading={isLoading}
+        onPress={() => handlerSubmit()}
+      >
+        Update
+      </ButtonCustom>
+    </BoxButtonOnFooter>
+  );
+  return (
+    <>
+      <ViewWrapper footerComponent={buttonSubmit}>
+        <StackCustom>
+          <AdminBackButtonAntTitle title="Update Bidang Bisnis" />
+
+          <TextInputCustom
+            label="Nama Bidang Bisnis"
+            placeholder="Masukan Nama Bidang Bisnis"
+            required
+            value={data?.name}
+            onChangeText={(value) => setData({ ...data, name: value })}
+          />
+
+          <StackCustom
+            gap={"sm"}
+            style={{
+              alignContent: "flex-start",
+            }}
+          >
+            <TextCustom>Status</TextCustom>
+
+            <Switch
+              style={{
+                alignSelf: "flex-start",
+              }}
+              color={MainColor.yellow}
+              value={data?.active}
+              onValueChange={(value) => setData({ ...data, active: value })}
+            />
+          </StackCustom>
+        </StackCustom>
+      </ViewWrapper>
+    </>
+  );
+}

app/(application)/admin/app-information/business-field/[id]/index.tsx

@@ -1,22 +1,22 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
-  BoxButtonOnFooter,
+  ActionIcon,
-  ButtonCustom,
+  BaseBox,
+  CenterCustom,
+  LoaderCustom,
+  Spacing,
   StackCustom,
   TextCustom,
-  TextInputCustom,
   ViewWrapper,
 } from "@/components";
+import { IconEdit } from "@/components/_Icon";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
-import {
+import { apiAdminMasterBusinessFieldById } from "@/service/api-admin/api-master-admin";
-  apiAdminMasterBusinessFieldById,
-  apiAdminMasterBusinessFieldUpdate,
-} from "@/service/api-admin/api-master-admin";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import { useCallback, useState } from "react";
-import { Switch } from "react-native-paper";
+import { Divider } from "react-native-paper";
-import Toast from "react-native-toast-message";
 
 export default function AdminAppInformation_BusinessFieldDetail() {
   const { id } = useLocalSearchParams();
@@ -33,8 +33,11 @@ export default function AdminAppInformation_BusinessFieldDetail() {
     try {
       const response = await apiAdminMasterBusinessFieldById({
         id: id as string,
+        category: "all",
       });
 
+      console.log("Response >>", JSON.stringify(response, null, 2));
+
       setData(response.data);
     } catch (error) {
       console.log("[ERROR]", error);
@@ -42,73 +45,89 @@ export default function AdminAppInformation_BusinessFieldDetail() {
     }
   };
 
-  const handlerSubmit = async () => {
-    if (!data.name) {
-      Toast.show({
-        type: "error",
-        text1: "Lengkapi Data",
-      });
-      return;
-    }
-
-    try {
-      setIsLoading(true);
-      const response = await apiAdminMasterBusinessFieldUpdate({
-        id: id as string,
-        data: data,
-      });
-
-      if (!response.success) {
-        Toast.show({
-          type: "error",
-          text1: "Gagal update data",
-        });
-        return;
-      }
-
-      Toast.show({
-        type: "success",
-        text1: "Data berhasil di update",
-      });
-      router.back();
-    } catch (error) {
-      console.log(error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const buttonSubmit = (
-    <BoxButtonOnFooter>
-      <ButtonCustom
-        disabled={!data?.name}
-        isLoading={isLoading}
-        onPress={() => handlerSubmit()}
-      >
-        Update
-      </ButtonCustom>
-    </BoxButtonOnFooter>
-  );
   return (
     <>
-      <ViewWrapper footerComponent={buttonSubmit}>
+      <ViewWrapper>
         <StackCustom>
-          <AdminBackButtonAntTitle title="Update Bidang Bisnis" />
+          <AdminBackButtonAntTitle title="Detail Bidang & Sub Bidang" />
 
-          <TextInputCustom
+          {!data ? (
-            label="Nama Bidang Bisnis"
+            <LoaderCustom />
-            placeholder="Masukan Nama Bidang Bisnis"
+          ) : (
-            required
+            <StackCustom gap={"xs"}>
-            value={data?.name}
+              <TextCustom bold>Nama Bidang</TextCustom>
-            onChangeText={(value) => setData({ ...data, name: value })}
+              <Spacing height={5} />
-          />
+              <BaseBox>
+                <StackCustom gap={"xs"}>
+                  <TextCustom bold>
+                    Status: {data?.bidang?.active ? "Aktif" : "Tidak Aktif"}
+                  </TextCustom>
+                  <GridSpan_NewComponent
+                    span1={10}
+                    span2={2}
+                    text1={
+                      <TextCustom bold size={"large"}>
+                        {data?.bidang?.name}
+                      </TextCustom>
+                    }
+                    text2={
+                      <CenterCustom>
+                        <ActionIcon
+                          icon={<IconEdit size={16} color={MainColor.black} />}
+                          onPress={() =>
+                            router.push(
+                              `/admin/app-information/business-field/${id}/bidang-update`
+                            )
+                          }
+                        />
+                      </CenterCustom>
+                    }
+                  />
+                </StackCustom>
+              </BaseBox>
+              {/* <Divider /> */}
+              <Spacing height={5} />
 
-          <TextCustom>Status Aktivasi</TextCustom>
+              <TextCustom bold>Sub Bidang Bisnis</TextCustom>
-          <Switch
+              <Spacing height={5} />
-            color={MainColor.yellow}
+
-            value={data?.active}
+              {data?.subBidang?.map((item: any, index: number) => (
-            onValueChange={(value) => setData({ ...data, active: value })}
+                <BaseBox key={index}>
-          />
+                  <StackCustom gap={0}>
+                    <TextCustom bold>
+                      Status: {item?.isActive ? "Aktif" : "Tidak Aktif"}
+                    </TextCustom>
+
+                    <GridSpan_NewComponent
+                      span1={10}
+                      span2={2}
+                      text1={
+                        <TextCustom bold size={"large"}>
+                          {item.name}
+                        </TextCustom>
+                      }
+                      text2={
+                        <CenterCustom>
+                          <ActionIcon
+                            icon={
+                              <IconEdit size={16} color={MainColor.black} />
+                            }
+                            onPress={() =>
+                              router.push(
+                                `/admin/app-information/business-field/${item?.id}/sub-bidang-update`
+                              )
+                            }
+                          />
+                        </CenterCustom>
+                      }
+                    />
+                  </StackCustom>
+                </BaseBox>
+              ))}
+            </StackCustom>
+          )}
+
+          {/* <TextCustom>{JSON.stringify(data, null, 2)}</TextCustom> */}
         </StackCustom>
       </ViewWrapper>
     </>

app/(application)/admin/app-information/business-field/[id]/sub-bidang-update.tsx

@@ -0,0 +1,135 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import {
+  BoxButtonOnFooter,
+  ButtonCustom,
+  StackCustom,
+  TextCustom,
+  TextInputCustom,
+  ViewWrapper,
+} from "@/components";
+import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import {
+  apiAdminMasterBusinessFieldById,
+  apiAdminMasterBusinessFieldUpdate,
+} from "@/service/api-admin/api-master-admin";
+import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
+import { useCallback, useState } from "react";
+import { Switch } from "react-native-paper";
+import Toast from "react-native-toast-message";
+
+export default function AdminAppInformation_BusinessFieldDetail() {
+  const { id } = useLocalSearchParams();
+  const [data, setData] = useState<any | null>(null);
+  const [isLoading, setIsLoading] = useState(false);
+
+  useFocusEffect(
+    useCallback(() => {
+      onLoadDetail();
+    }, [id])
+  );
+
+  const onLoadDetail = async () => {
+    try {
+      const response = await apiAdminMasterBusinessFieldById({
+        id: id as string,
+        category: "sub-bidang",
+        subBidangId: id as string,
+      });
+
+      console.log("Response >>", JSON.stringify(response, null, 2));
+
+
+
+
+      setData(response.data);
+    } catch (error) {
+      console.log("[ERROR]", error);
+      setData(null);
+    }
+  };
+
+  const handlerSubmit = async () => {
+    if (!data.name) {
+      Toast.show({
+        type: "error",
+        text1: "Lengkapi Data",
+      });
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      const response = await apiAdminMasterBusinessFieldUpdate({
+        id: id as string,
+        data: data,
+        category: "sub-bidang",
+      });
+
+      if (!response.success) {
+        Toast.show({
+          type: "error",
+          text1: "Gagal update data",
+        });
+        return;
+      }
+
+      Toast.show({
+        type: "success",
+        text1: "Data berhasil di update",
+      });
+      router.back();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const buttonSubmit = (
+    <BoxButtonOnFooter>
+      <ButtonCustom
+        disabled={!data?.name}
+        isLoading={isLoading}
+        onPress={() => handlerSubmit()}
+      >
+        Update
+      </ButtonCustom>
+    </BoxButtonOnFooter>
+  );
+  return (
+    <>
+      <ViewWrapper footerComponent={buttonSubmit}>
+        <StackCustom>
+          <AdminBackButtonAntTitle title="Update Bidang Bisnis" />
+
+          <TextInputCustom
+            label="Nama Bidang Bisnis"
+            placeholder="Masukan Nama Bidang Bisnis"
+            required
+            value={data?.name}
+            onChangeText={(value) => setData({ ...data, name: value })}
+          />
+
+          <StackCustom
+            gap={"sm"}
+            style={{
+              alignContent: "flex-start",
+            }}
+          >
+            <TextCustom>Status</TextCustom>
+
+            <Switch
+              style={{
+                alignSelf: "flex-start",
+              }}
+              color={MainColor.yellow}
+              value={data?.isActive}
+              onValueChange={(value) => setData({ ...data, isActive: value })}
+            />
+          </StackCustom>
+        </StackCustom>
+      </ViewWrapper>
+    </>
+  );
+}

app/(application)/admin/app-information/business-field/create.tsx

@@ -1,40 +1,81 @@
 import {
-    BoxButtonOnFooter,
+  ActionIcon,
-    ButtonCustom,
+  BoxButtonOnFooter,
-    StackCustom,
+  ButtonCustom,
-    TextInputCustom,
+  CenterCustom,
-    ViewWrapper,
+  Grid,
+  Spacing,
+  StackCustom,
+  TextInputCustom,
+  ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import { ICON_SIZE_XLARGE } from "@/constants/constans-value";
 import { apiAdminMasterBusinessFieldCreate } from "@/service/api-admin/api-master-admin";
+import { Ionicons } from "@expo/vector-icons";
 import { router } from "expo-router";
+import _ from "lodash";
 import { useState } from "react";
+import { View } from "react-native";
+import { Divider } from "react-native-paper";
 import Toast from "react-native-toast-message";
 
 export default function AdminAppInformation_BusinessFieldCreate() {
-  const [data, setData] = useState<any>({
+  const [isLoading, setIsLoading] = useState(false);
+  const [bidang, setBidang] = useState<any>({
     name: "",
   });
-  const [isLoading, setIsLoading] = useState(false);
+  const [subBidang, setSubBidang] = useState<any[]>([
+    {
+      name: "",
+    },
+  ]);
 
   const handlerSubmit = async () => {
-    if (!data.name) {
+    if (!bidang.name) {
       Toast.show({
         type: "error",
         text1: "Lengkapi Data",
       });
       return;
     }
+
+    if (subBidang[0].name === "") {
+      Toast.show({
+        type: "error",
+        text1: "Lengkapi Sub Bidang",
+      });
+      return;
+    }
+
     try {
       setIsLoading(true);
-      const response = await apiAdminMasterBusinessFieldCreate({ data: data });
+
+      const newData = {
+        bidang: bidang,
+        subBidang: subBidang,
+      };
+
+      console.log("[DATA]", newData);
+
+      const response = await apiAdminMasterBusinessFieldCreate({
+        data: newData,
+      });
+
+      console.log("[RESPONSE]", response);
 
       if (response.success) {
         Toast.show({
           type: "success",
           text1: "Data berhasil di tambah",
         });
-        router.back();
+        // router.back();
+      } else {
+        Toast.show({
+          type: "error",
+          text1: "Gagal tambah data",
+        });
       }
     } catch (error) {
       console.log("[ERROR]", error);
@@ -50,6 +91,7 @@ export default function AdminAppInformation_BusinessFieldCreate() {
   const buttonSubmit = (
     <BoxButtonOnFooter>
       <ButtonCustom
+        disabled={subBidang[0].name === ""}
         onPress={() => handlerSubmit()}
         isLoading={isLoading}
       >
@@ -60,16 +102,70 @@ export default function AdminAppInformation_BusinessFieldCreate() {
   return (
     <>
       <ViewWrapper footerComponent={buttonSubmit}>
-        <StackCustom>
+        <StackCustom gap={"xs"}>
           <AdminBackButtonAntTitle title="Tambah Bidang Bisnis" />
 
           <TextInputCustom
             label="Nama Bidang Bisnis"
             placeholder="Masukan Nama Bidang Bisnis"
             required
-            value={data.name}
+            value={bidang.name}
-            onChangeText={(value) => setData({ ...data, name: value })}
+            onChangeText={(value) => setBidang({ ...bidang, name: value })}
           />
+
+          <Divider />
+          <Spacing height={5} />
+
+          {subBidang.map((item, index) => (
+            <TextInputCustom
+              key={index}
+              label="Nama Sub Bidang"
+              placeholder="Masukan Nama Sub Bidang"
+              required
+              value={item.name}
+              onChangeText={(value) => {
+                const list = _.clone(subBidang);
+                list[index].name = value;
+                setSubBidang(list);
+              }}
+            />
+          ))}
+
+          <CenterCustom>
+            <View
+              style={{ flexDirection: "row", alignItems: "center", gap: 10 }}
+            >
+              <ActionIcon
+                onPress={() => {
+                  setSubBidang([...subBidang, { name: "" }]);
+                }}
+                icon={
+                  <Ionicons
+                    name="add-circle-outline"
+                    size={ICON_SIZE_XLARGE}
+                    color={MainColor.black}
+                  />
+                }
+                size="xl"
+              />
+              <ActionIcon
+                disabled={subBidang.length <= 1}
+                onPress={() => {
+                  const list = _.clone(subBidang);
+                  list.pop();
+                  setSubBidang(list);
+                }}
+                icon={
+                  <Ionicons
+                    name="remove-circle-outline"
+                    size={ICON_SIZE_XLARGE}
+                    color={MainColor.black}
+                  />
+                }
+                size="xl"
+              />
+            </View>
+          </CenterCustom>
         </StackCustom>
       </ViewWrapper>
     </>

app/(application)/admin/app-information/index.tsx

@@ -75,7 +75,7 @@ const listPage = [
   },
   {
     id: "2",
-    label: "Bidang Bisnis",
+    label: "Bidang & Sub Bidang",
     value: "business",
   },
   {

app/(application)/admin/collaboration/[id]/group.tsx

@@ -2,11 +2,13 @@
 import {
   BaseBox,
   Grid,
+  Spacing,
   StackCustom,
   TextCustom,
   ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import { apiAdminCollaborationGetById } from "@/service/api-admin/api-admin-collaboration";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import { useCallback, useState } from "react";
@@ -28,6 +30,8 @@ export default function AdminCollaborationGroup() {
         category: "group",
       });
 
+      console.log("[DATA]", JSON.stringify(response.data, null, 2));
+
       if (response.success) {
         setData(response.data);
       }
@@ -59,38 +63,33 @@ export default function AdminCollaborationGroup() {
               ))}
             </StackCustom>
           </BaseBox>
+
+          <TextCustom bold>Anggota</TextCustom>
+          <Spacing height={5}/>
           <BaseBox>
             <StackCustom>
-              <TextCustom align="center">Anggota</TextCustom>
+
+              <Grid>
+                <Grid.Col span={6} style={{ justifyContent: "center", paddingRight: 10 }}>
+                  <TextCustom bold>Nomor</TextCustom>
+                </Grid.Col>
+                <Grid.Col span={6} style={{ justifyContent: "center" }}>
+                  <TextCustom bold>Username</TextCustom>
+                </Grid.Col>
+              </Grid>
 
               {data?.ProjectCollaboration_AnggotaRoomChat?.map(
                 (item: any, index: number) => (
-                  <StackCustom key={index} gap={0}>
+                  <Grid key={index}>
-                    <Grid>
+                    <Grid.Col span={6} style={{ justifyContent: "center", paddingRight: 10 }}>
-                      <Grid.Col
+                      <TextCustom bold truncate>+{item?.User?.nomor || "-"}</TextCustom>
-                        span={4}
+                    </Grid.Col>
-                        style={{ justifyContent: "center", paddingRight: 10 }}
+                    <Grid.Col span={6} style={{ justifyContent: "center" }}>
-                      >
+                      <TextCustom bold>
-                        <TextCustom bold>Nama</TextCustom>
+                        {item?.User?.username || "-"}
-                      </Grid.Col>
+                      </TextCustom>
-                      <Grid.Col span={8} style={{ justifyContent: "center" }}>
+                    </Grid.Col>
-                        <TextCustom>
+                  </Grid>
-                          {item?.User?.Profile?.name || "-"}
-                        </TextCustom>
-                      </Grid.Col>
-                    </Grid>
-                    <Grid>
-                      <Grid.Col
-                        span={4}
-                        style={{ justifyContent: "center", paddingRight: 10 }}
-                      >
-                        <TextCustom bold>Username</TextCustom>
-                      </Grid.Col>
-                      <Grid.Col span={8} style={{ justifyContent: "center" }}>
-                        <TextCustom>{item?.User?.username || "-"}</TextCustom>
-                      </Grid.Col>
-                    </Grid>
-                  </StackCustom>
                 )
               )}
             </StackCustom>

app/(application)/admin/collaboration/group.tsx

@@ -1,17 +1,14 @@
 import {
-  ActionIcon,
+  ClickableCustom,
   LoaderCustom,
   StackCustom,
   TextCustom,
   ViewWrapper
 } from "@/components";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
-import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
-import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
-import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { apiAdminCollaboration } from "@/service/api-admin/api-admin-collaboration";
-import { Octicons } from "@expo/vector-icons";
 import { router, useFocusEffect } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
@@ -34,7 +31,7 @@ export default function AdminCollaborationGroup() {
       const response = await apiAdminCollaboration({
         category: "group",
       });
-      
+
       if (response.success) {
         setList(response.data);
       }
@@ -51,10 +48,19 @@ export default function AdminCollaborationGroup() {
         <StackCustom>
           <AdminComp_BoxTitle title="Group" />
           <>
-            <AdminTitleTable
+            <GridSpan_NewComponent
-              title1="Aksi"
+              span1={6}
-              title2="Jumlah peserta"
+              span2={6}
-              title3="Nama group"
+              text1={
+                <TextCustom bold truncate align="center">
+                  Jumlah Anggota
+                </TextCustom>
+              }
+              text2={
+                <TextCustom bold truncate>
+                  Nama Group
+                </TextCustom>
+              }
             />
             <Divider />
 
@@ -67,31 +73,27 @@ export default function AdminCollaborationGroup() {
             ) : (
               list?.map((item: any, index: number) => (
                 <View key={index}>
-                  <AdminTableValue
+                  <ClickableCustom
-                    value1={
+                    onPress={() => {
-                      <ActionIcon
+                      router.push(`/admin/collaboration/${item.id}/group`);
-                        icon={
+                    }}
-                          <Octicons
+                  >
-                            name="eye"
+                    <GridSpan_NewComponent
-                            size={ICON_SIZE_BUTTON}
+                      span1={6}
-                            color="black"
+                      span2={6}
-                          />
+                      text1={
-                        }
+                        <TextCustom truncate={1} align="center">
-                        onPress={() => {
+                          {item?.ProjectCollaboration_AnggotaRoomChat?.length ||
-                          router.push(`/admin/collaboration/${item.id}/group`);
+                            "-"}
-                        }}
+                        </TextCustom>
-                      />
+                      }
-                    }
+                      text2={
-                    value2={
+                        <TextCustom truncate={2}>
-                      <TextCustom truncate={1}>
+                          {item?.name || "-"}
-                        {item?.ProjectCollaboration_AnggotaRoomChat?.length ||
+                        </TextCustom>
-                          "-"}
+                      }
-                      </TextCustom>
+                    />
-                    }
+                  </ClickableCustom>
-                    value3={
-                      <TextCustom truncate={2}>{item?.name || "-"}</TextCustom>
-                    }
-                  />
                 </View>
               ))
             )}

app/(application)/admin/collaboration/publish.tsx

@@ -1,6 +1,8 @@
 import {
   ActionIcon,
+  ClickableCustom,
   LoaderCustom,
+  Spacing,
   StackCustom,
   TextCustom,
   ViewWrapper,
@@ -9,6 +11,7 @@ import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage"
 import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
 import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import { apiAdminCollaboration } from "@/service/api-admin/api-admin-collaboration";
 import { Octicons } from "@expo/vector-icons";
@@ -51,11 +54,7 @@ export default function AdminCollaborationPublish() {
         <StackCustom>
           <AdminComp_BoxTitle title="Publish" />
 
-          <AdminTitleTable
+          <GridSpan_NewComponent text1={<TextCustom bold>Username</TextCustom>} text2={<TextCustom bold>Judul Proyek</TextCustom>} />
-            title1="Aksi"
-            title2="Username"
-            title3="Judul Proyek"
-          />
           {/* <Spacing height={10} /> */}
           <Divider />
 
@@ -68,32 +67,26 @@ export default function AdminCollaborationPublish() {
           ) : (
             list?.map((item: any, index: number) => (
               <View key={index}>
-                <AdminTableValue
+                <ClickableCustom
-                  value1={
+                  onPress={() => {
-                    <ActionIcon
+                    router.push(`/admin/collaboration/${item?.id}/publish`);
-                      icon={
+                  }}
-                        <Octicons
+                >
-                          name="eye"
+                  <GridSpan_NewComponent
-                          size={ICON_SIZE_BUTTON}
+                    text1={
-                          color="black"
+                      <TextCustom truncate={1}>
-                        />
+                        {item?.Author?.username || "-"}{" "}
-                      }
+                      </TextCustom>
-                      onPress={() => {
+                    }
-                        router.push(`/admin/collaboration/${item?.id}/publish`);
+                    text2={
-                      }}
+                      <TextCustom truncate={2}>
-                    />
+                        {item?.title || "-"}
-                  }
+                      </TextCustom>
-                  value2={
+                    }
-                    <TextCustom align="center" truncate={1}>
+                  />
-                      {item?.Author?.username || "-"}{" "}
+                </ClickableCustom>
-                    </TextCustom>
+                <Spacing height={8}/>
-                  }
+                <Divider/>
-                  value3={
-                    <TextCustom align="center" truncate={2}>
-                      {item?.title || "-"}
-                    </TextCustom>
-                  }
-                />
               </View>
             ))
           )}

app/(application)/admin/donation/[id]/[status]/index.tsx

@@ -18,7 +18,7 @@ import { IconDot, IconList } from "@/components/_Icon/IconComponent";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
 import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import ReportBox from "@/components/Box/ReportBox";
 import { ICON_SIZE_BUTTON, TEXT_SIZE_LARGE } from "@/constants/constans-value";
 import AdminDonation_BoxOfDonationStory from "@/screens/Admin/Donation/BoxOfDonationStory";
@@ -195,7 +195,7 @@ export default function AdminDonationDetail() {
 
                 <StackCustom gap={5}>
                   {listPencarianDana.map((item, i) => (
-                    <GridDetail_4_8
+                    <GridSpan_4_8
                       key={i}
                       label={<TextCustom bold>{item.label}</TextCustom>}
                       value={<TextCustom>{item.value}</TextCustom>}
@@ -236,7 +236,7 @@ export default function AdminDonationDetail() {
               <Spacing />
 
               <StackCustom gap={"xs"}>
-                <GridDetail_4_8
+                <GridSpan_4_8
                   label={<TextCustom bold>Jumlah Donatur</TextCustom>}
                   value={
                     <TextCustom>
@@ -244,7 +244,7 @@ export default function AdminDonationDetail() {
                     </TextCustom>
                   }
                 />
-                <GridDetail_4_8
+                <GridSpan_4_8
                   label={<TextCustom bold>Dana Terkumpul</TextCustom>}
                   value={
                     <TextCustom>
@@ -261,7 +261,7 @@ export default function AdminDonationDetail() {
           <StackCustom>
             <DummyLandscapeImage imageId={data?.imageId || ""} />
             {listData.map((item, i) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={i}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}

app/(application)/admin/donation/[id]/[status]/transaction-detail.tsx

@@ -8,7 +8,7 @@ import {
   ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import {
   apiAdminDonationInvoiceDetailById,
   apiAdminDonationInvoiceUpdateById,
@@ -177,7 +177,7 @@ export default function AdminDonasiTransactionDetail() {
         <BaseBox>
           <StackCustom>
             {listData.map((item, index) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={index}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}

app/(application)/admin/donation/[id]/detail-disbursement-of-funds.tsx

@@ -7,7 +7,7 @@ import {
   ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import { apiAdminDonationDisbursementOfFundsListById } from "@/service/api-admin/api-admin-donation";
 import { dateTimeView } from "@/utils/dateTimeView";
 import { formatCurrencyDisplay } from "@/utils/formatCurrencyDisplay";
@@ -67,7 +67,7 @@ export default function AdminDonationDetailDisbursementOfFunds() {
         <BaseBox>
           <StackCustom>
             {listData?.map((item, index) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={index}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}

app/(application)/admin/donation/category-create.tsx

@@ -1,17 +1,56 @@
 import {
   BoxButtonOnFooter,
   ButtonCustom,
+  StackCustom,
+  TextCustom,
   TextInputCustom,
   ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import { apiAdminMasterDonationCategoryCreate } from "@/service/api-admin/api-master-admin";
 import { useRouter } from "expo-router";
+import { useState } from "react";
+import { Switch } from "react-native-paper";
+import Toast from "react-native-toast-message";
 
 export default function AdminDonationCategoryCreate() {
   const router = useRouter();
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState({
+    name: "",
+    active: false,
+  });
+
+  const onSubmit = async () => {
+    try {
+      setLoading(true);
+      const response = await apiAdminMasterDonationCategoryCreate({ data });
+      if (response.success) {
+        Toast.show({
+          type: "success",
+          text2: "Data berhasil disimpan",
+        });
+        router.back();
+        return;
+      }
+
+      Toast.show({
+        type: "error",
+        text1: "Gagal menyimpan data",
+      });
+    } catch (error) {
+      console.log("[Error]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
   const buttonSubmit = (
     <BoxButtonOnFooter>
-      <ButtonCustom onPress={() => router.back()}>Simpan</ButtonCustom>
+      <ButtonCustom isLoading={loading} onPress={onSubmit}>
+        Simpan
+      </ButtonCustom>
     </BoxButtonOnFooter>
   );
   return (
@@ -20,7 +59,23 @@ export default function AdminDonationCategoryCreate() {
         headerComponent={<AdminBackButtonAntTitle title="Tambah Kategori" />}
         footerComponent={buttonSubmit}
       >
-        <TextInputCustom placeholder="Masukkan Kategori" />
+        <TextInputCustom
+          label=""
+          placeholder="Masukkan Kategori"
+          value={data.name}
+          onChangeText={(text) => setData({ ...data, name: text })}
+        />
+        <StackCustom gap={"sm"}>
+          <TextCustom>Status</TextCustom>
+          <Switch
+            style={{
+              alignSelf: "flex-start",
+            }}
+            color={MainColor.yellow}
+            value={data.active}
+            onValueChange={(value) => setData({ ...data, active: value })}
+          />
+        </StackCustom>
       </ViewWrapper>
     </>
   );

app/(application)/admin/donation/category-update.tsx

@@ -1,21 +1,76 @@
 import {
+  AlertDefaultSystem,
   BoxButtonOnFooter,
   ButtonCustom,
+  StackCustom,
+  TextCustom,
   TextInputCustom,
   ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import {
+  apiAdminMasterDonationCategoryById,
+  apiAdminMasterDonationCategoryUpdate,
+} from "@/service/api-admin/api-master-admin";
 import { useLocalSearchParams, useRouter } from "expo-router";
-import { useState } from "react";
+import { useCallback, useEffect, useState } from "react";
+import { Switch } from "react-native-paper";
 
 export default function AdminDonationCategoryUpdate() {
+  const router = useRouter();
   const { id } = useLocalSearchParams();
   const [value, setValue] = useState(id);
 
-  const router = useRouter();
+  const [data, setData] = useState<any>(null);
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const response = await apiAdminMasterDonationCategoryById({
+        id: id as any,
+      });
+      console.log(JSON.stringify(response.data, null, 2));
+
+      setData(response.data);
+    };
+    fetchData();
+  }, [id]);
+
+  const handlerSubmit = async () => {
+    try {
+      setIsLoading(true);
+      const response = await apiAdminMasterDonationCategoryUpdate({
+        id: id as any,
+        data: data,
+      });
+      console.log(JSON.stringify(response.data, null, 2));
+      router.back();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
   const buttonSubmit = (
     <BoxButtonOnFooter>
-      <ButtonCustom onPress={() => router.back()}>Update</ButtonCustom>
+      <ButtonCustom
+        disabled={isLoading || data?.name === ""}
+        isLoading={isLoading}
+        onPress={() => {
+          AlertDefaultSystem({
+            title: "Update Data",
+            message: "Apakah anda yakin ingin mengupdate data ini?",
+            textLeft: "Batal",
+            textRight: "Ya",
+            onPressLeft: () => {},
+            onPressRight: () => handlerSubmit(),
+          });
+        }}
+      >
+        Update
+      </ButtonCustom>
     </BoxButtonOnFooter>
   );
   return (
@@ -25,10 +80,28 @@ export default function AdminDonationCategoryUpdate() {
         footerComponent={buttonSubmit}
       >
         <TextInputCustom
+          label="Nama Kategori"
           placeholder="Masukkan Kategori"
-          value={value as any}
+          value={data?.name}
-          onChangeText={setValue}
+          onChangeText={(value) => setData({ ...data, name: value })}
         />
+        <StackCustom
+          gap={"sm"}
+          style={{
+            alignContent: "flex-start",
+          }}
+        >
+          <TextCustom>Status</TextCustom>
+
+          <Switch
+            style={{
+              alignSelf: "flex-start",
+            }}
+            color={MainColor.yellow}
+            value={data?.active}
+            onValueChange={(value) => setData({ ...data, active: value })}
+          />
+        </StackCustom>
       </ViewWrapper>
     </>
   );

app/(application)/admin/donation/category.tsx

@@ -1,27 +1,65 @@
 import {
-    ActionIcon,
+  BadgeCustom,
-    BaseBox,
+  CenterCustom,
-    CenterCustom,
+  ClickableCustom,
-    Spacing,
+  Spacing,
-    StackCustom,
+  StackCustom,
-    TextCustom,
+  TextCustom,
-    ViewWrapper,
+  ViewWrapper
 } from "@/components";
-import { IconEdit } from "@/components/_Icon";
 import AdminActionIconPlus from "@/components/_ShareComponent/Admin/ActionIconPlus";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
-import { GridView_3_3_6 } from "@/components/_ShareComponent/GridView_3_3_6";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
-import { MainColor } from "@/constants/color-palet";
+import { apiAdminMasterDonationCategory } from "@/service/api-admin/api-master-admin";
-import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
+import { colorActivationForBadge } from "@/utils/colorActivationForBadge";
-import { View } from "react-native";
+import { router, useFocusEffect } from "expo-router";
-import { Divider, Switch } from "react-native-paper";
+import { useCallback, useState } from "react";
-import { router } from "expo-router";
+import { RefreshControl, View } from "react-native";
+import { Divider } from "react-native-paper";
 
 export default function AdminDonationCategory() {
+  const [listData, setListData] = useState<any[]>([]);
+  const [refreshing, setRefreshing] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  useFocusEffect(
+    useCallback(() => {
+      fetchMaster();
+    }, [])
+  );
+
+  const fetchMaster = async () => {
+    try {
+      setLoading(true);
+      const response = await apiAdminMasterDonationCategory();
+      if (response.success) {
+        console.log(JSON.stringify(response.data, null, 2));
+        setListData(response.data);
+      } else {
+        setListData([]);
+      }
+    } catch (error) {
+      console.log("[Error]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchMaster();
+    setRefreshing(false);
+  };
+
   return (
     <>
-      <ViewWrapper headerComponent={<AdminTitlePage title="Donasi" />}>
+      <ViewWrapper
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+        headerComponent={<AdminTitlePage title="Donasi" />}
+      >
         <AdminComp_BoxTitle
           title="Kategori"
           rightComponent={
@@ -33,81 +71,65 @@ export default function AdminDonationCategory() {
           }
         />
 
-        <BaseBox>
+        <View>
-          <GridView_3_3_6
+          <GridSpan_4_8
-            component1={
+            label={<TextCustom bold>Status</TextCustom>}
-              <TextCustom bold align="center">
+            value={<TextCustom bold>Kategori</TextCustom>}
-                Aksi
-              </TextCustom>
-            }
-            component2={<TextCustom bold>Status</TextCustom>}
-            component3={<TextCustom bold>Kategori</TextCustom>}
           />
+          {/* <Grid>
+            <Grid.Col style={{ paddingLeft: 10 }} span={4}>
+              <TextCustom bold>Status</TextCustom>
+            </Grid.Col>
+            <Grid.Col span={8}>
+              <TextCustom bold>Kategori</TextCustom>
+            </Grid.Col>
+          </Grid> */}
+
           <Divider />
           <Spacing />
 
           <StackCustom>
             {listData.map((item, index) => (
-              <View key={index}>
+              <ClickableCustom
-                <GridView_3_3_6
+                onPress={() => {
-                  component1={
+                  router.push(`/admin/donation/category-update?id=${item.id}`);
+                }}
+                key={index}
+              >
+                <GridSpan_4_8
+                  label={
                     <CenterCustom>
-                      <ActionIcon
+                      <BadgeCustom
-                        icon={
+                        color={colorActivationForBadge({
-                          <IconEdit size={ICON_SIZE_BUTTON} color="black" />
+                          status: item.active,
-                        }
+                        })}
-                        onPress={() => {
+                      >
-                            router.push(`/admin/donation/category-update?id=${index}`);
+                        {item.active ? "Aktif" : "Tidak Aktif"}
-                        }}
+                      </BadgeCustom>
-                      />
                     </CenterCustom>
                   }
-                  component2={
+                  value={<TextCustom>{item.name}</TextCustom>}
-                    <Switch
-                      value={true}
-                      onValueChange={(item) => {
-                        console.log(item);
-                      }}
-                      color={MainColor.yellow}
-                      
-                    />
-                  }
-                  component3={<TextCustom bold>{item.label}</TextCustom>}
                 />
-                <Spacing height={10} />
+                {/* <Grid containerStyle={{ paddingBottom: 10 }}>
+                  <Grid.Col span={4} style={{ paddingLeft: 10 }}>
+                    <CenterCustom>
+                      <BadgeCustom
+                        color={item.active ? MainColor.green : MainColor.red}
+                      >
+                        {item.active ? "Aktif" : "Tidak Aktif"}
+                      </BadgeCustom>
+                    </CenterCustom>
+                  </Grid.Col>
+                  <Grid.Col span={8}>
+                    <TextCustom bold>{item.name}</TextCustom>
+                  </Grid.Col>
+                </Grid> */}
                 <Divider />
-              </View>
+              </ClickableCustom>
             ))}
           </StackCustom>
-        </BaseBox>
+        </View>
       </ViewWrapper>
     </>
   );
 }
-
-const listData = [
-  {
-    label: "Kegiatan Sosial",
-    value: "kegiatan_sosial",
-  },
-  {
-    label: "Pendidikan",
-    value: "pendidikan",
-  },
-  {
-    label: "Kesehatan",
-    value: "kesehatan",
-  },
-  {
-    label: "Kebudayaan",
-    value: "kebudayaan",
-  },
-  {
-    label: "Bencana Alami",
-    value: "bencana_alami",
-  },
-  {
-    label: "Lainnya",
-    value: "lainnya",
-  },
-];

app/(application)/admin/event/[id]/[status]/index.tsx

@@ -1,22 +1,22 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
-    ActionIcon,
+  ActionIcon,
-    AlertDefaultSystem,
+  AlertDefaultSystem,
-    BadgeCustom,
+  BadgeCustom,
-    BaseBox,
+  BaseBox,
-    DrawerCustom,
+  DrawerCustom,
-    LoaderCustom,
+  LoaderCustom,
-    MenuDrawerDynamicGrid,
+  MenuDrawerDynamicGrid,
-    Spacing,
+  Spacing,
-    StackCustom,
+  StackCustom,
-    TextCustom,
+  TextCustom,
-    ViewWrapper,
+  ViewWrapper,
 } from "@/components";
 import { IconDot, IconList } from "@/components/_Icon/IconComponent";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
 import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import ReportBox from "@/components/Box/ReportBox";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import { useAuth } from "@/hooks/use-auth";
@@ -38,7 +38,12 @@ export default function AdminEventDetail() {
 
   const [data, setData] = React.useState<any | null>(null);
   const [loadData, setLoadData] = React.useState(false);
-  const deepLinkURL = `${DEEP_LINK_URL}/--/event/${id}/confirmation?userId=${user?.id}`;
+  const deepLinkURL = `${DEEP_LINK_URL}/event/${id}/confirmation?userId=${user?.id}`;
+  const deepLinkURLDEV = `${DEEP_LINK_URL}/--/event/${id}/confirmation?userId=${user?.id}`;
+
+  const isDevLink = process.env.NODE_ENV === "development" ? deepLinkURLDEV : deepLinkURL;
+
+
   useFocusEffect(
     useCallback(() => {
       onLoadData();
@@ -156,7 +161,7 @@ export default function AdminEventDetail() {
         <BaseBox>
           <StackCustom>
             {listData.map((item, i) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={i}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}
@@ -181,7 +186,7 @@ export default function AdminEventDetail() {
                 <LoaderCustom />
               ) : (
                 <QRCode
-                  value={deepLinkURL}
+                  value={isDevLink}
                   size={200}
                   // logo={require("@/assets/images/logo-hipmi.png")}
                   // logoSize={70}
@@ -190,6 +195,8 @@ export default function AdminEventDetail() {
                   // color="black"
                 />
               )}
+
+              <TextCustom align="center">{isDevLink}</TextCustom>
             </StackCustom>
           </BaseBox>
         )}

app/(application)/admin/event/[id]/list-of-participants.tsx

@@ -10,14 +10,17 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import { apiAdminEventListOfParticipants } from "@/service/api-admin/api-admin-event";
+import dayjs, { Dayjs } from "dayjs";
 import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
+import { View } from "moti";
 import { useCallback, useState } from "react";
 
 export default function AdminEventListOfParticipants() {
   const { id } = useLocalSearchParams();
   const [listData, setListData] = useState<any[] | null>(null);
   const [loadData, setLoadData] = useState(false);
+  const [startDate, setStartDate] = useState<Dayjs | undefined>();
 
   useFocusEffect(
     useCallback(() => {
@@ -32,8 +35,11 @@ export default function AdminEventListOfParticipants() {
         id: id as string,
       });
 
+      console.log("[DATA]", JSON.stringify(response, null, 2));
+
       if (response.success) {
         setListData(response.data);
+        setStartDate(dayjs(response.data.Event.tanggal));
       }
     } catch (error) {
       console.log("[ERROR]", error);
@@ -42,7 +48,6 @@ export default function AdminEventListOfParticipants() {
     }
   };
 
-
   return (
     <>
       <ViewWrapper
@@ -60,17 +65,35 @@ export default function AdminEventListOfParticipants() {
               <Grid>
                 <Grid.Col span={6}>
                   <StackCustom gap={"sm"}>
-                    <TextCustom bold truncate>{item?.User?.username}</TextCustom>
+                    <TextCustom bold truncate>
+                      {item?.User?.username}
+                    </TextCustom>
                     <TextCustom>+{item?.User?.nomor}</TextCustom>
                   </StackCustom>
                 </Grid.Col>
                 <Grid.Col span={6} style={{ justifyContent: "center" }}>
-                  <BadgeCustom
+                  {startDate &&
-                    style={{ alignSelf: "flex-end" }}
+                  startDate.subtract(1, "hour").diff(dayjs()) < 0 ? (
-                    color={item?.isPresent ? "green" : "red"}
+                    <BadgeCustom
-                  >
+                      style={{ alignSelf: "flex-end" }}
-                    {item?.isPresent ? "Hadir" : "Tidak Hadir"}
+                      color={item?.isPresent ? "green" : "red"}
-                  </BadgeCustom>
+                    >
+                      {item?.isPresent ? "Hadir" : "Tidak Hadir"}
+                    </BadgeCustom>
+                  ) : (
+                    <View
+                      style={{
+                        justifyContent: "flex-end",
+                      }}
+                    >
+                      <BadgeCustom
+                        style={{ alignSelf: "flex-end" }}
+                        color="gray"
+                      >
+                        -
+                      </BadgeCustom>
+                    </View>
+                  )}
                 </Grid.Col>
               </Grid>
             </BaseBox>

app/(application)/admin/event/[status]/status.tsx

@@ -1,11 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
   ActionIcon,
+  ClickableCustom,
   LoaderCustom,
   SearchInput,
   StackCustom,
   TextCustom,
-  ViewWrapper
+  ViewWrapper,
 } from "@/components";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
 import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
@@ -13,6 +14,7 @@ import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import { apiAdminEvent } from "@/service/api-admin/api-admin-event";
+import { dateTimeView } from "@/utils/dateTimeView";
 import { Octicons } from "@expo/vector-icons";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
@@ -74,8 +76,8 @@ export default function AdminEventStatus() {
 
         <StackCustom gap={"sm"}>
           <AdminTitleTable
-            title1="Aksi"
+            title1="Username"
-            title2="Username"
+            title2="Tanggal"
             title3="Judul Event"
           />
           <Divider />
@@ -83,36 +85,47 @@ export default function AdminEventStatus() {
           {loadData ? (
             <LoaderCustom />
           ) : _.isEmpty(listData) ? (
-            <TextCustom align="center" size="small" color="gray">Belum ada data</TextCustom>
+            <TextCustom align="center" size="small" color="gray">
+              Belum ada data
+            </TextCustom>
           ) : (
             listData?.map((item, index) => (
-              <AdminTableValue
+              <ClickableCustom
                 key={index}
-                value1={
+                onPress={() => {
-                  <ActionIcon
+                  router.push(`/admin/event/${item.id}/${status}`);
-                    icon={
+                }}
-                      <Octicons
+              >
-                        name="eye"
+                <AdminTableValue
-                        size={ICON_SIZE_BUTTON}
+                  key={index}
-                        color="black"
+                  value1={
-                      />
+                    <TextCustom truncate={1}>
-                    }
+                      {item?.Author?.username || "-"}
-                    onPress={() => {
+                    </TextCustom>
-                      router.push(`/admin/event/${item.id}/${status}`);
+                    // <ActionIcon
-                    }}
+                    //   icon={
-                  />
+                    //     <Octicons
-                }
+                    //       name="eye"
-                value2={
+                    //       size={ICON_SIZE_BUTTON}
-                  <TextCustom truncate={1}>
+                    //       color="black"
-                    {item?.Author?.username || "-"}
+                    //     />
-                  </TextCustom>
+                    //   }
-                }
+                    //   onPress={() => {
-                value3={
+                    //     router.push(`/admin/event/${item.id}/${status}`);
-                  <TextCustom align="center" truncate={2}>
+                    //   }}
-                    {item?.title || "-"}
+                    // />
-                  </TextCustom>
+                  }
-                }
+                  value2={
-              />
+                    <TextCustom truncate={1}>
+                      {dateTimeView({ date: item?.tanggal })}
+                    </TextCustom>
+                  }
+                  value3={
+                    <TextCustom truncate={2}>{item?.title || "-"}</TextCustom>
+                  }
+                />
+                <Divider/>
+              </ClickableCustom>
             ))
           )}
         </StackCustom>

app/(application)/admin/forum/[id]/index.tsx

@@ -11,7 +11,7 @@ import {
 } from "@/components";
 import { IconDot } from "@/components/_Icon/IconComponent";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_XLARGE } from "@/constants/constans-value";
 import { apiAdminForumPostingById } from "@/service/api-admin/api-admin-forum";
@@ -103,7 +103,7 @@ export default function AdminForumDetailPosting() {
         <BaseBox>
           <StackCustom gap={"sm"}>
             {listDataAction.map((item, i) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={i}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}

app/(application)/admin/forum/[id]/list-report-comment.tsx

@@ -3,6 +3,7 @@ import {
   ActionIcon,
   AlertDefaultSystem,
   BaseBox,
+  CenterCustom,
   DrawerCustom,
   LoaderCustom,
   MenuDrawerDynamicGrid,
@@ -16,7 +17,8 @@ import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButt
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
 import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
 import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import {
@@ -27,6 +29,7 @@ import {
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
+import { View } from "react-native";
 import { Divider } from "react-native-paper";
 import Toast from "react-native-toast-message";
 
@@ -95,24 +98,24 @@ export default function AdminForumReportComment() {
       >
         <BaseBox>
           <StackCustom gap={"sm"}>
-            <GridDetail_4_8
+            <GridSpan_NewComponent
-              label={<TextCustom bold>Username</TextCustom>}
+              text1={<TextCustom bold>Username</TextCustom>}
-              value={<TextCustom>{data?.Author?.username || "-"}</TextCustom>}
+              text2={<TextCustom>{data?.Author?.username || "-"}</TextCustom>}
             />
-            <GridDetail_4_8
+            <GridSpan_NewComponent
-              label={<TextCustom bold>Komentar</TextCustom>}
+              text1={<TextCustom bold>Komentar</TextCustom>}
-              value={<TextCustom>{data?.komentar || "-"}</TextCustom>}
+              text2={<TextCustom>{data?.komentar || "-"}</TextCustom>}
             />
           </StackCustom>
         </BaseBox>
 
         <AdminComp_BoxTitle title="Daftar Report Komentar" />
 
-        <StackCustom>
+        <StackCustom  gap={"sm"}>
-          <AdminTitleTable
+          <GridSpan_NewComponent
-            title1="Aksi"
+            text1={<TextCustom bold align="center">Aksi</TextCustom>}
-            title2="Pelapor"
+            text2={<TextCustom bold>Pelapor</TextCustom>}
-            title3="Kategori Report"
+            text3={<TextCustom bold>Kategori Report</TextCustom>}
           />
           <Divider />
           {loadList ? (
@@ -123,34 +126,39 @@ export default function AdminForumReportComment() {
             </TextCustom>
           ) : (
             listReport?.map((item: any, index: number) => (
-              <AdminTableValue
+              <View key={index}>
-                key={index}
+                <GridSpan_NewComponent
-                value1={
+                  text1={
-                  <ActionIcon
+                   <CenterCustom>
-                    icon={<IconView size={ICON_SIZE_BUTTON} color="black" />}
+                     <ActionIcon
-                    onPress={() => {
+                      icon={<IconView size={ICON_SIZE_BUTTON} color="black" />}
-                      setOpenDrawerAction(true);
+                      onPress={() => {
-                      setSelectedReport({
+                        setOpenDrawerAction(true);
-                        id: item.id,
+                        setSelectedReport({
-                        username: item.User?.username,
+                          id: item.id,
-                        kategori: item.ForumMaster_KategoriReport?.title,
+                          username: item.User?.username,
-                        keterangan: item.ForumMaster_KategoriReport?.deskripsi,
+                          kategori: item.ForumMaster_KategoriReport?.title,
-                        deskripsi: item.deskripsi,
+                          keterangan:
-                      });
+                            item.ForumMaster_KategoriReport?.deskripsi,
-                    }}
+                          deskripsi: item.deskripsi,
-                  />
+                        });
-                }
+                      }}
-                value2={
+                    />
-                  <TextCustom truncate={1}>
+                   </CenterCustom>
-                    {item?.User?.username || "-"}
+                  }
-                  </TextCustom>
+                  text2={
-                }
+                    <TextCustom truncate={1}>
-                value3={
+                      {item?.User?.username || "-"}
-                  <TextCustom truncate={2} align="center">
+                    </TextCustom>
-                    {item?.ForumMaster_KategoriReport?.title || "-"}
+                  }
-                  </TextCustom>
+                  text3={
-                }
+                    <TextCustom truncate={2}>
-              />
+                      {item?.ForumMaster_KategoriReport?.title || "-"}
+                    </TextCustom>
+                  }
+                />
+                <Divider />
+              </View>
             ))
           )}
         </StackCustom>
@@ -208,20 +216,20 @@ export default function AdminForumReportComment() {
         height={"auto"}
       >
         <StackCustom>
-          <GridDetail_4_8
+          <GridSpan_4_8
             label={<TextCustom bold>Pelapor</TextCustom>}
             value={<TextCustom>{selectedReport?.username || "-"}</TextCustom>}
           />
 
           {selectedReport?.kategori && (
             <>
-              <GridDetail_4_8
+              <GridSpan_4_8
                 label={<TextCustom bold>Kategori Report</TextCustom>}
                 value={
                   <TextCustom>{selectedReport?.kategori || "-"}</TextCustom>
                 }
               />
-              <GridDetail_4_8
+              <GridSpan_4_8
                 label={<TextCustom bold>Keterangan</TextCustom>}
                 value={
                   <TextCustom>{selectedReport?.keterangan || "-"}</TextCustom>
@@ -231,7 +239,7 @@ export default function AdminForumReportComment() {
           )}
 
           {selectedReport?.deskripsi && (
-            <GridDetail_4_8
+            <GridSpan_4_8
               label={<TextCustom bold>Deskripsi</TextCustom>}
               value={
                 <TextCustom>{selectedReport?.deskripsi || "-"}</TextCustom>

app/(application)/admin/forum/[id]/list-report-posting.tsx

@@ -4,6 +4,7 @@ import {
   AlertDefaultSystem,
   BadgeCustom,
   BaseBox,
+  CenterCustom,
   DrawerCustom,
   LoaderCustom,
   MenuDrawerDynamicGrid,
@@ -17,7 +18,8 @@ import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButt
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
 import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
 import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import {
@@ -28,6 +30,7 @@ import {
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
+import { View } from "react-native";
 import { Divider } from "react-native-paper";
 import Toast from "react-native-toast-message";
 
@@ -95,14 +98,14 @@ export default function AdminForumReportPosting() {
       >
         <BaseBox>
           <StackCustom gap={"sm"}>
-            <GridDetail_4_8
+            <GridSpan_NewComponent
-              label={<TextCustom bold>Username</TextCustom>}
+              text1={<TextCustom bold>Username</TextCustom>}
-              value={<TextCustom>{data?.Author?.username || "-"}</TextCustom>}
+              text2={<TextCustom>{data?.Author?.username || "-"}</TextCustom>}
             />
 
-            <GridDetail_4_8
+            <GridSpan_NewComponent
-              label={<TextCustom bold>Status</TextCustom>}
+              text1={<TextCustom bold>Status</TextCustom>}
-              value={
+              text2={
                 data && data?.ForumMaster_StatusPosting?.status ? (
                   <BadgeCustom
                     color={
@@ -121,19 +124,23 @@ export default function AdminForumReportPosting() {
               }
             />
 
-            <GridDetail_4_8
+            <GridSpan_NewComponent
-              label={<TextCustom bold>Postingan</TextCustom>}
+              text1={<TextCustom bold>Postingan</TextCustom>}
-              value={<TextCustom>{data?.diskusi || "-"}</TextCustom>}
+              text2={<TextCustom>{data?.diskusi || "-"}</TextCustom>}
             />
           </StackCustom>
         </BaseBox>
 
         <AdminComp_BoxTitle title="Daftar Report Posting" />
         <StackCustom gap={"sm"}>
-          <AdminTitleTable
+          <GridSpan_NewComponent
-            title1="Aksi"
+            text1={
-            title2="Pelapor"
+              <TextCustom bold align="center">
-            title3="Kategori Report"
+                Aksi
+              </TextCustom>
+            }
+            text2={<TextCustom bold>Pelapor</TextCustom>}
+            text3={<TextCustom bold>Kategori Report</TextCustom>}
           />
           <Divider />
           {loadListReport ? (
@@ -144,34 +151,41 @@ export default function AdminForumReportPosting() {
             </TextCustom>
           ) : (
             listReport?.map((item: any, index: number) => (
-              <AdminTableValue
+              <View key={index}>
-                key={index}
+                <GridSpan_NewComponent
-                value1={
+                  text1={
-                  <ActionIcon
+                    <CenterCustom>
-                    icon={<IconView size={ICON_SIZE_BUTTON} color="black" />}
+                      <ActionIcon
-                    onPress={() => {
+                        icon={
-                      setOpenDrawerAction(true);
+                          <IconView size={ICON_SIZE_BUTTON} color="black" />
-                      setSelectedReport({
+                        }
-                        id: item?.id,
+                        onPress={() => {
-                        username: item?.User?.username,
+                          setOpenDrawerAction(true);
-                        kategori: item?.ForumMaster_KategoriReport?.title,
+                          setSelectedReport({
-                        keterangan: item?.ForumMaster_KategoriReport?.deskripsi,
+                            id: item?.id,
-                        deskripsi: item?.deskripsi,
+                            username: item?.User?.username,
-                      });
+                            kategori: item?.ForumMaster_KategoriReport?.title,
-                    }}
+                            keterangan:
-                  />
+                              item?.ForumMaster_KategoriReport?.deskripsi,
-                }
+                            deskripsi: item?.deskripsi,
-                value2={
+                          });
-                  <TextCustom truncate={1}>
+                        }}
-                    {item?.User?.username || "-"}
+                      />
-                  </TextCustom>
+                    </CenterCustom>
-                }
+                  }
-                value3={
+                  text2={
-                  <TextCustom truncate={2} align="center">
+                    <TextCustom truncate>
-                    {item?.ForumMaster_KategoriReport?.title || "-"}
+                      {item?.User?.username || "-"}
-                  </TextCustom>
+                    </TextCustom>
-                }
+                  }
-              />
+                  text3={
+                    <TextCustom truncate={2}>
+                      {item?.ForumMaster_KategoriReport?.title || "-"}
+                    </TextCustom>
+                  }
+                />
+                <Divider />
+              </View>
             ))
           )}
         </StackCustom>
@@ -229,20 +243,20 @@ export default function AdminForumReportPosting() {
         height={"auto"}
       >
         <StackCustom>
-          <GridDetail_4_8
+          <GridSpan_4_8
             label={<TextCustom bold>Pelapor</TextCustom>}
             value={<TextCustom>{selectedReport?.username || "-"}</TextCustom>}
           />
 
           {selectedReport?.kategori && (
             <>
-              <GridDetail_4_8
+              <GridSpan_4_8
                 label={<TextCustom bold>Kategori Report</TextCustom>}
                 value={
                   <TextCustom>{selectedReport?.kategori || "-"}</TextCustom>
                 }
               />
-              <GridDetail_4_8
+              <GridSpan_4_8
                 label={<TextCustom bold>Keterangan</TextCustom>}
                 value={
                   <TextCustom>{selectedReport?.keterangan || "-"}</TextCustom>
@@ -252,7 +266,7 @@ export default function AdminForumReportPosting() {
           )}
 
           {selectedReport?.deskripsi && (
-            <GridDetail_4_8
+            <GridSpan_4_8
               label={<TextCustom bold>Deskripsi</TextCustom>}
               value={
                 <TextCustom>{selectedReport?.deskripsi || "-"}</TextCustom>

app/(application)/admin/forum/posting.tsx

@@ -1,22 +1,22 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
-  ActionIcon,
+  ClickableCustom,
   LoaderCustom,
   SearchInput,
+  Spacing,
   StackCustom,
   TextCustom,
   ViewWrapper,
 } from "@/components";
-import { IconView } from "@/components/_Icon/IconComponent";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
-import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
-import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
-import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { apiAdminForum } from "@/service/api-admin/api-admin-forum";
 import { router, useFocusEffect } from "expo-router";
 import _ from "lodash";
-import React, { useCallback, useState } from "react";
+import { useCallback, useState } from "react";
+import { View } from "react-native";
 import { Divider } from "react-native-paper";
 
 export default function AdminForumPosting() {
@@ -37,7 +37,9 @@ export default function AdminForumPosting() {
         category: "posting",
         search: search,
       });
-      
+
+      console.log("DATA", JSON.stringify(response, null, 2));
+
       if (response.success) {
         setList(response.data);
       }
@@ -51,7 +53,7 @@ export default function AdminForumPosting() {
   const rightComponent = (
     <SearchInput
       containerStyle={{ width: "100%", marginBottom: 0 }}
-      placeholder="Cari"
+      placeholder="Cari postingan"
       value={search}
       onChangeText={setSearch}
     />
@@ -61,9 +63,15 @@ export default function AdminForumPosting() {
     <>
       <ViewWrapper headerComponent={<AdminTitlePage title="Forum" />}>
         <AdminComp_BoxTitle title={"Posting"} rightComponent={rightComponent} />
+        <GridSpan_NewComponent
+          text1={<TextCustom bold truncate>Username</TextCustom>}
+          text2={<TextCustom bold truncate> Postingan</TextCustom>}
+          text3={<TextCustom bold align="center" truncate> Report Posting</TextCustom>}
+          text4={<TextCustom bold align="center" truncate> Komentar</TextCustom>}
+        />
+        <Divider />
+        <Spacing />
         <StackCustom>
-          <AdminTitleTable title1="Aksi" title2="Username" title3="Postingan" />
-          <Divider />
           {loadList ? (
             <LoaderCustom />
           ) : _.isEmpty(list) ? (
@@ -72,25 +80,38 @@ export default function AdminForumPosting() {
             </TextCustom>
           ) : (
             list?.map((item: any, index: number) => (
-              <AdminTableValue
+              <View key={index}>
-                key={index}
+                <ClickableCustom
-                value1={
+                  onPress={() => {
-                  <ActionIcon
+                    router.push(`/admin/forum/${item.id}`);
-                    icon={<IconView size={ICON_SIZE_BUTTON} color="black" />}
+                  }}
-                    onPress={() => {
+                >
-                      router.push(`/admin/forum/${item?.id}`);
+                  <GridSpan_NewComponent
-                    }}
+                    text1={
+                      <TextCustom truncate={1}>
+                        {item?.Author?.username || "-"}
+                      </TextCustom>
+                    }
+                    text2={
+                      <TextCustom truncate>
+                        {item?.diskusi || "-"}
+                      </TextCustom>
+                    }
+                    text3={
+                      <TextCustom align="center" truncate={2}>
+                        {item?.reportPosting || "-"}
+                      </TextCustom>
+                    } 
+                    text4={
+                      <TextCustom align="center" truncate={2}>
+                        {item?.komentar || "-"}
+                      </TextCustom>
+                    }
                   />
-                }
+
-                value2={
+                </ClickableCustom>
-                  <TextCustom truncate={1}>
+                <Divider />
-                    {item?.Author?.username || "-"}
+              </View>
-                  </TextCustom>
-                }
-                value3={
-                  <TextCustom truncate={2}>{item?.diskusi || "-"}</TextCustom>
-                }
-              />
             ))
           )}
         </StackCustom>

app/(application)/admin/forum/report-comment.tsx

@@ -1,8 +1,10 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
   ActionIcon,
+  ClickableCustom,
   LoaderCustom,
   SearchInput,
+  Spacing,
   StackCustom,
   TextCustom,
   ViewWrapper,
@@ -12,12 +14,14 @@ import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage"
 import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
 import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import { apiAdminForum } from "@/service/api-admin/api-admin-forum";
 import { router, useFocusEffect } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
+import { View } from "react-native";
 import { Divider } from "react-native-paper";
 
 export default function AdminForumReportComment() {
@@ -67,13 +71,26 @@ export default function AdminForumReportComment() {
           rightComponent={rightComponent}
         />
 
-        <StackCustom gap={"sm"}>
+        <GridSpan_NewComponent
-          <AdminTitleTable
+          text1={
-            title1="Aksi"
+            <TextCustom bold truncate>
-            title2="Pelapor"
+              Pelapor
-            title3="Jenis Laporan"
+            </TextCustom>
-          />
+          }
-          <Divider />
+          text2={
+            <TextCustom bold truncate>
+              Komentar
+            </TextCustom>
+          }
+          text3={
+            <TextCustom bold truncate>
+              Jenis Laporan
+            </TextCustom>
+          }
+        />
+        <Divider />
+        <Spacing />
+        <StackCustom gap={"lg"}>
           {loadList ? (
             <LoaderCustom />
           ) : _.isEmpty(listData) ? (
@@ -82,34 +99,35 @@ export default function AdminForumReportComment() {
             </TextCustom>
           ) : (
             listData?.map((item: any, index: number) => (
-              <AdminTableValue
+              <View key={index}>
-                key={index}
+                <ClickableCustom
-                value1={
+                  onPress={() => {
-                  <ActionIcon
+                    router.push(
-                    icon={
+                      `/admin/forum/${item?.Forum_Komentar?.id}/list-report-comment`
-                      <IconView
+                    );
-                        size={ICON_SIZE_BUTTON}
+                  }}
-                        color={MainColor.black}
+                >
-                      />
+                  <GridSpan_NewComponent
+                    text1={
+                      <TextCustom truncate={1}>
+                        {item?.User?.username || "-"}
+                      </TextCustom>
+                    }
+                    text2={
+                      <TextCustom truncate={2}>
+                        {item?.Forum_Komentar?.komentar || "-"}
+                      </TextCustom>
+                    }
+                    text3={
+                      <TextCustom truncate={2}>
+                        {item?.ForumMaster_KategoriReport?.title || "-"}
+                      </TextCustom>
                     }
-                    onPress={() => {
-                      router.push(
-                        `/admin/forum/${item?.Forum_Komentar?.id}/list-report-comment`
-                      );
-                    }}
                   />
-                }
+                </ClickableCustom>
-                value2={
+                <Spacing />
-                  <TextCustom truncate={1}>
+                <Divider />
-                    {item?.User?.username || "-"}
+              </View>
-                  </TextCustom>
-                }
-                value3={
-                  <TextCustom truncate={2} align="center">
-                    {item?.ForumMaster_KategoriReport?.title || "-"}
-                  </TextCustom>
-                }
-              />
             ))
           )}
         </StackCustom>

app/(application)/admin/forum/report-posting.tsx

@@ -1,24 +1,27 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
   ActionIcon,
+  ClickableCustom,
   Divider,
   LoaderCustom,
   SearchInput,
   StackCustom,
   TextCustom,
-  ViewWrapper
+  ViewWrapper,
 } from "@/components";
 import { IconView } from "@/components/_Icon/IconComponent";
 import AdminComp_BoxTitle from "@/components/_ShareComponent/Admin/BoxTitlePage";
 import AdminTitleTable from "@/components/_ShareComponent/Admin/TableTitle";
 import AdminTableValue from "@/components/_ShareComponent/Admin/TableValue";
 import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
+import { GridSpan_NewComponent } from "@/components/_ShareComponent/GridSpan_NewComponent";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
 import { apiAdminForum } from "@/service/api-admin/api-admin-forum";
 import { router, useFocusEffect } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
+import { View } from "react-native";
 
 export default function AdminForumReportPosting() {
   const [listData, setListData] = useState<any[] | null>(null);
@@ -67,46 +70,51 @@ export default function AdminForumReportPosting() {
           rightComponent={rightComponent}
         />
 
-        <StackCustom gap={"sm"}>
+        <GridSpan_NewComponent
-          <AdminTitleTable title1="Aksi" title2="Pelapor" title3="Postingan" />
+          text1={
-
+            <TextCustom bold truncate>
-          <Divider />
+              Username
+            </TextCustom>
+          }
+          text2={
+            <TextCustom bold truncate>
+              Postingan
+            </TextCustom>
+          }
+        />
+        <Divider />
+        <StackCustom>
           {loadList ? (
             <LoaderCustom />
           ) : _.isEmpty(listData) ? (
-            <TextCustom  align="center" color="gray">
+            <TextCustom align="center" color="gray">
               Belum ada data
             </TextCustom>
           ) : (
             listData?.map((item: any, index: number) => (
-              <AdminTableValue
+              <View key={index}>
-                key={index}
+                <ClickableCustom
-                value1={
+                  onPress={() => {
-                  <ActionIcon
+                    router.push(
-                    icon={
+                      `/admin/forum/${item?.Forum_Posting?.id}/list-report-posting`
-                      <IconView
+                    );
-                        size={ICON_SIZE_BUTTON}
+                  }}
-                        color={MainColor.black}
+                >
-                      />
+                  <GridSpan_NewComponent
+                    text1={
+                      <TextCustom truncate={1}>
+                        {item?.User?.username || "-"}
+                      </TextCustom>
+                    }
+                    text2={
+                      <TextCustom truncate={1}>
+                        {item?.Forum_Posting?.diskusi || "-"}
+                      </TextCustom>
                     }
-                    onPress={() => {
-                      router.push(
-                        `/admin/forum/${item?.Forum_Posting?.id}/list-report-posting`
-                      );
-                    }}
                   />
-                }
+                </ClickableCustom>
-                value2={
+                <Divider />
-                  <TextCustom truncate={1}>
+              </View>
-                    {item?.User?.username || "-"}
-                  </TextCustom>
-                }
-                value3={
-                  <TextCustom truncate={2} align="center">
-                    {item?.Forum_Posting?.diskusi || "-"}
-                  </TextCustom>
-                }
-              />
             ))
           )}
         </StackCustom>

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

@@ -19,7 +19,7 @@ import { IconDot, IconList } from "@/components/_Icon/IconComponent";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
 import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import ReportBox from "@/components/Box/ReportBox";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
@@ -183,7 +183,7 @@ export default function AdminInvestmentDetail() {
             />
             <Spacing />
             <StackCustom gap={"xs"}>
-              <GridDetail_4_8
+              <GridSpan_4_8
                 label={<TextCustom bold>Sisa Saham</TextCustom>}
                 value={
                   <TextCustom>
@@ -191,7 +191,7 @@ export default function AdminInvestmentDetail() {
                   </TextCustom>
                 }
               />
-              <GridDetail_4_8
+              <GridSpan_4_8
                 label={<TextCustom bold>Validasi Transaksi</TextCustom>}
                 value={
                   <TextCustom>
@@ -207,7 +207,7 @@ export default function AdminInvestmentDetail() {
           <StackCustom>
             <DummyLandscapeImage imageId={data?.imageId} />
             {listData.map((item, i) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={i}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}
@@ -218,7 +218,7 @@ export default function AdminInvestmentDetail() {
 
         <BaseBox>
           <StackCustom>
-            <GridDetail_4_8
+            <GridSpan_4_8
               label={<TextCustom bold>File Prospektus</TextCustom>}
               value={
                 <ButtonCustom
@@ -238,7 +238,7 @@ export default function AdminInvestmentDetail() {
                 </ButtonCustom>
               }
             />
-            <GridDetail_4_8
+            <GridSpan_4_8
               label={<TextCustom bold>File Dokumen</TextCustom>}
               value={
                 <StackCustom>

app/(application)/admin/investment/[id]/[status]/transaction-detail.tsx

@@ -10,7 +10,7 @@ import {
   ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import GridTwoView from "@/components/_ShareComponent/GridTwoView";
 import { MainColor } from "@/constants/color-palet";
 import {
@@ -225,7 +225,7 @@ export default function AdminInvestmentTransactionDetail() {
         <BaseBox>
           <StackCustom>
             {listData.map((item, index) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={index}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}

app/(application)/admin/super-admin/index.tsx

@@ -76,7 +76,7 @@ export default function SuperAdmin_ListUser() {
             </TextCustom>
           }
           component2={
-            <TextCustom align="center" bold>
+            <TextCustom bold>
               Username
             </TextCustom>
           }

app/(application)/admin/user-access/index.tsx

@@ -73,11 +73,7 @@ export default function AdminUserAccess() {
               Aksi
             </TextCustom>
           }
-          component2={
+          component2={<TextCustom bold>Username</TextCustom>}
-            <TextCustom align="center" bold>
-              Username
-            </TextCustom>
-          }
           component3={
             <TextCustom align="center" bold>
               Status Akses

app/(application)/admin/voting/[id]/[status]/index.tsx

@@ -1,19 +1,19 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
-    AlertDefaultSystem,
+  AlertDefaultSystem,
-    BadgeCustom,
+  BadgeCustom,
-    BaseBox,
+  BaseBox,
-    CircleContainer,
+  CircleContainer,
-    Grid,
+  Grid,
-    Spacing,
+  Spacing,
-    StackCustom,
+  StackCustom,
-    TextCustom,
+  TextCustom,
-    ViewWrapper,
+  ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
 import AdminButtonReview from "@/components/_ShareComponent/Admin/ButtonReview";
-import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
 import ReportBox from "@/components/Box/ReportBox";
 import { MainColor } from "@/constants/color-palet";
 import funUpdateStatusVoting from "@/screens/Admin/Voting/funUpdateStatus";
@@ -169,7 +169,7 @@ export default function AdminVotingDetail() {
         <BaseBox>
           <StackCustom>
             {listData.map((item, i) => (
-              <GridDetail_4_8
+              <GridSpan_4_8
                 key={i}
                 label={<TextCustom bold>{item.label}</TextCustom>}
                 value={<TextCustom>{item.value}</TextCustom>}

app/(application)/admin/voting/[status]/status.tsx

@@ -103,7 +103,7 @@ export default function AdminVotingStatus() {
                   </TextCustom>
                 }
                 value3={
-                  <TextCustom align="center" truncate={2}>
+                  <TextCustom truncate={2}>
                     {item?.title || "-"}
                   </TextCustom>
                 }

app/(application)/admin/voting/history.tsx

@@ -91,7 +91,7 @@ export default function AdminVotingHistory() {
               }
               value2={<TextCustom truncate={1}>{item?.Author?.username || "-"}</TextCustom>}
               value3={
-                <TextCustom align="center" truncate={2}>
+                <TextCustom truncate={2}>
                   {item?.title || "-"}
                 </TextCustom>
               }

app/(application)/terms-agreement.tsx

@@ -0,0 +1,116 @@
+import {
+    BoxButtonOnFooter,
+    ButtonCustom,
+    CheckboxCustom,
+    InformationBox,
+    StackCustom,
+    ViewWrapper
+} from "@/components";
+import { MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
+import { apiAcceptTermService, BASE_URL } from "@/service/api-config";
+import { GStyles } from "@/styles/global-styles";
+import { openBrowser } from "@/utils/openBrower";
+import { Stack } from "expo-router";
+import { useState } from "react";
+import { Text, View } from "react-native";
+import Toast from "react-native-toast-message";
+
+export default function TermsAgreement() {
+  const { user, logout } = useAuth();
+  const [term, setTerm] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const url = BASE_URL;
+
+  const handleSubmit = async () => {
+    try {
+      setIsLoading(true);
+      const response = await apiAcceptTermService({
+        data: {
+          id: user?.id as string,
+          termsOfServiceAccepted: term,
+        },
+      });
+
+      if (!response.success) {
+        Toast.show({
+          type: "error",
+          text1: "Gagal",
+          text2: response.message,
+        });
+
+        return;
+      }
+
+      Toast.show({
+        type: "success",
+        text1: "Anda berhasil menerima syarat & ketentuan",
+        text2: "Silahkan login kembali",
+      });
+
+      setTimeout(() => {
+        logout();
+      }, 2000);
+    } catch (error) {
+      console.log("error", error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const footerComponent = (
+    <BoxButtonOnFooter>
+      <ButtonCustom
+        onPress={handleSubmit}
+        disabled={!term}
+        isLoading={isLoading}
+      >
+        Setuju
+      </ButtonCustom>
+    </BoxButtonOnFooter>
+  );
+
+  return (
+    <>
+      <Stack.Screen
+        options={{
+          title: "Terms & Conditions",
+        }}
+      />
+      <ViewWrapper footerComponent={footerComponent}>
+        <StackCustom>
+          <InformationBox text="Anda dialihkan ke halaman syarat & ketentuan, karena Anda belum menerima persetujuan syarat & ketentuan." />
+
+          <View
+            style={{
+              flexDirection: "row",
+              alignItems: "center",
+              marginTop: 16,
+              marginBottom: 16,
+              paddingInline: 10,
+            }}
+          >
+            <CheckboxCustom value={term} onChange={() => setTerm(!term)} />
+
+            <Text style={GStyles.textLabel}>
+              Saya setuju dengan{" "}
+              <Text
+                style={{
+                  color: MainColor.yellow,
+                  textDecorationLine: "underline",
+                }}
+                onPress={() => {
+                  const toUrl = `${url}/terms-of-service.html`;
+                  openBrowser(toUrl);
+                }}
+              >
+                Syarat & Ketentuan
+              </Text>{" "}
+              yang melarang konten tidak pantas dan perilaku merugikan.
+            </Text>
+          </View>
+        </StackCustom>
+      </ViewWrapper>
+    </>
+  );
+}

components/Alert/AlertWarning.ts

@@ -0,0 +1,16 @@
+import { Alert } from "react-native";
+
+export default function AlertWarning({
+  title = "Peringatan Bagi Pengguna !",
+  description = "Konten yang Anda masukkan mengandung kata-kata yang tidak sesuai dengan pedoman komunitas kami. Mohon gunakan bahasa yang sopan dan menghargai sesama pengguna. Jika kata tersebut sebenarnya lumrah, mohon maaf—kemungkinan sistem kami belum mengenalnya sebagai wajar.",
+}: {
+  title?: string 
+  description?: string;
+}) {
+  return Alert.alert(title, description, [
+    {
+      text: "Tutup",
+      onPress: () => {},
+    },
+  ]);
+}

components/Button/FloatingButton.tsx

@@ -32,9 +32,10 @@ const FloatingButton: React.FC<FloatingButtonProps> = ({
 const styles = StyleSheet.create({
   fab: {
     position: "absolute",
-    margin: 16,
+    margin: "auto",
     right: 0,
-    bottom: 0,
+    // bottom: 10,
+    top: -20,
     backgroundColor: AccentColor.softblue, // Warna Twitter biru
     borderRadius: 50,
     borderColor: AccentColor.blue,

components/DateInput/DataTimeAndroid.tsx

@@ -53,6 +53,8 @@ const DateTimeInput_Android: React.FC<DateTimeInputProps> = ({
   const [selectedDate, setSelectedDate] = useState<Date>(value as any);
   const [selectedTime, setSelectedTime] = useState<Date>(value as any);
 
+  console.log("Date Android", value)
+
   // Fungsi untuk menggabungkan tanggal dan waktu
   const combineDateAndTime = useCallback((date: Date, time: Date): Date => {
     const combined = new Date(date);

components/DateInput/DateTimeIOS.tsx

@@ -7,7 +7,7 @@ import DateTimePicker, {
 } from "@react-native-community/datetimepicker";
 import dayjs from "dayjs";
 import React, { useState } from "react";
-import { StyleProp, Text, View, ViewStyle } from "react-native";
+import { Button, StyleProp, Text, View, ViewStyle } from "react-native";
 import ClickableCustom from "../Clickable/ClickableCustom";
 import TextCustom from "../Text/TextCustom";
 
@@ -129,24 +129,64 @@ const DateTimeInput_IOS: React.FC<DateTimeInputProps> = ({
               borderWidth: 1,
             }}
           >
-            <View style={{ alignItems: "flex-end" }}>
+            {/* <View style={{ alignItems: "flex-start" }}>
               <Ionicons
                 name="close"
                 size={20}
                 color="black"
-                onPress={() => setShow(false)}
+                onPress={() => {
+                  setShow(false);
+                  setSelectedDate(undefined);
+                }}
               />
-            </View>
+            </View> */}
 
             <DateTimePicker
               value={selectedDate || new Date()}
               mode={"datetime"}
-              display="inline"
+              display="spinner"
               onChange={handleConfirm}
               minimumDate={minimumDate}
               maximumDate={maximumDate}
               themeVariant="light"
             />
+            <View style={{ flexDirection: "row", gap: 10 }}>
+              <ClickableCustom
+                onPress={() => {
+                  setShow(false)
+                  setSelectedDate(undefined)
+                }}
+                style={{
+                  alignItems: "center",
+                  justifyContent: "center",
+                  padding: 12,
+                  borderRadius: 10,
+                  backgroundColor: MainColor.placeholder,
+                  marginTop: 10,
+                  width: "48%",
+                }}
+              >
+                <TextCustom color="black">Batal</TextCustom>
+              </ClickableCustom>
+
+              <ClickableCustom
+                onPress={() => {
+                  setShow(false)
+                  onChange(selectedDate as any)
+                }}
+                style={{
+                  alignItems: "center",
+                  justifyContent: "center",
+                  padding: 12,
+                  borderRadius: 10,
+                  backgroundColor: MainColor.darkblue,
+                  marginTop: 10,
+                  width: "48%",
+                }}
+              >
+                <TextCustom>OK</TextCustom>
+              </ClickableCustom>
+            </View>
           </View>
         </>
       )}

components/DateInput/DateTimePickerCustom.tsx

@@ -23,6 +23,9 @@ const DateTimePickerCustom: React.FC<Props> = ({
   minimumDate,
   disabled = false,
 }) => {
+
+  console.log("Date Android Comp", value)
+
   return (
     <>
       {Platform.OS === "ios" ? (
@@ -47,6 +50,9 @@ const DateTimePickerCustom: React.FC<Props> = ({
           maximumDate={maximumDate}
           minimumDate={minimumDate}
           disabled={disabled}
+          value={value as DateTimePickerEvent | Date | null | any}
+
+
         />
       )}
     </>

components/Grid/GridCustom.tsx

@@ -109,6 +109,7 @@ const styles = StyleSheet.create({
     flexDirection: "row",
     flexWrap: "wrap",
     justifyContent: "flex-start",
-    marginInline: 0.1
+    // marginInline: 0.1
+    margin: 0.1
   },
 });

components/Select/SelectCustom.tsx

@@ -87,7 +87,7 @@ const SelectCustom: React.FC<SelectProps> = ({
               borderRadius,
               flexDirection: "row",
               alignItems: "center",
-              paddingHorizontal: 10,
+              // paddingHorizontal: 0,
               height: 50,
             },
 

components/TextArea/TextAreaCustom.tsx

@@ -1,3 +1,4 @@
+import { AccentColor, MainColor } from "@/constants/color-palet";
 import { GStyles } from "@/styles/global-styles";
 import React, { useEffect, useState } from "react";
 import {
@@ -6,7 +7,9 @@ import {
   Text,
   View,
   ViewStyle,
+  useColorScheme,
 } from "react-native";
+import { PlaceholderColor } from "@/constants/color-palet";
 
 type IconType = React.ReactNode | string;
 
@@ -48,7 +51,7 @@ const TextAreaCustom: React.FC<TextAreaCustomProps> = ({
   minRows = 4,
   maxRows = 6,
   showCount = false,
-  maxLength,
+  maxLength = 1000,
   value,
   onChangeText,
   height = 100,
@@ -78,6 +81,9 @@ const TextAreaCustom: React.FC<TextAreaCustomProps> = ({
     );
   };
 
+  const colorScheme = useColorScheme();
+  const theme = PlaceholderColor[colorScheme || "light"];
+
   return (
     <View style={[GStyles.inputContainerArea]}>
       {label && (
@@ -109,6 +115,7 @@ const TextAreaCustom: React.FC<TextAreaCustomProps> = ({
             GStyles.textAreaInput,
             { color: fontColor },
           ]}
+          placeholderTextColor={theme.placeholder}
           editable={!disabled}
           value={value as string}
           onChangeText={onChangeText}

components/TextInput/TextInputCustom.tsx

@@ -1,3 +1,4 @@
+import { PlaceholderColor } from "@/constants/color-palet";
 import { GStyles } from "@/styles/global-styles";
 import Ionicons from "@expo/vector-icons/Ionicons";
 import React, { useState } from "react";
@@ -8,8 +9,10 @@ import {
   TouchableOpacity,
   View,
   ViewStyle,
+  useColorScheme
 } from "react-native";
 
+
 type IconType = React.ReactNode | string;
 
 type Props = {
@@ -74,6 +77,9 @@ const TextInputCustom = ({
     }
   };
 
+  const colorScheme = useColorScheme();
+  const theme = PlaceholderColor[colorScheme || "light"];
+
   return (
     <View style={[GStyles.inputContainerArea, containerStyle]}>
       {label && (
@@ -100,12 +106,14 @@ const TextInputCustom = ({
             { color: fontColor },
             disabled && GStyles.inputPlaceholderDisabled, // <-- placeholder saat disabled
           ]}
+          placeholderTextColor={theme.placeholder}
           editable={!disabled}
           secureTextEntry={secureTextEntry && !isPasswordVisible}
           keyboardType={keyboardType}
           onChangeText={handleTextChange}
           maxLength={maxLength}
           {...rest}
+          
         />
         {secureTextEntry && (
           <TouchableOpacity

components/_ShareComponent/Admin/ButtonReject.tsx

@@ -15,7 +15,7 @@ export default function AdminButtonReject({
     <>
       <ButtonCustom
         iconLeft={<IconReject size={16} />}
-        backgroundColor={MainColor.red}
+        backgroundColor={MainColor.orange}
         textColor="white"
         onPress={onReject}
         isLoading={isLoading}

components/_ShareComponent/Admin/TableValue.tsx

@@ -1,17 +1,23 @@
 import Grid from "@/components/Grid/GridCustom";
 import React from "react";
-import { View } from "react-native";
+import { StyleProp, View, ViewStyle } from "react-native";
 import { Divider } from "react-native-paper";
 
 export default function AdminTableValue({
   value1,
   value2,
   value3,
+  style1,
+  style2,
+  style3,
   bottomLine = false,
 }: {
   value1: React.ReactNode;
   value2: React.ReactNode;
   value3: React.ReactNode;
+  style1?: ViewStyle;
+  style2?: ViewStyle;
+  style3?: ViewStyle;
   bottomLine?: boolean;
 }) {
   return (
@@ -25,6 +31,7 @@ export default function AdminTableValue({
               justifyContent: "center",
               paddingLeft: 10,
               paddingRight: 10,
+              ...style1,
             }}
           >
             {value1}
@@ -36,6 +43,7 @@ export default function AdminTableValue({
               justifyContent: "center",
               paddingLeft: 10,
               paddingRight: 10,
+              ...style2,
             }}
           >
             {value2}
@@ -44,9 +52,10 @@ export default function AdminTableValue({
             span={6}
             style={{
               justifyContent: "center",
-              alignItems: "center",
+              alignItems: "flex-start",
               paddingLeft: 10,
               paddingRight: 10,
+              ...style3,
             }}
           >
             {value3}

components/_ShareComponent/GridDetail_4_8.tsx

@@ -1,20 +0,0 @@
-import { Grid } from "@/components";
-
-export const GridDetail_4_8 = ({
-    label,
-    value,
-}: {
-    label: React.ReactNode;
-    value: React.ReactNode;
-}) => {
-    return (
-        <Grid>
-            <Grid.Col span={4} style={{ justifyContent: "center", paddingRight: 10 }}>
-                {label}
-            </Grid.Col>
-            <Grid.Col span={8} style={{ justifyContent: "center" }}>
-                {value}
-            </Grid.Col>
-        </Grid>
-    );
-};

components/_ShareComponent/GridSpan_4_8.tsx

@@ -0,0 +1,27 @@
+import { Grid } from "@/components";
+
+export const GridSpan_4_8 = ({
+  label: text1,
+  value: text2,
+}: {
+  label: React.ReactNode;
+  value: React.ReactNode;
+}) => {
+  return (
+    <Grid>
+      <Grid.Col
+        span={4}
+        style={{
+          justifyContent: "flex-start",
+          paddingRight: 8,
+          paddingLeft: 8,
+        }}
+      >
+        {text1}
+      </Grid.Col>
+      <Grid.Col span={8} style={{ justifyContent: "center", paddingRight: 8 }}>
+        {text2}
+      </Grid.Col>
+    </Grid>
+  );
+};

components/_ShareComponent/GridSpan_NewComponent.tsx

@@ -0,0 +1,54 @@
+import { Grid } from "@/components";
+
+export const GridSpan_NewComponent = ({
+  text1,
+  text2,
+  text3,
+  text4,
+  span1,
+  span2,
+}: {
+  text1: React.ReactNode;
+  text2: React.ReactNode;
+  text3?: React.ReactNode;
+  text4?: React.ReactNode;
+  span1?: number;
+  span2?: number;
+}) => {
+  return (
+    <Grid>
+      <Grid.Col
+        span={span1 ? span1 : text4 ? 3 : 4}
+        style={{
+          justifyContent: "flex-start",
+          paddingRight: 5,
+          paddingLeft: 3,
+        }}
+      >
+        {text1}
+      </Grid.Col>
+      <Grid.Col
+        span={span2 ? span2 : text4 ? 3 : text3 ? 4 : 8}
+        style={{ justifyContent: "flex-start", paddingRight: 5 }}
+      >
+        {text2}
+      </Grid.Col>
+      {text3 && (
+        <Grid.Col
+          span={text4 ? 3 : 4}
+          style={{ justifyContent: "flex-start", paddingRight: 5 }}
+        >
+          {text3}
+        </Grid.Col>
+      )}
+      {text4 && (
+        <Grid.Col
+          span={3}
+          style={{ justifyContent: "flex-start", paddingRight: 5 }}
+        >
+          {text4}
+        </Grid.Col>
+      )}
+    </Grid>
+  );
+};

components/_ShareComponent/ListEmptyComponent.tsx

@@ -0,0 +1,20 @@
+import { View } from "react-native";
+import TextCustom from "../Text/TextCustom";
+
+//  Komponen Empty
+const ListEmptyComponent = ({ search }: { search?: string }) => (
+  <View
+    style={{
+      flex: 1,
+      justifyContent: "center",
+      alignItems: "center",
+      padding: 20,
+    }}
+  >
+    <TextCustom align="center" color="gray">
+      {search ? "Tidak ada hasil pencarian" : "Tidak ada data"}
+    </TextCustom>
+  </View>
+);
+
+export default ListEmptyComponent;

components/_ShareComponent/ListLoaderFooterComponent.tsx

@@ -0,0 +1,11 @@
+import { View } from "react-native";
+import LoaderCustom from "../Loader/LoaderCustom";
+
+const ListLoaderFooterComponent = () =>(
+   <View style={{ paddingVertical: 16, alignItems: "center" }}>
+      <LoaderCustom />
+    </View>
+)
+
+
+export default ListLoaderFooterComponent;

components/_ShareComponent/ListSkeletonComponent.tsx

@@ -0,0 +1,21 @@
+import { View } from "react-native";
+import StackCustom from "../Stack/StackCustom";
+import SkeletonCustom from "./SkeletonCustom";
+
+const ListSkeletonComponent = ({
+  length = 5,
+  height = 100,
+}: {
+  length?: number;
+  height?: number;
+}) => (
+  <View style={{ flex: 1 }}>
+    <StackCustom>
+      {Array.from({ length }).map((_, i) => (
+        <SkeletonCustom height={height} key={i} />
+      ))}
+    </StackCustom>
+  </View>
+);
+
+export default ListSkeletonComponent;

components/_ShareComponent/NewWrapper.tsx

@@ -0,0 +1,188 @@
+// @/components/NewWrapper.tsx
+import { MainColor } from "@/constants/color-palet";
+import { OS_HEIGHT } from "@/constants/constans-value";
+import { GStyles } from "@/styles/global-styles";
+import {
+  ImageBackground,
+  Keyboard,
+  KeyboardAvoidingView,
+  Platform,
+  ScrollView,
+  FlatList,
+  TouchableWithoutFeedback,
+  View,
+  StyleProp,
+  ViewStyle,
+} from "react-native";
+import {
+  NativeSafeAreaViewProps,
+  SafeAreaView,
+} from "react-native-safe-area-context";
+import type { ScrollViewProps, FlatListProps } from "react-native";
+
+// --- ✅ Tambahkan refreshControl ke BaseProps ---
+interface BaseProps {
+  withBackground?: boolean;
+  headerComponent?: React.ReactNode;
+  footerComponent?: React.ReactNode;
+  floatingButton?: React.ReactNode;
+  hideFooter?: boolean;
+  edgesFooter?: NativeSafeAreaViewProps["edges"];
+  style?: StyleProp<ViewStyle>;
+  refreshControl?: ScrollViewProps["refreshControl"]; // ✅ dipakai di kedua mode
+}
+
+interface StaticModeProps extends BaseProps {
+  children: React.ReactNode;
+  listData?: never;
+  renderItem?: never;
+}
+
+interface ListModeProps extends BaseProps {
+  children?: never;
+  listData?: any[];
+  renderItem?: FlatListProps<any>["renderItem"];
+  onEndReached?: () => void;
+  // ✅ Gunakan tipe yang kompatibel dengan FlatList
+  ListHeaderComponent?: React.ReactElement | null;
+  ListFooterComponent?: React.ReactElement | null;
+  ListEmptyComponent?: React.ReactElement | null;
+  keyExtractor?: FlatListProps<any>["keyExtractor"];
+}
+
+type NewWrapperProps = StaticModeProps | ListModeProps;
+
+const NewWrapper = (props: NewWrapperProps) => {
+  const {
+    withBackground = false,
+    headerComponent,
+    footerComponent,
+    floatingButton,
+    hideFooter = false,
+    edgesFooter = [],
+    style,
+    refreshControl, // ✅ sekarang ada di BaseProps
+  } = props;
+
+  const assetBackground = require("../../assets/images/main-background.png");
+
+  const renderContainer = (content: React.ReactNode) => {
+    if (withBackground) {
+      return (
+        <ImageBackground
+          source={assetBackground}
+          resizeMode="cover"
+          style={GStyles.imageBackground}
+        >
+          <View style={[GStyles.containerWithBackground, style]}>
+            {content}
+          </View>
+        </ImageBackground>
+      );
+    }
+    return <View style={[GStyles.container, style]}>{content}</View>;
+  };
+
+  // 🔹 Mode Dinamis
+  if ("listData" in props) {
+    const listProps = props as ListModeProps;
+
+    return (
+      <KeyboardAvoidingView
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+        style={{ flex: 1, backgroundColor: MainColor.darkblue }}
+      >
+        {headerComponent && (
+          <View style={GStyles.stickyHeader}>{headerComponent}</View>
+        )}
+        <View style={[GStyles.container, style]}>
+          <FlatList
+            data={listProps.listData}
+            renderItem={listProps.renderItem}
+            keyExtractor={
+              listProps.keyExtractor ||
+              ((item) => {
+                if (item.id == null) {
+                  console.warn("Item tanpa 'id':", item);
+                  return `fallback-${JSON.stringify(item)}`;
+                }
+                return String(item.id);
+              })
+            }
+          
+            refreshControl={refreshControl} // ✅ dari BaseProps
+            onEndReached={listProps.onEndReached}
+            onEndReachedThreshold={0.5}
+            ListHeaderComponent={listProps.ListHeaderComponent}
+            ListFooterComponent={listProps.ListFooterComponent}
+            ListEmptyComponent={listProps.ListEmptyComponent}
+            contentContainerStyle={{ flexGrow: 1 }}
+            keyboardShouldPersistTaps="handled"
+          />
+        </View>
+
+        {footerComponent ? (
+          <SafeAreaView
+            edges={Platform.OS === "ios" ? edgesFooter : ["bottom"]}
+            style={{ backgroundColor: MainColor.darkblue, height: OS_HEIGHT }}
+          >
+            {footerComponent}
+          </SafeAreaView>
+        ) : hideFooter ? null : (
+          <SafeAreaView
+            edges={["bottom"]}
+            style={{ backgroundColor: MainColor.darkblue }}
+          />
+        )}
+
+        {floatingButton && (
+          <View style={GStyles.floatingContainer}>{floatingButton}</View>
+        )}
+      </KeyboardAvoidingView>
+    );
+  }
+
+  // 🔹 Mode Statis
+  const staticProps = props as StaticModeProps;
+
+  return (
+    <KeyboardAvoidingView
+      behavior={Platform.OS === "ios" ? "padding" : "height"}
+      style={{ flex: 1, backgroundColor: MainColor.darkblue }}
+    >
+      {headerComponent && (
+        <View style={GStyles.stickyHeader}>{headerComponent}</View>
+      )}
+
+      <ScrollView
+        contentContainerStyle={{ flexGrow: 1 }}
+        keyboardShouldPersistTaps="handled"
+        refreshControl={refreshControl} // ✅ sekarang valid
+      >
+        <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
+          {renderContainer(staticProps.children)}
+        </TouchableWithoutFeedback>
+      </ScrollView>
+
+      {footerComponent ? (
+        <SafeAreaView
+          edges={Platform.OS === "ios" ? edgesFooter : ["bottom"]}
+          style={{ backgroundColor: MainColor.darkblue, height: OS_HEIGHT }}
+        >
+          {footerComponent}
+        </SafeAreaView>
+      ) : hideFooter ? null : (
+        <SafeAreaView
+          edges={["bottom"]}
+          style={{ backgroundColor: MainColor.darkblue }}
+        />
+      )}
+
+      {floatingButton && (
+        <View style={GStyles.floatingContainer}>{floatingButton}</View>
+      )}
+    </KeyboardAvoidingView>
+  );
+};
+
+export default NewWrapper;

components/_ShareComponent/SkeletonCustom.tsx

@@ -0,0 +1,59 @@
+// components/CustomSkeleton.tsx
+import React from "react";
+import { View, StyleProp, ViewStyle, DimensionValue } from "react-native";
+import { MotiView } from "moti";
+import { AccentColor, MainColor } from "@/constants/color-palet";
+
+interface CustomSkeletonProps {
+  isLoading?: boolean;
+  style?: StyleProp<ViewStyle>;
+  width?: DimensionValue;
+  height?: DimensionValue;
+  radius?: number;
+}
+
+const CustomSkeleton: React.FC<CustomSkeletonProps> = ({
+  isLoading = true,
+  style,
+  width = "100%",
+  height = 16,
+  radius = 8,
+}) => {
+  if (!isLoading) return null;
+
+  return (
+    <View
+      style={[
+        {
+          width,
+          height,
+          borderRadius: radius,
+          backgroundColor:  AccentColor.darkblue,
+          overflow: "hidden",
+          position: "relative",
+        },
+        style,
+      ]}
+    >
+      <MotiView
+        from={{ translateY: -100 }}
+        animate={{ translateY: 100 }}
+        transition={{
+          duration: 1200,
+          repeat: Infinity,
+          type: "timing",
+        }}
+        style={{
+          position: "absolute",
+          left: 0,
+          right: 0,
+          height: 100,
+          backgroundColor: MainColor.soft_darkblue,
+          borderRadius: 4,
+        }}
+      />
+    </View>
+  );
+};
+
+export default CustomSkeleton;

components/_ShareComponent/ViewWrapper.tsx

@@ -11,6 +11,7 @@ import {
   View,
   StyleProp,
   ViewStyle,
+  ScrollViewProps,
 } from "react-native";
 import { NativeSafeAreaViewProps, SafeAreaView } from "react-native-safe-area-context";
 
@@ -23,6 +24,7 @@ interface ViewWrapperProps {
   hideFooter?: boolean;
   edgesFooter?: NativeSafeAreaViewProps["edges"];
   style?: StyleProp<ViewStyle>;
+  refreshControl?: ScrollViewProps["refreshControl"];
 }
 
 /**
@@ -40,6 +42,7 @@ const ViewWrapper = ({
   hideFooter = false,
   edgesFooter =[],
   style,
+  refreshControl,
 }: ViewWrapperProps) => {
   const assetBackground = require("../../assets/images/main-background.png");
 
@@ -57,6 +60,7 @@ const ViewWrapper = ({
         <ScrollView
           contentContainerStyle={{ flexGrow: 1 }}
           keyboardShouldPersistTaps="handled"
+          refreshControl={refreshControl}
         >
           <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
             <View style={{ flex: 1 }}>

components/index.ts

@@ -59,6 +59,7 @@ import ViewWrapper from "./_ShareComponent/ViewWrapper";
 import SearchInput from "./_ShareComponent/SearchInput";
 import DummyLandscapeImage from "./_ShareComponent/DummyLandscapeImage";
 import GridComponentView from "./_ShareComponent/GridSectionView";
+import NewWrapper from "./_ShareComponent/NewWrapper";
 // Progress
 import ProgressCustom from "./Progress/ProgressCustom";
 // Loader
@@ -119,6 +120,7 @@ export {
   DummyLandscapeImage,
   GridComponentView,
   Spacing,
+  NewWrapper,
   // Stack
   StackCustom,
   TabBarBackground,

constants/color-palet.ts

@@ -45,3 +45,23 @@ export const AdminColor = {
 // Warna Asli: #002e59
 // Warna Lebih Gelap: #001f3b
 // Warna Tergelap: #001323
+
+
+export const PlaceholderColor = {
+  light: {
+    text: "#000",
+    placeholder: "#666",
+    border: "#ccc",
+    background: "#fff",
+    error: "#d00",
+    icon: "#555",
+  },
+  dark: {
+    text: "#fff",
+    placeholder: "#aaa",
+    border: "#444",
+    background: "#1a1a1a",
+    error: "#ff4d4d",
+    icon: "#ccc",
+  },
+};

context/AuthContext.tsx

@@ -24,6 +24,7 @@ type AuthContextType = {
   registerUser: (userData: {
     username: string;
     nomor: string;
+    termsOfServiceAccepted: boolean;
   }) => Promise<void>;
   userData: (token: string) => Promise<any>;
 };
@@ -71,8 +72,31 @@ 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 });
-      await AsyncStorage.setItem("kode_otp", response.kodeId);
+      console.log("[RESPONSE AUTH]", JSON.stringify(response));
+
+
+      if (response.success) {
+        console.log("[Keluar provider]", nomor);
+        Toast.show({
+          type: "success",
+          text1: "Sukses",
+          text2: "Kode OTP berhasil dikirim",
+        });
+
+        await AsyncStorage.setItem("kode_otp", response.kodeId);
+        router.push(`/verification?nomor=${nomor}`);
+        return;
+      } else {
+        router.push(`/register?nomor=${nomor}`);
+        Toast.show({
+          type: "info",
+          text1: "Info",
+          text2: "Silahkan mendaftar",
+        });
+        return;
+      }
     } catch (error: any) {
       throw new Error(error.response?.data?.message || "Gagal kirim OTP");
     } finally {
@@ -80,13 +104,26 @@ 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 {
       setIsLoading(true);
       const response = await apiValidationCode({ nomor: nomor });
-
       const { token } = response;
+      console.log("[RESPONSE VALIDASI OTP]", JSON.stringify(response, null, 2));
+
       if (response.success) {
         setToken(token);
         await AsyncStorage.setItem("authToken", token);
@@ -103,20 +140,23 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
 
         if (response.active) {
           if (response.roleId === "1") {
-            return "/(application)/(user)/home";
+            router.replace("/(application)/(user)/home");
+            return;
           } else {
-            return "/(application)/admin/dashboard";
+            router.replace("/(application)/admin/dashboard");
+            return;
           }
         } else {
-          return "/(application)/(user)/waiting-room";
+          router.replace("/(application)/(user)/waiting-room");
+          return;
         }
       } else {
         Toast.show({
           type: "info",
-          text1: "Anda belum terdaftar",
+          text1: "Terjadi kesalahan",
-          text2: "Silahkan daftar terlebih dahulu",
+          text2: "Silahkan coba lagi",
         });
-        return `/register?nomor=${nomor}`;
+        return;
       }
     } catch (error: any) {
       console.log("Error validasi otp >>", (error as Error).message || error);
@@ -131,6 +171,10 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
   // --- 3. Ambil data user ---
   const userData = async (token: string) => {
     try {
+      if (!token) {
+        throw new Error("Token tidak ditemukan");
+      }
+
       setIsLoading(true);
       const response = await apiConfig.get(`/mobile?token=${token}`, {
         headers: {
@@ -144,7 +188,10 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
       await AsyncStorage.setItem("userData", JSON.stringify(dataUser));
       return dataUser;
     } catch (error: any) {
-      console.log(error.response?.data?.message + "user" || "Gagal mengambil data user");
+      console.log(
+        "[LOAD USER DATA]",
+        error.response?.data?.message + "user" || "Gagal mengambil data user"
+      );
     } finally {
       setIsLoading(false);
     }
@@ -154,12 +201,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
   const registerUser = async (userData: {
     username: string;
     nomor: string;
+    termsOfServiceAccepted: boolean;
   }) => {
     setIsLoading(true);
     try {
       const response = await apiRegister({ data: userData });
+      console.log("[REGISTER FETCH]", JSON.stringify(response, null, 2));
 
-      const { token } = response;
       if (!response.success) {
         Toast.show({
           type: "info",
@@ -170,23 +218,63 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
         return;
       }
 
-      setToken(token);
-      await AsyncStorage.setItem("authToken", token);
       Toast.show({
         type: "success",
         text1: "Sukses",
         text2: "Anda berhasil terdaftar",
       });
-      router.replace("/(application)/(user)/waiting-room");
+      router.replace(`/verification?nomor=${userData.nomor}`);
       return;
     } catch (error: any) {
+      Toast.show({
+        type: "error",
+        text1: "Error",
+        text2: error.response?.data?.message || "Gagal mendaftar",
+      });
       console.log("Error register", error);
     } finally {
       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 ---
+
   const logout = async () => {
     try {
       setIsLoading(true);

google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "608461535079",
+    "project_id": "hipmi-badung-connect",
+    "storage_bucket": "hipmi-badung-connect.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:608461535079:android:4ff12ddc283fb3746761c2",
+        "android_client_info": {
+          "package_name": "com.bip.hipmimobileapp"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBiDtIk3Q9zffFwIdJ5cjqY7e4390JGSkM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

hipmi-note.md

@@ -11,4 +11,5 @@ Exp: open ios/HIPMIBADUNG.xcworkspace
 
 ### Other
 perubahan versi : npm version patch
-
+ios: bunx expo prebuild --platform ios
+android: bunx expo prebuild --platform android

hooks/use-paginated-api.ts

@@ -0,0 +1,97 @@
+// @/hooks/use-paginated-api.ts
+import { useCallback, useState, useEffect, useRef } from "react";
+
+interface UsePaginatedApiProps {
+  fetcher: (params: { page: number; search?: string }) => Promise<any[]>;
+  initialSearch?: string; // mengatur nilai awal dari state
+  pageSize?: number;
+  dependencies?: any[]; // untuk refresh saat deps berubah (misal: user.id)
+}
+
+export const usePaginatedApi = ({
+  fetcher,
+  initialSearch = "",
+  pageSize = 5,
+  dependencies = [],
+}: UsePaginatedApiProps) => {
+  const [data, setData] = useState<any[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [refreshing, setRefreshing] = useState(false);
+  const [hasMore, setHasMore] = useState(true);
+  const [page, setPage] = useState(1);
+  const [search, setSearch] = useState(initialSearch);
+  const refreshingRef = useRef<boolean>(false);
+  const loadingRef = useRef<boolean>(false);
+  const fetchRef = useRef(false);
+
+  const fetchData = useCallback(
+  async (pageNumber: number, clear: boolean) => {
+    const isRefresh = clear;
+    
+    // 🔒 Proteksi: jangan jalankan jika sedang refreshing (untuk refresh)
+    if (isRefresh && refreshingRef.current) return;
+    // 🔒 Proteksi: jangan jalankan loadMore jika sedang loading
+    if (!isRefresh && loadingRef.current) return;
+
+    const setLoadingState = (isLoading: boolean) => {
+      if (isRefresh) {
+        setRefreshing(isLoading);
+        refreshingRef.current = isLoading;
+      } else {
+        setLoading(isLoading);
+        loadingRef.current = isLoading;
+      }
+    };
+
+    setLoadingState(true);
+
+    try {
+      const newData = await fetcher({ page: pageNumber, search });
+      setData((prev) => {
+        const current = Array.isArray(prev) ? prev : [];
+        return clear ? newData : [...current, ...newData];
+      });
+      setHasMore(newData.length === pageSize);
+      setPage(pageNumber);
+    } catch (error) {
+      console.error("[usePaginatedApi] Error:", error);
+      setHasMore(false);
+    } finally {
+      setLoadingState(false);
+    }
+  },
+  [search, hasMore, pageSize, ...dependencies]
+);
+
+  const onRefresh = useCallback(() => {
+    fetchData(1, true);
+  }, [fetchData]);
+
+  const loadMore = useCallback(() => {
+    if (hasMore && !loading && !refreshing) {
+      fetchData(page + 1, false);
+    }
+  }, [hasMore, loading, refreshing, page, fetchData]);
+
+  // Reset & fetch ulang saat search atau deps berubah
+  useEffect(() => {
+    if (fetchRef.current) return; // hindari double initial
+  fetchRef.current = true;
+
+    setPage(1);
+    setData([]);
+    setHasMore(true);
+    fetchData(1, true);
+  }, [search, ...dependencies]);
+
+  return {
+    data,
+    loading,
+    refreshing,
+    hasMore,
+    search,
+    setSearch,
+    onRefresh,
+    loadMore,
+  };
+};

ios/HIPMIBadungConnect.xcodeproj/project.pbxproj

@@ -10,7 +10,8 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		241CFEB1CBB2124E18A09822 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 51B6792712498367CD1EEA5D /* PrivacyInfo.xcprivacy */; };
 		3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
-		7833AA2741E7B2CCBEBEB1C7 /* libPods-HIPMIBadungConnect.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B3A38F3F981E3720B61AC51 /* libPods-HIPMIBadungConnect.a */; };
+		5FFACD268BA648EFA3A59CDC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E8EB1D2D7338425899CD9FA1 /* GoogleService-Info.plist */; };
+		74742C163A8F5202D2925B40 /* libPods-HIPMIBadungConnect.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE614D12468C9A25709B0317 /* libPods-HIPMIBadungConnect.a */; };
 		BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
 		D138B3E4BC618ADDE62DCDCC /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8F39CC335B3942749573F05 /* ExpoModulesProvider.swift */; };
 		F11748422D0307B40044C1D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11748412D0307B40044C1D9 /* AppDelegate.swift */; };
@@ -20,12 +21,13 @@
 		13B07F961A680F5B00A75B9A /* HIPMIBadungConnect.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HIPMIBadungConnect.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = HIPMIBadungConnect/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = HIPMIBadungConnect/Info.plist; sourceTree = "<group>"; };
-		1E94102500A8768C71C74AF6 /* Pods-HIPMIBadungConnect.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HIPMIBadungConnect.debug.xcconfig"; path = "Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect.debug.xcconfig"; sourceTree = "<group>"; };
+		40E847A832DE042BE51AD9E9 /* Pods-HIPMIBadungConnect.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HIPMIBadungConnect.release.xcconfig"; path = "Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect.release.xcconfig"; sourceTree = "<group>"; };
 		51B6792712498367CD1EEA5D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = HIPMIBadungConnect/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
-		9B3A38F3F981E3720B61AC51 /* libPods-HIPMIBadungConnect.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-HIPMIBadungConnect.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = HIPMIBadungConnect/SplashScreen.storyboard; sourceTree = "<group>"; };
 		BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
-		C19B4954908DD0D4CD2965DF /* Pods-HIPMIBadungConnect.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HIPMIBadungConnect.release.xcconfig"; path = "Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect.release.xcconfig"; sourceTree = "<group>"; };
+		BE614D12468C9A25709B0317 /* libPods-HIPMIBadungConnect.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-HIPMIBadungConnect.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		C273E4769DE3DC0FEF6A377C /* Pods-HIPMIBadungConnect.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HIPMIBadungConnect.debug.xcconfig"; path = "Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect.debug.xcconfig"; sourceTree = "<group>"; };
+		E8EB1D2D7338425899CD9FA1 /* GoogleService-Info.plist */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "HIPMIBadungConnect/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		F11748412D0307B40044C1D9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = HIPMIBadungConnect/AppDelegate.swift; sourceTree = "<group>"; };
 		F11748442D0722820044C1D9 /* HIPMIBadungConnect-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "HIPMIBadungConnect-Bridging-Header.h"; path = "HIPMIBadungConnect/HIPMIBadungConnect-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -37,7 +39,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7833AA2741E7B2CCBEBEB1C7 /* libPods-HIPMIBadungConnect.a in Frameworks */,
+				74742C163A8F5202D2925B40 /* libPods-HIPMIBadungConnect.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -54,6 +56,7 @@
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */,
 				51B6792712498367CD1EEA5D /* PrivacyInfo.xcprivacy */,
+				E8EB1D2D7338425899CD9FA1 /* GoogleService-Info.plist */,
 			);
 			name = HIPMIBadungConnect;
 			sourceTree = "<group>";
@@ -62,7 +65,7 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				9B3A38F3F981E3720B61AC51 /* libPods-HIPMIBadungConnect.a */,
+				BE614D12468C9A25709B0317 /* libPods-HIPMIBadungConnect.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -108,8 +111,8 @@
 		A30E580F1E4E26A6BD0E3B24 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1E94102500A8768C71C74AF6 /* Pods-HIPMIBadungConnect.debug.xcconfig */,
+				C273E4769DE3DC0FEF6A377C /* Pods-HIPMIBadungConnect.debug.xcconfig */,
-				C19B4954908DD0D4CD2965DF /* Pods-HIPMIBadungConnect.release.xcconfig */,
+				40E847A832DE042BE51AD9E9 /* Pods-HIPMIBadungConnect.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -138,14 +141,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "HIPMIBadungConnect" */;
 			buildPhases = (
-				08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */,
+				AA173A81855B88A7082A949D /* [CP] Check Pods Manifest.lock */,
 				0B90913696EEE0E819CAF510 /* [Expo] Configure project */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */,
+				1A2B5C8B77E56B3325ADC6E7 /* [CP] Embed Pods Frameworks */,
-				2DA25245F64078F29C0B38E4 /* [CP] Embed Pods Frameworks */,
+				AECA4AD2A3DFA75F552CA1F1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -196,6 +199,7 @@
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */,
 				241CFEB1CBB2124E18A09822 /* PrivacyInfo.xcprivacy in Resources */,
+				5FFACD268BA648EFA3A59CDC /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -219,28 +223,6 @@
 			shellPath = /bin/sh;
 			shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n  source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n  source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n# The project root by default is one level up from the ios directory\nexport PROJECT_ROOT=\"$PROJECT_DIR\"/..\n\nif [[ \"$CONFIGURATION\" = *Debug* ]]; then\n  export SKIP_BUNDLING=1\nfi\nif [[ -z \"$ENTRY_FILE\" ]]; then\n  # Set the entry JS file using the bundler's entry resolution.\n  export ENTRY_FILE=\"$(\"$NODE_BINARY\" -e \"require('expo/scripts/resolveAppEntry')\" \"$PROJECT_ROOT\" ios absolute | tail -n 1)\"\nfi\n\nif [[ -z \"$CLI_PATH\" ]]; then\n  # Use Expo CLI\n  export CLI_PATH=\"$(\"$NODE_BINARY\" --print \"require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })\")\"\nfi\nif [[ -z \"$BUNDLE_COMMAND\" ]]; then\n  # Default Expo CLI command for bundling\n  export BUNDLE_COMMAND=\"export:embed\"\nfi\n\n# Source .xcode.env.updates if it exists to allow\n# SKIP_BUNDLING to be unset if needed\nif [[ -f \"$PODS_ROOT/../.xcode.env.updates\" ]]; then\n  source \"$PODS_ROOT/../.xcode.env.updates\"\nfi\n# Source local changes to allow overrides\n# if needed\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n  source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n`\"$NODE_BINARY\" --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'\"`\n\n";
 		};
-		08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-HIPMIBadungConnect-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		0B90913696EEE0E819CAF510 /* [Expo] Configure project */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -265,21 +247,29 @@
 			shellPath = /bin/sh;
 			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-HIPMIBadungConnect/expo-configure-project.sh\"\n";
 		};
-		2DA25245F64078F29C0B38E4 /* [CP] Embed Pods Frameworks */ = {
+		1A2B5C8B77E56B3325ADC6E7 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/MapboxMaps/MapboxMaps.framework",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCommon/MapboxCommon.framework/MapboxCommon",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCoreMaps/MapboxCoreMaps.framework/MapboxCoreMaps",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/React-Core-prebuilt/React.framework/React",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/ReactNativeDependencies/ReactNativeDependencies.framework/ReactNativeDependencies",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Turf/Turf.framework/Turf",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMaps.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCommon.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreMaps.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactNativeDependencies.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Turf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -287,17 +277,49 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = {
+		AA173A81855B88A7082A949D /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-HIPMIBadungConnect-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		AECA4AD2A3DFA75F552CA1F1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-HIPMIBadungConnect/Pods-HIPMIBadungConnect-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/EXApplication/ExpoApplication_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/EXNotifications/ExpoNotifications_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoDevice/ExpoDevice_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoSystemUI/ExpoSystemUI_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseMessaging/FirebaseMessaging_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
 				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
@@ -324,14 +346,25 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/EXDevMenu.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/react-native-maps/ReactNativeMapsPrivacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoApplication_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoNotifications_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoDevice_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoSystemUI_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseMessaging_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
@@ -358,6 +391,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevLauncher.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevMenu.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeMapsPrivacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -382,12 +416,12 @@
 /* Begin XCBuildConfiguration section */
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1E94102500A8768C71C74AF6 /* Pods-HIPMIBadungConnect.debug.xcconfig */;
+			baseConfigurationReference = C273E4769DE3DC0FEF6A377C /* Pods-HIPMIBadungConnect.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HIPMIBadungConnect/HIPMIBadungConnect.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = BMY6GT6W3D;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -408,7 +442,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.anonymous.hipmi-mobile";
-				PRODUCT_NAME = HIPMIBadungConnect;
+				PRODUCT_NAME = "HIPMIBadungConnect";
 				SWIFT_OBJC_BRIDGING_HEADER = "HIPMIBadungConnect/HIPMIBadungConnect-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -419,12 +453,12 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C19B4954908DD0D4CD2965DF /* Pods-HIPMIBadungConnect.release.xcconfig */;
+			baseConfigurationReference = 40E847A832DE042BE51AD9E9 /* Pods-HIPMIBadungConnect.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = HIPMIBadungConnect/HIPMIBadungConnect.entitlements;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = BMY6GT6W3D;
 				INFOPLIST_FILE = HIPMIBadungConnect/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
@@ -440,7 +474,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.anonymous.hipmi-mobile";
-				PRODUCT_NAME = HIPMIBadungConnect;
+				PRODUCT_NAME = "HIPMIBadungConnect";
 				SWIFT_OBJC_BRIDGING_HEADER = "HIPMIBadungConnect/HIPMIBadungConnect-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/HIPMIBadungConnect/AppDelegate.swift

@@ -1,4 +1,5 @@
 import Expo
+import FirebaseCore
 import React
 import ReactAppDependencyProvider
 
@@ -23,6 +24,9 @@ public class AppDelegate: ExpoAppDelegate {
 
 #if os(iOS) || os(tvOS)
     window = UIWindow(frame: UIScreen.main.bounds)
+// @generated begin @react-native-firebase/app-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-10e8520570672fd76b2403b7e1e27f5198a6349a
+FirebaseApp.configure()
+// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions
     factory.startReactNative(
       withModuleName: "main",
       in: window,

ios/HIPMIBadungConnect/GoogleService-Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyAAvM0yBp5kCXa0hLAaNFZNqwkpBGYAWYs</string>
+	<key>GCM_SENDER_ID</key>
+	<string>608461535079</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.anonymous.hipmi-mobile</string>
+	<key>PROJECT_ID</key>
+	<string>hipmi-badung-connect</string>
+	<key>STORAGE_BUCKET</key>
+	<string>hipmi-badung-connect.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:608461535079:ios:589f31b2b6b1068b6761c2</string>
+</dict>
+</plist>