Merge pull request 'notification donation & EULA Logic' (#42) from notification/23-jan-26 into staging

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

app.config.js

@@ -21,7 +21,7 @@ export default {
         "Aplikasi membutuhkan akses lokasi untuk menampilkan peta.",
     },
     associatedDomains: ["applinks:cld-dkr-staging-hipmi.wibudev.com"],
-    buildNumber: "19",
+    buildNumber: "20",
   },
 
   android: {

app/(application)/(user)/donation/(tabs)/status.tsx

@@ -9,14 +9,16 @@ import { useAuth } from "@/hooks/use-auth";
 import { dummyMasterStatus } from "@/lib/dummy-data/_master/status";
 import Donasi_BoxStatus from "@/screens/Donation/BoxStatus";
 import { apiDonationGetByStatus } from "@/service/api-client/api-donation";
-import { useFocusEffect } from "expo-router";
+import { useFocusEffect, useLocalSearchParams } from "expo-router";
 import _ from "lodash";
 import { useCallback, useState } from "react";
 
 export default function DonationStatus() {
   const { user } = useAuth();
+  const { status } = useLocalSearchParams<{ status?: string }>();
+
   const [activeCategory, setActiveCategory] = useState<string | null>(
-    "publish"
+    status || "publish",
   );
   const [listData, setListData] = useState<any[] | null>(null);
   const [loadList, setLoadList] = useState(false);
@@ -24,7 +26,7 @@ export default function DonationStatus() {
   useFocusEffect(
     useCallback(() => {
       onLoadList();
-    }, [activeCategory])
+    }, [activeCategory]),
   );
 
   const onLoadList = async () => {

app/(application)/(user)/donation/create-story.tsx

@@ -103,7 +103,7 @@ export default function DonationCreateStory() {
         type: "success",
         text1: "Donasi berhasil disimpan",
       });
-      router.replace("/donation/status");
+      router.replace("/donation/status?status=review");
     } catch (error) {
       console.log("[ERROR]", error);
     } finally {

app/(application)/(user)/investment/[id]/(news)/add-news.tsx

@@ -115,7 +115,11 @@ export default function InvestmentAddNews() {
           onChangeText={(value) => setData({ ...data, deskripsi: value })}
         />
 
-        <ButtonCustom isLoading={isLoading} onPress={handlerSubmit}>
+        <ButtonCustom
+          disabled={!data.title || !data.deskripsi || isLoading}
+          isLoading={isLoading}
+          onPress={handlerSubmit}
+        >
           Simpan
         </ButtonCustom>
       </StackCustom>

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

@@ -18,10 +18,7 @@ import {
   apiInvestmentUpdateData,
 } from "@/service/api-client/api-investment";
 import { apiMasterInvestment } from "@/service/api-client/api-master";
-import {
+import { deleteFileService, uploadFileService } from "@/service/upload-service";
-  deleteFileService,
-  uploadFileService,
-} from "@/service/upload-service";
 import { formatCurrencyDisplay } from "@/utils/formatCurrencyDisplay";
 import pickFile from "@/utils/pickFile";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
@@ -70,7 +67,7 @@ export default function InvestmentEdit() {
     useCallback(() => {
       onLoadMaster();
       onLoadData();
-    }, [id])
+    }, [id]),
   );
 
   const onLoadMaster = async () => {
@@ -178,7 +175,7 @@ export default function InvestmentEdit() {
       const responseUpdate = await apiInvestmentUpdateData({
         id: id as string,
         data: newData,
-        category: "data"
+        category: "data",
       });
 
       if (responseUpdate.success) {
@@ -256,6 +253,7 @@ export default function InvestmentEdit() {
         />
 
         <TextInputCustom
+          disabled
           required
           placeholder="0"
           label="Total Lembar"

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

@@ -54,7 +54,7 @@ export default function InvestmentCreate() {
   useFocusEffect(
     useCallback(() => {
       onLoadMaster();
-    }, [])
+    }, []),
   );
 
   const onLoadMaster = async () => {
@@ -264,6 +264,7 @@ export default function InvestmentCreate() {
 
         <StackCustom gap={0}>
           <TextInputCustom
+            disabled
             required
             placeholder="0"
             label="Total Lembar"

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

@@ -36,7 +36,7 @@ export default function ProfileLayout() {
 
         <Stack.Screen
           name="[id]/blocked-list"
-          options={{ title: "Blocked List", headerLeft: () => <BackButton /> }}
+          options={{ title: "Daftar Blokir", headerLeft: () => <BackButton /> }}
         />
 
         <Stack.Screen

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

@@ -1,4 +1,5 @@
 import {
+  AlertDefaultSystem,
   BadgeCustom,
   BaseBox,
   BoxButtonOnFooter,
@@ -9,6 +10,7 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import { GridSpan_4_8 } from "@/components/_ShareComponent/GridSpan_4_8";
+import { useAuth } from "@/hooks/use-auth";
 import {
   apiAdminDonationInvoiceDetailById,
   apiAdminDonationInvoiceUpdateById,
@@ -22,6 +24,7 @@ import { useCallback, useState } from "react";
 import Toast from "react-native-toast-message";
 
 export default function AdminDonasiTransactionDetail() {
+  const { user } = useAuth();
   const { id, status } = useLocalSearchParams();
   console.log("[STATUS]", id, status);
 
@@ -33,7 +36,7 @@ export default function AdminDonasiTransactionDetail() {
       onLoadData();
 
       // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [id])
+    }, [id]),
   );
 
   const onLoadData = async () => {
@@ -57,6 +60,7 @@ export default function AdminDonasiTransactionDetail() {
       const newData = {
         donationId: data?.donasiId,
         nominal: data?.nominal,
+        senderId: user?.id,
       };
 
       const response = await apiAdminDonationInvoiceUpdateById({
@@ -97,7 +101,15 @@ export default function AdminDonasiTransactionDetail() {
           <ButtonCustom
             isLoading={isLoading}
             onPress={() => {
-              handlerSubmit();
+              AlertDefaultSystem({
+                title: "Konfirmasi transaksi",
+                message: "Apakah anda yakin ingin menyetujui transaksi ini?",
+                textLeft: "Tidak",
+                textRight: "Ya",
+                onPressRight: () => {
+                  handlerSubmit();
+                },
+              });
             }}
           >
             Terima donasi
@@ -109,7 +121,7 @@ export default function AdminDonasiTransactionDetail() {
     return (
       <BoxButtonOnFooter>
         <ButtonCustom disabled>
-           {data?.DonasiMaster_StatusInvoice?.name}
+          {data?.DonasiMaster_StatusInvoice?.name}
         </ButtonCustom>
       </BoxButtonOnFooter>
     );
@@ -140,7 +152,7 @@ export default function AdminDonasiTransactionDetail() {
             })}
           >
             {_.startCase(
-              (data?.DonasiMaster_StatusInvoice?.name as any) || "-"
+              (data?.DonasiMaster_StatusInvoice?.name as any) || "-",
             )}
           </BadgeCustom>
         )) ||
@@ -157,7 +169,7 @@ export default function AdminDonasiTransactionDetail() {
           <ButtonCustom
             onPress={() =>
               router.push(
-                `/(application)/(image)/preview-image/${data?.imageId}`
+                `/(application)/(image)/preview-image/${data?.imageId}`,
               )
             }
           >

app/(application)/admin/donation/[id]/reject-input.tsx

@@ -7,15 +7,15 @@ import {
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
 import AdminButtonReject from "@/components/_ShareComponent/Admin/ButtonReject";
+import { useAuth } from "@/hooks/use-auth";
 import { funUpdateStatusDonation } from "@/screens/Admin/Donation/funDonationUpdateStatus";
-import {
+import { apiAdminDonationDetailById } from "@/service/api-admin/api-admin-donation";
-  apiAdminDonationDetailById
-} from "@/service/api-admin/api-admin-donation";
 import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
 import React from "react";
 import Toast from "react-native-toast-message";
 
 export default function AdminDonationRejectInput() {
+  const { user } = useAuth();
   const { id, status } = useLocalSearchParams();
 
   const [data, setData] = React.useState<any | null>(null);
@@ -24,7 +24,7 @@ export default function AdminDonationRejectInput() {
   useFocusEffect(
     React.useCallback(() => {
       onLoadData();
-    }, [id])
+    }, [id]),
   );
 
   const onLoadData = async () => {
@@ -48,11 +48,23 @@ export default function AdminDonationRejectInput() {
     changeStatus: "publish" | "review" | "reject";
   }) => {
     try {
+      if (!user?.id) {
+        Toast.show({
+          type: "error",
+          text1: "User tidak ditemukan",
+        });
+
+        return;
+      }
+
       setIsLoading(true);
       const response = await funUpdateStatusDonation({
         id: id as string,
         changeStatus,
-        data: data,
+        data: {
+          senderId: user?.id as string,
+          catatan: data,
+        },
       });
 
       if (!response.success) {
@@ -61,7 +73,7 @@ export default function AdminDonationRejectInput() {
           text1: "Report gagal",
         });
 
-        return
+        return;
       }
 
       Toast.show({

components/Modal/ModalReactNative.tsx

@@ -0,0 +1,33 @@
+import { Modal, View } from "react-native";
+
+export default function ModalReactNative({
+  children,
+  isVisible,
+}: {
+  children: React.ReactNode;
+  isVisible: boolean;
+}) {
+  return (
+    <Modal
+      animationType="slide"
+      backdropColor={"rgba(0, 0, 0, 0.5)"}
+      visible={isVisible}
+    >
+      <View
+        style={{
+          flex: 1,
+          justifyContent: "center",
+          alignItems: "center",
+          backgroundColor: "rgba(0, 0, 0, 0.5)",
+        //   margin: 10,
+        marginBlock: 30,
+          padding: 10,
+          borderRadius: 10,
+          paddingTop: 30
+        }}
+      >
+        {children}
+      </View>
+    </Modal>
+  );
+}

context/AuthContext.tsx

@@ -21,7 +21,7 @@ type AuthContextType = {
   isAuthenticated: boolean;
   isAdmin: boolean;
   isUserActive: boolean;
-  loginWithNomor: (nomor: string) => Promise<void>;
+  loginWithNomor: (nomor: string) => Promise<boolean>;
   validateOtp: (nomor: string) => Promise<any>;
   logout: () => Promise<void>;
   registerUser: (userData: {
@@ -30,12 +30,12 @@ type AuthContextType = {
     termsOfServiceAccepted: boolean;
   }) => Promise<void>;
   userData: (token: string) => Promise<any>;
-  acceptedTerms: (nomor: string) => Promise<any>;
+  acceptedTerms: (nomor: string, onSetModalVisible: (visible: boolean) => void) => Promise<any>;
 };
 
 // --- Create Context ---
 export const AuthContext = createContext<AuthContextType | undefined>(
-  undefined
+  undefined,
 );
 
 export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
@@ -79,31 +79,35 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
       const response = await apiLogin({ nomor: nomor });
       console.log("[RESPONSE AUTH]", JSON.stringify(response, null, 2));
 
-      if (response.success) {
+      if (response.success && response.isAcceptTerms) {
-        if (response.isAcceptTerms) {
+       
-          Toast.show({
+        await AsyncStorage.setItem("kode_otp", response.kodeId);
-            type: "success",
+        router.push(`/verification?nomor=${nomor}`);
-            text1: "Sukses",
+        return true;
-            text2: "Kode OTP berhasil dikirim",
-          });
-
-          await AsyncStorage.setItem("kode_otp", response.kodeId);
-          router.push(`/verification?nomor=${nomor}`);
-          return;
-        } else {
-          router.push(`/eula?nomor=${nomor}`);
-          return;
-        }
       } else {
-        router.push(`/eula?nomor=${nomor}`);
+        // router.push(`/eula?nomor=${nomor}`);
-
+        return false;
-        // Toast.show({
-        //   type: "info",
-        //   text1: "Info",
-        //   text2: "Silahkan mendaftar",
-        // });
-        return;
       }
+
+      // if (response.success) {
+      //   if (response.isAcceptTerms) {
+      //     Toast.show({
+      //       type: "success",
+      //       text1: "Sukses",
+      //       text2: "Kode OTP berhasil dikirim",
+      //     });
+
+      //     await AsyncStorage.setItem("kode_otp", response.kodeId);
+      //     router.push(`/verification?nomor=${nomor}`);
+      //     return false
+      //   } else {
+      //     // router.push(`/eula?nomor=${nomor}`);
+      //     return true
+      //   }
+      // } else {
+      //   router.push(`/eula?nomor=${nomor}`);
+      //   return true;
+      // }
     } catch (error: any) {
       throw new Error(error.response?.data?.message || "Gagal kirim OTP");
     } finally {
@@ -158,7 +162,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     } catch (error: any) {
       console.log("Error validasi otp >>", (error as Error).message || error);
       throw new Error(
-        error.response?.data?.message || "OTP salah atau user tidak ditemukan"
+        error.response?.data?.message || "OTP salah atau user tidak ditemukan",
       );
     } finally {
       setIsLoading(false);
@@ -187,7 +191,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     } catch (error: any) {
       console.log(
         "[LOAD USER DATA]",
-        error.response?.data?.message + "user" || "Gagal mengambil data user"
+        error.response?.data?.message + "user" || "Gagal mengambil data user",
       );
     } finally {
       setIsLoading(false);
@@ -261,7 +265,8 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     }
   };
 
-  const acceptedTerms = async (nomor: string) => {
+  // --- 6. Accept Terms ---
+  const acceptedTerms = async (nomor: string, onSetModalVisible: (visible: boolean) => void) => {
     try {
       setIsLoading(true);
       const response = await apiUpdatedTermCondition({ nomor: nomor });
@@ -283,6 +288,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
       console.log("Error accept terms", error);
     } finally {
       setIsLoading(false);
+      // onSetModalVisible(false);
     }
   };
 

hipmi-note.md

@@ -18,7 +18,7 @@ android: bunx expo prebuild --platform android
 adb devices : cek device yang terhubung
 Note: izinkan perangkat dulu agar statusnya tidak unauthorized
 
-adb install android/app/build/outputs/apk/debug/app-debug.apk : install apk ke device
+adb install android/app/build/outputs/apk/debug/app-debug.apk : install apk ke device / emulator
 Note:
 Gunakan flag -s (serial) di perintah adb untuk menentukan target 
 adb -s <0G52319V261040B2 ini adalah id nya> install android/app/build/outputs/apk/debug/app-debug.apk

ios/HIPMIBadungConnect/Info.plist

@@ -39,7 +39,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>19</string>
+    <string>20</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSMinimumSystemVersion</key>

screens/Admin/Donation/funDonationUpdateStatus.ts

@@ -1,4 +1,5 @@
 import { apiAdminDonationUpdateStatus } from "@/service/api-admin/api-admin-donation";
+import { typeRejectedData } from "@/types/type-collect-other";
 
 export const funUpdateStatusDonation = async ({
   id,
@@ -7,7 +8,7 @@ export const funUpdateStatusDonation = async ({
 }: {
   id: string;
   changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data?: typeRejectedData;
 }) => {
   try {
     const response = await apiAdminDonationUpdateStatus({

screens/Authentication/EULASection.tsx

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

screens/Authentication/EULAView.tsx

@@ -12,25 +12,6 @@ import { SafeAreaView } from "react-native-safe-area-context";
 import { AccentColor, MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 
-// Ganti dengan API call ke backend Anda
-// const acceptEula = async (): Promise<boolean> => {
-//   try {
-//     const response = await fetch("/api/user/update-eula", {
-//       method: "PATCH",
-//       headers: { "Content-Type": "application/json" },
-//       credentials: "include",
-//       body: JSON.stringify({
-//         eulaAcceptedAt: new Date().toISOString(),
-//         eulaVersion: "2026-01-v1", // sesuaikan versi Anda
-//       }),
-//     });
-//     return response.ok;
-//   } catch (error) {
-//     console.error("Gagal menyimpan persetujuan EULA:", error);
-//     return false;
-//   }
-// };
-
 export default function EULAView() {
   const { acceptedTerms } = useAuth();
   const { nomor } = useLocalSearchParams();
@@ -52,7 +33,7 @@ export default function EULAView() {
       if (!isAtBottom) return;
 
       setIsLoading(true);
-      await acceptedTerms(nomor as string);
+      // await acceptedTerms(nomor as string);
     } catch (error) {
       console.log("Error accept terms", error);
     } finally {

screens/Authentication/LoginView.tsx

@@ -1,25 +1,31 @@
-import { NewWrapper } from "@/components";
+import { NewWrapper, TextCustom } from "@/components";
 import ButtonCustom from "@/components/Button/ButtonCustom";
+import ModalReactNative from "@/components/Modal/ModalReactNative";
 import Spacing from "@/components/_ShareComponent/Spacing";
 import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
 import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
-import { apiVersion } from "@/service/api-config";
+import { apiVersion, BASE_URL } from "@/service/api-config";
 import { GStyles } from "@/styles/global-styles";
+import { openBrowser } from "@/utils/openBrower";
 import versionBadge from "@/utils/viersionBadge";
 import VersionBadge from "@/utils/viersionBadge";
 import { Redirect } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, Text, View } from "react-native";
+import { Modal, RefreshControl, Text, View } from "react-native";
 import PhoneInput, { ICountry } from "react-native-international-phone-number";
 import Toast from "react-native-toast-message";
+import EULASection from "./EULASection";
 
 export default function LoginView() {
+  const url = BASE_URL;
   const [version, setVersion] = useState<string>("");
   const [selectedCountry, setSelectedCountry] = useState<null | ICountry>(null);
   const [inputValue, setInputValue] = useState<string>("");
   const [loading, setLoading] = useState<boolean>(false);
   const [refreshing, setRefreshing] = useState<boolean>(false);
+  const [modalVisible, setModalVisible] = useState(false);
+  const [numberToEULA, setNumberToEULA] = useState<string>("");
 
   const { loginWithNomor, token, isAdmin, isUserActive } = useAuth();
 
@@ -84,10 +90,17 @@ export default function LoginView() {
     let fixNumber = inputValue.replace(/\s+/g, "").replace(/^0+/, "");
 
     const realNumber = callingCode + fixNumber;
+    
 
     try {
       setLoading(true);
-      await loginWithNomor(realNumber);
+      const loginRes = await loginWithNomor(realNumber);
+
+      if (!loginRes) {
+        setModalVisible(true);
+      }
+
+      setNumberToEULA(realNumber);
     } catch (error) {
       console.log("Error login", error);
       Toast.show({
@@ -98,30 +111,6 @@ export default function LoginView() {
     } finally {
       setLoading(false);
     }
-
-    // try {
-    //   setLoading(true);
-    //   // const response = await apiLogin({ nomor: realNumber });
-    //  const response =  await loginWithNomor(realNumber);
-    //  console.log("[RESPONSE]", response);
-
-    //   Toast.show({
-    //     type: "success",
-    //     text1: "Sukses",
-    //     text2: "Kode OTP berhasil dikirim",
-    //   });
-
-    //   // router.navigate(`/verification?nomor=${realNumber}`);
-    // } catch (error) {
-    //   console.log("Error login", error);
-    //   Toast.show({
-    //     type: "error",
-    //     text1: "Error",
-    //     text2: error as string,
-    //   });
-    // } finally {
-    //   setLoading(false);
-    // }
   }
 
   if (token && token !== "" && !isUserActive) {
@@ -148,6 +137,7 @@ export default function LoginView() {
       }
     >
       <View style={GStyles.authContainer}>
+      
         <View>
           <View style={GStyles.authContainerTitle}>
             <Text style={GStyles.authSubTitle}>WELCOME TO</Text>
@@ -185,11 +175,41 @@ export default function LoginView() {
         <ButtonCustom onPress={handleLogin} isLoading={loading}>
           Login
         </ButtonCustom>
-        <Spacing />
+        <Spacing height={50} />
-        {/* <ButtonCustom onPress={() => router.navigate("/(application)/coba")}>
+
-          Coba
+        {/* <ButtonCustom
+          onPress={() => {
+            setModalVisible(true);
+            console.log("Show modal", modalVisible);
+          }}
+        >
+          Show Modal
         </ButtonCustom> */}
+        {/* <CheckboxCustom value={term} onChange={() => setTerm(!term)} /> */}
+
+        <Text
+          style={{ ...GStyles.textLabel, textAlign: "center", fontSize: 12 }}
+        >
+          Dengan menggunakan aplikasi ini, Anda telah menyetujui{" "}
+          <Text
+            style={{
+              color: MainColor.yellow,
+              textDecorationLine: "underline",
+            }}
+            onPress={() => {
+              const toUrl = `${url}/terms-of-service.html`;
+              openBrowser(toUrl);
+            }}
+          >
+            Syarat & Ketentuan
+          </Text>{" "}
+          dan seluruh kebijakan privasi yang berlaku.
+        </Text>
       </View>
+
+      <ModalReactNative isVisible={modalVisible}>
+        <EULASection nomor={numberToEULA || ""} onSetModalVisible={setModalVisible} />
+      </ModalReactNative>
     </NewWrapper>
   );
 }

screens/Profile/ListPage.tsx

@@ -70,7 +70,7 @@ export const drawerItemsProfile = ({
           color={AccentColor.white}
         />
       ),
-      label: "Blocked List",
+      label: "Daftar Blokir",
       path: `/(application)/profile/${id}/blocked-list`,
       value: "blocked-list",
     },

service/api-admin/api-admin-donation.ts

@@ -1,3 +1,4 @@
+import { typeRejectedData } from "@/types/type-collect-other";
 import { apiConfig } from "../api-config";
 
 export async function apiAdminDonation({
@@ -33,7 +34,7 @@ export async function apiAdminDonationUpdateStatus({
 }: {
   id: string;
   changeStatus: "publish" | "review" | "reject";
-  data?: string;
+  data?: typeRejectedData;
 }) {
   try {
     const response = await apiConfig.put(