Refresh control dan Blockir user di forum

### No Issue
Penambahan fitur block user: 50%
2025-11-26 16:13:05 +08:00 · 2025-11-25 11:04:12 +08:00 · 2025-11-24 17:09:52 +08:00 · 2025-11-21 17:43:58 +08:00 · 2025-11-20 15:42:37 +08:00 · 2025-11-19 17:40:35 +08:00
51 changed files with 2005 additions and 560 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -92,8 +92,8 @@ android {
        applicationId 'com.bip.hipmimobileapp'
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"

        buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
    }
@@ -180,3 +180,5 @@ dependencies {
        implementation jscFlavor
    }
 }
+
+apply plugin: 'com.google.gms.google-services'
--- a/android/app/google-services.json
+++ b/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"
+}
--- a/android/app/src/main/AndroidManifest.xml
+++ b/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"/>
@@ -29,6 +31,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>
--- a/android/build.gradle
+++ b/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')
--- a/app.config.js
+++ b/app.config.js
@@ -16,9 +16,10 @@ export default {
    bundleIdentifier: "com.anonymous.hipmi-mobile",
    infoPlist: {
      ITSAppUsesNonExemptEncryption: false,
+      "NSLocationWhenInUseUsageDescription": "Aplikasi membutuhkan akses lokasi untuk menampilkan peta.",
    },
    associatedDomains: ["applinks:cld-dkr-staging-hipmi.wibudev.com"],
-    buildNumber: "5",
+    buildNumber: "8",
  },

  android: {
@@ -55,6 +56,7 @@ export default {

  plugins: [
    "expo-router",
+    "expo-notifications",
    "expo-web-browser",
    [
      "expo-splash-screen",
@@ -74,6 +76,7 @@ export default {
      },
    ],
    "expo-font",
+    "@rnmapbox/maps",
  ],

  experiments: {
--- a/app/(application)/(user)/_layout.tsx
+++ b/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={{
--- a/app/(application)/(user)/delete-account.tsx
+++ b/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>
+    </>
+  );
+}
--- a/app/(application)/(user)/forum/[id]/forumku.tsx
+++ b/app/(application)/(user)/forum/[id]/forumku.tsx
@@ -1,142 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import {
-  AvatarComp,
-  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";
+import View_Forumku from "@/screens/Forum/ViewForumku";
+import View_Forumku2 from "@/screens/Forum/ViewForumku2";

 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
-        floatingButton={
-          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>
+      {/* <View_Forumku />  */}
+      <View_Forumku2 />
    </>
  );
 }
--- a/app/(application)/(user)/forum/[id]/index.tsx
+++ b/app/(application)/(user)/forum/[id]/index.tsx
@@ -223,6 +223,7 @@ export default function ForumDetail() {
      >
        <Forum_MenuDrawerBerandaSection
          id={dataId}
+          authorUsername={data?.Author?.username as string}
          status={status}
          setIsDrawerOpen={() => {
            setOpenDrawer(false);
--- a/app/(application)/(user)/forum/index.tsx
+++ b/app/(application)/(user)/forum/index.tsx
@@ -1,129 +1,12 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import {
-  AvatarComp,
-  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";
+import Forum_ViewBeranda from "@/screens/Forum/ViewBeranda";
+import Forum_ViewBeranda2 from "@/screens/Forum/ViewBeranda2";

 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
-        options={{
-          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>
+      {/* <Forum_ViewBeranda /> */}
+      <Forum_ViewBeranda2 />
    </>
  );
 }
--- a/app/(application)/(user)/home.tsx
+++ b/app/(application)/(user)/home.tsx
@@ -16,25 +16,34 @@ import { useEffect, useState } from "react";

 export default function Application() {
  const { token, user } = useAuth();
-
  const [data, setData] = useState<any>();

+  console.log("[User] >>", JSON.stringify(user?.id, null, 2));
+  
  useEffect(() => {
    onLoadData();
    checkVersion();
  }, []);
-
+  
  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));
  };
+  
+  if (user && user?.termsOfServiceAccepted === false) {
+    console.log("User is not accept term service");
+    return <Redirect href={`/terms-agreement`} />;
+  }

  if (data && data?.active === false) {
    console.log("User is not active");
--- a/app/(application)/(user)/maps/index.tsx
+++ b/app/(application)/(user)/maps/index.tsx
@@ -1,32 +1,6 @@
-import {
-  ButtonCustom,
-  DrawerCustom,
-  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,
-};
+import MapsView from "@/screens/Maps/MapsView";
+import MapsView2 from "@/screens/Maps/MapsView2";
+import { Text, View } from "react-native";

 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 }}>
-        {/* <MapCustom height={"100%"} /> */}
-        <View style={{ flex: 1 }}>
-          {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>
+      <MapsView />
+      {/* <MapsView2 />, */}
+      {/* <View style={{ flex: 1, backgroundColor: "gray" }}><Text style={{ color: "white" }}>Map disabled</Text></View> */}
    </>
  );
 }
--- a/app/(application)/_layout.tsx
+++ b/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
--- a/app/(application)/terms-agreement.tsx
+++ b/app/(application)/terms-agreement.tsx
@@ -0,0 +1,115 @@
+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 Agreement",
+        }}
+      />
+      <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,
+            }}
+          >
+            <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>
+    </>
+  );
+}
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -1,27 +1,10 @@
 import { AuthProvider } from "@/context/AuthContext";
 import AppRoot from "@/screens/RootLayout/AppRoot";
-import { registerForPushNotificationsAsync } from "@/utils/notifications";
-import { useEffect } from "react";
 import "react-native-gesture-handler";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 import Toast from "react-native-toast-message";

 export default function RootLayout() {
-  useEffect(() => {
-    // Jalankan sekali saat app pertama kali dibuka
-    registerForPushNotificationsAsync().then((token) => {
-      if (token) {
-        // TODO: Kirim token ke backend kamu
-        // Contoh:
-        // fetch('https://api.hipmibadung.id/save-token', {
-        //   method: 'POST',
-        //   headers: { 'Content-Type': 'application/json' },
-        //   body: JSON.stringify({ token })
-        // });
-      }
-    });
-  }, []);
-
  return (
    <>
      <SafeAreaProvider>
--- a/assets/images/constants/logo-hipmi.png
+++ b/assets/images/constants/logo-hipmi.png
--- a/assets/images/constants/logo-hipmi_back.png
+++ b/assets/images/constants/logo-hipmi_back.png
--- a/bun.lock
+++ b/bun.lock
@@ -12,6 +12,7 @@
        "@react-navigation/elements": "^2.3.8",
        "@react-navigation/native": "^7.1.6",
        "@react-navigation/native-stack": "^7.3.10",
+        "@rnmapbox/maps": "^10.2.7",
        "@types/lodash": "^4.17.20",
        "@types/react-native-vector-icons": "^6.4.18",
        "axios": "^1.11.0",
@@ -19,24 +20,27 @@
        "expo": "^54.0.0",
        "expo-camera": "~17.0.7",
        "expo-clipboard": "~8.0.7",
-        "expo-constants": "~18.0.10",
+        "expo-constants": "^18.0.10",
        "expo-dev-client": "~6.0.12",
-        "expo-device": "~8.0.9",
+        "expo-device": "^8.0.9",
        "expo-document-picker": "~14.0.7",
        "expo-file-system": "^19.0.15",
        "expo-font": "~14.0.8",
        "expo-haptics": "~15.0.7",
        "expo-image": "~3.0.8",
        "expo-image-picker": "~17.0.8",
+        "expo-linear-gradient": "~15.0.7",
        "expo-linking": "~8.0.8",
-        "expo-notifications": "~0.32.12",
+        "expo-location": "~19.0.7",
+        "expo-notifications": "^0.32.13",
        "expo-router": "~6.0.1",
        "expo-splash-screen": "~31.0.9",
        "expo-status-bar": "~3.0.8",
        "expo-symbols": "~1.0.7",
        "expo-system-ui": "~6.0.7",
-        "expo-web-browser": "~15.0.7",
+        "expo-web-browser": "~15.0.9",
        "lodash": "^4.17.21",
+        "moti": "^0.30.0",
        "react": "19.1.0",
        "react-dom": "19.1.0",
        "react-native": "0.81.4",
@@ -338,6 +342,10 @@

    "@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.0.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA=="],

+    "@emotion/is-prop-valid": ["@emotion/is-prop-valid@0.8.8", "", { "dependencies": { "@emotion/memoize": "0.7.4" } }, "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="],
+
+    "@emotion/memoize": ["@emotion/memoize@0.7.4", "", {}, "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="],
+
    "@eslint-community/eslint-utils": ["@eslint-community/eslint-utils@4.7.0", "", { "dependencies": { "eslint-visitor-keys": "^3.4.3" }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw=="],

    "@eslint-community/regexpp": ["@eslint-community/regexpp@4.12.1", "", {}, "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ=="],
@@ -476,6 +484,18 @@

    "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.25", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="],

+    "@motionone/animation": ["@motionone/animation@10.18.0", "", { "dependencies": { "@motionone/easing": "^10.18.0", "@motionone/types": "^10.17.1", "@motionone/utils": "^10.18.0", "tslib": "^2.3.1" } }, "sha512-9z2p5GFGCm0gBsZbi8rVMOAJCtw1WqBTIPw3ozk06gDvZInBPIsQcHgYogEJ4yuHJ+akuW8g1SEIOpTOvYs8hw=="],
+
+    "@motionone/dom": ["@motionone/dom@10.12.0", "", { "dependencies": { "@motionone/animation": "^10.12.0", "@motionone/generators": "^10.12.0", "@motionone/types": "^10.12.0", "@motionone/utils": "^10.12.0", "hey-listen": "^1.0.8", "tslib": "^2.3.1" } }, "sha512-UdPTtLMAktHiqV0atOczNYyDd/d8Cf5fFsd1tua03PqTwwCe/6lwhLSQ8a7TbnQ5SN0gm44N1slBfj+ORIhrqw=="],
+
+    "@motionone/easing": ["@motionone/easing@10.18.0", "", { "dependencies": { "@motionone/utils": "^10.18.0", "tslib": "^2.3.1" } }, "sha512-VcjByo7XpdLS4o9T8t99JtgxkdMcNWD3yHU/n6CLEz3bkmKDRZyYQ/wmSf6daum8ZXqfUAgFeCZSpJZIMxaCzg=="],
+
+    "@motionone/generators": ["@motionone/generators@10.18.0", "", { "dependencies": { "@motionone/types": "^10.17.1", "@motionone/utils": "^10.18.0", "tslib": "^2.3.1" } }, "sha512-+qfkC2DtkDj4tHPu+AFKVfR/C30O1vYdvsGYaR13W/1cczPrrcjdvYCj0VLFuRMN+lP1xvpNZHCRNM4fBzn1jg=="],
+
+    "@motionone/types": ["@motionone/types@10.17.1", "", {}, "sha512-KaC4kgiODDz8hswCrS0btrVrzyU2CSQKO7Ps90ibBVSQmjkrt2teqta6/sOG59v7+dPnKMAg13jyqtMKV2yJ7A=="],
+
+    "@motionone/utils": ["@motionone/utils@10.18.0", "", { "dependencies": { "@motionone/types": "^10.17.1", "hey-listen": "^1.0.8", "tslib": "^2.3.1" } }, "sha512-3XVF7sgyTSI2KWvTf6uLlBJ5iAgRgmvp3bpuOiQJvInd4nZ19ET8lX5unn30SlmRH7hXbBbH+Gxd0m0klJ3Xtw=="],
+
    "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@0.2.11", "", { "dependencies": { "@emnapi/core": "^1.4.3", "@emnapi/runtime": "^1.4.3", "@tybys/wasm-util": "^0.9.0" } }, "sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA=="],

    "@nicolo-ribaudo/chokidar-2": ["@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3", "", {}, "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ=="],
@@ -574,6 +594,8 @@

    "@react-navigation/routers": ["@react-navigation/routers@7.4.1", "", { "dependencies": { "nanoid": "^3.3.11" } }, "sha512-42mZrMzQ0LfKxUb5OHIurYrPYyRsXFLolucILrvm21f0O40Sw0Ufh1bnn/jRqnxZZu7wvpUGIGYM8nS9zVE1Aw=="],

+    "@rnmapbox/maps": ["@rnmapbox/maps@10.2.7", "", { "dependencies": { "@turf/along": "6.5.0", "@turf/distance": "6.5.0", "@turf/helpers": "6.5.0", "@turf/length": "6.5.0", "@turf/nearest-point-on-line": "6.5.0", "@types/geojson": "^7946.0.7", "debounce": "^2.2.0" }, "peerDependencies": { "expo": ">=47.0.0", "mapbox-gl": "^2.9.0", "react": ">=17.0.0", "react-dom": ">= 17.0.0", "react-native": ">=0.69" }, "optionalPeers": ["expo", "mapbox-gl", "react-dom"] }, "sha512-CJZuBKz2EiHjpJsyPz0jZOcm0jniDJdkeboeuyrcCIGe53Cw8gCFM6hxWOTJTL04o7idbNxD54jD4BQKxs6b1A=="],
+
    "@rtsao/scc": ["@rtsao/scc@1.1.0", "", {}, "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g=="],

    "@sinclair/typebox": ["@sinclair/typebox@0.27.8", "", {}, "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="],
@@ -588,6 +610,30 @@

    "@tsconfig/node18": ["@tsconfig/node18@18.2.4", "", {}, "sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ=="],

+    "@turf/along": ["@turf/along@6.5.0", "", { "dependencies": { "@turf/bearing": "^6.5.0", "@turf/destination": "^6.5.0", "@turf/distance": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" } }, "sha512-LLyWQ0AARqJCmMcIEAXF4GEu8usmd4Kbz3qk1Oy5HoRNpZX47+i5exQtmIWKdqJ1MMhW26fCTXgpsEs5zgJ5gw=="],
+
+    "@turf/bbox": ["@turf/bbox@7.3.0", "", { "dependencies": { "@turf/helpers": "7.3.0", "@turf/meta": "7.3.0", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" } }, "sha512-EC5GSUJlhXSiCVCEmgCSheZYm0s1ouKzUNqeEOsEYlqTbMAZ19RWgsg/xH2tjnuUw2JP9eGAUzQnCFX6JEV53w=="],
+
+    "@turf/bearing": ["@turf/bearing@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" } }, "sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A=="],
+
+    "@turf/destination": ["@turf/destination@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" } }, "sha512-4cnWQlNC8d1tItOz9B4pmJdWpXqS0vEvv65bI/Pj/genJnsL7evI0/Xw42RvEGROS481MPiU80xzvwxEvhQiMQ=="],
+
+    "@turf/distance": ["@turf/distance@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0" } }, "sha512-xzykSLfoURec5qvQJcfifw/1mJa+5UwByZZ5TZ8iaqjGYN0vomhV9aiSLeYdUGtYRESZ+DYC/OzY+4RclZYgMg=="],
+
+    "@turf/helpers": ["@turf/helpers@6.5.0", "", {}, "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw=="],
+
+    "@turf/invariant": ["@turf/invariant@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0" } }, "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg=="],
+
+    "@turf/length": ["@turf/length@6.5.0", "", { "dependencies": { "@turf/distance": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/meta": "^6.5.0" } }, "sha512-5pL5/pnw52fck3oRsHDcSGrj9HibvtlrZ0QNy2OcW8qBFDNgZ4jtl6U7eATVoyWPKBHszW3dWETW+iLV7UARig=="],
+
+    "@turf/line-intersect": ["@turf/line-intersect@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0", "@turf/line-segment": "^6.5.0", "@turf/meta": "^6.5.0", "geojson-rbush": "3.x" } }, "sha512-CS6R1tZvVQD390G9Ea4pmpM6mJGPWoL82jD46y0q1KSor9s6HupMIo1kY4Ny+AEYQl9jd21V3Scz20eldpbTVA=="],
+
+    "@turf/line-segment": ["@turf/line-segment@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0", "@turf/meta": "^6.5.0" } }, "sha512-jI625Ho4jSuJESNq66Mmi290ZJ5pPZiQZruPVpmHkUw257Pew0alMmb6YrqYNnLUuiVVONxAAKXUVeeUGtycfw=="],
+
+    "@turf/meta": ["@turf/meta@6.5.0", "", { "dependencies": { "@turf/helpers": "^6.5.0" } }, "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA=="],
+
+    "@turf/nearest-point-on-line": ["@turf/nearest-point-on-line@6.5.0", "", { "dependencies": { "@turf/bearing": "^6.5.0", "@turf/destination": "^6.5.0", "@turf/distance": "^6.5.0", "@turf/helpers": "^6.5.0", "@turf/invariant": "^6.5.0", "@turf/line-intersect": "^6.5.0", "@turf/meta": "^6.5.0" } }, "sha512-WthrvddddvmymnC+Vf7BrkHGbDOUu6Z3/6bFYUGv1kxw8tiZ6n83/VG6kHz4poHOfS0RaNflzXSkmCi64fLBlg=="],
+
    "@tybys/wasm-util": ["@tybys/wasm-util@0.9.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw=="],

    "@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="],
