Fix redirect admin

Fix QC Inno
Fix: - app/(application)/admin/donation/category-create.tsx - app/(application)/admin/donation/category-update.tsx - app/(application)/admin/donation/category.tsx - components/_ShareComponent/Admin/TableValue.tsx - screens/Authentication/LoginView.tsx - service/api-admin/api-master-admin.ts ### No Issue
2025-12-04 17:41:19 +08:00 · 2025-12-04 16:59:39 +08:00 · 2025-12-03 17:23:12 +08:00 · 2025-12-02 17:48:24 +08:00
22 changed files with 544 additions and 163 deletions
--- a/app.config.js
+++ b/app.config.js
@@ -19,7 +19,7 @@ export default {
      "NSLocationWhenInUseUsageDescription": "Aplikasi membutuhkan akses lokasi untuk menampilkan peta.",
    },
    associatedDomains: ["applinks:cld-dkr-staging-hipmi.wibudev.com"],
-    buildNumber: "9",
+    buildNumber: "12",
  },

  android: {
--- a/app/(application)/(user)/investment/[id]/index.tsx
+++ b/app/(application)/(user)/investment/[id]/index.tsx
@@ -15,6 +15,7 @@ import Investment_ButtonInvestasiSection from "@/screens/Invesment/ButtonInvesta
 import Invesment_ComponentBoxOnBottomDetail from "@/screens/Invesment/ComponentBoxOnBottomDetail";
 import Invesment_DetailDataPublishSection from "@/screens/Invesment/DetailDataPublishSection";
 import { apiInvestmentGetOne } from "@/service/api-client/api-investment";
+import { countDownAndCondition } from "@/utils/countDownAndCondition";
 import { AntDesign, MaterialIcons } from "@expo/vector-icons";
 import {
  router,
@@ -23,7 +24,7 @@ import {
  useLocalSearchParams,
 } from "expo-router";
 import _ from "lodash";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";

 export default function InvestmentDetail() {
  const { user } = useAuth();
@@ -62,6 +63,31 @@ export default function InvestmentDetail() {
    setOpenDrawerPublish(false);
  };

+    const [value, setValue] = useState({
+      sisa: 0,
+      reminder: false,
+    });
+  
+    useEffect(() => {
+      updateCountDown();
+    }, [data]);
+
+    console.log("[DATA DETAIL]", JSON.stringify(data, null, 2));
+  
+    const updateCountDown = () => {
+      const countDown = countDownAndCondition({
+        duration: data?.MasterPencarianInvestor.name,
+        publishTime: data?.countDown,
+      });
+  
+      setValue({
+        sisa: countDown.durationDay,
+        reminder: countDown.reminder,
+      });
+    };
+
+
+
  const bottomSection = (
    <Invesment_ComponentBoxOnBottomDetail
      id={id as string}
@@ -71,7 +97,7 @@ export default function InvestmentDetail() {
  );

  const buttonSection = (
-    <Investment_ButtonInvestasiSection id={id as string} isMine={user?.id === data?.author?.id} />
+    <Investment_ButtonInvestasiSection id={id as string} isMine={user?.id === data?.author?.id} reminder={value.reminder} />
  );

  return (
--- a/app/(application)/(user)/voting/(tabs)/index.tsx
+++ b/app/(application)/(user)/voting/(tabs)/index.tsx
@@ -6,6 +6,7 @@ import {
  TextCustom,
  ViewWrapper,
 } from "@/components";
+import { useAuth } from "@/hooks/use-auth";
 import Voting_BoxPublishSection from "@/screens/Voting/BoxPublishSection";
 import { apiVotingGetAll } from "@/service/api-client/api-voting";
 import { router, useFocusEffect } from "expo-router";
@@ -13,6 +14,7 @@ import _ from "lodash";
 import { useCallback, useState } from "react";

 export default function VotingBeranda() {
+  const { user } = useAuth();
  const [listData, setListData] = useState<any>([]);
  const [loadingGetData, setLoadingGetData] = useState(false);
  const [search, setSearch] = useState("");
@@ -29,6 +31,7 @@ export default function VotingBeranda() {
      const response = await apiVotingGetAll({
        search,
        category: "beranda",
+        userLoginId: user?.id,
      });
      if (response.success) {
        setListData(response.data);
--- a/app/(application)/(user)/waiting-room.tsx
+++ b/app/(application)/(user)/waiting-room.tsx
@@ -4,6 +4,7 @@ import {
  ButtonCenteredOnly,
  ButtonCustom,
  InformationBox,
+  NewWrapper,
  StackCustom,
  ViewWrapper,
 } from "@/components";
@@ -12,6 +13,7 @@ import { useAuth } from "@/hooks/use-auth";
 import { apiUser } from "@/service/api-client/api-user";
 import { Ionicons } from "@expo/vector-icons";
 import { router } from "expo-router";
+import { RefreshControl } from "react-native";
 import Toast from "react-native-toast-message";

 export default function WaitingRoom() {
@@ -33,7 +35,7 @@ export default function WaitingRoom() {
        } else {
          Toast.show({
            type: "success",
-            text1: "Akun anda telah aktif", // text2: "Anda berhasil login",
+            text1: "Selamat ! Akun anda telah aktif", // text2: "Anda berhasil login",
          });
          router.replace(`/(application)/(user)/profile/create`);
        }
@@ -82,10 +84,18 @@ export default function WaitingRoom() {

  return (
    <>
-      <ViewWrapper footerComponent={logoutButton()}>
+      <NewWrapper
+        footerComponent={logoutButton()}
+        refreshControl={
+          <RefreshControl refreshing={isLoading} onRefresh={handleCheck} />
+        }
+      >
        <StackCustom>
-          <InformationBox text="Permohonan akses Anda sedang dalam proses verifikasi oleh admin. Harap tunggu, Anda akan menerima pemberitahuan melalui Whatsapp setelah disetujui." />
-          <ButtonCenteredOnly
+          <InformationBox
+            text="Akun Anda sedang menunggu aktivasi.
+Silakan tunggu beberapa saat. Untuk memperbarui status, tarik layar ke bawah."
+          />
+          {/* <ButtonCenteredOnly
            isLoading={isLoading}
            onPress={() => {
              handleCheck();
@@ -93,9 +103,9 @@ export default function WaitingRoom() {
            icon="refresh-ccw"
          >
            Check
-          </ButtonCenteredOnly>
+          </ButtonCenteredOnly> */}
        </StackCustom>
-      </ViewWrapper>
+      </NewWrapper>
    </>
  );
 }
--- a/app/(application)/admin/donation/category-create.tsx
+++ b/app/(application)/admin/donation/category-create.tsx
@@ -1,17 +1,56 @@
 import {
  BoxButtonOnFooter,
  ButtonCustom,
+  StackCustom,
+  TextCustom,
  TextInputCustom,
  ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import { apiAdminMasterDonationCategoryCreate } from "@/service/api-admin/api-master-admin";
 import { useRouter } from "expo-router";
+import { useState } from "react";
+import { Switch } from "react-native-paper";
+import Toast from "react-native-toast-message";

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

 export default function AdminDonationCategoryUpdate() {
+  const router = useRouter();
  const { id } = useLocalSearchParams();
  const [value, setValue] = useState(id);

-  const router = useRouter();
+  const [data, setData] = useState<any>(null);
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const response = await apiAdminMasterDonationCategoryById({
+        id: id as any,
+      });
+      console.log(JSON.stringify(response.data, null, 2));
+
+      setData(response.data);
+    };
+    fetchData();
+  }, [id]);
+
+  const handlerSubmit = async () => {
+    try {
+      setIsLoading(true);
+      const response = await apiAdminMasterDonationCategoryUpdate({
+        id: id as any,
+        data: data,
+      });
+      console.log(JSON.stringify(response.data, null, 2));
+      router.back();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
  const buttonSubmit = (
    <BoxButtonOnFooter>
-      <ButtonCustom onPress={() => router.back()}>Update</ButtonCustom>
+      <ButtonCustom
+        disabled={isLoading || data?.name === ""}
+        isLoading={isLoading}
+        onPress={() => {
+          AlertDefaultSystem({
+            title: "Update Data",
+            message: "Apakah anda yakin ingin mengupdate data ini?",
+            textLeft: "Batal",
+            textRight: "Ya",
+            onPressLeft: () => {},
+            onPressRight: () => handlerSubmit(),
+          });
+        }}
+      >
+        Update
+      </ButtonCustom>
    </BoxButtonOnFooter>
  );
  return (
@@ -25,10 +80,28 @@ export default function AdminDonationCategoryUpdate() {
        footerComponent={buttonSubmit}
      >
        <TextInputCustom
+          label="Nama Kategori"
          placeholder="Masukkan Kategori"
-          value={value as any}
-          onChangeText={setValue}
+          value={data?.name}
+          onChangeText={(value) => setData({ ...data, name: value })}
        />
+        <StackCustom
+          gap={"sm"}
+          style={{
+            alignContent: "flex-start",
+          }}
+        >
+          <TextCustom>Status</TextCustom>
+
+          <Switch
+            style={{
+              alignSelf: "flex-start",
+            }}
+            color={MainColor.yellow}
+            value={data?.active}
+            onValueChange={(value) => setData({ ...data, active: value })}
+          />
+        </StackCustom>
      </ViewWrapper>
    </>
  );
--- a/app/(application)/admin/donation/category.tsx
+++ b/app/(application)/admin/donation/category.tsx
@@ -1,11 +1,15 @@
 import {
-    ActionIcon,
-    BaseBox,
-    CenterCustom,
-    Spacing,
-    StackCustom,
-    TextCustom,
-    ViewWrapper,
+  ActionIcon,
+  BadgeCustom,
+  BaseBox,
+  CenterCustom,
+  ClickableCustom,
+  DividerCustom,
+  Grid,
+  Spacing,
+  StackCustom,
+  TextCustom,
+  ViewWrapper,
 } from "@/components";
 import { IconEdit } from "@/components/_Icon";
 import AdminActionIconPlus from "@/components/_ShareComponent/Admin/ActionIconPlus";
@@ -14,14 +18,56 @@ import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
 import { GridView_3_3_6 } from "@/components/_ShareComponent/GridView_3_3_6";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
-import { View } from "react-native";
+import { RefreshControl, View } from "react-native";
 import { Divider, Switch } from "react-native-paper";
-import { router } from "expo-router";
+import { router, useFocusEffect } from "expo-router";
+import { useCallback, useEffect, useState } from "react";
+import { apiAdminMasterDonationCategory } from "@/service/api-admin/api-master-admin";
+import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import GridTwoView from "@/components/_ShareComponent/GridTwoView";

 export default function AdminDonationCategory() {
+  const [listData, setListData] = useState<any[]>([]);
+  const [refreshing, setRefreshing] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  useFocusEffect(
+    useCallback(() => {
+      fetchMaster();
+    }, [])
+  );
+
+  const fetchMaster = async () => {
+    try {
+      setLoading(true);
+      const response = await apiAdminMasterDonationCategory();
+      if (response.success) {
+        console.log(JSON.stringify(response.data, null, 2));
+        setListData(response.data);
+      } else {
+        setListData([]);
+      }
+    } catch (error) {
+      console.log("[Error]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchMaster();
+    setRefreshing(false);
+  };
+
  return (
    <>
-      <ViewWrapper headerComponent={<AdminTitlePage title="Donasi" />}>
+      <ViewWrapper
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+        headerComponent={<AdminTitlePage title="Donasi" />}
+      >
        <AdminComp_BoxTitle
          title="Kategori"
          rightComponent={
@@ -33,81 +79,50 @@ export default function AdminDonationCategory() {
          }
        />

-        <BaseBox>
-          <GridView_3_3_6
-            component1={
-              <TextCustom bold align="center">
-                Aksi
-              </TextCustom>
-            }
-            component2={<TextCustom bold>Status</TextCustom>}
-            component3={<TextCustom bold>Kategori</TextCustom>}
-          />
+        <View>
+          <Grid>
+            <Grid.Col style={{paddingLeft: 10}} span={4}>
+              <TextCustom bold>Status</TextCustom>
+            </Grid.Col>
+            <Grid.Col span={8}>
+              <TextCustom bold>Kategori</TextCustom>
+            </Grid.Col>
+          </Grid>
+
          <Divider />
          <Spacing />

          <StackCustom>
            {listData.map((item, index) => (
-              <View key={index}>
-                <GridView_3_3_6
-                  component1={
+              <ClickableCustom
+                onPress={() => {
+                  router.push(`/admin/donation/category-update?id=${item.id}`);
+                }}
+                key={index}
+              >
+                <Grid containerStyle={{ paddingBottom: 10 }}>
+                  <Grid.Col
+                    span={4}
+                    style={{paddingLeft: 10}}
+                     >
                    <CenterCustom>
-                      <ActionIcon
-                        icon={
-                          <IconEdit size={ICON_SIZE_BUTTON} color="black" />
-                        }
-                        onPress={() => {
-                            router.push(`/admin/donation/category-update?id=${index}`);
-                        }}
-                      />
+                      <BadgeCustom
+                        color={item.active ? MainColor.green : MainColor.red}
+                      >
+                        {item.active ? "Aktif" : "Tidak Aktif"}
+                      </BadgeCustom>
                    </CenterCustom>
-                  }
-                  component2={
-                    <Switch
-                      value={true}
-                      onValueChange={(item) => {
-                        console.log(item);
-                      }}
-                      color={MainColor.yellow}
-                      
-                    />
-                  }
-                  component3={<TextCustom bold>{item.label}</TextCustom>}
-                />
-                <Spacing height={10} />
+                  </Grid.Col>
+                  <Grid.Col span={8}>
+                    <TextCustom bold>{item.name}</TextCustom>
+                  </Grid.Col>
+                </Grid>
                <Divider />
-              </View>
+              </ClickableCustom>
            ))}
          </StackCustom>
-        </BaseBox>
+        </View>
      </ViewWrapper>
    </>
  );
 }
-
-const listData = [
-  {
-    label: "Kegiatan Sosial",
-    value: "kegiatan_sosial",
-  },
-  {
-    label: "Pendidikan",
-    value: "pendidikan",
-  },
-  {
-    label: "Kesehatan",
-    value: "kesehatan",
-  },
-  {
-    label: "Kebudayaan",
-    value: "kebudayaan",
-  },
-  {
-    label: "Bencana Alami",
-    value: "bencana_alami",
-  },
-  {
-    label: "Lainnya",
-    value: "lainnya",
-  },
-];
--- a/app/(application)/terms-agreement.tsx
+++ b/app/(application)/terms-agreement.tsx
@@ -74,7 +74,7 @@ export default function TermsAgreement() {
    <>
      <Stack.Screen
        options={{
-          title: "Terms Agreement",
+          title: "Terms & Conditions",
        }}
      />
      <ViewWrapper footerComponent={footerComponent}>
@@ -87,6 +87,7 @@ export default function TermsAgreement() {
              alignItems: "center",
              marginTop: 16,
              marginBottom: 16,
+              paddingInline: 10,
            }}
          >
            <CheckboxCustom value={term} onChange={() => setTerm(!term)} />
--- a/components/_ShareComponent/Admin/TableValue.tsx
+++ b/components/_ShareComponent/Admin/TableValue.tsx
@@ -1,17 +1,23 @@
 import Grid from "@/components/Grid/GridCustom";
 import React from "react";
-import { View } from "react-native";
+import { StyleProp, View, ViewStyle } from "react-native";
 import { Divider } from "react-native-paper";

 export default function AdminTableValue({
  value1,
  value2,
  value3,
+  style1,
+  style2,
+  style3,
  bottomLine = false,
 }: {
  value1: React.ReactNode;
  value2: React.ReactNode;
  value3: React.ReactNode;
+  style1?: ViewStyle;
+  style2?: ViewStyle;
+  style3?: ViewStyle;
  bottomLine?: boolean;
 }) {
  return (
@@ -25,6 +31,7 @@ export default function AdminTableValue({
              justifyContent: "center",
              paddingLeft: 10,
              paddingRight: 10,
+              ...style1,
            }}
          >
            {value1}
@@ -36,6 +43,7 @@ export default function AdminTableValue({
              justifyContent: "center",
              paddingLeft: 10,
              paddingRight: 10,
+              ...style2,
            }}
          >
            {value2}
@@ -44,9 +52,10 @@ export default function AdminTableValue({
            span={6}
            style={{
              justifyContent: "center",
-              alignItems: "center",
+              alignItems: "flex-start",
              paddingLeft: 10,
              paddingRight: 10,
+              ...style3,
            }}
          >
            {value3}
--- a/context/AuthContext.tsx
+++ b/context/AuthContext.tsx
@@ -72,8 +72,31 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
  const loginWithNomor = async (nomor: string) => {
    setIsLoading(true);
    try {
+      console.log("[Masuk provider]", nomor);
      const response = await apiLogin({ nomor: nomor });
-      await AsyncStorage.setItem("kode_otp", response.kodeId);
+      console.log("[RESPONSE AUTH]", JSON.stringify(response));
+
+
+      if (response.success) {
+        console.log("[Keluar provider]", nomor);
+        Toast.show({
+          type: "success",
+          text1: "Sukses",
+          text2: "Kode OTP berhasil dikirim",
+        });
+
+        await AsyncStorage.setItem("kode_otp", response.kodeId);
+        router.push(`/verification?nomor=${nomor}`);
+        return;
+      } else {
+        router.push(`/register?nomor=${nomor}`);
+        Toast.show({
+          type: "info",
+          text1: "Info",
+          text2: "Silahkan mendaftar",
+        });
+        return;
+      }
    } catch (error: any) {
      throw new Error(error.response?.data?.message || "Gagal kirim OTP");
    } finally {
@@ -81,13 +104,26 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
    }
  };

+  // const loginWithNomor = async (nomor: string) => {
+  //   setIsLoading(true);
+  //   try {
+  //     const response = await apiLogin({ nomor: nomor });
+  //     await AsyncStorage.setItem("kode_otp", response.kodeId);
+  //   } catch (error: any) {
+  //     throw new Error(error.response?.data?.message || "Gagal kirim OTP");
+  //   } finally {
+  //     setIsLoading(false);
+  //   }
+  // };
+
  // --- 2. Validasi OTP & cek user ---
  const validateOtp = async (nomor: string) => {
    try {
      setIsLoading(true);
      const response = await apiValidationCode({ nomor: nomor });
-
      const { token } = response;
+      console.log("[RESPONSE VALIDASI OTP]", JSON.stringify(response, null, 2));
+
      if (response.success) {
        setToken(token);
        await AsyncStorage.setItem("authToken", token);
@@ -104,20 +140,23 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {

        if (response.active) {
          if (response.roleId === "1") {
-            return "/(application)/(user)/home";
+            router.replace("/(application)/(user)/home");
+            return;
          } else {
-            return "/(application)/admin/dashboard";
+            router.replace("/(application)/admin/dashboard");
+            return;
          }
        } else {
-          return "/(application)/(user)/waiting-room";
+          router.replace("/(application)/(user)/waiting-room");
+          return;
        }
      } else {
        Toast.show({
          type: "info",
-          text1: "Anda belum terdaftar",
-          text2: "Silahkan daftar terlebih dahulu",
+          text1: "Terjadi kesalahan",
+          text2: "Silahkan coba lagi",
        });
-        return `/register?nomor=${nomor}`;
+        return;
      }
    } catch (error: any) {
      console.log("Error validasi otp >>", (error as Error).message || error);
@@ -132,6 +171,10 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
  // --- 3. Ambil data user ---
  const userData = async (token: string) => {
    try {
+      if (!token) {
+        throw new Error("Token tidak ditemukan");
+      }
+
      setIsLoading(true);
      const response = await apiConfig.get(`/mobile?token=${token}`, {
        headers: {
@@ -145,7 +188,10 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
      await AsyncStorage.setItem("userData", JSON.stringify(dataUser));
      return dataUser;
    } catch (error: any) {
-      console.log("[LOAD USER DATA]",error.response?.data?.message + "user" || "Gagal mengambil data user");
+      console.log(
+        "[LOAD USER DATA]",
+        error.response?.data?.message + "user" || "Gagal mengambil data user"
+      );
    } finally {
      setIsLoading(false);
    }
@@ -160,9 +206,8 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
    setIsLoading(true);
    try {
      const response = await apiRegister({ data: userData });
-      console.log("response", response);
+      console.log("[REGISTER FETCH]", JSON.stringify(response, null, 2));

-      const { token } = response;
      if (!response.success) {
        Toast.show({
          type: "info",
@@ -173,23 +218,63 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
        return;
      }

-      setToken(token);
-      await AsyncStorage.setItem("authToken", token);
      Toast.show({
        type: "success",
        text1: "Sukses",
        text2: "Anda berhasil terdaftar",
      });
-      router.replace("/(application)/(user)/waiting-room");
+      router.replace(`/verification?nomor=${userData.nomor}`);
      return;
    } catch (error: any) {
+      Toast.show({
+        type: "error",
+        text1: "Error",
+        text2: error.response?.data?.message || "Gagal mendaftar",
+      });
      console.log("Error register", error);
    } finally {
      setIsLoading(false);
    }
  };
+  // const registerUser = async (userData: {
+  //   username: string;
+  //   nomor: string;
+  //   termsOfServiceAccepted: boolean;
+  // }) => {
+  //   setIsLoading(true);
+  //   try {
+  //     const response = await apiRegister({ data: userData });
+  //     console.log("response", response);
+
+  //     const { token } = response;
+  //     if (!response.success) {
+  //       Toast.show({
+  //         type: "info",
+  //         text1: "Info",
+  //         text2: response.message,
+  //       });
+
+  //       return;
+  //     }
+
+  //     setToken(token);
+  //     await AsyncStorage.setItem("authToken", token);
+  //     Toast.show({
+  //       type: "success",
+  //       text1: "Sukses",
+  //       text2: "Anda berhasil terdaftar",
+  //     });
+  //     router.replace("/(application)/(user)/waiting-room");
+  //     return;
+  //   } catch (error: any) {
+  //     console.log("Error register", error);
+  //   } finally {
+  //     setIsLoading(false);
+  //   }
+  // };

  // --- 5. Logout ---
+
  const logout = async () => {
    try {
      setIsLoading(true);
--- a/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj
+++ b/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj
@@ -422,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;
@@ -454,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/Info.plist
+++ b/ios/HIPMIBadungConnect/Info.plist
@@ -39,7 +39,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>9</string>
+    <string>12</string>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSMinimumSystemVersion</key>
--- a/screens/Authentication/LoginView.tsx
+++ b/screens/Authentication/LoginView.tsx
@@ -1,3 +1,4 @@
+import { NewWrapper } from "@/components";
 import ButtonCustom from "@/components/Button/ButtonCustom";
 import Spacing from "@/components/_ShareComponent/Spacing";
 import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
@@ -5,9 +6,11 @@ import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import { apiVersion } from "@/service/api-config";
 import { GStyles } from "@/styles/global-styles";
-import { Redirect, router } from "expo-router";
+import versionBadge from "@/utils/viersionBadge";
+import VersionBadge from "@/utils/viersionBadge";
+import { Redirect } from "expo-router";
 import { useEffect, useState } from "react";
-import { Text, View } from "react-native";
+import { RefreshControl, Text, View } from "react-native";
 import PhoneInput, { ICountry } from "react-native-international-phone-number";
 import Toast from "react-native-toast-message";

@@ -16,6 +19,7 @@ export default function LoginView() {
  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 { loginWithNomor, token, isAdmin, isUserActive } = useAuth();

@@ -25,7 +29,18 @@ export default function LoginView() {

  async function onLoadVersion() {
    const res = await apiVersion();
-    setVersion(res.data);
+
+    if (res.success) {
+      setVersion(versionBadge());
+    }
+  }
+
+  async function handleRefresh() {
+    setRefreshing(true);
+    await onLoadVersion();
+    setInputValue("");
+    setLoading(false);
+    setRefreshing(false);
  }

  function handleInputValue(phoneNumber: string) {
@@ -65,27 +80,14 @@ export default function LoginView() {
    const isValid = await validateData();
    if (!isValid) return;

-    // const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
-    // const fixNumber = inputValue.replace(/\s+/g, "");
    const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
    let fixNumber = inputValue.replace(/\s+/g, "").replace(/^0+/, "");

    const realNumber = callingCode + fixNumber;

-    console.log("[REALNUMBER]", realNumber);
-
    try {
      setLoading(true);
-      // const response = await apiLogin({ nomor: realNumber });
      await loginWithNomor(realNumber);
-
-      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({
@@ -96,6 +98,30 @@ 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) {
@@ -115,7 +141,12 @@ export default function LoginView() {
  }

  return (
-    <ViewWrapper withBackground>
+    <NewWrapper
+      withBackground
+      refreshControl={
+        <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} />
+      }
+    >
      <View style={GStyles.authContainer}>
        <View>
          <View style={GStyles.authContainerTitle}>
@@ -159,6 +190,6 @@ export default function LoginView() {
          Coba
        </ButtonCustom> */}
      </View>
-    </ViewWrapper>
+    </NewWrapper>
  );
 }
--- a/screens/Authentication/VerificationView.tsx
+++ b/screens/Authentication/VerificationView.tsx
@@ -17,6 +17,8 @@ import Toast from "react-native-toast-message";
 export default function VerificationView() {
  const { nomor } = useLocalSearchParams<{ nomor: string }>();

+  console.log("[NOMOR]", nomor);
+
  const [inputOtp, setInputOtp] = useState<string>("");
  const [userNumber, setUserNumber] = useState<string>("");
  const [loading, setLoading] = useState<boolean>(false);
@@ -52,7 +54,7 @@ export default function VerificationView() {
    try {
      const response = await apiCheckCodeOtp({ kodeId });
      console.log(
-        "Response check code otp >>",
+        "[OTP] >>",
        JSON.stringify(response.otp, null, 2)
      );
      // Kita tidak perlu simpan codeOtp di state karena verifikasi dilakukan di backend
@@ -89,8 +91,9 @@ export default function VerificationView() {
      // ✅ VERIFIKASI OTOMATIS UNTUK APPLE REVIEW
      if (inputOtp === "1234") {
        try {
-          const response = await validateOtp(nomor as string);
-          router.replace(response);
+          await validateOtp(nomor as string);
+
+          return;
        } catch (error) {
          console.log("Error verification", error);
          Toast.show({ type: "error", text1: "Gagal verifikasi" });
@@ -103,16 +106,8 @@ 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);
+      await validateOtp(nomor as string);
+      return
    } catch (error) {
      console.log("Error verification", error);
      Toast.show({ type: "error", text1: "Gagal verifikasi" });
--- a/screens/Home/topFeatureSection.tsx
+++ b/screens/Home/topFeatureSection.tsx
@@ -15,7 +15,7 @@ export default function Home_FeatureSection() {
      name: "Collaboration",
      icon: <Ionicons name="share" size={48} color="gray" />,
      onPress: () => router.push("/(application)/(user)/collaboration/(tabs)"),
-      status: "active",
+      status: "inactive",
    },
    {
      name: "Voting",
--- a/screens/Invesment/BoxBerandaSection.tsx
+++ b/screens/Invesment/BoxBerandaSection.tsx
@@ -1,12 +1,13 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import {
-    BaseBox,
-    Grid,
-    ProgressCustom,
-    StackCustom,
-    TextCustom,
+  BaseBox,
+  Grid,
+  ProgressCustom,
+  StackCustom,
+  TextCustom,
 } from "@/components";
 import API_STRORAGE from "@/constants/base-url-api-strorage";
+import { MainColor } from "@/constants/color-palet";
 import DUMMY_IMAGE from "@/constants/dummy-image-value";
 import { countDownAndCondition } from "@/utils/countDownAndCondition";
 import { Ionicons } from "@expo/vector-icons";
@@ -21,7 +22,7 @@ export default function Investment_BoxBerandaSection({
  id: string;
  data: any;
 }) {
-//   console.log("[DATA By one]", JSON.stringify(data, null, 2));
+  //   console.log("[DATA By one]", JSON.stringify(data, null, 2));

  const [value, setValue] = useState({
    sisa: 0,
@@ -32,6 +33,8 @@ export default function Investment_BoxBerandaSection({
    updateCountDown();
  }, [data]);

+  console.log("[DATA BERANDA]", JSON.stringify(data, null, 2));
+
  const updateCountDown = () => {
    const countDown = countDownAndCondition({
      duration: data?.pencarianInvestor,
@@ -66,8 +69,10 @@ export default function Investment_BoxBerandaSection({
              <TextCustom truncate={2}>{data.title}</TextCustom>
              <ProgressCustom
                label={`${data.progress}%`}
-                value={data.progress}
+                value={Number(data.progress)}
                size="lg"
+                animated
+                color="primary"
              />
              {value.reminder ? (
                <View
@@ -79,13 +84,11 @@ export default function Investment_BoxBerandaSection({
                >
                  <Ionicons name="alert-circle-outline" size={16} color="red" />
                  <TextCustom truncate color="red" size="small">
-                    Periode Investasi Berakhir
+                    Periode Berakhir
                  </TextCustom>
                </View>
              ) : (
-                <TextCustom>
-                  Sisa waktu: {value.sisa} hari
-                </TextCustom>
+                <TextCustom>Sisa waktu: {value.sisa} hari</TextCustom>
              )}
            </StackCustom>
          </Grid.Col>
--- a/screens/Invesment/ButtonInvestasiSection.tsx
+++ b/screens/Invesment/ButtonInvestasiSection.tsx
@@ -4,9 +4,11 @@ import { router } from "expo-router";
 export default function Investment_ButtonInvestasiSection({
  id,
  isMine,
+  reminder,
 }: {
  id: string;
  isMine: boolean;
+  reminder: boolean;
 }) {
  return (
    <>
@@ -14,11 +16,12 @@ export default function Investment_ButtonInvestasiSection({
        <ButtonCustom disabled>Investasi ini milik Anda</ButtonCustom>
      ) : (
        <ButtonCustom
+          disabled={reminder}
          onPress={() => {
            router.navigate(`/investment/${id}/(transaction-flow)`);
          }}
        >
-          Beli Saham
+          {reminder ? "Periode Investasi Berakhir" : "Beli Saham"}
        </ButtonCustom>
      )}
    </>
--- a/screens/Invesment/DetailDataPublishSection.tsx
+++ b/screens/Invesment/DetailDataPublishSection.tsx
@@ -52,7 +52,7 @@ export default function Invesment_DetailDataPublishSection({
            <ReportBox text={data?.catatan} />
          )}
        <Invesment_BoxProgressSection
-          progress={data?.progress}
+          progress={Number(data?.progress)}
          status={status as string}
        />
        <Invesment_BoxDetailDataSection
--- a/service/api-admin/api-master-admin.ts
+++ b/service/api-admin/api-master-admin.ts
@@ -167,3 +167,56 @@ export async function apiAdminMasterTypeOfEventUpdate({
 }

 // ================== END EVENT ================== //
+
+// ================== START DONATION ================== //
+
+export async function apiAdminMasterDonationCategory() {
+  try {
+    const response = await apiConfig.get(`/mobile/admin/master/donation`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiAdminMasterDonationCategoryById({ id }: { id: string }) {
+  try {
+    const response = await apiConfig.get(`/mobile/admin/master/donation/${id}`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiAdminMasterDonationCategoryUpdate({
+  id,
+  data,
+}: {
+  id: string;
+  data: any;
+}) {
+  try {
+    const response = await apiConfig.put(
+      `/mobile/admin/master/donation/${id}`,
+      {
+        data: data,
+      }
+    );
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiAdminMasterDonationCategoryCreate({ data }: { data: any }) {
+  try {
+    const response = await apiConfig.post(`/mobile/admin/master/donation`, {
+      data: data,
+    });
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+// ================== END DONATION ================== //
--- a/service/api-client/api-voting.ts
+++ b/service/api-client/api-voting.ts
@@ -79,12 +79,14 @@ export async function apiVotingUpdateData({
  }
 }

-export async function apiVotingGetAll({ search, category, authorId }: { search?: string, category: "beranda" | "contribution" | "all-history" | "my-history", authorId?: string }) {
+export async function apiVotingGetAll({ search, category, authorId, userLoginId }: { search?: string, category: "beranda" | "contribution" | "all-history" | "my-history", authorId?: string, userLoginId?: string }) {
  try {
+    console.log("userLoginId", userLoginId);
    const categoryQuery = category ? `?category=${category}` : "";
    const searchQuery = search ? `&search=${search}` : "";
    const authorIdQuery = authorId ? `&authorId=${authorId}` : "";
-    const response = await apiConfig.get(`/mobile/voting${categoryQuery}${searchQuery}${authorIdQuery}`);
+    const userLoginIdQuery = userLoginId ? `&userLoginId=${userLoginId}` : "";
+    const response = await apiConfig.get(`/mobile/voting${categoryQuery}${searchQuery}${authorIdQuery}${userLoginIdQuery}`);
    return response.data;
  } catch (error) {
    throw error;
--- a/service/api-config.ts
+++ b/service/api-config.ts
@@ -14,13 +14,13 @@ apiConfig.interceptors.request.use(
  async (config) => {
    console.log("API_BASE_URL >>", API_BASE_URL);
    const token = await AsyncStorage.getItem("authToken");
+    // console.log("[TOKEN] >>", token);
    if (token) {
      // config.timeout = 10000;
      config.headers["Content-Type"] = "application/json";
      config.headers.Authorization = `Bearer ${token}`;
    }

-    // console.log("config", JSON.stringify(config, null, 2));
    return config;
  },
  (error) => {
@@ -29,16 +29,15 @@ apiConfig.interceptors.request.use(
 );

 export async function apiVersion() {
-  // console.log("API_BASE_URL", API_BASE_URL);
  const response = await apiConfig.get("/version");
  return response.data;
 }

 export async function apiLogin({ nomor }: { nomor: string }) {
-  const response = await apiConfig.post("/auth/login", {
+  const response = await apiConfig.post("/auth/mobile-login", {
    nomor: nomor,
  });
-  return response.data;
+  return response.data;;
 }

 export async function apiCheckCodeOtp({ kodeId }: { kodeId: string }) {
@@ -47,7 +46,7 @@ export async function apiCheckCodeOtp({ kodeId }: { kodeId: string }) {
 }

 export async function apiValidationCode({ nomor }: { nomor: string }) {
-  const response = await apiConfig.post(`/auth/validasi`, {
+  const response = await apiConfig.post(`/auth/mobile-validasi`, {
    nomor: nomor,
  });
  return response.data;
@@ -58,7 +57,7 @@ export async function apiRegister({
 }: {
  data: { nomor: string; username: string; termsOfServiceAccepted: boolean };
 }) {
-  const response = await apiConfig.post(`/auth/register`, {
+  const response = await apiConfig.post(`/auth/mobile-register`, {
    data: data,
  });
  return response.data;
--- a/utils/viersionBadge.ts
+++ b/utils/viersionBadge.ts
@@ -0,0 +1,18 @@
+// VersionBadge.tsx
+import Constants from "expo-constants";
+import { Platform } from "react-native";
+
+export default function versionBadge() {
+  const expoConfig = Constants.expoConfig;
+
+  const version = expoConfig?.version; // "1.0.1"
+  const iosBuild = expoConfig?.ios?.buildNumber; // "10"
+  const androidBuild = expoConfig?.android?.versionCode; // 2
+
+  const build =
+    Platform.OS === "ios" ? iosBuild : androidBuild;
+
+    const result = `${version} ( ${build} )`;
+
+  return result
+}
Author	SHA1	Message	Date
bagasbanuna	ab5733f336	Fix redirect admin	2025-12-04 17:41:19 +08:00
bagasbanuna	f5e30087ed	Fix QC Inno Fix: - app/(application)/admin/donation/category-create.tsx - app/(application)/admin/donation/category-update.tsx - app/(application)/admin/donation/category.tsx - components/_ShareComponent/Admin/TableValue.tsx - screens/Authentication/LoginView.tsx - service/api-admin/api-master-admin.ts ### No Issue	2025-12-04 16:59:39 +08:00
bagasbanuna	a93f97ed6a	Fix rejected Apple Add: - utils/viersionBadge.ts Fix: - app.config.js - context/AuthContext.tsx - ios/HIPMIBadungConnect/Info.plist - screens/Authentication/LoginView.tsx - screens/Authentication/VerificationView.tsx - service/api-config.ts ### No Issue	2025-12-03 17:23:12 +08:00
bagasbanuna	858b441a8c	Clearing apple rejected QC: Inno Fix: - app.config.js - app/(application)/(user)/investment/[id]/index.tsx - app/(application)/(user)/voting/(tabs)/index.tsx - app/(application)/(user)/waiting-room.tsx - app/(application)/terms-agreement.tsx - context/AuthContext.tsx - ios/HIPMIBadungConnect.xcodeproj/project.pbxproj - ios/HIPMIBadungConnect/Info.plist - screens/Authentication/LoginView.tsx - screens/Authentication/VerificationView.tsx - screens/Home/topFeatureSection.tsx - screens/Invesment/BoxBerandaSection.tsx - screens/Invesment/ButtonInvestasiSection.tsx - screens/Invesment/DetailDataPublishSection.tsx - service/api-client/api-voting.ts - service/api-config.ts ### No Issue	2025-12-02 17:48:24 +08:00