@@ -984,6 +1030,8 @@

    "dayjs": ["dayjs@1.11.13", "", {}, "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="],

+    "debounce": ["debounce@2.2.0", "", {}, "sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw=="],
+
    "debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],

    "decamelize": ["decamelize@1.2.0", "", {}, "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="],
@@ -1196,8 +1244,12 @@

    "expo-keep-awake": ["expo-keep-awake@15.0.7", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-CgBNcWVPnrIVII5G54QDqoE125l+zmqR4HR8q+MQaCfHet+dYpS5vX5zii/RMayzGN4jPgA4XYIQ28ePKFjHoA=="],

+    "expo-linear-gradient": ["expo-linear-gradient@15.0.7", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-yF+y+9Shpr/OQFfy/wglB/0bykFMbwHBTuMRa5Of/r2P1wbkcacx8rg0JsUWkXH/rn2i2iWdubyqlxSJa3ggZA=="],
+
    "expo-linking": ["expo-linking@8.0.8", "", { "dependencies": { "expo-constants": "~18.0.8", "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-MyeMcbFDKhXh4sDD1EHwd0uxFQNAc6VCrwBkNvvvufUsTYFq3glTA9Y8a+x78CPpjNqwNAamu74yIaIz7IEJyg=="],

+    "expo-location": ["expo-location@19.0.7", "", { "peerDependencies": { "expo": "*" } }, "sha512-YNkh4r9E6ECbPkBCAMG5A5yHDgS0pw+Rzyd0l2ZQlCtjkhlODB55nMCKr5CZnUI0mXTkaSm8CwfoCO8n2MpYfg=="],
+
    "expo-manifests": ["expo-manifests@1.0.8", "", { "dependencies": { "@expo/config": "~12.0.8", "expo-json-utils": "~0.15.0" }, "peerDependencies": { "expo": "*" } }, "sha512-nA5PwU2uiUd+2nkDWf9e71AuFAtbrb330g/ecvuu52bmaXtN8J8oiilc9BDvAX0gg2fbtOaZdEdjBYopt1jdlQ=="],

    "expo-module-scripts": ["expo-module-scripts@4.1.10", "", { "dependencies": { "@babel/cli": "^7.23.4", "@babel/plugin-transform-export-namespace-from": "^7.23.4", "@babel/preset-env": "^7.23.8", "@babel/preset-typescript": "^7.23.3", "@expo/npm-proofread": "^1.0.1", "@testing-library/react-native": "^13.1.0", "@tsconfig/node18": "^18.2.2", "@types/jest": "^29.2.1", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-preset-expo": "~13.2.3", "commander": "^12.1.0", "eslint-config-universe": "^15.0.3", "glob": "^10.4.2", "jest-expo": "~53.0.9", "jest-snapshot-prettier": "npm:prettier@^2", "jest-watch-typeahead": "2.2.1", "resolve-workspace-root": "^2.0.0", "ts-jest": "~29.0.4", "typescript": "^5.8.3" }, "bin": { "expo-module": "bin/expo-module.js" } }, "sha512-fQVXVgxqUOz1cnnNumNLm0eI+Y8IhYNa056ad0vxEhcMui6FjS1+beZNHiaClGwd/NQb5RjlT48ABL3XSGHwxQ=="],
@@ -1206,7 +1258,7 @@

    "expo-modules-core": ["expo-modules-core@3.0.15", "", { "dependencies": { "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-vGI7osd0/IjprldD08k4bckWSu7ID4HhZNP68l/UtilONQ8XZig8mWJd/Fm7i7KGvE3HyuF+HOXE9l671no42Q=="],

-    "expo-notifications": ["expo-notifications@0.32.12", "", { "dependencies": { "@expo/image-utils": "^0.8.7", "@ide/backoff": "^1.0.0", "abort-controller": "^3.0.0", "assert": "^2.0.0", "badgin": "^1.1.5", "expo-application": "~7.0.7", "expo-constants": "~18.0.9" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-FVJ5W4rOpKvmrLJ1Sd5pxiVTV4a7ApgTlKro+E5X8M2TBbXmEVOjs09klzdalXTjlzmU/Gu8aRw9xr7Ea/gZdw=="],
+    "expo-notifications": ["expo-notifications@0.32.13", "", { "dependencies": { "@expo/image-utils": "^0.8.7", "@ide/backoff": "^1.0.0", "abort-controller": "^3.0.0", "assert": "^2.0.0", "badgin": "^1.1.5", "expo-application": "~7.0.7", "expo-constants": "~18.0.10" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-PL0R1ulLVUgAswlXtRDKxBlcipNM3YA6+P5nB5JIhXbsjLJ7y+EKVaEhHhbaGzuK1QVsRQSJNm/4oISX+vsmFQ=="],

    "expo-router": ["expo-router@6.0.1", "", { "dependencies": { "@expo/metro-runtime": "6.1.1", "@expo/schema-utils": "^0.1.7", "@expo/server": "^0.7.4", "@radix-ui/react-slot": "1.2.0", "@radix-ui/react-tabs": "^1.1.12", "@react-navigation/bottom-tabs": "^7.4.0", "@react-navigation/native": "^7.1.8", "@react-navigation/native-stack": "^7.3.16", "client-only": "^0.0.1", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "invariant": "^2.2.4", "nanoid": "^3.3.8", "query-string": "^7.1.3", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.1.6", "semver": "~7.6.3", "server-only": "^0.0.1", "sf-symbols-typescript": "^2.1.0", "shallowequal": "^1.1.0", "use-latest-callback": "^0.2.1", "vaul": "^1.1.2" }, "peerDependencies": { "@react-navigation/drawer": "^7.5.0", "@testing-library/react-native": ">= 12.0.0", "expo": "*", "expo-constants": "^18.0.8", "expo-linking": "^8.0.8", "react": "*", "react-dom": "*", "react-native": "*", "react-native-gesture-handler": "*", "react-native-reanimated": "*", "react-native-safe-area-context": ">= 5.4.0", "react-native-screens": "*", "react-native-web": "*", "react-server-dom-webpack": ">= 19.0.0" }, "optionalPeers": ["@react-navigation/drawer", "@testing-library/react-native", "react-dom", "react-native-gesture-handler", "react-native-reanimated", "react-native-web", "react-server-dom-webpack"] }, "sha512-5wXkWyNMqUbjCWH0PRkOM0P6UsgLVdgchDkiLz5FY7HfU00ToBcxij965bqtlaATBgoaIo4DuLu6EgxewrKJ8Q=="],

@@ -1220,7 +1272,7 @@

    "expo-updates-interface": ["expo-updates-interface@2.0.0", "", { "peerDependencies": { "expo": "*" } }, "sha512-pTzAIufEZdVPKql6iMi5ylVSPqV1qbEopz9G6TSECQmnNde2nwq42PxdFBaUEd8IZJ/fdJLQnOT3m6+XJ5s7jg=="],

-    "expo-web-browser": ["expo-web-browser@15.0.7", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-eXnfO3FQ2WthTA8uEPNJ7SDRfPaLIU/P2k082HGEYIHAFZMwh2o9Wo+SDVytO3E95TAv1qwhggUjOrczYzxteQ=="],
+    "expo-web-browser": ["expo-web-browser@15.0.9", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-Dj8kNFO+oXsxqCDNlUT/GhOrJnm10kAElH++3RplLydogFm5jTzXYWDEeNIDmV+F+BzGYs+sIhxiBf7RyaxXZg=="],

    "exponential-backoff": ["exponential-backoff@3.1.2", "", {}, "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="],

@@ -1272,6 +1324,10 @@

    "form-data": ["form-data@4.0.4", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow=="],

+    "framer-motion": ["framer-motion@6.5.1", "", { "dependencies": { "@motionone/dom": "10.12.0", "framesync": "6.0.1", "hey-listen": "^1.0.8", "popmotion": "11.0.3", "style-value-types": "5.0.0", "tslib": "^2.1.0" }, "optionalDependencies": { "@emotion/is-prop-valid": "^0.8.2" }, "peerDependencies": { "react": ">=16.8 || ^17.0.0 || ^18.0.0", "react-dom": ">=16.8 || ^17.0.0 || ^18.0.0" } }, "sha512-o1BGqqposwi7cgDrtg0dNONhkmPsUFDaLcKXigzuTFC5x58mE8iyTazxSudFzmT6MEyJKfjjU8ItoMe3W+3fiw=="],
+
+    "framesync": ["framesync@6.0.1", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-fUY88kXvGiIItgNC7wcTOl0SNRCVXMKSWW2Yzfmn7EKNc+MpCzcz9DhdHcdjbrtN3c6R4H5dTY2jiCpPdysEjA=="],
+
    "freeport-async": ["freeport-async@2.0.0", "", {}, "sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ=="],

    "fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],
@@ -1290,6 +1346,8 @@

    "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="],

+    "geojson-rbush": ["geojson-rbush@3.2.0", "", { "dependencies": { "@turf/bbox": "*", "@turf/helpers": "6.x", "@turf/meta": "6.x", "@types/geojson": "7946.0.8", "rbush": "^3.0.1" } }, "sha512-oVltQTXolxvsz1sZnutlSuLDEcQAKYC/uXt9zDzJJ6bu0W+baTI8LZBaTup5afzibEH4N3jlq2p+a152wlBJ7w=="],
+
    "get-caller-file": ["get-caller-file@2.0.5", "", {}, "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="],

    "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="],
@@ -1346,6 +1404,8 @@

    "hermes-parser": ["hermes-parser@0.29.1", "", { "dependencies": { "hermes-estree": "0.29.1" } }, "sha512-xBHWmUtRC5e/UL0tI7Ivt2riA/YBq9+SiYFU7C1oBa/j2jYGlIF9043oak1F47ihuDIxQ5nbsKueYJDRY02UgA=="],

+    "hey-listen": ["hey-listen@1.0.8", "", {}, "sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q=="],
+
    "hoist-non-react-statics": ["hoist-non-react-statics@3.3.2", "", { "dependencies": { "react-is": "^16.7.0" } }, "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="],

    "hosted-git-info": ["hosted-git-info@7.0.2", "", { "dependencies": { "lru-cache": "^10.0.1" } }, "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w=="],
@@ -1700,6 +1760,8 @@

    "mkdirp": ["mkdirp@3.0.1", "", { "bin": "dist/cjs/src/bin.js" }, "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="],

+    "moti": ["moti@0.30.0", "", { "dependencies": { "framer-motion": "^6.5.1" }, "peerDependencies": { "react-native-reanimated": "*" } }, "sha512-YN78mcefo8kvJaL+TZNyusq6YA2aMFvBPl8WiLPy4eb4wqgOFggJOjP9bUr2YO8PrAt0uusmRG8K4RPL4OhCsA=="],
+
    "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],

    "mz": ["mz@2.7.0", "", { "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", "thenify-all": "^1.0.0" } }, "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="],
@@ -1816,6 +1878,8 @@

    "pngjs": ["pngjs@5.0.0", "", {}, "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="],

+    "popmotion": ["popmotion@11.0.3", "", { "dependencies": { "framesync": "6.0.1", "hey-listen": "^1.0.8", "style-value-types": "5.0.0", "tslib": "^2.1.0" } }, "sha512-Y55FLdj3UxkR7Vl3s7Qr4e9m0onSnP8W7d/xQLsoJM40vs6UKHFdygs6SWryasTZYqugMjm3BepCF4CWXDiHgA=="],
+
    "possible-typed-array-names": ["possible-typed-array-names@1.1.0", "", {}, "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg=="],

    "postcss": ["postcss@8.4.49", "", { "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA=="],
@@ -1862,10 +1926,14 @@

    "queue-microtask": ["queue-microtask@1.2.3", "", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="],

+    "quickselect": ["quickselect@2.0.0", "", {}, "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="],
+
    "randombytes": ["randombytes@2.1.0", "", { "dependencies": { "safe-buffer": "^5.1.0" } }, "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="],

    "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="],

+    "rbush": ["rbush@3.0.1", "", { "dependencies": { "quickselect": "^2.0.0" } }, "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w=="],
+
    "rc": ["rc@1.2.8", "", { "dependencies": { "deep-extend": "^0.6.0", "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" }, "bin": "cli.js" }, "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="],

    "react": ["react@19.1.0", "", {}, "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg=="],
@@ -2124,6 +2192,8 @@

    "structured-headers": ["structured-headers@0.4.1", "", {}, "sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg=="],

+    "style-value-types": ["style-value-types@5.0.0", "", { "dependencies": { "hey-listen": "^1.0.8", "tslib": "^2.1.0" } }, "sha512-08yq36Ikn4kx4YU6RD7jWEv27v4V+PUsOGa4n/as8Et3CuODMJQ00ENeAVXAeydX4Z2j1XHZF1K2sX4mGl18fA=="],
+
    "styleq": ["styleq@0.1.3", "", {}, "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA=="],

    "sucrase": ["sucrase@3.35.0", "", { "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", "glob": "^10.3.10", "lines-and-columns": "^1.1.6", "mz": "^2.7.0", "pirates": "^4.0.1", "ts-interface-checker": "^0.1.9" }, "bin": { "sucrase": "bin/sucrase", "sucrase-node": "bin/sucrase-node" } }, "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA=="],
@@ -2500,6 +2570,10 @@

    "@testing-library/react-native/pretty-format": ["pretty-format@30.0.5", "", { "dependencies": { "@jest/schemas": "30.0.5", "ansi-styles": "^5.2.0", "react-is": "^18.3.1" } }, "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw=="],

+    "@turf/bbox/@turf/helpers": ["@turf/helpers@7.3.0", "", { "dependencies": { "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" } }, "sha512-5kWdgwI6e2vGbkt2qOD+Z2BiKQ7dfKN/PtWRLCpvzyOO59rk19R53CHi8nUT/Y1vQLgWmT6eNpiKwsWwPZGIdg=="],
+
+    "@turf/bbox/@turf/meta": ["@turf/meta@7.3.0", "", { "dependencies": { "@turf/helpers": "7.3.0", "@types/geojson": "^7946.0.10" } }, "sha512-fTLqdQqRm8qA2zHHUbBMY++YT9LDQejLG7OD70XF2dwg9nPiF9mUxO7nrsDp2IY8vNmH9OTAiMtlIjb0ssYccg=="],
+
    "@types/react-native/@types/react": ["@types/react@19.0.14", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-ixLZ7zG7j1fM0DijL9hDArwhwcCb4vqmePgwtV0GfnkHRSCUEv4LvzarcTdhoqgyMznUx/EhoTUv31CKZzkQlw=="],

    "@types/react-native-vector-icons/@types/react": ["@types/react@19.0.14", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-ixLZ7zG7j1fM0DijL9hDArwhwcCb4vqmePgwtV0GfnkHRSCUEv4LvzarcTdhoqgyMznUx/EhoTUv31CKZzkQlw=="],
@@ -2618,6 +2692,8 @@

    "finalhandler/statuses": ["statuses@1.5.0", "", {}, "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="],

+    "geojson-rbush/@types/geojson": ["@types/geojson@7946.0.8", "", {}, "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="],
+
    "glob/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="],

    "hoist-non-react-statics/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="],
--- a/components/Grid/GridCustom.tsx
+++ b/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
  },
 });
--- a/components/_ShareComponent/NewWrapper.tsx
+++ b/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;
--- a/components/_ShareComponent/SkeletonCustom.tsx
+++ b/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;
--- a/components/_ShareComponent/ViewWrapper.tsx
+++ b/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 }}>
--- a/context/AuthContext.tsx
+++ b/context/AuthContext.tsx
@@ -24,6 +24,7 @@ type AuthContextType = {
  registerUser: (userData: {
    username: string;
    nomor: string;
+    termsOfServiceAccepted: boolean;
  }) => Promise<void>;
  userData: (token: string) => Promise<any>;
 };
@@ -154,10 +155,12 @@ 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("response", response);

      const { token } = response;
      if (!response.success) {
--- a/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj
+++ b/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj
@@ -272,14 +272,22 @@
 			);
 			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;
@@ -294,8 +302,11 @@
 			);
 			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}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
@@ -328,8 +339,11 @@
 			);
 			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}/RNCAsyncStorage_resources.bundle",
@@ -408,7 +422,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;
@@ -440,7 +454,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";
--- a/ios/HIPMIBadungConnect/HIPMIBadungConnect.entitlements
+++ b/ios/HIPMIBadungConnect/HIPMIBadungConnect.entitlements
@@ -2,6 +2,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>aps-environment</key>
+    <string>development</string>
    <key>com.apple.developer.associated-domains</key>
    <array>
      <string>applinks:cld-dkr-staging-hipmi.wibudev.com</string>
--- a/ios/HIPMIBadungConnect/Info.plist
+++ b/ios/HIPMIBadungConnect/Info.plist
@@ -39,7 +39,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>5</string>
+    <string>8</string>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSMinimumSystemVersion</key>
@@ -53,12 +53,15 @@
      <key>NSAllowsLocalNetworking</key>
      <true/>
    </dict>
-    <key>NSCameraUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your camera</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your microphone</string>
+
+    <!-- Photo Library -->
    <key>NSPhotoLibraryUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your photos</string>
+    <string>Untuk mengunggah dokumen dan media bisnis seperti foto profil, logo usaha, poster lowongan, atau bukti transaksi di berbagai fitur aplikasi: Profile, Portofolio, Job Vacancy, Investasi, dan Donasi.</string>
+
+    <!-- Camera -->
+    <key>NSCameraUsageDescription</key>
+    <string>Untuk mengambil foto langsung saat mengunggah dokumen bisnis seperti foto profil, logo usaha, poster, atau bukti pembayaran di fitur Profile, Portofolio, Job Vacancy, Investasi, dan Donasi.</string>
+
    <key>NSUserActivityTypes</key>
    <array>
      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
--- a/ios/HIPMIBadungConnect/PrivacyInfo.xcprivacy
+++ b/ios/HIPMIBadungConnect/PrivacyInfo.xcprivacy
@@ -4,6 +4,16 @@
 <dict>
 	<key>NSPrivacyAccessedAPITypes</key>
 	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+				<string>0A2A.1</string>
+				<string>3B52.1</string>
+			</array>
+		</dict>
 		<dict>
 			<key>NSPrivacyAccessedAPIType</key>
 			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
@@ -14,12 +24,10 @@
 		</dict>
 		<dict>
 			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
 			<key>NSPrivacyAccessedAPITypeReasons</key>
 			<array>
-				<string>0A2A.1</string>
-				<string>3B52.1</string>
-				<string>C617.1</string>
+				<string>35F9.1</string>
 			</array>
 		</dict>
 		<dict>
@@ -31,14 +39,6 @@
 				<string>85F4.1</string>
 			</array>
 		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>35F9.1</string>
-			</array>
-		</dict>
 	</array>
 	<key>NSPrivacyCollectedDataTypes</key>
 	<array/>
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,5 +1,7 @@
 PODS:
-  - EXConstants (18.0.8):
+  - EXApplication (7.0.7):
+    - ExpoModulesCore
+  - EXConstants (18.0.10):
    - ExpoModulesCore
  - EXImageLoader (6.0.0):
    - ExpoModulesCore
@@ -7,6 +9,8 @@ PODS:
  - EXJSONUtils (0.15.0)
  - EXManifests (1.0.8):
    - ExpoModulesCore
+  - EXNotifications (0.32.13):
+    - ExpoModulesCore
  - Expo (54.0.2):
    - ExpoModulesCore
    - hermes-engine
@@ -211,6 +215,8 @@ PODS:
    - ZXingObjC/PDF417
  - ExpoClipboard (8.0.7):
    - ExpoModulesCore
+  - ExpoDevice (8.0.9):
+    - ExpoModulesCore
  - ExpoDocumentPicker (14.0.7):
    - ExpoModulesCore
  - ExpoFileSystem (19.0.15):
@@ -235,6 +241,8 @@ PODS:
    - ExpoModulesCore
  - ExpoLinking (8.0.8):
    - ExpoModulesCore
+  - ExpoLocation (19.0.7):
+    - ExpoModulesCore
  - ExpoModulesCore (3.0.15):
    - hermes-engine
    - RCTRequired
@@ -264,7 +272,7 @@ PODS:
    - ExpoModulesCore
  - ExpoSystemUI (6.0.7):
    - ExpoModulesCore
-  - ExpoWebBrowser (15.0.7):
+  - ExpoWebBrowser (15.0.9):
    - ExpoModulesCore
  - EXUpdatesInterface (2.0.0):
    - ExpoModulesCore
@@ -289,6 +297,14 @@ PODS:
  - libwebp/sharpyuv (1.5.0)
  - libwebp/webp (1.5.0):
    - libwebp/sharpyuv
+  - MapboxCommon (24.15.4):
+    - Turf (= 4.0.0)
+  - MapboxCoreMaps (11.15.4):
+    - MapboxCommon (= 24.15.4)
+  - MapboxMaps (11.15.4):
+    - MapboxCommon (= 24.15.4)
+    - MapboxCoreMaps (= 11.15.4)
+    - Turf (= 4.0.0)
  - RCTDeprecation (0.81.4)
  - RCTRequired (0.81.4)
  - RCTTypeSafety (0.81.4):
@@ -2144,6 +2160,33 @@ PODS:
    - ReactCommon/turbomodule/core
    - ReactNativeDependencies
    - Yoga
+  - rnmapbox-maps (10.2.7):
+    - MapboxMaps (~> 11.15.2)
+    - React
+    - React-Core
+    - rnmapbox-maps/DynamicLibrary (= 10.2.7)
+    - Turf
+  - rnmapbox-maps/DynamicLibrary (10.2.7):
+    - hermes-engine
+    - MapboxMaps (~> 11.15.2)
+    - RCTRequired
+    - RCTTypeSafety
+    - React
+    - React-Core
+    - React-Core-prebuilt
+    - React-featureflags
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Turf
+    - Yoga
  - RNReanimated (4.1.0):
    - hermes-engine
    - RCTRequired
@@ -2414,6 +2457,7 @@ PODS:
  - SDWebImageWebPCoder (0.14.6):
    - libwebp (~> 1.0)
    - SDWebImage/Core (~> 5.17)
+  - Turf (4.0.0)
  - Yoga (0.0.0)
  - ZXingObjC/Core (3.6.9)
  - ZXingObjC/OneD (3.6.9):
@@ -2422,10 +2466,12 @@ PODS:
    - ZXingObjC/Core

 DEPENDENCIES:
+  - EXApplication (from `../node_modules/expo-application/ios`)
  - EXConstants (from `../node_modules/expo-constants/ios`)
  - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
  - EXJSONUtils (from `../node_modules/expo-json-utils/ios`)
  - EXManifests (from `../node_modules/expo-manifests/ios`)
+  - EXNotifications (from `../node_modules/expo-notifications/ios`)
  - Expo (from `../node_modules/expo`)
  - expo-dev-client (from `../node_modules/expo-dev-client/ios`)
  - expo-dev-launcher (from `../node_modules/expo-dev-launcher`)
@@ -2434,6 +2480,7 @@ DEPENDENCIES:
  - ExpoAsset (from `../node_modules/expo-asset/ios`)
  - ExpoCamera (from `../node_modules/expo-camera/ios`)
  - ExpoClipboard (from `../node_modules/expo-clipboard/ios`)
+  - ExpoDevice (from `../node_modules/expo-device/ios`)
  - ExpoDocumentPicker (from `../node_modules/expo-document-picker/ios`)
  - ExpoFileSystem (from `../node_modules/expo-file-system/ios`)
  - ExpoFont (from `../node_modules/expo-font/ios`)
@@ -2443,6 +2490,7 @@ DEPENDENCIES:
  - ExpoImagePicker (from `../node_modules/expo-image-picker/ios`)
  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
  - ExpoLinking (from `../node_modules/expo-linking/ios`)
+  - ExpoLocation (from `../node_modules/expo-location/ios`)
  - ExpoModulesCore (from `../node_modules/expo-modules-core`)
  - ExpoSplashScreen (from `../node_modules/expo-splash-screen/ios`)
  - ExpoSymbols (from `../node_modules/expo-symbols/ios`)
@@ -2524,6 +2572,7 @@ DEPENDENCIES:
  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
  - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
+  - "rnmapbox-maps (from `../node_modules/@rnmapbox/maps`)"
  - RNReanimated (from `../node_modules/react-native-reanimated`)
  - RNScreens (from `../node_modules/react-native-screens`)
  - RNSVG (from `../node_modules/react-native-svg`)
@@ -2536,13 +2585,19 @@ SPEC REPOS:
    - libavif
    - libdav1d
    - libwebp
+    - MapboxCommon
+    - MapboxCoreMaps
+    - MapboxMaps
    - SDWebImage
    - SDWebImageAVIFCoder
    - SDWebImageSVGCoder
    - SDWebImageWebPCoder
+    - Turf
    - ZXingObjC

 EXTERNAL SOURCES:
+  EXApplication:
+    :path: "../node_modules/expo-application/ios"
  EXConstants:
    :path: "../node_modules/expo-constants/ios"
  EXImageLoader:
@@ -2551,6 +2606,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-json-utils/ios"
  EXManifests:
    :path: "../node_modules/expo-manifests/ios"
+  EXNotifications:
+    :path: "../node_modules/expo-notifications/ios"
  Expo:
    :path: "../node_modules/expo"
  expo-dev-client:
@@ -2567,6 +2624,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-camera/ios"
  ExpoClipboard:
    :path: "../node_modules/expo-clipboard/ios"
+  ExpoDevice:
+    :path: "../node_modules/expo-device/ios"
  ExpoDocumentPicker:
    :path: "../node_modules/expo-document-picker/ios"
  ExpoFileSystem:
@@ -2585,6 +2644,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/expo-keep-awake/ios"
  ExpoLinking:
    :path: "../node_modules/expo-linking/ios"
+  ExpoLocation:
+    :path: "../node_modules/expo-location/ios"
  ExpoModulesCore:
    :path: "../node_modules/expo-modules-core"
  ExpoSplashScreen:
@@ -2746,6 +2807,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-community/datetimepicker"
  RNGestureHandler:
    :path: "../node_modules/react-native-gesture-handler"
+  rnmapbox-maps:
+    :path: "../node_modules/@rnmapbox/maps"
  RNReanimated:
    :path: "../node_modules/react-native-reanimated"
  RNScreens:
@@ -2760,10 +2823,12 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/yoga"

 SPEC CHECKSUMS:
-  EXConstants: 7e4654405af367ff908c863fe77a8a22d60bd37d
+  EXApplication: 296622817d459f46b6c5fe8691f4aac44d2b79e7
+  EXConstants: fd688cef4e401dcf798a021cfb5d87c890c30ba3
  EXImageLoader: 189e3476581efe3ad4d1d3fb4735b7179eb26f05
  EXJSONUtils: 1d3e4590438c3ee593684186007028a14b3686cd
  EXManifests: 224345a575fca389073c416297b6348163f28d1a
+  EXNotifications: a62e1f8e3edd258dc3b155d3caa49f32920f1c6c
  Expo: 9e6ddfbc1f5aefde22029899293c701f1d34c2b1
  expo-dev-client: f3434d6ca09ecb14ae48c2a3912bdbb07464cc85
  expo-dev-launcher: b9538b1e0dc3fd2ddad75017b6ee9c8dfb206925
@@ -2772,6 +2837,7 @@ SPEC CHECKSUMS:
  ExpoAsset: 84810d6fed8179f04d4a7a4a6b37028bbd726e26
  ExpoCamera: ae1d6691b05b753261a845536d2b19a9788a8750
  ExpoClipboard: af650d14765f19c60ce2a1eaf9dfe6445eff7365
+  ExpoDevice: 148accb4071873d19fba80a2506c58ffa433d620
  ExpoDocumentPicker: 2200eefc2817f19315fa18f0147e0b80ece86926
  ExpoFileSystem: 5fb091ea11198e109ceef2bdef2e6e66523e62c4
  ExpoFont: 86ceec09ffed1c99cfee36ceb79ba149074901b5
@@ -2781,17 +2847,21 @@ SPEC CHECKSUMS:
  ExpoImagePicker: d251aab45a1b1857e4156fed88511b278b4eee1c
  ExpoKeepAwake: 1a2e820692e933c94a565ec3fbbe38ac31658ffe
  ExpoLinking: f051f28e50ea9269ff539317c166adec81d9342d
+  ExpoLocation: 93d7faa0c2adbd5a04686af0c1a61bc6ed3ee2f7
  ExpoModulesCore: 9281d8f1cda9d0c37dbce34c26014212b22eb8c0
  ExpoSplashScreen: 0634b705953e6934a5156397162eefc1ee5d6a7c
  ExpoSymbols: 1ae04ce686de719b9720453b988d8bc5bf776c68
  ExpoSystemUI: 6cd74248a2282adf6dec488a75fa532d69dee314
-  ExpoWebBrowser: 533bc2a1b188eec1c10e4926decf658f1687b5e5
+  ExpoWebBrowser: b973e1351fdcf5fec0c400997b1851f5a8219ec3
  EXUpdatesInterface: 5adf50cb41e079c861da6d9b4b954c3db9a50734
  FBLazyVector: 9e0cd874afd81d9a4d36679daca991b58b260d42
  hermes-engine: 35c763d57c9832d0eef764316ca1c4d043581394
  libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
  libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
  libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
+  MapboxCommon: 975faa94b893bb64a1d28b09d9d6d820e1030a26
+  MapboxCoreMaps: 105af9894d850290fbb466e9f9a133f5d175abf1
+  MapboxMaps: e97e59d6ba48bb6f695a4c1dc2f174cb24743cd4
  RCTDeprecation: 7487d6dda857ccd4cb3dd6ecfccdc3170e85dcbc
  RCTRequired: 54128b7df8be566881d48c7234724a78cb9b6157
  RCTTypeSafety: d2b07797a79e45d7b19e1cd2f53c79ab419fe217
@@ -2864,6 +2934,7 @@ SPEC CHECKSUMS:
  RNCAsyncStorage: 3a4f5e2777dae1688b781a487923a08569e27fe4
  RNDateTimePicker: be0e44bcb9ed0607c7c5f47dbedd88cf091f6791
  RNGestureHandler: 2914750df066d89bf9d8f48a10ad5f0051108ac3
+  rnmapbox-maps: 3c20ce786a7991498445c32de4fe4244e32aa0ee
  RNReanimated: 8d3a14606ad49f022c17d9e12a2d339e9e5ad9b0
  RNScreens: d8d6f1792f6e7ac12b0190d33d8d390efc0c1845
  RNSVG: 31d6639663c249b7d5abc9728dde2041eb2a3c34
@@ -2873,9 +2944,10 @@ SPEC CHECKSUMS:
  SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90
  SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
  SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
+  Turf: c9eb11a65d96af58cac523460fd40fec5061b081
  Yoga: 051f086b5ccf465ff2ed38a2cf5a558ae01aaaa1
  ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5

-PODFILE CHECKSUM: 08ec3cea5bbb38596b0b014c2569f7bd48b51230
+PODFILE CHECKSUM: 961e5122c387eef49538723a9e3e7a469ca4144f

 COCOAPODS: 1.16.2
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
    "@react-navigation/elements": "^2.3.8",
    "@react-navigation/native": "^7.1.6",
    "@react-navigation/native-stack": "^7.3.10",
+    "@rnmapbox/maps": "^10.2.7",
    "@types/lodash": "^4.17.20",
    "@types/react-native-vector-icons": "^6.4.18",
    "axios": "^1.11.0",
@@ -26,24 +27,27 @@
    "expo": "^54.0.0",
    "expo-camera": "~17.0.7",
    "expo-clipboard": "~8.0.7",
-    "expo-constants": "~18.0.10",
+    "expo-constants": "^18.0.10",
    "expo-dev-client": "~6.0.12",
-    "expo-device": "~8.0.9",
+    "expo-device": "^8.0.9",
    "expo-document-picker": "~14.0.7",
    "expo-file-system": "^19.0.15",
    "expo-font": "~14.0.8",
    "expo-haptics": "~15.0.7",
    "expo-image": "~3.0.8",
    "expo-image-picker": "~17.0.8",
+    "expo-linear-gradient": "~15.0.7",
    "expo-linking": "~8.0.8",
-    "expo-notifications": "~0.32.12",
+    "expo-location": "~19.0.7",
+    "expo-notifications": "^0.32.13",
    "expo-router": "~6.0.1",
    "expo-splash-screen": "~31.0.9",
    "expo-status-bar": "~3.0.8",
    "expo-symbols": "~1.0.7",
    "expo-system-ui": "~6.0.7",
-    "expo-web-browser": "~15.0.7",
+    "expo-web-browser": "~15.0.9",
    "lodash": "^4.17.21",
+    "moti": "^0.30.0",
    "react": "19.1.0",
    "react-dom": "19.1.0",
    "react-native": "0.81.4",
--- a/screens/Authentication/LoginView.tsx
+++ b/screens/Authentication/LoginView.tsx
@@ -102,7 +102,11 @@ export default function LoginView() {
  }

  if (token && token !== "" && isAdmin) {
-    return <Redirect href={"/(application)/admin/dashboard"} />;
+    // Akan di aktifkan jika sudah losos review
+    // return <Redirect href={"/(application)/admin/dashboard"} />;
+
+    // Sementara gunakan ini
+    return <Redirect href={"/(application)/(user)/home"} />;
  }

  return (
--- a/screens/Authentication/RegisterView.tsx
+++ b/screens/Authentication/RegisterView.tsx
@@ -1,10 +1,13 @@
+import { CheckboxCustom } from "@/components";
 import Spacing from "@/components/_ShareComponent/Spacing";
 import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
 import ButtonCustom from "@/components/Button/ButtonCustom";
 import TextInputCustom from "@/components/TextInput/TextInputCustom";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
+import { BASE_URL } from "@/service/api-config";
 import { GStyles } from "@/styles/global-styles";
+import { openBrowser } from "@/utils/openBrower";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useState } from "react";
@@ -14,7 +17,8 @@ import Toast from "react-native-toast-message";
 export default function RegisterView() {
  const { nomor } = useLocalSearchParams();
  const [username, setUsername] = useState("");
-
+  const [term, setTerm] = useState(false);
+  const url = BASE_URL;
  const { registerUser, isLoading } = useAuth();

  const validasiData = () => {
@@ -61,6 +65,7 @@ export default function RegisterView() {
    await registerUser({
      nomor: nomor as string,
      username: usernameLower,
+      termsOfServiceAccepted: term,
    });
  }

@@ -96,7 +101,39 @@ export default function RegisterView() {
              }
            />

-            <ButtonCustom isLoading={isLoading} onPress={handleRegister}>
+            <View
+              style={{
+                flexDirection: "row",
+                alignItems: "center",
+                marginTop: 16,
+                marginBottom: 16,
+              }}
+            >
+              <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>
+
+            <ButtonCustom
+              disabled={!term}
+              isLoading={isLoading}
+              onPress={handleRegister}
+            >
              Daftar
            </ButtonCustom>
          </View>
--- a/screens/Authentication/VerificationView.tsx
+++ b/screens/Authentication/VerificationView.tsx
@@ -5,6 +5,7 @@ import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import { apiCheckCodeOtp } from "@/service/api-config";
 import { GStyles } from "@/styles/global-styles";
+import { registerForPushNotificationsAsync } from "@/utils/notifications";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -28,7 +29,7 @@ export default function VerificationView() {
    nomor === "6282340374412";

  // --- Context ---
-  const { validateOtp, isLoading } = useAuth();
+  const { validateOtp, isLoading, loginWithNomor } = useAuth();

  useEffect(() => {
    setUserNumber(nomor?.replace(/^\+/, "") || "");
@@ -70,6 +71,9 @@ export default function VerificationView() {

    try {
      setLoading(true);
+      await loginWithNomor(nomor as string);
+      setRecodeOtp(true);
+
      // ❌ Kamu tidak punya nomor di sini, jadi pastikan `nomor` tersedia
      // Sebaiknya simpan nomor saat login, atau gunakan dari `useLocalSearchParams`
      router.setParams({ nomor }); // opsional
@@ -100,6 +104,14 @@ export default function VerificationView() {
    // 🔁 VERIFIKASI NORMAL (untuk pengguna sungguhan)
    try {
      const response = await validateOtp(nomor as string);
+      // registerForPushNotificationsAsync().then((token) => {
+      //   if (token) {
+      //     console.log("Expo Push Token:", token);
+      //     // TODO: Kirim token ke backend kamu
+      //   } else {
+      //     console.log("Failed to get Expo Push Token");
+      //   }
+      // });
      router.replace(response);
    } catch (error) {
      console.log("Error verification", error);
--- a/screens/Forum/ListPage.tsx
+++ b/screens/Forum/ListPage.tsx
@@ -22,6 +22,7 @@ const drawerItemsForumBerandaForAuthor = ({
    ),
    label: "Edit posting",
    path: `/forum/${id}/edit`,
+    values: "edit"
  },
  {
    icon:
@@ -34,6 +35,7 @@ const drawerItemsForumBerandaForAuthor = ({
    label: status === "Open" ? "Tutup forum" : "Buka forum",
    path: "",
    color: status === "Open" ? MainColor.orange : MainColor.green,
+    value: "status"
  },
  {
    icon: (
@@ -42,10 +44,11 @@ const drawerItemsForumBerandaForAuthor = ({
    label: "Hapus",
    path: "",
    color: MainColor.red,
+    value: "delete"
  },
 ];

-const drawerItemsForumBerandaForNonAuthor = ({ id }: { id: string }) => [
+const drawerItemsForumBerandaForNonAuthor = ({ id, username }: { id: string; username: string }) => [
  {
    icon: (
      <Ionicons name="flag" size={ICON_SIZE_SMALL} color={MainColor.white} />
@@ -53,6 +56,16 @@ const drawerItemsForumBerandaForNonAuthor = ({ id }: { id: string }) => [
    label: "Laporkan diskusi",
    // color: MainColor.white,
    path: `/forum/${id}/report-posting`,
+    value: "report"
+  },
+  {
+    icon: (
+      <Ionicons name="ban" size={ICON_SIZE_SMALL} color={MainColor.white} />
+    ),
+    label: `Blockir @${username}`,
+    color: MainColor.red,
+    path: `/forum/${id}/report-posting`,
+    value: "block"
  },
 ];

@@ -64,6 +77,7 @@ const drawerItemsForumComentarForAuthor = ({ id }: { id: string }) => [
    label: "Hapus",
    color: MainColor.red,
    path: "",
+    value: "delete"
  },
 ];

@@ -75,5 +89,6 @@ const drawerItemsForumComentarForNonAuthor = ({ id }: { id: string }) => [
    label: "Laporkan",
    // color: MainColor.white,
    path: `/forum/${id}/report-commentar`,
+    value: "report"
  },
 ];
--- a/screens/Forum/MenuDrawerSection.tsx/MenuBeranda.tsx
+++ b/screens/Forum/MenuDrawerSection.tsx/MenuBeranda.tsx
@@ -9,15 +9,18 @@ import {
 import { useAuth } from "@/hooks/use-auth";
 import { apiForumDelete } from "@/service/api-client/api-forum";
 import Toast from "react-native-toast-message";
+import { apiForumBlockUser } from "@/service/api-client/api-user";

 export default function Forum_MenuDrawerBerandaSection({
  id,
+  authorUsername,
  status,
  setIsDrawerOpen,
  authorId,
  handlerUpdateStatus,
 }: {
  id: string;
+  authorUsername: string;
  status: string;
  setIsDrawerOpen: (value: boolean) => void;
  authorId: string;
@@ -25,7 +28,7 @@ export default function Forum_MenuDrawerBerandaSection({
 }) {
  const { user } = useAuth();
  const handlePress = (item: IMenuDrawerItem) => {
-    if (item.label === "Hapus") {
+    if (item.value === "delete") {
      AlertDefaultSystem({
        title: "Hapus diskusi",
        message: "Apakah Anda yakin ingin menghapus diskusi ini?",
@@ -34,7 +37,7 @@ export default function Forum_MenuDrawerBerandaSection({
        onPressRight: async () => {
          try {
            const response = await apiForumDelete({ id });
-           
+
            if (response.success) {
              Toast.show({
                type: "success",
@@ -52,14 +55,46 @@ export default function Forum_MenuDrawerBerandaSection({
          }
        },
      });
-    } else if (item.label === "Buka forum" || item.label === "Tutup forum") {
+    } else if (item.value === "status") {
      AlertDefaultSystem({
        title: "Ubah Status",
        message: "Apakah Anda yakin ingin mengubah status forum ini?",
        textLeft: "Batal",
        textRight: "Ubah",
        onPressRight: () => {
-          handlerUpdateStatus?.(item.label === "Buka forum" ? "Open" : "Closed");
+          handlerUpdateStatus?.(
+            item.label === "Buka forum" ? "Open" : "Closed"
+          );
+        },
+      });
+    } else if (item.value === "block") {
+      AlertDefaultSystem({
+        title: "Blockir user",
+        message: `Apakah anda yakin ingin blockir user @${authorUsername}?`,
+        textLeft: "Batal",
+        textRight: "Blockir",
+        onPressRight: async () => {
+          console.log("Blockir");
+          const response = await apiForumBlockUser({
+            data: {
+              menuFeature: "Forum",
+              blockedId: authorId,
+              blockerId: user?.id || "",
+            },
+          });
+
+          if (response.success) {
+            Toast.show({
+              type: "success",
+              text1: "Berhasil blokir",
+            });
+            router.back();
+          } else {
+            Toast.show({
+              type: "error",
+              text1: response.message,
+            });
+          }
        },
      });
    } else {
@@ -76,9 +111,12 @@ export default function Forum_MenuDrawerBerandaSection({
        data={
          authorId === user?.id
            ? drawerItemsForumBerandaForAuthor({ id, status })
-            : drawerItemsForumBerandaForNonAuthor({ id })
+            : drawerItemsForumBerandaForNonAuthor({
+                id,
+                username: authorUsername,
+              })
        }
-        columns={4} // Ubah ke 2 jika ingin 2 kolom per baris
+        columns={authorId === user?.id ? 4 : 2} // Ubah ke 2 jika ingin 2 kolom per baris
        onPressItem={handlePress as any}
      />
    </>
--- a/screens/Forum/ViewBeranda.tsx
+++ b/screens/Forum/ViewBeranda.tsx
@@ -0,0 +1,108 @@
+import {
+  BackButton,
+  AvatarComp,
+  ViewWrapper,
+  SearchInput,
+  FloatingButton,
+  LoaderCustom,
+  TextCustom,
+} from "@/components";
+import { useAuth } from "@/hooks/use-auth";
+import { apiForumGetAll } from "@/service/api-client/api-forum";
+import { apiUser } from "@/service/api-client/api-user";
+import { Stack, router } from "expo-router";
+import _ from "lodash";
+import { useState, useEffect } from "react";
+import { RefreshControl } from "react-native";
+import Forum_BoxDetailSection from "./DiscussionBoxSection";
+
+export default function Forum_ViewBeranda() {
+  const { user } = useAuth();
+  const [dataUser, setDataUser] = useState<any>();
+  const [listData, setListData] = useState<any[]>();
+  const [loadingGetList, setLoadingGetList] = useState(false);
+  const [search, setSearch] = useState("");
+
+  useEffect(() => {
+    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({
+        category: "beranda",
+        search: search,
+        userLoginId: user?.id,
+      });
+
+      setListData(response.data);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+      setLoadingGetList(false);
+    }
+  };
+
+  return (
+    <>
+      <Stack.Screen
+        options={{
+          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")
+            }
+          />
+        }
+        refreshControl={
+          <RefreshControl refreshing={loadingGetList} onRefresh={onLoadData} />
+        }
+      >
+        {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={() => {}}
+              isTruncate={true}
+              href={`/forum/${e.id}`}
+              isRightComponent={false}
+            />
+          ))
+        )}
+      </ViewWrapper>
+    </>
+  );
+}
--- a/screens/Forum/ViewBeranda2.tsx
+++ b/screens/Forum/ViewBeranda2.tsx
@@ -0,0 +1,215 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import {
+  AvatarComp,
+  BackButton,
+  FloatingButton,
+  LoaderCustom,
+  SearchInput,
+  StackCustom,
+  TextCustom, // ← gunakan NewWrapper yang sudah diperbaiki
+} from "@/components";
+import SkeletonCustom from "@/components/_ShareComponent/SkeletonCustom";
+import NewWrapper from "@/components/_ShareComponent/NewWrapper";
+import { useAuth } from "@/hooks/use-auth";
+import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
+import { apiForumGetAll } from "@/service/api-client/api-forum";
+import { apiUser } from "@/service/api-client/api-user";
+import { router, Stack } from "expo-router";
+import _ from "lodash";
+import { useCallback, useEffect, useState } from "react";
+import { RefreshControl, View } from "react-native";
+import { MainColor } from "@/constants/color-palet";
+
+// Sesuai dengan `takeData = 5` di API-mu
+const PAGE_SIZE = 5;
+
+export default function Forum_ViewBeranda2() {
+  const { user } = useAuth();
+  const [dataUser, setDataUser] = useState<any>(null);
+  const [listData, setListData] = useState<any[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [hasMore, setHasMore] = useState(true);
+  const [page, setPage] = useState(1);
+  const [search, setSearch] = useState("");
+
+  // 🔹 Load data profil user sekali
+  useEffect(() => {
+    if (user?.id) {
+      apiUser(user.id).then((res) => setDataUser(res.data));
+    }
+  }, [user?.id]);
+
+  // 🔹 Reset dan muat ulang saat search atau user berubah
+  useEffect(() => {
+    setPage(1);
+    setListData([]);
+    setHasMore(true);
+    fetchData(1, true);
+  }, [search, user?.id]);
+
+  // 🔹 Fungsi fetch data
+  const fetchData = async (pageNumber: number, clear: boolean) => {
+    if (!user?.id) return;
+
+    // Cegah multiple call
+    if (!clear && (loading || refreshing)) return;
+
+    const isRefresh = clear;
+    if (isRefresh) setRefreshing(true);
+    if (!isRefresh) setLoading(true);
+
+    try {
+      const response = await apiForumGetAll({
+        category: "beranda",
+        search: search || "",
+        userLoginId: user.id,
+        page: String(pageNumber), // API terima string
+      });
+
+      const newData = response.data || [];
+      setListData((prev) => {
+        const current = Array.isArray(prev) ? prev : [];
+        return clear ? newData : [...current, ...newData];
+      });
+      setHasMore(newData.length === PAGE_SIZE);
+      setPage(pageNumber);
+    } catch (error) {
+      console.error("[ERROR] Fetch forum:", error);
+      setHasMore(false);
+    } finally {
+      setRefreshing(false);
+      setLoading(false);
+    }
+  };
+
+  // 🔹 Pull-to-refresh
+  const onRefresh = useCallback(() => {
+    fetchData(1, true);
+  }, [search, user?.id]);
+
+  // 🔹 Infinite scroll
+  const loadMore = useCallback(() => {
+    if (hasMore && !loading && !refreshing) {
+      fetchData(page + 1, false);
+    }
+  }, [hasMore, loading, refreshing, page, search, user?.id]);
+
+  // 🔹 Render item forum
+  const renderForumItem = ({ item }: { item: any }) => (
+    <Forum_BoxDetailSection
+      key={item.id}
+      data={item}
+      onSetData={() => {}}
+      isTruncate={true}
+      href={`/forum/${item.id}`}
+      isRightComponent={false}
+    />
+  );
+
+  // 🔹 Komponen Header List (di dalam FlatList)
+  const ListHeaderComponent = (
+    <View style={{ paddingVertical: 8, alignItems: "center" }}>
+      <TextCustom>Diskusi Terbaru</TextCustom>
+    </View>
+  );
+
+  // 🔹 Komponen Footer List (loading indicator)
+  const ListFooterComponent =
+    loading && !refreshing && listData.length > 0 ? (
+      <View style={{ paddingVertical: 16, alignItems: "center" }}>
+        {/* <Text style={{ color: "#aaa", fontSize: 14 }}>Memuat diskusi...</Text> */}
+        <LoaderCustom />
+      </View>
+    ) : null;
+
+  // Skeleton List (untuk initial load)
+  const SkeletonListComponent = () => (
+    <View style={{ flex: 1 }}>
+      <StackCustom>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <SkeletonCustom height={200} key={i} />
+        ))}
+      </StackCustom>
+    </View>
+  );
+
+  //  Komponen Empty
+  const EmptyComponent = () => (
+    <View
+      style={{
+        flex: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        padding: 20,
+      }}
+    >
+      <TextCustom align="center" color="gray">
+        {search ? "Tidak ada hasil pencarian" : "Tidak ada diskusi"}
+      </TextCustom>
+    </View>
+  );
+
+  return (
+    <>
+      {/* 🔹 Header Navigation */}
+      <Stack.Screen
+        options={{
+          title: "Forum",
+          headerLeft: () => <BackButton />,
+          headerRight: () => (
+            <AvatarComp
+              fileId={dataUser?.Profile?.imageId}
+              size="base"
+              href={`/forum/${user?.id}/forumku`}
+            />
+          ),
+        }}
+      />
+
+      {/* 🔹 NewWrapper dalam mode list */}
+      <NewWrapper
+        // Header global (di atas FlatList, sticky)
+        headerComponent={
+          <View style={{ paddingHorizontal: 16, paddingTop: 8 }}>
+            <SearchInput
+              placeholder="Cari topik diskusi"
+              onChangeText={_.debounce((text) => setSearch(text), 500)}
+              //   value={search}
+            />
+          </View>
+        }
+        // Floating action button
+        floatingButton={
+          <FloatingButton
+            onPress={() =>
+              router.navigate("/(application)/(user)/forum/create")
+            }
+          />
+        }
+        // --- Mode List Props ---
+        listData={listData}
+        renderItem={renderForumItem}
+        refreshControl={
+          <RefreshControl
+            // IOS
+            tintColor={MainColor.yellow}
+            // Android
+            colors={[MainColor.yellow]}
+            progressBackgroundColor={MainColor.yellow}
+
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+          />
+        }
+        onEndReached={loadMore}
+        // ListHeaderComponent={ListHeaderComponent}
+        ListFooterComponent={ListFooterComponent}
+        ListEmptyComponent={
+          _.isEmpty(listData) ? <SkeletonListComponent /> : <EmptyComponent />
+        }
+        // ------------------------
+      />
+    </>
+  );
+}
--- a/screens/Forum/ViewForumku.tsx
+++ b/screens/Forum/ViewForumku.tsx
@@ -0,0 +1,144 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import {
+  AvatarComp,
+  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 View_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, 
+        category: "forumku",
+      });
+
+      setListData(response.data);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+      setLoadingGetList(false);
+    }
+  };
+
+  return (
+    <>
+      <ViewWrapper
+        floatingButton={
+          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}
+          authorUsername={dataUser?.username}
+        />
+      </DrawerCustom>
+    </>
+  );
+}
--- a/screens/Forum/ViewForumku2.tsx
+++ b/screens/Forum/ViewForumku2.tsx
@@ -0,0 +1,215 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import {
+  AvatarComp,
+  ButtonCustom,
+  CenterCustom,
+  FloatingButton,
+  Grid,
+  LoaderCustom,
+  Spacing,
+  StackCustom,
+  TextCustom,
+} from "@/components";
+import NewWrapper from "@/components/_ShareComponent/NewWrapper";
+import NoDataText from "@/components/_ShareComponent/NoDataText";
+import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom";
+import { MainColor } from "@/constants/color-palet";
+import { useAuth } from "@/hooks/use-auth";
+import Forum_BoxDetailSection from "@/screens/Forum/DiscussionBoxSection";
+import { apiForumGetAll } from "@/service/api-client/api-forum";
+import { apiUser } from "@/service/api-client/api-user";
+import { router, useLocalSearchParams } from "expo-router";
+import _ from "lodash";
+import { useCallback, useEffect, useState } from "react";
+import { RefreshControl, View } from "react-native";
+
+const PAGE_SIZE = 5;
+
+export default function View_Forumku2() {
+  const { id } = useLocalSearchParams();
+  const { user } = useAuth();
+  const [listData, setListData] = useState<any[]>([]);
+  const [dataUser, setDataUser] = useState<any | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
+  const [hasMore, setHasMore] = useState(true);
+  const [page, setPage] = useState(1);
+  const [count, setCount] = useState(0);
+
+  useEffect(() => {
+    onLoadDataProfile(id as string);
+  }, [id]);
+
+  useEffect(() => {
+    setPage(1);
+    setListData([]);
+    setHasMore(true);
+    fetchData(1, true);
+  }, [user?.id]);
+
+  const onLoadDataProfile = async (id: string) => {
+    try {
+      const response = await apiUser(id);
+
+      setDataUser(response.data);
+    } catch (error) {
+      console.log("[ERROR]", error);
+    } finally {
+    }
+  };
+
+  // 🔹 Fungsi fetch data
+  const fetchData = async (pageNumber: number, clear: boolean) => {
+    if (!user?.id) return;
+
+    // Cegah multiple call
+    if (!clear && (loading || refreshing)) return;
+
+    const isRefresh = clear;
+    if (isRefresh) setRefreshing(true);
+    if (!isRefresh) setLoading(true);
+
+    try {
+      const response = await apiForumGetAll({
+        category: "forumku",
+        authorId: id as string,
+        userLoginId: user.id,
+        page: String(pageNumber), // API terima string
+      });
+
+      const newData = response.data.data || [];
+      setListData((prev) => {
+        const current = Array.isArray(prev) ? prev : [];
+        return clear ? newData : [...current, ...newData];
+      });
+      setHasMore(newData.length === PAGE_SIZE);
+      setPage(pageNumber);
+      setCount(response.data.count);
+    } catch (error) {
+      console.error("[ERROR] Fetch forum:", error);
+      setHasMore(false);
+    } finally {
+      setRefreshing(false);
+      setLoading(false);
+    }
+  };
+
+  // 🔹 Pull-to-refresh
+  const onRefresh = useCallback(() => {
+    fetchData(1, true);
+  }, [user?.id]);
+
+  // 🔹 Infinite scroll
+  const loadMore = useCallback(() => {
+    if (hasMore && !loading && !refreshing) {
+      fetchData(page + 1, false);
+    }
+  }, [hasMore, loading, refreshing, page, user?.id]);
+
+  const randerHeaderComponent = () => (
+    <>
+      <CenterCustom>
+        <AvatarComp
+          fileId={dataUser?.Profile?.imageId}
+          href={`/(application)/(image)/preview-image/${dataUser?.Profile?.imageId}`}
+          size="xl"
+        />
+      </CenterCustom>
+
+      <Grid>
+        <Grid.Col style={{ paddingLeft: 8 }} span={6}>
+          <TextCustom bold truncate>
+            @{dataUser?.username || "-"}
+          </TextCustom>
+          <TextCustom>{count || "0"} postingan</TextCustom>
+        </Grid.Col>
+        <Grid.Col span={6} style={{ alignItems: "flex-end", paddingRight: 8 }}>
+          <ButtonCustom href={`/profile/${dataUser?.Profile?.id}`}>
+            Kunjungi Profile
+          </ButtonCustom>
+        </Grid.Col>
+      </Grid>
+      <Spacing />
+    </>
+  );
+
+  const renderList = ({ item }: { item: any }) => (
+    <Forum_BoxDetailSection
+      key={item.id}
+      data={item}
+      onSetData={() => {}}
+      isTruncate={true}
+      href={`/forum/${item.id}`}
+      isRightComponent={false}
+    />
+  );
+
+  // Skeleton List (untuk initial load)
+  const SkeletonListComponent = () => (
+    <View style={{ flex: 1 }}>
+      <StackCustom>
+        {Array.from({ length: 5 }).map((_, i) => (
+          <CustomSkeleton height={200} key={i} />
+        ))}
+      </StackCustom>
+    </View>
+  );
+
+  //  Komponen Empty
+  const EmptyComponent = () => (
+    <View
+      style={{
+        flex: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        padding: 20,
+      }}
+    >
+      <NoDataText />
+    </View>
+  );
+
+  // 🔹 Komponen Footer List (loading indicator)
+  const ListFooterComponent =
+    loading && !refreshing && listData.length > 0 ? (
+      <View style={{ paddingVertical: 16, alignItems: "center" }}>
+        {/* <Text style={{ color: "#aaa", fontSize: 14 }}>Memuat diskusi...</Text> */}
+        <LoaderCustom />
+      </View>
+    ) : null;
+
+  return (
+    <>
+      <NewWrapper
+        floatingButton={
+          user?.id === id && (
+            <FloatingButton
+              onPress={() =>
+                router.navigate("/(application)/(user)/forum/create")
+              }
+            />
+          )
+        }
+        listData={listData}
+        renderItem={renderList}
+        refreshControl={
+          <RefreshControl
+            // IOS
+            tintColor={MainColor.yellow}
+            // Android
+            colors={[MainColor.yellow]}
+            progressBackgroundColor={MainColor.yellow}
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+          />
+        }
+        onEndReached={loadMore}
+        ListHeaderComponent={randerHeaderComponent()}
+        ListFooterComponent={ListFooterComponent}
+        ListEmptyComponent={
+          _.isEmpty(listData) ? <SkeletonListComponent /> : <EmptyComponent />
+        }
+      />
+    </>
+  );
+}
--- a/screens/Home/homeViewStyle.tsx
+++ b/screens/Home/homeViewStyle.tsx
@@ -59,11 +59,30 @@ export const stylesHome = StyleSheet.create({
    borderWidth: 2,
    borderColor: AccentColor.blue,
  },
+  gridItemInactive: {
+    width: "46%",
+    height: "100%",
+    aspectRatio: 1,
+    backgroundColor: MainColor.darkblue,
+    borderRadius: 8,
+    padding: 16,
+    alignItems: "center",
+    justifyContent: "center",
+    marginVertical: 8,
+    borderWidth: 2,
+    borderColor: AccentColor.blue,
+    opacity: 0.7,
+  },
  gridLabel: {
    marginTop: 8,
    color: "white",
    fontWeight: "bold",
  },
+  gridLabelInactive: {
+    marginTop: 8,
+    color: "gray",
+    fontWeight: "bold",
+  },
  jobVacancyContainer: {
    backgroundColor: MainColor.darkblue,
    borderRadius: 8,
--- a/screens/Home/topFeatureSection.tsx
+++ b/screens/Home/topFeatureSection.tsx
@@ -9,21 +9,25 @@ export default function Home_FeatureSection() {
      name: "Event",
      icon: <Ionicons name="analytics" size={48} color="white" />,
      onPress: () => router.push("/(application)/(user)/event/(tabs)"),
+      status: "active",
    },
    {
      name: "Collaboration",
-      icon: <Ionicons name="share" size={48} color="white" />,
+      icon: <Ionicons name="share" size={48} color="gray" />,
      onPress: () => router.push("/(application)/(user)/collaboration/(tabs)"),
+      status: "inactive",
    },
    {
      name: "Voting",
      icon: <Ionicons name="cube" size={48} color="white" />,
      onPress: () => router.push("/(application)/(user)/voting/(tabs)"),
+      status: "active",
    },
    {
      name: "Crowdfunding",
      icon: <Ionicons name="heart" size={48} color="white" />,
      onPress: () => router.push("/(application)/(user)/crowdfunding"),
+      status: "active",
    },
  ];

@@ -33,11 +37,12 @@ export default function Home_FeatureSection() {
        {listFeature.map((item, index) => (
          <TouchableOpacity
            key={index}
-            style={stylesHome.gridItem}
+            style={item.status === "inactive" ? stylesHome.gridItemInactive : stylesHome.gridItem}
            onPress={item.onPress}
+            disabled={item.status === "inactive"}
          >
            {item.icon}
-            <Text style={stylesHome.gridLabel}>{item.name}</Text>
+            <Text style={item.status === "inactive" ? stylesHome.gridLabelInactive : stylesHome.gridLabel}>{item.name}</Text>
          </TouchableOpacity>
        ))}
      </View>
--- a/screens/Maps/MapsView.tsx
+++ b/screens/Maps/MapsView.tsx
@@ -0,0 +1,226 @@
+import {
+  ViewWrapper,
+  DrawerCustom,
+  DummyLandscapeImage,
+  Spacing,
+  StackCustom,
+  TextCustom,
+  Grid,
+  ButtonCustom,
+} 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 { useFocusEffect, router } from "expo-router";
+import { useState, useCallback } 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 default function MapsView() {
+  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 }}>
+        {/* <MapCustom height={"100%"} /> */}
+        <View style={{ flex: 1 }}>
+          {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>
+    </>
+  );
+}
--- a/screens/Maps/MapsView2.tsx
+++ b/screens/Maps/MapsView2.tsx
@@ -0,0 +1,28 @@
+import { TextCustom, ViewWrapper } from "@/components";
+import Mapbox from "@rnmapbox/maps";
+import { View } from "react-native";
+
+// Nonaktifkan telemetry (opsional, untuk privasi)
+Mapbox.setTelemetryEnabled(false);
+
+// Gunakan style OSM gratis
+const MAP_STYLE_URL = "https://tiles.stadiamaps.com/styles/osm_bright.json";
+
+// Atau gunakan MapLibre default:
+// const MAP_STYLE_URL = 'https://demotiles.maplibre.org/style.json';
+export default function MapsView2() {
+  return (
+    <>
+      <ViewWrapper>
+      <View style={{ flex: 1 }}>
+          <Mapbox.MapView style={{ flex: 1 }}>
+          <Mapbox.Camera
+            centerCoordinate={[115.2126, -8.65]} // Bali
+            zoomLevel={12}
+          />
+        </Mapbox.MapView>
+      </View>
+      </ViewWrapper>
+    </>
+  );
+}
--- a/screens/Profile/ListPage.tsx
+++ b/screens/Profile/ListPage.tsx
@@ -1,6 +1,7 @@
 import { IMenuDrawerItem } from "@/components/_Interface/types";
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_MEDIUM } from "@/constants/constans-value";
+import { useAuth } from "@/hooks/use-auth";
 import { Ionicons } from "@expo/vector-icons";

 export const drawerItemsProfile = ({
@@ -10,6 +11,8 @@ export const drawerItemsProfile = ({
  id: string;
  isAdmin: boolean;
 }) => {
+  const { user } = useAuth();
+
  const adminItems: IMenuDrawerItem[] = [
    {
      icon: (
@@ -21,6 +24,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Edit profile",
      path: `/(application)/profile/${id}/edit`,
+      value: "edit-profile",
    },
    {
      icon: (
@@ -32,6 +36,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Ubah foto profile",
      path: `/(application)/profile/${id}/update-photo`,
+      value: "update-photo",
    },
    {
      icon: (
@@ -43,6 +48,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Ubah latar belakang",
      path: `/(application)/profile/${id}/update-background`,
+      value: "update-background",
    },
    {
      icon: (
@@ -54,6 +60,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Tambah portofolio",
      path: `/(application)/portofolio/${id}/create`,
+      value: "create-portofolio",
    },
    {
      icon: (
@@ -65,6 +72,20 @@ export const drawerItemsProfile = ({
      ),
      label: "Dashboard Admin",
      path: `/(application)/admin/dashboard`,
+      value: "dashboard-admin",
+    },
+    {
+      icon: (
+        <Ionicons
+          name="trash"
+          size={ICON_SIZE_MEDIUM}
+          color={AccentColor.white}
+        />
+      ),
+      label: "Hapus Akun",
+      color: MainColor.red,
+      path: `/(application)/(user)/delete-account?phone=${user?.nomor}`,
+      value: "delete-account",
    },
    {
      icon: (
@@ -77,6 +98,7 @@ export const drawerItemsProfile = ({
      label: "Keluar",
      color: MainColor.red,
      path: "",
+      value: "logout",
    },
  ];

@@ -91,6 +113,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Edit profile",
      path: `/(application)/profile/${id}/edit`,
+      value: "edit-profile",
    },
    {
      icon: (
@@ -102,6 +125,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Ubah foto profile",
      path: `/(application)/profile/${id}/update-photo`,
+      value: "update-photo",
    },
    {
      icon: (
@@ -113,6 +137,7 @@ export const drawerItemsProfile = ({
      ),
      label: "Ubah latar belakang",
      path: `/(application)/profile/${id}/update-background`,
+      value: "update-background",
    },
    {
      icon: (
@@ -124,6 +149,20 @@ export const drawerItemsProfile = ({
      ),
      label: "Tambah portofolio",
      path: `/(application)/portofolio/${id}/create`,
+      value: "create-portofolio",
+    },
+    {
+      icon: (
+        <Ionicons
+          name="trash"
+          size={ICON_SIZE_MEDIUM}
+          color={AccentColor.white}
+        />
+      ),
+      label: "Hapus Akun",
+      color: MainColor.red,
+      path: `/(application)/(user)/delete-account?phone=${user?.nomor}`,
+      value: "delete-account",
    },
    {
      icon: (
@@ -136,6 +175,7 @@ export const drawerItemsProfile = ({
      label: "Keluar",
      color: MainColor.red,
      path: "",
+      value: "logout",
    },
  ];

--- a/screens/Profile/menuDrawerSection.tsx
+++ b/screens/Profile/menuDrawerSection.tsx
@@ -1,6 +1,9 @@
 import { AlertDefaultSystem } from "@/components";
 import { IMenuDrawerItem } from "@/components/_Interface/types";
 import MenuDrawerDynamicGrid from "@/components/Drawer/MenuDrawerDynamicGird";
+import { useAuth } from "@/hooks/use-auth";
+import { apiDeleteUser } from "@/service/api-client/api-user";
+import { openBrowser } from "@/utils/openBrower";
 import { router } from "expo-router";

 export default function Profile_MenuDrawerSection({
@@ -12,8 +15,11 @@ export default function Profile_MenuDrawerSection({
  setIsDrawerOpen: (value: boolean) => void;
  logout: () => Promise<void>;
 }) {
+  const { user } = useAuth();
+
  const handlePress = (item: IMenuDrawerItem) => {
-    if (item.label === "Keluar") {
+    // console.log("ITEM >> ", item);
+    if (item.value === "logout") {
      //   console.log("Logout clicked");
      // setShowLogoutAlert(true);
      AlertDefaultSystem({
@@ -27,6 +33,22 @@ export default function Profile_MenuDrawerSection({
        },
        onPressLeft: () => setIsDrawerOpen(false),
      });
+    } else if (item.value === "delete-account") {
+      console.log("PATH >> ", item.path);
+      // openBrowser(item.path as any);
+      AlertDefaultSystem({
+        title: "Apakah anda yakin ingin menghapus akun ini?",
+        message:
+          "Pilih 'Ya' untuk masuk ke halaman penghapusan akun",
+        textLeft: "Batal",
+        textRight: "Ya",
+        onPressRight: async () => {
+          router.push(item.path as any);
+
+          setIsDrawerOpen(false);
+        },
+        onPressLeft: () => setIsDrawerOpen(false),
+      });
    } else {
      console.log("PATH >> ", item.path);
      router.push(item.path as any);
@@ -43,6 +65,7 @@ export default function Profile_MenuDrawerSection({
          label: item.label,
          path: item.path as any,
          color: item.color,
+          value: item.value,
        }))}
        columns={4} // Ubah ke 2 jika ingin 2 kolom per baris
        onPressItem={(item) => handlePress(item as any)}
--- a/service/api-client/api-forum.ts
+++ b/service/api-client/api-forum.ts
@@ -14,13 +14,22 @@ export async function apiForumCreate({ data }: { data: any }) {
 export async function apiForumGetAll({
  search,
  authorId,
+  userLoginId,
+  category,
+  page,
 }: {
-  search: string;
+  search?: string;
  authorId?: string;
+  userLoginId?: string;
+  category: "beranda" | "forumku";
+  page?: string;
 }) {
-  const authorQuery = authorId ? `?authorId=${authorId}` : "";
-  const searchQuery = search ? `?search=${search}` : "";
-  const query = search ? searchQuery : authorQuery;
+  const categoryQuery = `?category=${category}`;
+  const authorQuery = authorId ? `&authorId=${authorId}` : "";
+  const userLoginQuery = userLoginId ? `&userLoginId=${userLoginId}` : "";
+  const searchQuery = search ? `&search=${search}` : "";
+  const pageQuery = page ? `&page=${page}` : "";
+  const query = `${categoryQuery}${authorQuery}${userLoginQuery}${searchQuery}${pageQuery}`;

  try {
    const response = await apiConfig.get(`/mobile/forum${query}`);
--- a/service/api-client/api-master.ts
+++ b/service/api-client/api-master.ts
@@ -1,5 +1,17 @@
 import { apiConfig } from "../api-config";

+// ================== START MASTER ================== //
+export async function apiMasterAppCategory() {
+  try {
+    const response = await apiConfig.get(`/mobile/master/app-category`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+// ================== END MASTER ================== //
+
 // ================== START MASTER PORTFOLIO ================== //
 export async function apiMasterBidangBisnis() {
  try {
@@ -167,4 +179,4 @@ export async function apiMasterTransaction() {
  } catch (error) {
    throw error;
  }
-}
+}
--- a/service/api-client/api-user.ts
+++ b/service/api-client/api-user.ts
@@ -10,3 +10,29 @@ export async function apiAllUser({ search }: { search: string }) {
  return response.data;
 }

+export async function apiDeleteUser({id}:{id: string}) {
+  const response = await apiConfig.delete(`/mobile/user/${id}`);
+  return response.data;
+}
+
+export async function apiForumBlockUser({
+  data,
+}: {
+  data: {
+    // Id yang di blokir
+    blockedId: string;
+    // Id yang melakukan blokir
+    blockerId: string;
+    menuFeature: "Event" | "Forum";
+  };
+}) {
+  console.log("[FETCH API]", data);
+  try {
+    const response = await apiConfig.post(`/mobile/block-user`, {
+      data: data,
+    });
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
--- a/service/api-config.ts
+++ b/service/api-config.ts
@@ -56,10 +56,22 @@ export async function apiValidationCode({ nomor }: { nomor: string }) {
 export async function apiRegister({
  data,
 }: {
-  data: { nomor: string; username: string };
+  data: { nomor: string; username: string; termsOfServiceAccepted: boolean };
 }) {
  const response = await apiConfig.post(`/auth/register`, {
    data: data,
  });
  return response.data;
 }
+
+export async function apiAcceptTermService({
+  data,
+}: {
+  data: { id: string; termsOfServiceAccepted: boolean };
+}) {
+  const response = await apiConfig.post(`/auth/term-service`, {
+    data: data,
+  });
+  return response.data;
+}
+
--- a/types/User.ts
+++ b/types/User.ts
@@ -14,4 +14,5 @@ export interface IUser {
  updatedAt?: string | null;
  masterUserRoleId?: string;
  MasterUserRole?: IMasterUserRole;
+  termsOfServiceAccepted?: boolean;
 }
--- a/utils/notifications.ts
+++ b/utils/notifications.ts
@@ -1,18 +1,29 @@
 // utils/notifications.ts
-import * as Device from 'expo-device';
 import * as Notifications from 'expo-notifications';
 import Constants from 'expo-constants';
+import * as Device from 'expo-device';
+
+
+// Notifications.setNotificationHandler({
+//   handleNotification: async () => ({
+//     shouldShowAlert: true,
+//     shouldPlaySound: true,
+//     shouldSetBadge: false,
+//     shouldShowBanner: true,
+//     shouldShowList: true,
+//   }),
+// });

 Notifications.setNotificationHandler({
  handleNotification: async () => ({
-    shouldShowAlert: true,
-    shouldPlaySound: true,
+    shouldPlaySound: false,
    shouldSetBadge: false,
    shouldShowBanner: true,
    shouldShowList: true,
  }),
 });

+
 export async function registerForPushNotificationsAsync() {
  if (!Device.isDevice) {
    console.warn("Push notifications don't work on simulator");
--- a/utils/openBrower.ts
+++ b/utils/openBrower.ts
@@ -0,0 +1,9 @@
+import * as WebBrowser from "expo-web-browser";
+
+export const openBrowser = async (url: string) => {
+  try {
+    await WebBrowser.openBrowserAsync(url);
+  } catch (error) {
+    console.error("Gagal membuka browser:", error);
+  }
+};
Author	SHA1	Message	Date
bagasbanuna	d471682ae7	Refresh control dan Blockir user di forum ### No Issue	2025-11-26 16:13:05 +08:00
bagasbanuna	00eea71248	Penambahan fitur block user: 50% Fix: - app/(application)/(user)/forum/[id]/index.tsx - app/(application)/(user)/home.tsx - screens/Forum/ListPage.tsx - screens/Forum/MenuDrawerSection.tsx/MenuBeranda.tsx - service/api-client/api-master.ts - service/api-client/api-user.ts ### No Issue	2025-11-25 11:04:12 +08:00
bagasbanuna	41e648d8f3	Fix rejected Apple : Submission ID: 1efcd8eb-7d68-4348-9925-43a8e1bd7d1e Add: - app/(application)/terms-agreement.tsx Fix: - app/(application)/(user)/home.tsx - app/(application)/_layout.tsx - context/AuthContext.tsx - ios/HIPMIBadungConnect/Info.plist - screens/Authentication/LoginView.tsx - screens/Authentication/RegisterView.tsx - service/api-config.ts - types/User.ts ### NO Issue	2025-11-24 17:09:52 +08:00
bagasbanuna	0c4deac6e2	Fix map android : Add: - screens/Maps/ Fix: - android/app/src/main/AndroidManifest.xml - app.config.js - app/(application)/(user)/maps/index.tsx - bun.lock - ios/HIPMIBadungConnect.xcodeproj/project.pbxproj - ios/HIPMIBadungConnect/Info.plist - ios/Podfile.lock - package.json ### No Issue	2025-11-21 17:43:58 +08:00
bagasbanuna	676b8a38be	Fix apple rejected: - app/(application)/(user)/delete-account.tsx - screens/Profile/menuDrawerSection.tsx ### No Issue	2025-11-20 15:42:37 +08:00
bagasbanuna	0a2aa71013	Add: - app/(application)/(user)/delete-account.tsx - assets/images/constants/logo-hipmi_back.png Fix: - app/(application)/(user)/_layout.tsx - assets/images/constants/logo-hipmi.png - components/Grid/GridCustom.tsx - screens/Profile/ListPage.tsx - screens/Profile/menuDrawerSection.tsx - service/api-client/api-user.ts ### No Issue	2025-11-19 17:40:35 +08:00
bagasbanuna	868e96a54a	Try to notification ### Issue: package import * as Notifications from expo-notifications;	2025-11-18 17:46:33 +08:00
bagasbanuna	059b4d053a	Fix rejected apple delete account & start for notification ### No issue	2025-11-18 14:29:02 +08:00