upd : build version

Deskripsi;
- build version otomatis

No Issues

.gitignore

@@ -32,6 +32,9 @@ yarn-error.*
 # local env files
 .env*.local
 
+#env
+.env
+
 # typescript
 *.tsbuildinfo
 
@@ -41,4 +44,4 @@ x.ts
 x.sh
 
 google-services.json
-mobile-darmasaba-firebase-adminsdk-fbsvc-f5abb292b5.json
+service-account.json

app.config.js

@@ -0,0 +1,81 @@
+import 'dotenv/config';
+
+export default {
+   expo: {
+      name: "mobile-darmasaba",
+      slug: "mobile-darmasaba",
+      version: "1.0.2",
+      jsEngine: "jsc",
+      orientation: "portrait",
+      icon: "./assets/images/icon.png",
+      scheme: "myapp",
+      userInterfaceStyle: "automatic",
+      newArchEnabled: false,
+      ios: {
+         supportsTablet: true,
+         bundleIdentifier: "mobiledarmasaba.app",
+         infoPlist: {
+            ITSAppUsesNonExemptEncryption: false
+         },
+         googleServicesFile: "./ios/mobiledarmasaba/GoogleService-Info.plist"
+      },
+      android: {
+         package: "mobiledarmasaba.app",
+         versionCode: 6,
+         adaptiveIcon: {
+            foregroundImage: "./assets/images/splash-icon.png",
+            backgroundColor: "#ffffff"
+         },
+         googleServicesFile: "./google-services.json",
+         permissions: [
+            "READ_EXTERNAL_STORAGE",
+            "WRITE_EXTERNAL_STORAGE",
+            "READ_MEDIA_IMAGES",   // Android 13+
+            "READ_MEDIA_VIDEO",    // Android 13+
+            "READ_MEDIA_AUDIO"     // Android 13+
+         ]
+      },
+      web: {
+         bundler: "metro",
+         output: "static",
+         favicon: "./assets/images/favicon.png"
+      },
+      plugins: [
+         "expo-router",
+         [
+            "expo-splash-screen",
+            {
+               image: "./assets/images/splash-icon.png",
+               imageWidth: 200,
+               resizeMode: "contain",
+               backgroundColor: "#ffffff"
+            }
+         ],
+         "expo-font",
+         "expo-image-picker",
+         "expo-web-browser",
+         [
+            "@react-native-firebase/app",
+            {
+               ios: {
+                  googleServicesFile: "./ios/mobiledarmasaba/GoogleService-Info.plist"
+               }
+            }
+         ]
+      ],
+      experiments: {
+         typedRoutes: true
+      },
+      extra: {
+         router: {},
+         eas: {
+            projectId: "cfe34fb8-da8c-4004-b5c6-29d07df75cf2"
+         },
+         URL_API: process.env.URL_API,
+         URL_OTP: process.env.URL_OTP,
+         URL_STORAGE: process.env.URL_STORAGE,
+         URL_FIREBASE_DB: process.env.URL_FIREBASE_DB,
+         PASS_ENC: process.env.PASS_ENC
+      }
+   }
+};

app/(application)/_layout.tsx

@@ -13,8 +13,10 @@ import { apiReadOneNotification } from "@/lib/api";
 import { pushToPage } from "@/lib/pushToPage";
 import store from "@/lib/store";
 import { useAuthSession } from "@/providers/AuthProvider";
-import firebase from '@react-native-firebase/app';
-import { Redirect, router, Stack } from "expo-router";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { getApp } from "@react-native-firebase/app";
+import { getMessaging, onMessage } from "@react-native-firebase/messaging";
+import { Redirect, router, Stack, usePathname } from "expo-router";
 import { StatusBar } from 'expo-status-bar';
 import { useEffect } from "react";
 import { Easing, Notifier } from 'react-native-notifier';
@@ -22,11 +24,14 @@ import { Provider } from "react-redux";
 
 export default function RootLayout() {
    const { token, decryptToken, isLoading } = useAuthSession()
+   const pathname = usePathname()
 
-   async function handleReadNotification(id: string, category: string, idContent: string) {
+   async function handleReadNotification(id: string, category: string, idContent: string, title: string) {
       try {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiReadOneNotification({ user: hasil, id: id })
+         if (title != "Komentar Baru") {
+            const hasil = await decryptToken(String(token?.current))
+            const response = await apiReadOneNotification({ user: hasil, id: id })
+         }
          pushToPage(category, idContent)
       } catch (error) {
          console.error(error)
@@ -34,25 +39,46 @@ export default function RootLayout() {
    }
 
    useEffect(() => {
-      const unsubscribe = firebase.app().messaging().onMessage(async remoteMessage => {
+      const checkNavigation = async () => {
+         const navData = await AsyncStorage.getItem('navigateOnOpen');
+         if (navData) {
+            const { screen, content } = JSON.parse(navData);
+            await AsyncStorage.removeItem('navigateOnOpen'); // reset
+            pushToPage(screen, content)
+         }
+      };
+
+      checkNavigation();
+   }, []);
+
+   useEffect(() => {
+      const mess = getMessaging(getApp());
+
+      const unsubscribe = onMessage(mess, async remoteMessage => {
          const id = remoteMessage?.data?.id;
          const category = remoteMessage?.data?.category;
          const content = remoteMessage?.data?.content;
-         if (remoteMessage.notification != undefined && remoteMessage.notification.title != undefined && remoteMessage.notification.body != undefined) {
-            Notifier.showNotification({
-               title: remoteMessage.notification?.title,
-               description: remoteMessage.notification?.body,
-               duration: 3000,
-               animationDuration: 300,
-               showEasing: Easing.ease,
-               onPress: () => handleReadNotification(String(id), String(category), String(content)),
-               hideOnPress: true,
-            });
+         const title = remoteMessage?.notification?.title;
+
+         if (remoteMessage.notification?.title && remoteMessage.notification?.body) {
+            if (category === 'discussion-general' && pathname === '/discussion/' + content) {
+               return null;
+            } else if (pathname !== `/${category}/${content}`) {
+               Notifier.showNotification({
+                  title: title,
+                  description: remoteMessage.notification?.body,
+                  duration: 3000,
+                  animationDuration: 300,
+                  showEasing: Easing.ease,
+                  onPress: () => handleReadNotification(String(id), String(category), String(content), String(title)),
+                  hideOnPress: true,
+               });
+            }
          }
       });
 
       return unsubscribe;
-   }, []);
+   }, [pathname]);
 
 
    if (isLoading) {
@@ -122,7 +148,7 @@ export default function RootLayout() {
                }}
             />
          </Stack>
-         <StatusBar style="light" translucent={false} backgroundColor="black" />
+         <StatusBar style="inverted" translucent={false} backgroundColor="black" />
          <ToastCustom />
       </Provider>
    )

app/(application)/announcement/[id].tsx

@@ -84,9 +84,9 @@ export default function DetailAnnouncement() {
                         </View>
                         :
                         <>
-                           <View style={Styles.rowItemsCenter}>
+                           <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
                               <MaterialIcons name="campaign" size={30} color="black" style={Styles.mr05} />
-                              <Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text>
+                              <Text style={[Styles.textDefaultSemiBold, Styles.w90]}>{data?.title}</Text>
                            </View>
                            <View style={[Styles.mt10]}>
                               {

app/(application)/announcement/create.tsx

@@ -21,7 +21,8 @@ export default function CreateAnnouncement() {
    const { token, decryptToken } = useAuthSession()
    const [disableBtn, setDisableBtn] = useState(true);
    const [modalDivisi, setModalDivisi] = useState(false);
-   const [divisionMember, setDivisionMember] = useState<any>([]);
+   const [divisionMember, setDivisionMember] = useState<any>([])
+   const [loading, setLoading] = useState(false)
    const [dataForm, setDataForm] = useState({
       title: "",
       desc: "",
@@ -66,6 +67,7 @@ export default function CreateAnnouncement() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateAnnouncement({
             data: { ...dataForm, user: hasil, groups: divisionMember },
@@ -77,6 +79,8 @@ export default function CreateAnnouncement() {
          }
       } catch (error) {
          console.error(error);
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -95,7 +99,7 @@ export default function CreateAnnouncement() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
                      category="create"
                      onPress={() => {
                         divisionMember.length == 0
@@ -145,9 +149,9 @@ export default function CreateAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
                                           <Entypo name="dot-single" size={24} color="black" />
-                                          <Text style={[Styles.textDefault]}>{division.name}</Text>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
                                        </View>
                                     ))
                                  }

app/(application)/announcement/edit/[id].tsx

@@ -33,6 +33,7 @@ export default function EditAnnouncement() {
    const [modalDivisi, setModalDivisi] = useState(false);
    const [disableBtn, setDisableBtn] = useState(true);
    const [dataMember, setDataMember] = useState<any>([]);
+   const [loading, setLoading] = useState(false)
    const [dataForm, setDataForm] = useState({
       title: "",
       desc: "",
@@ -109,6 +110,7 @@ export default function EditAnnouncement() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditAnnouncement({
             ...dataForm, user: hasil, groups: dataMember,
@@ -120,6 +122,8 @@ export default function EditAnnouncement() {
          }
       } catch (error) {
          console.error(error);
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -138,7 +142,7 @@ export default function EditAnnouncement() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => {
                         dataMember.length == 0
@@ -189,9 +193,9 @@ export default function EditAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
                                           <Entypo name="dot-single" size={24} color="black" />
-                                          <Text style={[Styles.textDefault]}>{division.name}</Text>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
                                        </View>
                                     ))
                                  }

app/(application)/announcement/index.tsx

@@ -87,7 +87,7 @@ export default function Announcement() {
          <View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={[{ flex: 2 }, Styles.mb50]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -114,7 +114,7 @@ export default function Announcement() {
                                     </View>
                                  }
                                  title={item.title}
-                                 desc={item.desc.replace(/<[^>]*>?/gm, '')}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
                                  rightTopInfo={item.createdAt}
                               />
                            )

app/(application)/banner/[id].tsx

@@ -2,6 +2,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditBanner, apiGetBanner, apiGetBannerOne } from "@/lib/api";
 import { setEntities } from "@/lib/bannerSlice";
@@ -30,6 +31,7 @@ export default function EditBanner() {
    const [title, setTitle] = useState("");
    const [error, setError] = useState(false);
    const [imgForm, setImgForm] = useState<any>();
+   const [loading, setLoading] = useState(false)
 
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
@@ -42,8 +44,6 @@ export default function EditBanner() {
       if (!result.canceled) {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
-      } else {
-         alert("Tidak ada gambar yang dipilih");
       }
    };
 
@@ -51,7 +51,7 @@ export default function EditBanner() {
       const hasil = await decryptToken(String(token?.current));
       const data = await apiGetBannerOne({ user: hasil, id });
       setSelectedImage({
-         uri: `https://wibu-storage.wibudev.com/api/files/${data.data.image}`,
+         uri: `${ConstEnv.url_storage}/files/${data.data.image}`,
       });
       setTitle(data.data.title);
    };
@@ -71,6 +71,7 @@ export default function EditBanner() {
 
    const handleUpdateEntity = async () => {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData();
 
@@ -105,6 +106,8 @@ export default function EditBanner() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+      } finally {
+         setLoading(false)
       }
    };
 
@@ -122,7 +125,7 @@ export default function EditBanner() {
                headerTitle: "Edit Banner",
                headerTitleAlign: "center",
                headerRight: () => <ButtonSaveHeader
-                  disable={title == "" || error ? true : false}
+                  disable={title == "" || error || loading ? true : false}
                   onPress={() => { handleUpdateEntity() }}
                   category="update" />,
             }}

app/(application)/banner/create.tsx

@@ -29,6 +29,7 @@ export default function CreateBanner() {
    const [imgForm, setImgForm] = useState<any>();
    const [title, setTitle] = useState("");
    const [error, setError] = useState(false);
+   const [loading, setLoading] = useState(false)
 
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
@@ -41,8 +42,6 @@ export default function CreateBanner() {
          if (result.assets?.[0].uri) {
             setSelectedImage(result.assets[0].uri);
             setImgForm(result.assets[0]);
-         } else {
-            alert("Tidak ada gambar yang dipilih");
          }
       }
    };
@@ -57,32 +56,40 @@ export default function CreateBanner() {
    }
 
    const handleCreateEntity = async () => {
-      const hasil = await decryptToken(String(token?.current));
-      const fd = new FormData();
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const fd = new FormData();
 
-      fd.append("file", {
-         uri: imgForm.uri,
-         type: imgForm.mimeType,
-         name: imgForm.fileName,
-      } as any);
+         fd.append("file", {
+            uri: imgForm.uri,
+            type: imgForm.mimeType,
+            name: imgForm.fileName,
+         } as any);
 
-      fd.append(
-         "data",
-         JSON.stringify({
-            title,
-            user: hasil,
-         })
-      );
-
-      const createdEntity = await apiCreateBanner(fd);
-      if (createdEntity.success) {
-         Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
-         apiGetBanner({ user: hasil }).then((data) =>
-            dispatch(setEntities(data.data))
+         fd.append(
+            "data",
+            JSON.stringify({
+               title,
+               user: hasil,
+            })
          );
-         router.back();
-      } else {
+
+         const createdEntity = await apiCreateBanner(fd);
+         if (createdEntity.success) {
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
+            apiGetBanner({ user: hasil }).then((data) =>
+               dispatch(setEntities(data.data))
+            );
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
+         }
+      } catch (error) {
+         console.error(error);
          Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
+      } finally {
+         setLoading(false)
       }
    };
 
@@ -101,7 +108,7 @@ export default function CreateBanner() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={title == "" || selectedImage == undefined || error ? true : false}
+                     disable={title == "" || selectedImage == undefined || error || loading ? true : false}
                      category="create"
                      onPress={() => {
                         handleCreateEntity();

app/(application)/banner/index.tsx

@@ -5,6 +5,8 @@ import ButtonBackHeader from "@/components/buttonBackHeader"
 import DrawerBottom from "@/components/drawerBottom"
 import MenuItemRow from "@/components/menuItemRow"
 import ModalLoading from "@/components/modalLoading"
+import Text from "@/components/Text"
+import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteBanner, apiGetBanner } from "@/lib/api"
 import { setEntities } from "@/lib/bannerSlice"
@@ -20,7 +22,6 @@ import * as mime from 'react-native-mime-types'
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
-
 type Props = {
    id: string
    title: string
@@ -71,7 +72,7 @@ export default function BannerList() {
    const openFile = () => {
       setModal(false)
       setLoadingOpen(true)
-      let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.image;
+      let remoteUrl = ConstEnv.url_storage + '/files/' + selectFile?.image;
       const fileName = selectFile?.title + '.' + selectFile?.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
       const mimeType = mime.lookup(fileName)
@@ -112,7 +113,7 @@ export default function BannerList() {
             }}
          />
          <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
-         <ScrollView 
+         <ScrollView
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
@@ -121,26 +122,37 @@ export default function BannerList() {
             }
             style={[Styles.h100]}
          >
-            <View style={[Styles.p15, Styles.mb100]}>
-               {entities.map((index: any, key: number) => (
-                  <BorderBottomItem
-                     key={key}
-                     onPress={() => {
-                        setDataId(index.id)
-                        setSelectFile(index)
-                        setModal(true)
-                     }}
-                     borderType="all"
-                     icon={
-                        <Image
-                           source={{ uri: `https://wibu-storage.wibudev.com/api/files/${index.image}` }}
-                           style={[Styles.imgListBanner]}
+            {
+               entities.length > 0
+                  ?
+                  <View style={[Styles.p15, Styles.mb100]}>
+                     {entities.map((index: any, key: number) => (
+                        <BorderBottomItem
+                           key={key}
+                           onPress={() => {
+                              setDataId(index.id)
+                              setSelectFile(index)
+                              setModal(true)
+                           }}
+                           borderType="all"
+                           icon={
+                              <Image
+                                 source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
+                                 style={[Styles.imgListBanner]}
+                              />
+                           }
+                           title={index.title}
+                           width={65}
                         />
-                     }
-                     title={index.title}
-                  />
-               ))}
-            </View>
+                     ))}
+                  </View>
+                  :
+                  <View style={[Styles.p15, Styles.mb100]}>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                  </View>
+            }
+
+
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title="Menu">
@@ -155,7 +167,7 @@ export default function BannerList() {
                />
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
-                  title="Lihat File"
+                  title="Lihat / Share"
                   onPress={() => { openFile() }}
                />
                <MenuItemRow

app/(application)/discussion/[id].tsx

@@ -8,11 +8,14 @@ import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from '@/components/Text';
 import { ColorsStatus } from "@/constants/ColorsStatus";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
+import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { firebase } from '@react-native-firebase/database';
+import { ref } from '@react-native-firebase/database';
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
@@ -48,7 +51,8 @@ export default function DetailDiscussionGeneral() {
    const [loading, setLoading] = useState(true)
    const [loadingKomentar, setLoadingKomentar] = useState(true)
    const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
-   const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-general/${id}`);
+   const reference = ref(getDB(), `/discussion-general/${id}`);
+   const headerHeight = useHeaderHeight();
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
@@ -143,7 +147,6 @@ export default function DetailDiscussionGeneral() {
                         :
                         <BorderBottomItem
                            descEllipsize={false}
-                           width={55}
                            borderType="bottom"
                            icon={
                               <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
@@ -180,10 +183,9 @@ export default function DetailDiscussionGeneral() {
                               return (
                                  <BorderBottomItem
                                     key={i}
-                                    width={55}
                                     borderType="bottom"
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="xs" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
                                     }
                                     title={item.username}
                                     rightTopInfo={item.createdAt}
@@ -197,7 +199,7 @@ export default function DetailDiscussionGeneral() {
             </ScrollView>
             <KeyboardAvoidingView
                behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-               keyboardVerticalOffset={110}
+               keyboardVerticalOffset={headerHeight}
             >
                <View style={[
                   Styles.contentItemCenter,

app/(application)/discussion/add-member/[id].tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberDiscussionGeneral, apiGetDiscussionGeneralOne, apiGetUser } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
@@ -31,6 +32,7 @@ export default function AddMemberDiscussionDetail() {
    const [idGroup, setIdGroup] = useState('')
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -70,15 +72,21 @@ export default function AddMemberDiscussionDetail() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberDiscussionGeneral({ id: id, data: { user: hasil, member: selectMember } })
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
             dispatch(setUpdateDiscussionGeneralDetail(!update))
             router.back()
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -93,7 +101,7 @@ export default function AddMemberDiscussionDetail() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -114,7 +122,7 @@ export default function AddMemberDiscussionDetail() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -140,7 +148,7 @@ export default function AddMemberDiscussionDetail() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                     {
@@ -149,7 +157,7 @@ export default function AddMemberDiscussionDetail() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/discussion/create.tsx

@@ -7,6 +7,7 @@ import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateDiscussionGeneral } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
@@ -31,6 +32,7 @@ export default function CreateDiscussionGeneral() {
    const [isSelect, setSelect] = useState(false);
    const entitiesMember = useSelector((state: any) => state.memberChoose)
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
+   const [loading, setLoading] = useState(false)
    const [dataForm, setDataForm] = useState({
       idGroup: "",
       title: "",
@@ -95,6 +97,7 @@ export default function CreateDiscussionGeneral() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateDiscussionGeneral({
             data: { ...dataForm, user: hasil, member: entitiesMember },
@@ -110,6 +113,8 @@ export default function CreateDiscussionGeneral() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -127,7 +132,7 @@ export default function CreateDiscussionGeneral() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      onPress={() => {
                         entitiesMember.length == 0
                            ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
@@ -211,7 +216,7 @@ export default function CreateDiscussionGeneral() {
                                     key={index}
                                     borderType="bottom"
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
                                  />

app/(application)/discussion/edit/[id].tsx

@@ -16,6 +16,7 @@ export default function EditDiscussionGeneral() {
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disableBtn, setDisableBtn] = useState(false)
    const dispatch = useDispatch()
+   const [loading, setLoading] = useState(false)
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [dataForm, setDataForm] = useState({
       title: "",
@@ -80,6 +81,7 @@ export default function EditDiscussionGeneral() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditDiscussionGeneral({ user: hasil, title: dataForm.title, desc: dataForm.desc }, id);
          if (response.success) {
@@ -89,6 +91,9 @@ export default function EditDiscussionGeneral() {
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -107,7 +112,7 @@ export default function EditDiscussionGeneral() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => { handleEdit() }}
                   />

app/(application)/discussion/index.tsx

@@ -122,7 +122,7 @@ export default function Discussion() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -153,7 +153,7 @@ export default function Discussion() {
                                     status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
                                  }
                                  rightTopInfo={item.createdAt}
-                                 desc={item.desc}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
                                  leftBottomInfo={
                                     <View style={[Styles.rowItemsCenter]}>
                                        <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
@@ -176,34 +176,6 @@ export default function Discussion() {
                            />
                         }
                      />
-                     // data.map((item: any, i: number) => {
-                     //    return (
-                     //       <BorderBottomItem
-                     //          key={i}
-                     //          onPress={() => { router.push(`/discussion/${item.id}`) }}
-                     //          borderType="bottom"
-                     //          icon={
-                     //             <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                     //                <MaterialIcons name="chat" size={25} color={'#384288'} />
-                     //             </View>
-                     //          }
-                     //          title={item.title}
-                     //          subtitle={
-                     //             status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
-                     //          }
-                     //          rightTopInfo={item.createdAt}
-                     //          desc={item.desc}
-                     //          leftBottomInfo={
-                     //             <View style={[Styles.rowItemsCenter]}>
-                     //                <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                     //                <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
-                     //             </View>
-                     //          }
-                     //          rightBottomInfo={`${item.total_komentar} Komentar`}
-
-                     //       />
-                     //    )
-                     // })
                      :
                      <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
             }

app/(application)/discussion/member/[id].tsx

@@ -7,6 +7,7 @@ import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from '@/components/Text';
 import { ColorsStatus } from "@/constants/ColorsStatus";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -109,7 +110,7 @@ export default function MemberDiscussionDetail() {
                                  key={index}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.name}
                                  onPress={() => {

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberCalendar, apiGetCalendarOne, apiGetDivisionMember } from "@/lib/api";
 import { setUpdateCalendar } from "@/lib/calendarUpdate";
@@ -31,6 +32,7 @@ export default function AddMemberCalendarEvent() {
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
    const [idCalendar, setIdCalendar] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoadOldMember() {
       try {
@@ -78,6 +80,7 @@ export default function AddMemberCalendarEvent() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberCalendar({ id: idCalendar, data: { user: hasil, member: selectMember } })
          if (response.success) {
@@ -90,6 +93,8 @@ export default function AddMemberCalendarEvent() {
       } catch (error) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -104,7 +109,7 @@ export default function AddMemberCalendarEvent() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -124,7 +129,7 @@ export default function AddMemberCalendarEvent() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -150,7 +155,7 @@ export default function AddMemberCalendarEvent() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10, { width: '80%' }]}>
                                     <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefault]}>{item.name}</Text>
                                     {
@@ -159,7 +164,7 @@ export default function AddMemberCalendarEvent() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx

@@ -9,10 +9,11 @@ import { valueTypeEventRepeat } from "@/constants/TypeEventRepeat"
 import { apiGetCalendarOne, apiUpdateCalendar } from "@/lib/api"
 import { stringToDateTime } from "@/lib/fun_stringToDate"
 import { useAuthSession } from "@/providers/AuthProvider"
+import { useHeaderHeight } from "@react-navigation/elements"
 import { Stack, router, useLocalSearchParams } from "expo-router"
 import moment from "moment"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, View } from "react-native"
+import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 
 export default function EditEventCalendar() {
@@ -21,6 +22,8 @@ export default function EditEventCalendar() {
    const [isSelect, setSelect] = useState(false)
    const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>()
    const [idCalendar, setIdCalendar] = useState('')
+   const [loading, setLoading] = useState(false)
+   const headerHeight = useHeaderHeight()
 
    const [error, setError] = useState({
       title: false,
@@ -140,6 +143,7 @@ export default function EditEventCalendar() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiUpdateCalendar({ data: { ...data, user: hasil }, id: idCalendar })
          if (response.success) {
@@ -150,7 +154,9 @@ export default function EditEventCalendar() {
          }
       } catch (error) {
          console.error(error)
-         Toast.show({ type: 'small', text1: 'Gagal mengubah acara', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -164,7 +170,7 @@ export default function EditEventCalendar() {
                headerTitleAlign: 'center',
                headerRight: () =>
                   <ButtonSaveHeader
-                     disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == ""}
+                     disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == "" || loading}
                      category="update-calendar"
                      onPress={() => {
                         handleUpdate()
@@ -172,94 +178,100 @@ export default function EditEventCalendar() {
                   />
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <InputForm
-                  label="Nama Acara"
-                  type="default"
-                  placeholder="Nama Acara"
-                  required
-                  bg="white"
-                  value={data.title}
-                  onChange={(val) => validationForm("title", val)}
-                  error={error.title}
-                  errorText="Nama acara tidak boleh kosong"
-               />
-               <InputDate
-                  onChange={(val) => validationForm("dateStart", val)}
-                  mode="date"
-                  value={data.dateStart}
-                  label="Tanggal Acara"
-                  required
-                  error={error.dateStart}
-                  errorText="Tanggal acara tidak boleh kosong"
-                  placeholder="Pilih Tanggal Acara"
-               />
-               <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeStart", val)}
-                        mode="time"
-                        value={data.timeStart}
-                        label="Waktu Awal"
-                        required
-                        error={error.timeStart}
-                        errorText="Waktu awal tidak valid"
-                        placeholder="--:--"
-                     />
-                  </View>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeEnd", val)}
-                        mode="time"
-                        value={data.timeEnd}
-                        label="Waktu Akhir"
-                        required
-                        error={error.timeEnd}
-                        errorText="Waktu akhir tidak valid"
-                        placeholder="--:--"
-                     />
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15]}>
+                  <InputForm
+                     label="Nama Acara"
+                     type="default"
+                     placeholder="Nama Acara"
+                     required
+                     bg="white"
+                     value={data.title}
+                     onChange={(val) => validationForm("title", val)}
+                     error={error.title}
+                     errorText="Nama acara tidak boleh kosong"
+                  />
+                  <InputDate
+                     onChange={(val) => validationForm("dateStart", val)}
+                     mode="date"
+                     value={data.dateStart}
+                     label="Tanggal Acara"
+                     required
+                     error={error.dateStart}
+                     errorText="Tanggal acara tidak boleh kosong"
+                     placeholder="Pilih Tanggal Acara"
+                  />
+                  <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeStart", val)}
+                           mode="time"
+                           value={data.timeStart}
+                           label="Waktu Awal"
+                           required
+                           error={error.timeStart}
+                           errorText="Waktu awal tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeEnd", val)}
+                           mode="time"
+                           value={data.timeEnd}
+                           label="Waktu Akhir"
+                           required
+                           error={error.timeEnd}
+                           errorText="Waktu akhir tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
                   </View>
+                  <InputForm
+                     label="Link Meet"
+                     type="default"
+                     placeholder="Link Meet"
+                     bg="white"
+                     value={data.linkMeet}
+                     onChange={(val) => validationForm("linkMeet", val)}
+                  />
+                  <SelectForm
+                     bg="white"
+                     label="Ulangi Acara"
+                     placeholder="Ulangi Acara"
+                     value={choose.label}
+                     required
+                     onPress={() => { setSelect(true) }}
+                  />
+                  <InputForm
+                     label="Jumlah Pengulangan"
+                     type="numeric"
+                     placeholder="Jumlah Pengulangan"
+                     required
+                     bg="white"
+                     value={String(data.repeatValue)}
+                     onChange={(val) => validationForm("repeatValue", val)}
+                     error={error.repeatValue}
+                     errorText="Jumlah pengulangan tidak valid"
+                     disable={choose.val == "once"}
+                  />
+                  <InputForm
+                     label="Deskripsi"
+                     type="default"
+                     placeholder="Deskripsi"
+                     bg="white"
+                     value={data.desc}
+                     onChange={(val) => validationForm("desc", val)}
+                     multiline
+                  />
                </View>
-               <InputForm
-                  label="Link Meet"
-                  type="default"
-                  placeholder="Link Meet"
-                  bg="white"
-                  value={data.linkMeet}
-                  onChange={(val) => validationForm("linkMeet", val)}
-               />
-               <SelectForm
-                  bg="white"
-                  label="Ulangi Acara"
-                  placeholder="Ulangi Acara"
-                  value={choose.label}
-                  required
-                  onPress={() => { setSelect(true) }}
-               />
-               <InputForm
-                  label="Jumlah Pengulangan"
-                  type="numeric"
-                  placeholder="Jumlah Pengulangan"
-                  required
-                  bg="white"
-                  value={String(data.repeatValue)}
-                  onChange={(val) => validationForm("repeatValue", val)}
-                  error={error.repeatValue}
-                  errorText="Jumlah pengulangan tidak valid"
-                  disable={choose.val == "once"}
-               />
-               <InputForm
-                  label="Deskripsi"
-                  type="default"
-                  placeholder="Deskripsi"
-                  bg="white"
-                  value={data.desc}
-                  onChange={(val) => validationForm("desc", val)}
-                  multiline
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+
 
          <ModalSelect
             category={"type-event-repeat"}

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx

@@ -7,14 +7,16 @@ import ImageUser from "@/components/imageNew"
 import MenuItemRow from "@/components/menuItemRow"
 import Skeleton from "@/components/skeleton"
 import Text from "@/components/Text"
+import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api"
 import { setUpdateCalendar } from "@/lib/calendarUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { MaterialCommunityIcons } from "@expo/vector-icons"
+import Clipboard from "@react-native-clipboard/clipboard"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
@@ -70,7 +72,7 @@ export default function DetailEventCalendar() {
       }
    }
 
-   async function handleLoad(loading:boolean) {
+   async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
          const hasil = await decryptToken(String(token?.current));
@@ -114,6 +116,11 @@ export default function DetailEventCalendar() {
       handleLoadMember();
    }, [update.member]);
 
+   const handleCopy = (text: string) => {
+      Clipboard.setString(text);
+      Toast.show({ type: 'small', text1: 'Berhasil menyalin link', })
+   };
+
    async function handleDeleteUser() {
       try {
          const hasil = await decryptToken(String(token?.current));
@@ -164,12 +171,12 @@ export default function DetailEventCalendar() {
          >
             <View style={[Styles.p15]}>
                <View style={[Styles.wrapPaper, Styles.mb15]}>
-                  <View style={Styles.rowItemsCenter}>
+                  <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
                      <MaterialCommunityIcons name="calendar-text" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           : <Text style={[Styles.textDefault]}>{data?.title}</Text>
+                           : <Text style={[Styles.textDefault, Styles.w90]}>{data?.title}</Text>
                      }
 
                   </View>
@@ -215,16 +222,20 @@ export default function DetailEventCalendar() {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
                            :
-                           <Text style={[Styles.textDefault]}>{data?.linkMeet ? data.linkMeet : '-'}</Text>
+                           data?.linkMeet ?
+                              <Pressable onPress={() => { handleCopy(data.linkMeet) }}>
+                                 <Text style={[Styles.textDefault]}>{data.linkMeet}</Text>
+                              </Pressable>
+                              : <Text style={[Styles.textDefault]}>-</Text>
                      }
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                  <View style={[Styles.rowItemsCenter, Styles.mt10, { alignItems: 'flex-start' }]}>
                      <MaterialCommunityIcons name="card-text-outline" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
                            :
-                           <Text style={[Styles.textDefault]}>{data?.desc}</Text>
+                           <Text style={[Styles.textDefault, Styles.w90]}>{data?.desc}</Text>
                      }
                   </View>
                </View>
@@ -241,7 +252,7 @@ export default function DetailEventCalendar() {
                            <BorderBottomItem
                               key={index}
                               borderType="bottom"
-                              icon={<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} />}
+                              icon={<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />}
                               title={item.name}
                               subtitle={item.email}
                               onPress={() => {

app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateCalendar, apiGetDivisionMember } from "@/lib/api";
 import { setFormCreateCalendar } from "@/lib/calendarCreate";
@@ -31,6 +32,7 @@ export default function CreateCalendarAddMember() {
    const update = useSelector((state: any) => state.calendarCreate)
    const dispatch = useDispatch()
    const updateRefresh = useSelector((state: any) => state.calendarUpdate)
+   const [loading, setLoading] = useState(false)
 
 
 
@@ -58,6 +60,7 @@ export default function CreateCalendarAddMember() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateCalendar({ data: { ...update, user: hasil, idDivision: id, member: selectMember } })
          if (response.success) {
@@ -80,7 +83,9 @@ export default function CreateCalendarAddMember() {
          }
       } catch (error) {
          console.error(error)
-         Toast.show({ type: 'small', text1: 'Gagal membuat acara', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -94,7 +99,7 @@ export default function CreateCalendarAddMember() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => { handleAddMember() }}
                   />
                )
@@ -113,7 +118,7 @@ export default function CreateCalendarAddMember() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -136,13 +141,13 @@ export default function CreateCalendarAddMember() {
                               onPress={() => { onChoose(item.idUser, item.name, item.img) }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/(fitur-division)/calendar/create.tsx

@@ -17,6 +17,7 @@ import {
    View
 } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CalendarDivisionCreate() {
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -24,6 +25,7 @@ export default function CalendarDivisionCreate() {
    const [isSelect, setSelect] = useState(false)
    const update = useSelector((state: any) => state.calendarCreate)
    const dispatch = useDispatch()
+   const headerHeight = useHeaderHeight();
    const [error, setError] = useState({
       title: false,
       dateStart: false,
@@ -145,7 +147,7 @@ export default function CalendarDivisionCreate() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15]}>

app/(application)/division/[id]/(fitur-division)/calendar/index.tsx

@@ -8,7 +8,6 @@ import Styles from "@/constants/Styles";
 import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
-import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
 import 'intl/locale-data/jsonp/id';
@@ -53,7 +52,7 @@ export default function CalendarDivision() {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetCalendarByDateDivision({
             user: hasil,
-            date: dayjs(selected).format("YYYY-MM-DD"),
+            date: moment(selected).format("YYYY-MM-DD"),
             division: id,
          });
          setData(response.data);
@@ -71,14 +70,16 @@ export default function CalendarDivision() {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetIndicatorCalendar({
             user: hasil,
-            date: dayjs(newDate).format("YYYY-MM-DD"),
+            date: moment(newDate).format("YYYY-MM-DD"),
             division: id,
          });
          setDataIndicator(response.data);
       } catch (error) {
          console.error(error);
       } finally {
-         setLoadingBtn(false)
+         setTimeout(() => {
+            setLoadingBtn(false)
+         }, 500)
       }
    }
 
@@ -111,6 +112,7 @@ export default function CalendarDivision() {
                text={day.text}
                isSelected={day.isSelected}
                isSign={sign}
+               onPress={() => setSelected(new Date(today))}
             />
          );
       },
@@ -154,7 +156,7 @@ export default function CalendarDivision() {
                      mode="single"
                      date={selected}
                      month={month}
-                     onChange={({ date }) => setSelected(date)}
+                     onMonthChange={(month) => setMonth(month)}
                      styles={{
                         selected: Styles.selectedDate,
                         month_label: Styles.cBlack,

app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx

@@ -17,6 +17,7 @@ export default function DiscussionDivisionEdit() {
    const [data, setData] = useState("");
    const update = useSelector((state: any) => state.discussionUpdate);
    const dispatch = useDispatch();
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -38,6 +39,7 @@ export default function DiscussionDivisionEdit() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditDiscussion({
             data: { user: hasil, desc: data },
@@ -47,9 +49,14 @@ export default function DiscussionDivisionEdit() {
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
             router.back();
+         }else{
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -68,7 +75,7 @@ export default function DiscussionDivisionEdit() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={data == ""}
+                     disable={data == "" || loading}
                      category="update"
                      onPress={() => {
                         handleUpdate();

app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx

@@ -7,15 +7,18 @@ import LabelStatus from "@/components/labelStatus";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import {
    apiGetDiscussionOne,
    apiGetDivisionOneFeature,
    apiSendDiscussionCommentar,
 } from "@/lib/api";
+import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { firebase } from "@react-native-firebase/database";
+import { ref } from "@react-native-firebase/database";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
@@ -57,8 +60,9 @@ export default function DiscussionDetail() {
    const [loading, setLoading] = useState(true)
    const [loadingKomentar, setLoadingKomentar] = useState(true)
    const arrSkeleton = Array.from({ length: 3 })
-   const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-division/${detail}`);
+   const reference = ref(getDB(), `/discussion-division/${detail}`);
    const [refreshing, setRefreshing] = useState(false)
+   const headerHeight = useHeaderHeight();
 
 
    useEffect(() => {
@@ -214,11 +218,10 @@ export default function DiscussionDetail() {
                         :
                         <BorderBottomItem
                            descEllipsize={false}
-                           width={55}
                            borderType="bottom"
                            icon={
                               <ImageUser
-                                 src={`https://wibu-storage.wibudev.com/api/files/${data?.user_img}`}
+                                 src={`${ConstEnv.url_storage}/files/${data?.user_img}`}
                                  size="sm"
                               />
                            }
@@ -262,11 +265,10 @@ export default function DiscussionDetail() {
                            dataComment.map((item, index) => (
                               <BorderBottomItem
                                  key={index}
-                                 width={55}
                                  borderType="bottom"
                                  icon={
                                     <ImageUser
-                                       src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                       src={`${ConstEnv.url_storage}/files/${item.img}`}
                                        size="xs"
                                     />
                                  }
@@ -283,7 +285,7 @@ export default function DiscussionDetail() {
             </ScrollView>
             <KeyboardAvoidingView
                behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-               keyboardVerticalOffset={110}
+               keyboardVerticalOffset={headerHeight}
             >
                <View
                   style={[

app/(application)/division/[id]/(fitur-division)/discussion/create.tsx

@@ -17,9 +17,11 @@ export default function CreateDiscussionDivision() {
    const { token, decryptToken } = useAuthSession()
    const update = useSelector((state: any) => state.discussionUpdate)
    const dispatch = useDispatch();
+   const [loading, setLoading] = useState(false)
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } })
          if (response.success) {
@@ -32,6 +34,8 @@ export default function CreateDiscussionDivision() {
       } catch (error) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -43,7 +47,7 @@ export default function CreateDiscussionDivision() {
                headerTitle: 'Tambah Diskusi',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={desc == ""}
+                  disable={desc == "" || loading}
                   category="create"
                   onPress={() => {
                      handleCreate()

app/(application)/division/[id]/(fitur-division)/discussion/index.tsx

@@ -5,6 +5,7 @@ import InputSearch from "@/components/inputSearch";
 import LabelStatus from "@/components/labelStatus";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetDiscussion } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -120,7 +121,7 @@ export default function DiscussionDivision() {
             <InputSearch onChange={setSearch} />
          </View>
 
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -138,11 +139,10 @@ export default function DiscussionDivision() {
                            return (
                               <BorderBottomItem
                                  key={index}
-                                 width={55}
                                  onPress={() => { router.push(`./discussion/${item.id}`) }}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.user_name}
                                  subtitle={
@@ -171,34 +171,8 @@ export default function DiscussionDivision() {
                            />
                         }
                      />
-                     // data.map((item, index) => (
-                     //    <BorderBottomItem
-                     //       key={index}
-                     //       width={55}
-                     //       onPress={() => { router.push(`./discussion/${item.id}`) }}
-                     //       borderType="bottom"
-                     //       icon={
-                     //          <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
-                     //       }
-                     //       title={item.user_name}
-                     //       subtitle={
-                     //          active == "true" ? item.status == 1 ? <LabelStatus category='success' text='BUKA' size="small" /> : <LabelStatus category='error' text='TUTUP' size="small" /> : <></>
-                     //       }
-                     //       rightTopInfo={item.createdAt}
-                     //       desc={item.desc}
-                     //       leftBottomInfo={
-                     //          <View style={[Styles.rowItemsCenter]}>
-                     //             <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                     //             <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
-                     //          </View>
-                     //       }
-                     //       rightBottomInfo={item.total_komentar + ' Komentar'}
-                     //    />
-                     // ))
                      :
-                     (
-                        <Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>
-                     )
+                     (<Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>)
             }
          </View>
       </View>

app/(application)/division/[id]/(fitur-division)/document/index.tsx

@@ -13,6 +13,7 @@ import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import {
    apiDocumentDelete,
@@ -64,6 +65,7 @@ type PropsPath = {
 };
 
 export default function DocumentDivision() {
+   const [loadingRename, setLoadingRename] = useState(false)
    const [isShare, setShare] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -200,6 +202,7 @@ export default function DocumentDivision() {
 
    async function handleRename() {
       try {
+         setLoadingRename(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiDocumentRename({ user: hasil, ...bodyRename });
          if (response.success) {
@@ -213,7 +216,8 @@ export default function DocumentDivision() {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
-         setRename(false);
+         setLoadingRename(false)
+         setRename(false)
       }
    }
 
@@ -268,7 +272,7 @@ export default function DocumentDivision() {
 
    const openFile = (item: Props) => {
       if (Platform.OS == 'android') setLoadingOpen(true)
-      let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
+      let remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage;
       const fileName = item.name + '.' + item.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
       const mimeType = mime.lookup(fileName)
@@ -359,25 +363,20 @@ export default function DocumentDivision() {
             <View style={[Styles.p15, Styles.mb100]}>
                <View style={[Styles.rowItemsCenter]}>
                   {
-                     loading ?
-                        arrSkeleton.map((item, index) => (
-                           <Skeleton key={index} width={60} height={10} borderRadius={10} style={[Styles.mr05]} />
-                        ))
-                        :
-                        dataJalur.map((item, index) => (
-                           <Pressable
-                              key={index}
-                              style={[Styles.rowItemsCenter]}
-                              onPress={() => {
-                                 setPath(item.id);
-                              }}
-                           >
-                              {item.id != "home" && (
-                                 <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
-                              )}
-                              <Text> {item.name} </Text>
-                           </Pressable>
-                        ))
+                     dataJalur.map((item, index) => (
+                        <Pressable
+                           key={index}
+                           style={[Styles.rowItemsCenter]}
+                           onPress={() => {
+                              setPath(item.id);
+                           }}
+                        >
+                           {item.id != "home" && (
+                              <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
+                           )}
+                           <Text> {item.name} </Text>
+                        </Pressable>
+                     ))
                   }
                </View>
                <View>
@@ -440,20 +439,6 @@ export default function DocumentDivision() {
          {(selectedFiles.length > 0 || dariSelectAll) && (
             <View style={[ColorsStatus.primary, Styles.bottomMenuSelectDocument]}>
                <View style={[Styles.rowItemsCenter, { justifyContent: "center" }]}>
-                  {/* <MenuItemRow
-                     icon={
-                        <MaterialCommunityIcons
-                           name="download-outline"
-                           color="white"
-                           size={25}
-                        />
-                     }
-                     title="Unduh"
-                     onPress={() => { }}
-                     column="many"
-                     color="white"
-                     disabled={selectedFiles.length == 0 || !copyAllowed}
-                  /> */}
                   <MenuItemRow
                      icon={
                         <MaterialCommunityIcons
@@ -551,7 +536,7 @@ export default function DocumentDivision() {
             isVisible={isRename}
             setVisible={() => { setRename(false) }}
             onSubmit={() => { handleRename() }}
-            disableSubmit={bodyRename.name == ""}
+            disableSubmit={bodyRename.name == "" || loadingRename}
          >
             <View>
                <InputForm

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-file.tsx

@@ -32,6 +32,7 @@ export default function TaskDivisionAddFile() {
    const [loadingCheck, setLoadingCheck] = useState(false);
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false);
 
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
@@ -90,6 +91,7 @@ export default function TaskDivisionAddFile() {
 
    async function handleAddFile() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData();
 
@@ -119,6 +121,8 @@ export default function TaskDivisionAddFile() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -138,7 +142,7 @@ export default function TaskDivisionAddFile() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={fileForm.length == 0 ? true : false}
+                     disable={fileForm.length == 0 || loading ? true : false}
                      onPress={() => { handleAddFile() }}
                   />
                ),
@@ -171,6 +175,9 @@ export default function TaskDivisionAddFile() {
                {
                   loadingCheck && <ActivityIndicator size="small" />
                }
+               {
+                  loading && <ActivityIndicator size="large" />
+               }
             </View>
          </ScrollView>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberTask, apiGetDivisionMember, apiGetTaskOne } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
@@ -30,6 +31,7 @@ export default function AddMemberTask() {
    const [data, setData] = useState<Props[]>([])
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoadOldMember() {
       try {
@@ -72,6 +74,7 @@ export default function AddMemberTask() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberTask({ id: detail, data: { user: hasil, member: selectMember, idDivision: id } })
          if (response.success) {
@@ -83,7 +86,9 @@ export default function AddMemberTask() {
          }
       } catch (error) {
          console.error(error)
-         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -98,7 +103,7 @@ export default function AddMemberTask() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -119,7 +124,7 @@ export default function AddMemberTask() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -145,7 +150,7 @@ export default function AddMemberTask() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w80]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                     {
@@ -154,7 +159,7 @@ export default function AddMemberTask() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx

@@ -1,16 +1,22 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateTaskTugas } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
-   KeyboardAvoidingView, Platform, SafeAreaView,
+   KeyboardAvoidingView, Platform, Pressable, SafeAreaView,
    ScrollView,
    View
 } from "react-native";
@@ -24,6 +30,8 @@ export default function TaskDivisionAddTask() {
    const update = useSelector((state: any) => state.taskUpdate);
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const [disable, setDisable] = useState(true);
+   const [loading, setLoading] = useState(false)
+   const headerHeight = useHeaderHeight();
    const [range, setRange] = useState<{
       startDate: DateType;
       endDate: DateType;
@@ -33,12 +41,13 @@ export default function TaskDivisionAddTask() {
       endDate: false,
       title: false,
    });
-   const [title, setTitle] = useState("");
+   const [title, setTitle] = useState("")
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    function checkAll() {
       if (
@@ -67,20 +76,49 @@ export default function TaskDivisionAddTask() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll();
    }, [from, to, title, error]);
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
+         setLoading(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCreateTaskTugas({
             data: {
                title,
-               dateStart: dayjs(range.startDate).format("YYYY-MM-DD"),
-               dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"),
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
                user: hasil,
                idDivision: id,
+               dataDetail: dataDetailFix,
             },
             id: detail,
          });
@@ -93,7 +131,9 @@ export default function TaskDivisionAddTask() {
          }
       } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: 'Gagal menambah data', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -113,7 +153,7 @@ export default function TaskDivisionAddTask() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={disable}
+                     disable={disable || loading}
                      onPress={() => {
                         handleCreate();
                      }}
@@ -123,7 +163,7 @@ export default function TaskDivisionAddTask() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -137,6 +177,13 @@ export default function TaskDivisionAddTask() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           month_selector_label: Styles.cBlack,
+                           year_label: Styles.cBlack,
+                           year_selector_label: Styles.cBlack,
+                           day_label: Styles.cBlack,
+                           time_label: Styles.cBlack,
+                           weekday_label: Styles.cBlack,
                         }}
                      />
                   </View>
@@ -162,6 +209,13 @@ export default function TaskDivisionAddTask() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -179,7 +233,14 @@ export default function TaskDivisionAddTask() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
-
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/(fitur-division)/task/[detail]/cancel.tsx

@@ -19,6 +19,7 @@ export default function TaskDivisionCancel() {
    const [reason, setReason] = useState("");
    const [error, setError] = useState(false);
    const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
 
    function onValidation(val: string) {
       setReason(val);
@@ -43,6 +44,7 @@ export default function TaskDivisionCancel() {
 
    async function handleCancel() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCancelTask(
             {
@@ -60,7 +62,9 @@ export default function TaskDivisionCancel() {
          }
       } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: 'Gagal membatalkan kegiatan', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -79,7 +83,7 @@ export default function TaskDivisionCancel() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="cancel"
                      onPress={() => {
                         handleCancel();

app/(application)/division/[id]/(fitur-division)/task/[detail]/edit.tsx

@@ -19,6 +19,7 @@ export default function TaskDivisionEdit() {
    const [disable, setDisable] = useState(false);
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -61,6 +62,7 @@ export default function TaskDivisionEdit() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditTask(
             {
@@ -79,6 +81,8 @@ export default function TaskDivisionEdit() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -98,7 +102,7 @@ export default function TaskDivisionEdit() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={disable}
+                     disable={disable || loading}
                      onPress={() => { handleUpdate() }}
                   />
                ),

app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx

@@ -3,10 +3,12 @@ import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
 import HeaderRightTaskDetail from "@/components/task/headerTaskDetail";
 import SectionFileTask from "@/components/task/sectionFileTask";
+import SectionLinkTask from "@/components/task/sectionLinkTask";
 import SectionMemberTask from "@/components/task/sectionMemberTask";
+import SectionReportTask from "@/components/task/sectionReportTask";
 import SectionTanggalTugasTask from "@/components/task/sectionTanggalTugasTask";
 import Styles from "@/constants/Styles";
-import { apiGetTaskOne } from "@/lib/api";
+import { apiGetDivisionOneFeature, apiGetTaskOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -30,6 +32,35 @@ export default function DetailTaskDivision() {
    const [progress, setProgress] = useState(0)
    const update = useSelector((state: any) => state.taskUpdate)
    const [refreshing, setRefreshing] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false);
+   const [isAdminDivision, setIsAdminDivision] = useState(false);
+   const entityUser = useSelector((state: any) => state.user);
+
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         setIsMemberDivision(response.data);
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleCheckMember()
+   }, [])
 
 
    async function handleLoad(cat: 'data' | 'progress') {
@@ -72,7 +103,9 @@ export default function DetailTaskDivision() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: loading ? 'Loading...                            ' : data?.title,
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightTaskDetail id={detail} division={id} status={data?.status} />,
+               headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision
+                  ? <></>
+                  : <HeaderRightTaskDetail id={detail} division={id} status={data?.status} isAdminDivision={isAdminDivision} />,
             }}
          />
          <ScrollView
@@ -88,9 +121,11 @@ export default function DetailTaskDivision() {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasTask refreshing={refreshing}/>
-               <SectionFileTask refreshing={refreshing}/>
-               <SectionMemberTask refreshing={refreshing}/>
+               <SectionReportTask refreshing={refreshing} />
+               <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionFileTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionLinkTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionMemberTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
             </View>
          </ScrollView>
       </SafeAreaView>

app/(application)/division/[id]/(fitur-division)/task/[detail]/report.tsx

@@ -0,0 +1,129 @@
+import ButtonBackHeader from "@/components/buttonBackHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import { InputForm } from "@/components/inputForm";
+import Styles from "@/constants/Styles";
+import { apiGetTaskOne, apiReportTask } from "@/lib/api";
+import { setUpdateTask } from "@/lib/taskUpdate";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import { useEffect, useState } from "react";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+export default function TaskDivisionReport() {
+   const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
+   const { token, decryptToken } = useAuthSession();
+   const [laporan, setLaporan] = useState("");
+   const [error, setError] = useState(false);
+   const [disable, setDisable] = useState(false);
+   const dispatch = useDispatch();
+   const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false)
+
+   async function handleLoad() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetTaskOne({
+            user: hasil,
+            cat: "data",
+            id: detail,
+         });
+         setLaporan(response.data.report);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleLoad();
+   }, []);
+
+   function onValidation(val: string) {
+      setLaporan(val);
+      if (val == "" || val == "null") {
+         setError(true);
+      } else {
+         setError(false);
+      }
+   }
+
+   function checkAll() {
+      if (laporan == "" || laporan == "null" || laporan == undefined || laporan == null || error) {
+         setDisable(true);
+      } else {
+         setDisable(false);
+      }
+   }
+
+   useEffect(() => {
+      checkAll();
+   }, [laporan, error]);
+
+   async function handleUpdate() {
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiReportTask(
+            {
+               report: laporan,
+               user: hasil,
+            },
+            detail
+         );
+         if (response.success) {
+            dispatch(setUpdateTask({ ...update, report: !update.report }));
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
+      }
+   }
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               headerLeft: () => (
+                  <ButtonBackHeader
+                     onPress={() => {
+                        router.back();
+                     }}
+                  />
+               ),
+               headerTitle: "Laporan Kegiatan",
+               headerTitleAlign: "center",
+               headerRight: () => (
+                  <ButtonSaveHeader
+                     category="update"
+                     disable={disable || loading}
+                     onPress={() => { handleUpdate() }}
+                  />
+               ),
+            }}
+         />
+         <ScrollView>
+            <View style={[Styles.p15, Styles.mb100]}>
+               <InputForm
+                  label="Laporan Kegiatan"
+                  type="default"
+                  placeholder="Laporan Kegiatan"
+                  required
+                  bg="white"
+                  value={laporan}
+                  onChange={(val) => { onValidation(val) }}
+                  error={error}
+                  errorText="Laporan kegiatan harus diisi"
+                  multiline
+               />
+            </View>
+         </ScrollView>
+      </SafeAreaView>
+   );
+}

app/(application)/division/[id]/(fitur-division)/task/create.tsx

@@ -9,6 +9,7 @@ import MenuItemRow from "@/components/menuItemRow";
 import ModalSelect from "@/components/modalSelect";
 import SectionListAddTask from "@/components/project/sectionListAddTask";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateTask } from "@/lib/api";
 import { setMemberChoose } from "@/lib/memberChoose";
@@ -38,6 +39,7 @@ export default function CreateTaskDivision() {
    const [title, setTitle] = useState('')
    const [error, setError] = useState(false);
    const [isModal, setModal] = useState(false)
+   const [loading, setLoading] = useState(false)
    let hitung = 0;
 
    useEffect(() => {
@@ -77,6 +79,7 @@ export default function CreateTaskDivision() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -102,6 +105,9 @@ export default function CreateTaskDivision() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -121,7 +127,7 @@ export default function CreateTaskDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0}
+                     disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0 || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
@@ -184,7 +190,7 @@ export default function CreateTaskDivision() {
                                     borderType="bottom"
                                     icon={
                                        <ImageUser
-                                          src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
                                           size="sm"
                                        />
                                     }

app/(application)/division/[id]/(fitur-division)/task/create/member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetDivisionMember } from "@/lib/api";
 import { setMemberChoose } from "@/lib/memberChoose";
@@ -25,7 +26,6 @@ export default function AddMemberCreateTask() {
    const dispatch = useDispatch()
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string, detail: string }>()
-   const [dataOld, setDataOld] = useState<Props[]>([])
    const [data, setData] = useState<Props[]>([])
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
@@ -94,7 +94,7 @@ export default function AddMemberCreateTask() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -119,13 +119,13 @@ export default function AddMemberCreateTask() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/(fitur-division)/task/create/task.tsx

@@ -1,15 +1,22 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -20,6 +27,7 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateTaskAddTugas() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -33,11 +41,12 @@ export default function CreateTaskAddTugas() {
    })
    const [title, setTitle] = useState('');
    const taskCreate = useSelector((state: any) => state.taskCreate)
+   const [dsbButton, setDsbButton] = useState(true)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate, "DD-MM-YYYY")
+   const to = formatDateOnly(range.endDate, "DD-MM-YYYY")
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -58,18 +67,45 @@ export default function CreateTaskAddTugas() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          dispatch(setTaskCreate([...taskCreate, {
             title: title,
             dateStart: from,
             dateEnd: to,
-            dateStartFix: dayjs(range.startDate).format("YYYY-MM-DD"),
-            dateEndFix: dayjs(range.endDate).format("YYYY-MM-DD"),
+            dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+            dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+            dataDetail: dataDetailFix
          }]))
          router.back();
       } catch (error) {
@@ -101,7 +137,7 @@ export default function CreateTaskAddTugas() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -115,6 +151,13 @@ export default function CreateTaskAddTugas() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           month_selector_label: Styles.cBlack,
+                           year_label: Styles.cBlack,
+                           year_selector_label: Styles.cBlack,
+                           day_label: Styles.cBlack,
+                           time_label: Styles.cBlack,
+                           weekday_label: Styles.cBlack,
                         }}
                      />
                   </View>
@@ -140,6 +183,13 @@ export default function CreateTaskAddTugas() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -157,6 +207,14 @@ export default function CreateTaskAddTugas() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/(fitur-division)/task/index.tsx

@@ -179,7 +179,7 @@ export default function ListTask() {
                </Pressable>
             </View>
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   isList ?

app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx

@@ -1,17 +1,24 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -21,6 +28,7 @@ import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function UpdateProjectTaskDivision() {
+   const headerHeight = useHeaderHeight();
    const { detail } = useLocalSearchParams<{ detail: string }>();
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
@@ -29,10 +37,14 @@ export default function UpdateProjectTaskDivision() {
       startDate: DateType;
       endDate: DateType;
    }>({ startDate: undefined, endDate: undefined });
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [month, setMonth] = useState<any>();
    const [year, setYear] = useState<any>();
    const [loading, setLoading] = useState(true);
    const [disableBtn, setDisableBtn] = useState(false);
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
    const [title, setTitle] = useState("");
    const [error, setError] = useState({
       startDate: false,
@@ -40,10 +52,8 @@ export default function UpdateProjectTaskDivision() {
       title: false,
    });
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    async function handleLoad() {
       try {
@@ -60,6 +70,22 @@ export default function UpdateProjectTaskDivision() {
          });
          setMonth(new Date(response.data.dateStart).getMonth());
          setYear(new Date(response.data.dateStart).getFullYear());
+
+         const response2 = await apiGetTaskTugas({
+            user: hasil,
+            id: detail,
+            cat: "detailTask"
+         });
+         if (response2.data.length == 0) {
+            const datanya = getDatesInRange(response.data.dateStart, response.data.dateEnd)
+            setDataDetail(datanya.map((item: any) => ({
+               date: item,
+               timeStart: null,
+               timeEnd: null,
+            })))
+         } else {
+            setDataDetail(response2.data)
+         }
       } catch (error) {
          console.error(error);
       } finally {
@@ -73,8 +99,23 @@ export default function UpdateProjectTaskDivision() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditTaskTugas({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
+         const response = await apiEditTaskTugas({
+            data: {
+               title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            },
+            id: detail
+         });
          if (response.success) {
             dispatch(setUpdateTask({ ...update, task: !update.task }))
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
@@ -84,7 +125,9 @@ export default function UpdateProjectTaskDivision() {
          }
       } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: 'Gagal mengubah data', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoadingSubmit(false)
       }
    }
 
@@ -115,10 +158,33 @@ export default function UpdateProjectTaskDivision() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll();
    }, [from, to, title, error]);
 
+
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -134,7 +200,7 @@ export default function UpdateProjectTaskDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loadingSubmit}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -145,7 +211,7 @@ export default function UpdateProjectTaskDivision() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -162,6 +228,13 @@ export default function UpdateProjectTaskDivision() {
                               selected: Styles.selectedDate,
                               selected_label: Styles.cWhite,
                               range_fill: Styles.selectRangeDate,
+                              month_label: Styles.cBlack,
+                              month_selector_label: Styles.cBlack,
+                              year_label: Styles.cBlack,
+                              year_selector_label: Styles.cBlack,
+                              day_label: Styles.cBlack,
+                              time_label: Styles.cBlack,
+                              weekday_label: Styles.cBlack,
                            }}
                         />
                      )}
@@ -190,6 +263,13 @@ export default function UpdateProjectTaskDivision() {
                            Tanggal tidak boleh kosong
                         </Text>
                      )}
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -207,7 +287,14 @@ export default function UpdateProjectTaskDivision() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
-
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/add-member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberDivision, apiGetDivisionOneDetail, apiGetUser } from "@/lib/api";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
@@ -31,9 +32,11 @@ export default function AddMemberDivision() {
    const [search, setSearch] = useState('')
    const update = useSelector((state: any) => state.divisionUpdate)
    const dispatch = useDispatch()
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDivisionOneDetail({ user: hasil, id })
          setDataOld(response.data.member)
@@ -72,6 +75,7 @@ export default function AddMemberDivision() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberDivision({ id: id, data: { user: hasil, member: selectMember } })
          if (response.success) {
@@ -83,7 +87,9 @@ export default function AddMemberDivision() {
          }
       } catch (error) {
          console.error(error)
-         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -98,7 +104,7 @@ export default function AddMemberDivision() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -119,7 +125,7 @@ export default function AddMemberDivision() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -145,7 +151,7 @@ export default function AddMemberDivision() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -154,7 +160,7 @@ export default function AddMemberDivision() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/edit.tsx

@@ -16,6 +16,7 @@ export default function EditDivision() {
    const update = useSelector((state: any) => state.divisionUpdate)
    const { token, decryptToken } = useAuthSession();
    const { id } = useLocalSearchParams<{ id: string }>();
+   const [loading, setLoading] = useState(false)
    const [data, setData] = useState({
       name: "",
       desc: "",
@@ -43,6 +44,7 @@ export default function EditDivision() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditDivision({ user: hasil, name: data.name, desc: data.desc }, id)
          if (response.success) {
@@ -55,6 +57,8 @@ export default function EditDivision() {
       } catch (error) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -73,7 +77,7 @@ export default function EditDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={error.name}
+                     disable={error.name || loading ? true : false}
                      category="update"
                      onPress={() => { handleEdit() }}
                   />

app/(application)/division/[id]/info.tsx

@@ -7,14 +7,16 @@ import ImageUser from "@/components/imageNew"
 import SectionCancel from "@/components/sectionCancel"
 import Skeleton from "@/components/skeleton"
 import SkeletonTwoItem from "@/components/skeletonTwoItem"
+import Text from "@/components/Text"
 import { ColorsStatus } from "@/constants/ColorsStatus"
+import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { Pressable, SafeAreaView, ScrollView, Text, View } from "react-native"
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useSelector } from "react-redux"
 
@@ -184,12 +186,11 @@ export default function InformationDivision() {
                            dataMember.map((item, index) => {
                               return (
                                  <BorderBottomItem
-                                    width={55}
                                     key={index}
                                     borderType="bottom"
                                     onPress={() => { dataDetail?.isActive && handleChooseMember(item) }}
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
                                     rightTopInfo={item.isAdmin ? "Admin" : "Anggota"}

app/(application)/division/create/add-admin-division.tsx

@@ -2,6 +2,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateDivision } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
@@ -29,6 +30,7 @@ export default function CreateDivisionAddAdmin() {
    const update = useSelector((state: any) => state.divisionCreate)
    const updateDivision = useSelector((state: any) => state.divisionUpdate)
    const dispatch = useDispatch()
+   const [loading, setLoading] = useState(false)
 
    async function handleLoadMember() {
       setData(update.member)
@@ -48,9 +50,9 @@ export default function CreateDivisionAddAdmin() {
 
    async function handleAddMember() {
       try {
-         dispatch(setFormCreateDivision({ ...update, admin: selectMember }))
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateDivision({ ...update, user: hasil })
+         const response = await apiCreateDivision({ ...update, admin: selectMember, user: hasil })
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil membuat divisi', })
             dispatch(setFormCreateDivision({ admin: [], member: [], data: { idGroup: '', name: '', desc: '' } }))
@@ -61,7 +63,9 @@ export default function CreateDivisionAddAdmin() {
          }
       } catch (error) {
          console.error(error)
-         Toast.show({ type: 'small', text1: 'Gagal membuat divisi', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -76,7 +80,7 @@ export default function CreateDivisionAddAdmin() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -99,7 +103,7 @@ export default function CreateDivisionAddAdmin() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -108,7 +112,7 @@ export default function CreateDivisionAddAdmin() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/create/add-member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetUser } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
@@ -86,7 +87,7 @@ export default function CreateDivisionAddMember() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -112,7 +113,7 @@ export default function CreateDivisionAddMember() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -121,7 +122,7 @@ export default function CreateDivisionAddMember() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/index.tsx

@@ -180,7 +180,7 @@ export default function ListDivision() {
                   </View>
             }
 
-            <View style={[Styles.rowSpaceBetween]}>
+            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
                <Pressable
                   onPress={() => {
@@ -200,7 +200,7 @@ export default function ListDivision() {
                </View>
             )}
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   isList ?

app/(application)/edit-profile.tsx

@@ -4,10 +4,12 @@ import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditProfile, apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
@@ -46,7 +48,8 @@ export default function EditProfile() {
    const [isSelect, setSelect] = useState(false);
    const [disableBtn, setDisableBtn] = useState(false)
    const [valChoose, setValChoose] = useState("")
-   const [imgForm, setImgForm] = useState<any>();
+   const [imgForm, setImgForm] = useState<any>()
+   const [loading, setLoading] = useState(false)
    const [data, setData] = useState<Props>({
       id: entities.id,
       name: entities.name,
@@ -119,7 +122,7 @@ export default function EditProfile() {
          }
       } else if (cat == "phone") {
          setData({ ...data, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -150,6 +153,7 @@ export default function EditProfile() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -179,6 +183,8 @@ export default function EditProfile() {
       } catch (error) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -197,7 +203,6 @@ export default function EditProfile() {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
       } else {
-         alert("Tidak ada gambar yang dipilih");
          setErrorImg(false)
       }
    };
@@ -217,7 +222,7 @@ export default function EditProfile() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -226,8 +231,8 @@ export default function EditProfile() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView style={[Styles.h100]}>
+            <View style={[Styles.p15]}>
                <View style={{ justifyContent: "center", alignItems: "center" }}>
                   {
                      selectedImage != undefined ? (
@@ -241,16 +246,20 @@ export default function EditProfile() {
                               style={[Styles.userProfileBig]}
                               onError={() => { setErrorImg(true) }}
                            />
+                           <View style={[Styles.absoluteIconPicker]}>
+                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                           </View>
                         </Pressable>
                      ) : (
                         <Pressable onPress={pickImageAsync}>
-                           {
-                              <Image
-                                 source={errorImg ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
-                                 style={[Styles.userProfileBig]}
-                                 onError={() => { setErrorImg(true) }}
-                              />
-                           }
+                           <Image
+                              source={errorImg ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${data?.img}` }}
+                              style={[Styles.userProfileBig]}
+                              onError={() => { setErrorImg(true) }}
+                           />
+                           <View style={[Styles.absoluteIconPicker]}>
+                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                           </View>
                         </Pressable>
                      )
                   }

app/(application)/group/index.tsx

@@ -15,7 +15,7 @@ import { setUpdateGroup } from "@/lib/groupSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -34,7 +34,7 @@ export default function Index() {
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
    const [status, setStatus] = useState<'true' | 'false'>('true')
-
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [idChoose, setIdChoose] = useState('')
    const [activeChoose, setActiveChoose] = useState(true)
    const [titleChoose, setTitleChoose] = useState('')
@@ -42,24 +42,21 @@ export default function Index() {
 
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.groupUpdate)
-
-   const [data11, setData1] = useState(Array.from({ length: 20 }, (_, i) => `Item ${i}`));
-
-   const renderItem = ({ item }: { item: string }) => (
-      <View style={{ padding: 20, borderBottomWidth: 1, borderColor: '#ccc' }}>
-         <Text>{item}</Text>
-      </View>
-   );
+   const [error, setError] = useState({
+      title: false,
+   });
 
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditGroup({ user: hasil, name: titleChoose }, idChoose)
          dispatch(setUpdateGroup(!update))
       } catch (error) {
          console.error(error)
       } finally {
+         setLoadingSubmit(false)
          setVisibleEdit(false)
          setModal(false)
          Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
@@ -109,10 +106,29 @@ export default function Index() {
       setRefreshing(false)
    };
 
+   function validationForm(val: any, cat: 'title') {
+      if (cat === 'title') {
+         setTitleChoose(val)
+         if (val == "" || val.length < 3) {
+            setError((prev) => ({ ...prev, title: true }))
+         } else {
+            setError((prev) => ({ ...prev, title: false }))
+         }
+      }
+   }
+
+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      isActive: data[index].isActive,
+   });
+
+
 
    return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View style={[Styles.mb10]}>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -130,51 +146,53 @@ export default function Index() {
                   n={2} />
             </View>
             <InputSearch onChange={setSearch} />
-            <ScrollView
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }
-               style={[Styles.h100]}
-            >
-               <View>
-                  {
-
-                     loading ?
-                        arrSkeleton.map((item, index) => {
+         </View>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
-                              <SkeletonTwoItem key={index} />
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    setIdChoose(item.id)
+                                    setActiveChoose(item.isActive)
+                                    setTitleChoose(item.name)
+                                    setModal(true)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                              />
                            )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => {
-                                       setIdChoose(item.id)
-                                       setActiveChoose(item.isActive)
-                                       setTitleChoose(item.name)
-                                       setModal(true)
-                                    }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
          </View>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
@@ -207,15 +225,22 @@ export default function Index() {
          <DrawerBottom animation="none" keyboard height={30} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Lembaga Desa">
             <View style={{ flex: 1 }}>
                <View>
-                  <InputForm type="default" placeholder="Nama Lembaga Desa" required label="Lembaga Desa" value={titleChoose} onChange={setTitleChoose} />
+                  <InputForm
+                     type="default"
+                     placeholder="Nama Lembaga Desa"
+                     required
+                     label="Lembaga Desa"
+                     value={titleChoose}
+                     error={error.title}
+                     errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
+                     onChange={(val) => { validationForm(val, 'title') }} />
                </View>
                <View>
-                  <ButtonForm text="SIMPAN" onPress={() => { handleEdit() }} />
+                  <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || titleChoose == "" || loadingSubmit} onPress={() => { handleEdit() }} />
                </View>
             </View>
          </DrawerBottom>
+      </View >
 
-
-      </SafeAreaView>
    )
 }

app/(application)/home.tsx

@@ -22,8 +22,8 @@ import { useDispatch, useSelector } from "react-redux";
 export default function Home() {
    const entities = useSelector((state: any) => state.entities)
    const dispatch = useDispatch()
-   const { token, decryptToken } = useAuthSession()
-   const insets = useSafeAreaInsets();
+   const { token, decryptToken, signOut } = useAuthSession()
+   const insets = useSafeAreaInsets()
 
    useEffect(() => {
       handleUserLogin()
@@ -31,7 +31,11 @@ export default function Home() {
 
    async function handleUserLogin() {
       const hasil = await decryptToken(String(token?.current))
-      apiGetProfile({ id: hasil }).then((data) => dispatch(setEntities(data.data)));
+      apiGetProfile({ id: hasil })
+         .then((data) => dispatch(setEntities(data.data)))
+         .catch((error) => {
+            signOut()
+         });
    }
 
    return (

app/(application)/member/[id].tsx

@@ -1,9 +1,11 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ImageUser from "@/components/imageNew";
 import ItemDetailMember from "@/components/itemDetailMember";
+import LabelStatus from "@/components/labelStatus";
 import HeaderRightMemberDetail from "@/components/member/headerMemberDetail";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import { valueRoleUser } from "@/constants/RoleUser";
 import Styles from "@/constants/Styles";
 import { apiGetProfile } from "@/lib/api";
@@ -92,8 +94,8 @@ export default function MemberDetail() {
                      </>
                      :
                      <>
-                        <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${data?.img}`} size="lg" />
-                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{data?.name}</Text>
+                        <ImageUser src={`${ConstEnv.url_storage}/files/${data?.img}`} size="lg" />
+                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, { textAlign: 'center' }]}>{data?.name}</Text>
                         <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
                      </>
 
@@ -102,6 +104,11 @@ export default function MemberDetail() {
             <View style={[Styles.p15]}>
                <View style={[Styles.rowSpaceBetween]}>
                   <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
+                  <LabelStatus
+                     size="small"
+                     category={data?.isActive ? 'success' : 'error'}
+                     text={data?.isActive ? 'AKTIF' : 'TIDAK AKTIF'}
+                  />
                </View>
                {
                   loading ?

app/(application)/member/create.tsx

@@ -10,6 +10,7 @@ import { apiCreateUser } from "@/lib/api";
 import { setUpdateMember } from "@/lib/memberSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { useHeaderHeight } from '@react-navigation/elements';
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
@@ -26,6 +27,7 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateMember() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -41,6 +43,7 @@ export default function CreateMember() {
    const [disableBtn, setDisableBtn] = useState(true)
    const [valChoose, setValChoose] = useState("")
    const [imgForm, setImgForm] = useState<any>()
+   const [loading, setLoading] = useState(false)
    const [error, setError] = useState({
       group: false,
       position: false,
@@ -114,7 +117,7 @@ export default function CreateMember() {
          }
       } else if (cat == "phone") {
          setDataForm({ ...dataForm, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -144,7 +147,7 @@ export default function CreateMember() {
    }, [error, dataForm])
 
    useEffect(() => {
-      if(entityUser.role !="supadmin" && entityUser.role != "developer"){
+      if (entityUser.role != "supadmin" && entityUser.role != "developer") {
          validationForm("group", entities.idGroup, entities.group)
       }
    }, [])
@@ -152,6 +155,7 @@ export default function CreateMember() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -169,7 +173,7 @@ export default function CreateMember() {
             fd.append("file", "undefined")
          }
 
-         const response = await apiCreateUser({data: fd})
+         const response = await apiCreateUser({ data: fd })
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             dispatch(setUpdateMember(!update))
@@ -179,6 +183,9 @@ export default function CreateMember() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -194,9 +201,6 @@ export default function CreateMember() {
       if (!result.canceled) {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
-
-      } else {
-         alert("Tidak ada gambar yang dipilih");
       }
    };
 
@@ -215,7 +219,7 @@ export default function CreateMember() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
@@ -223,9 +227,9 @@ export default function CreateMember() {
             }}
          />
          <KeyboardAvoidingView
-             style={[Styles.h100]}
-             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-             keyboardVerticalOffset={110}
+            style={[Styles.h100]}
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15]}>
@@ -233,17 +237,16 @@ export default function CreateMember() {
                      {selectedImage != undefined ? (
                         <Pressable onPress={pickImageAsync}>
                            <Image src={selectedImage} style={[Styles.userProfileBig]} />
+                           <View style={[Styles.absoluteIconPicker]}>
+                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                           </View>
                         </Pressable>
                      ) : (
-                        <Pressable
-                           onPress={pickImageAsync}
-                           style={[Styles.iconContent, ColorsStatus.gray]}
-                        >
-                           <MaterialCommunityIcons
-                              name="account-tie"
-                              size={100}
-                              color={"gray"}
-                           />
+                        <Pressable onPress={pickImageAsync} style={[Styles.iconContent, ColorsStatus.gray]} >
+                           <MaterialCommunityIcons name="account-tie" size={85} color={"gray"} />
+                           <View style={[Styles.absoluteIconPicker]}>
+                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                           </View>
                         </Pressable>
                      )}
                   </View>

app/(application)/member/edit/[id].tsx

@@ -4,10 +4,13 @@ import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditUser, apiGetProfile } from "@/lib/api";
 import { setUpdateMember } from "@/lib/memberSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { useHeaderHeight } from '@react-navigation/elements';
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -38,6 +41,7 @@ type Props = {
 };
 
 export default function EditMember() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -52,6 +56,7 @@ export default function EditMember() {
    const [disableBtn, setDisableBtn] = useState(false)
    const [valChoose, setValChoose] = useState("")
    const [imgForm, setImgForm] = useState<any>();
+   const [loading, setLoading] = useState(false)
    const [data, setData] = useState<Props>({
       id: "",
       name: "",
@@ -79,7 +84,7 @@ export default function EditMember() {
       try {
          const response = await apiGetProfile({ id: id });
          setData(response.data);
-         setSelectedImage({ uri: `https://wibu-storage.wibudev.com/api/files/${response.data.img}`, });
+         setSelectedImage({ uri: `${ConstEnv.url_storage}/files/${response.data.img}`, });
          setChoosePosition({
             val: response.data.idPosition,
             label: response.data.position,
@@ -144,7 +149,7 @@ export default function EditMember() {
          }
       } else if (cat == "phone") {
          setData({ ...data, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -175,6 +180,7 @@ export default function EditMember() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -203,7 +209,9 @@ export default function EditMember() {
          }
       } catch (error) {
          console.error(error)
-         Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -222,7 +230,6 @@ export default function EditMember() {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
       } else {
-         alert("Tidak ada gambar yang dipilih");
          setErrorImg(false)
       }
    };
@@ -242,7 +249,7 @@ export default function EditMember() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -255,7 +262,7 @@ export default function EditMember() {
          <KeyboardAvoidingView
             style={[Styles.h100]}
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -263,13 +270,14 @@ export default function EditMember() {
                      {
                         errorImg ?
                            <Pressable onPress={pickImageAsync}>
-                              {
-                                 <Image
-                                    source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
-                                    style={[Styles.userProfileBig]}
-                                    onError={() => { setErrorImg(true) }}
-                                 />
-                              }
+                              <Image
+                                 source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${data?.img}` }}
+                                 style={[Styles.userProfileBig]}
+                                 onError={() => { setErrorImg(true) }}
+                              />
+                              <View style={[Styles.absoluteIconPicker]}>
+                                 <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                              </View>
                            </Pressable>
                            :
                            selectedImage != undefined ? (
@@ -283,6 +291,9 @@ export default function EditMember() {
                                     style={[Styles.userProfileBig]}
                                     onError={() => { setErrorImg(true) }}
                                  />
+                                 <View style={[Styles.absoluteIconPicker]}>
+                                    <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                                 </View>
                               </Pressable>
                            ) : (
                               <Image

app/(application)/member/index.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetUser } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -128,7 +129,7 @@ export default function Index() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -150,7 +151,7 @@ export default function Index() {
                                  onPress={() => { router.push(`/member/${item.id}`) }}
                                  borderType="all"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />
                                  }
                                  title={item.name}
                                  subtitle={`${item.group} - ${item.position}`}

app/(application)/notification.tsx

@@ -136,7 +136,6 @@ export default function Notification() {
                            return (
                               <BorderBottomItem
                                  borderType="bottom"
-                                 width={55}
                                  icon={
                                     <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
                                        <Feather name="bell" size={25} color="white" />

app/(application)/position/index.tsx

@@ -16,7 +16,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -40,6 +40,7 @@ export default function Index() {
    const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState('')
    const [nameGroup, setNameGroup] = useState('')
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [chooseData, setChooseData] = useState({ name: '', id: '', active: false, idGroup: '' })
    const [error, setError] = useState({
       name: false,
@@ -94,15 +95,20 @@ export default function Index() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditPosition({ user: hasil, name: chooseData.name, idGroup: chooseData.idGroup }, chooseData.id)
-         dispatch(setUpdatePosition(!update))
+         if (response.success) {
+            dispatch(setUpdatePosition(!update))
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
       } catch (error) {
          console.error(error)
       } finally {
+         setLoadingSubmit(false)
          setVisibleEdit(false)
          setModal(false)
-         Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
       }
 
    }
@@ -129,9 +135,18 @@ export default function Index() {
       setRefreshing(false)
    };
 
+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      idGroup: data[index].idGroup,
+      group: data[index].group,
+      isActive: data[index].isActive,
+   });
+
    return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -155,47 +170,50 @@ export default function Index() {
                   <Text>Filter : {nameGroup}</Text>
                </View>
             }
-            <ScrollView
-               style={[Styles.h100]}
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }>
-               <View>
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                    subtitle={item.group}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
          </View>
-
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                                 subtitle={item.group}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
+         </View>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
@@ -239,11 +257,10 @@ export default function Index() {
                   />
                </View>
                <View style={Styles.mb30}>
-                  <ButtonForm text="SIMPAN" onPress={() => { checkForm() }} />
+                  <ButtonForm text="SIMPAN" onPress={() => { handleEdit() }} disabled={Object.values(error).some((v) => v == true) || chooseData.name == "" || loadingSubmit} />
                </View>
             </View>
          </DrawerBottom>
-
-      </SafeAreaView>
+      </View>
    )
 }

app/(application)/profile.tsx

@@ -3,6 +3,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import ItemDetailMember from "@/components/itemDetailMember";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
@@ -41,7 +42,7 @@ export default function Profile() {
             <View style={{ flexDirection: 'column' }}>
                <View style={[Styles.wrapHeadViewMember]}>
                   <Image
-                     source={error ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${entities.img}` }}
+                     source={error ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${entities.img}` }}
                      onError={() => { setError(true) }}
                      style={[Styles.userProfileBig]}
                   />

app/(application)/project/[id]/add-file.tsx

@@ -26,6 +26,7 @@ export default function ProjectAddFile() {
    const [loadingCheck, setLoadingCheck] = useState(false)
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
+   const [loading, setLoading] = useState(false)
 
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
@@ -86,6 +87,7 @@ export default function ProjectAddFile() {
 
    async function handleAddFile() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData();
 
@@ -116,6 +118,8 @@ export default function ProjectAddFile() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -130,7 +134,7 @@ export default function ProjectAddFile() {
                headerTitle: 'Tambah File',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={fileForm.length == 0 ? true : false}
+                  disable={fileForm.length == 0 || loading ? true : false}
                   category="create"
                   onPress={() => { handleAddFile() }} />
             }}
@@ -162,6 +166,9 @@ export default function ProjectAddFile() {
                {
                   loadingCheck && <ActivityIndicator size="small" />
                }
+               {
+                  loading && <ActivityIndicator size="large" />
+               }
             </View>
          </ScrollView>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">

app/(application)/project/[id]/add-member.tsx

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberProject, apiGetProjectOne, apiGetUser } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
@@ -31,6 +32,7 @@ export default function AddMemberProject() {
    const [idGroup, setIdGroup] = useState('')
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -43,6 +45,7 @@ export default function AddMemberProject() {
          setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin'))
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       }
    }
 
@@ -73,6 +76,7 @@ export default function AddMemberProject() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberProject({ id: id, data: { user: hasil, member: selectMember } })
          if (response.success) {
@@ -82,6 +86,9 @@ export default function AddMemberProject() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -96,7 +103,7 @@ export default function AddMemberProject() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -116,7 +123,7 @@ export default function AddMemberProject() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -141,7 +148,7 @@ export default function AddMemberProject() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w80]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                     {
@@ -150,7 +157,7 @@ export default function AddMemberProject() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/project/[id]/add-task.tsx

@@ -1,17 +1,24 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateProjectTask } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -23,9 +30,12 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function ProjectAddTask() {
+   const headerHeight = useHeaderHeight();
    const { token, decryptToken } = useAuthSession()
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -38,11 +48,11 @@ export default function ProjectAddTask() {
       title: false,
    })
    const [title, setTitle] = useState('');
+   const [loading, setLoading] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -63,21 +73,62 @@ export default function ProjectAddTask() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
+
    async function handleCreate() {
       try {
+         setLoading(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiCreateProjectTask({ data: { name: title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id });
+         const response = await apiCreateProjectTask({
+            data: {
+               name: title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            }, id
+         });
          if (response.success) {
             dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
             Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -96,7 +147,7 @@ export default function ProjectAddTask() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
@@ -105,7 +156,7 @@ export default function ProjectAddTask() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -114,11 +165,18 @@ export default function ProjectAddTask() {
                         mode="range"
                         startDate={range.startDate}
                         endDate={range.endDate}
-                        onChange={(param) => setRange(param)}
+                        onChange={(param) => { setRange(param) }}
                         styles={{
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           month_selector_label: Styles.cBlack,
+                           year_label: Styles.cBlack,
+                           year_selector_label: Styles.cBlack,
+                           day_label: Styles.cBlack,
+                           time_label: Styles.cBlack,
+                           weekday_label: Styles.cBlack,
                         }}
                      />
                   </View>
@@ -144,6 +202,13 @@ export default function ProjectAddTask() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -161,6 +226,14 @@ export default function ProjectAddTask() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/project/[id]/cancel.tsx

@@ -19,6 +19,7 @@ export default function ProjectCancel() {
    const [reason, setReason] = useState("");
    const [error, setError] = useState(false);
    const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
 
 
    function onValidation(val: string) {
@@ -44,6 +45,7 @@ export default function ProjectCancel() {
 
    async function handleCancel() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCancelProject({
             reason: reason,
@@ -56,6 +58,9 @@ export default function ProjectCancel() {
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -74,7 +79,7 @@ export default function ProjectCancel() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="cancel"
                      onPress={() => {
                         handleCancel();

app/(application)/project/[id]/edit.tsx

@@ -19,6 +19,7 @@ export default function EditProject() {
    const [judul, setJudul] = useState("");
    const [error, setError] = useState(false);
    const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -42,6 +43,8 @@ export default function EditProject() {
       setJudul(val)
       if (val == "" || val == "null") {
          setError(true)
+      }else{
+         setError(false)
       }
    }
 
@@ -59,6 +62,7 @@ export default function EditProject() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditProject({
             name: judul,
@@ -68,9 +72,14 @@ export default function EditProject() {
             dispatch(setUpdateProject({ ...update, data: !update.data }))
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -91,7 +100,7 @@ export default function EditProject() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="update"
                      onPress={() => { handleUpdate() }}
                   />

app/(application)/project/[id]/index.tsx

@@ -1,7 +1,9 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import HeaderRightProjectDetail from "@/components/project/headerProjectDetail";
 import SectionFile from "@/components/project/sectionFile";
+import SectionLink from "@/components/project/sectionLink";
 import SectionMember from "@/components/project/sectionMember";
+import SectionReportProject from "@/components/project/sectionReportProject";
 import SectionTanggalTugasProject from "@/components/project/sectionTanggalTugas";
 import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
@@ -111,8 +113,10 @@ export default function DetailProject() {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing}/>
+               <SectionReportProject refreshing={refreshing} />
+               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionFile status={data?.status} member={isMember} refreshing={refreshing} />
+               <SectionLink status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionMember status={data?.status} refreshing={refreshing} />
             </View>
          </ScrollView>

app/(application)/project/[id]/report.tsx

@@ -0,0 +1,128 @@
+import ButtonBackHeader from "@/components/buttonBackHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import { InputForm } from "@/components/inputForm";
+import Styles from "@/constants/Styles";
+import { apiGetProjectOne, apiReportProject } from "@/lib/api";
+import { setUpdateProject } from "@/lib/projectUpdate";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import { useEffect, useState } from "react";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+export default function ReportProject() {
+   const { token, decryptToken } = useAuthSession();
+   const { id } = useLocalSearchParams<{ id: string }>();
+   const dispatch = useDispatch()
+   const update = useSelector((state: any) => state.projectUpdate)
+   const [laporan, setLaporan] = useState("");
+   const [error, setError] = useState(false);
+   const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
+
+   async function handleLoad() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetProjectOne({
+            user: hasil,
+            cat: "data",
+            id: id,
+         });
+         setLaporan(response.data.report);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleLoad();
+   }, []);
+
+   function onValidation(val: string) {
+      setLaporan(val)
+      if (val == "" || val == "null") {
+         setError(true)
+      } else {
+         setError(false)
+      }
+   }
+
+   function checkAll() {
+      if (laporan == "" || laporan == "null" || laporan == null || laporan == undefined || error) {
+         setDisable(true)
+      } else {
+         setDisable(false)
+      }
+   }
+
+   useEffect(() => {
+      checkAll()
+   }, [laporan, error]);
+
+   async function handleUpdate() {
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiReportProject({
+            report: laporan,
+            user: hasil,
+         }, id);
+         if (response.success) {
+            dispatch(setUpdateProject({ ...update, report: !update.report }))
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
+      }
+   }
+
+
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               headerLeft: () => (
+                  <ButtonBackHeader
+                     onPress={() => {
+                        router.back();
+                     }}
+                  />
+               ),
+               headerTitle: "Laporan Kegiatan",
+               headerTitleAlign: "center",
+               headerRight: () => (
+                  <ButtonSaveHeader
+                     disable={disable || loading}
+                     category="update"
+                     onPress={() => { handleUpdate() }}
+                  />
+               ),
+            }}
+         />
+         <ScrollView>
+            <View style={[Styles.p15, Styles.mb100]}>
+               <InputForm
+                  label="Laporan Kegiatan"
+                  type="default"
+                  placeholder="Laporan Kegiatan"
+                  required
+                  bg="white"
+                  value={laporan}
+                  onChange={(val) => { onValidation(val) }}
+                  error={error}
+                  errorText="Judul Kegiatan harus diisi"
+                  multiline
+               />
+            </View>
+         </ScrollView>
+      </SafeAreaView>
+   );
+}

app/(application)/project/create.tsx

@@ -10,8 +10,10 @@ import ModalSelect from "@/components/modalSelect";
 import SectionListAddTask from "@/components/project/sectionListAddTask";
 import SelectForm from "@/components/selectForm";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateProject } from "@/lib/api";
+import { setGroupChoose } from "@/lib/groupChoose";
 import { setMemberChoose } from "@/lib/memberChoose";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { setTaskCreate } from "@/lib/taskCreate";
@@ -29,6 +31,7 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateProject() {
+   const [loading, setLoading] = useState(false)
    const { token, decryptToken } = useAuthSession();
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
    const dispatch = useDispatch();
@@ -39,7 +42,6 @@ export default function CreateProject() {
    const taskCreate = useSelector((state: any) => state.taskCreate);
    const update = useSelector((state: any) => state.projectUpdate)
    const entityUser = useSelector((state: any) => state.user);
-   const userLogin = useSelector((state: any) => state.entities)
    const [fileForm, setFileForm] = useState<any[]>([])
    const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const [disableBtn, setDisableBtn] = useState(true)
@@ -55,10 +57,21 @@ export default function CreateProject() {
       member: false,
    });
    const [hitung, setHitung] = useState(0)
+   let hitungRefresh = 0;
+
+   useEffect(() => {
+      if (hitungRefresh == 0) {
+         dispatch(setGroupChoose(''));
+         dispatch(setTaskCreate([]));
+         dispatch(setMemberChoose([]));
+      }
+      hitungRefresh++;
+   }, []);
 
    function validationForm(cat: string, val: any, label?: string) {
       if (cat == "group") {
          setChooseGroup({ val, label: String(label) });
+         dispatch(setGroupChoose(val));
          dispatch(setMemberChoose([]));
          setDataForm({ ...dataForm, idGroup: val });
          if (val == "" || val == "null") {
@@ -91,6 +104,7 @@ export default function CreateProject() {
    }
 
    function handleBack() {
+      dispatch(setGroupChoose(''));
       dispatch(setTaskCreate([]));
       dispatch(setMemberChoose([]));
       router.back();
@@ -102,6 +116,7 @@ export default function CreateProject() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -127,6 +142,9 @@ export default function CreateProject() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -178,7 +196,7 @@ export default function CreateProject() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="create"
                      onPress={() => {
                         handleCreate()
@@ -234,16 +252,12 @@ export default function CreateProject() {
                   onPress={() => {
                      if (entityUser.role == "supadmin" || entityUser.role == "developer") {
                         if (chooseGroup.val != "") {
-                           setSelect(true);
-                           setValSelect("member");
+                           router.push(`/project/create/member`);
                         } else {
                            Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu", })
                         }
                      } else {
-                        validationForm('group', userLogin.idGroup, userLogin.group);
-                        setValChoose(userLogin.idGroup)
-                        setSelect(true);
-                        setValSelect("member");
+                        router.push(`/project/create/member`);
                      }
                   }}
                   error={error.member}
@@ -287,7 +301,7 @@ export default function CreateProject() {
                                     borderType="bottom"
                                     icon={
                                        <ImageUser
-                                          src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
                                           size="sm"
                                        />
                                     }

app/(application)/project/create/member.tsx

@@ -0,0 +1,148 @@
+import ButtonBackHeader from "@/components/buttonBackHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ImageUser from "@/components/imageNew";
+import ImageWithLabel from "@/components/imageWithLabel";
+import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
+import Styles from "@/constants/Styles";
+import { apiGetUser } from "@/lib/api";
+import { setMemberChoose } from "@/lib/memberChoose";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { AntDesign } from "@expo/vector-icons";
+import { router, Stack } from "expo-router";
+import { useEffect, useState } from "react";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+type Props = {
+   idUser: string,
+   name: string,
+   img: string
+}
+
+export default function AddMemberCreateProject() {
+   const dispatch = useDispatch()
+   const { token, decryptToken } = useAuthSession()
+   const [data, setData] = useState<Props[]>([])
+   const [selectMember, setSelectMember] = useState<any[]>([])
+   const [search, setSearch] = useState('')
+   const entitiesMember = useSelector((state: any) => state.memberChoose)
+   const entitiesGroup = useSelector((state: any) => state.groupChoose)
+   const entityUser = useSelector((state: any) => state.user)
+   const userLogin = useSelector((state: any) => state.entities)
+
+   async function handleLoadMember() {
+      const hasil = await decryptToken(String(token?.current))
+      let groupFix = userLogin.idGroup
+      if (entityUser.role == 'supadmin' || entityUser.role == 'developer') {
+         groupFix = entitiesGroup
+      }
+
+      const responMemberDivision = await apiGetUser({ user: hasil, active: "true", search: search, group: groupFix })
+      setData(responMemberDivision.data.filter((i: any) => i.idUserRole != 'supadmin'))
+      if (entitiesMember.length > 0) {
+         setSelectMember(entitiesMember)
+      }
+   }
+
+   useEffect(() => {
+      handleLoadMember()
+   }, [search]);
+
+   function onChoose(val: string, label: string, img?: string) {
+      if (selectMember.some((i: any) => i.idUser == val)) {
+         setSelectMember(selectMember.filter((i: any) => i.idUser != val))
+      } else {
+         setSelectMember([...selectMember, { idUser: val, name: label, img }])
+      }
+   }
+
+   async function handleAddMember() {
+      try {
+         dispatch(setMemberChoose(selectMember))
+         router.back()
+      } catch (error) {
+         console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
+      }
+   }
+
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               headerTitle: 'Pilih Anggota',
+               headerTitleAlign: 'center',
+               headerRight: () => (
+                  <ButtonSaveHeader
+                     category="create"
+                     disable={selectMember.length > 0 ? false : true}
+                     onPress={() => {
+                        handleAddMember()
+                     }}
+                  />
+               )
+            }}
+         />
+         <View style={[Styles.p15]}>
+            <InputSearch onChange={(val) => setSearch(val)} value={search} />
+
+            {
+               selectMember.length > 0
+                  ?
+                  <View>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                        {
+                           selectMember.map((item: any, index: any) => (
+                              <ImageWithLabel
+                                 key={index}
+                                 label={item.name}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
+                                 onClick={() => onChoose(item.idUser, item.name, item.img)}
+                              />
+                           ))
+                        }
+                     </ScrollView>
+                  </View>
+
+                  :
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+            }
+            <ScrollView>
+
+               {
+                  data.length > 0 ?
+                     data.map((item: any, index: any) => {
+                        return (
+                           <Pressable
+                              key={index}
+                              style={[Styles.itemSelectModal]}
+                              onPress={() => {
+                                 onChoose(item.id, item.name, item.img)
+                              }}
+                           >
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
+                                 <View style={[Styles.ml10]}>
+                                    <Text style={[Styles.textDefault]}>{item.name}</Text>
+                                 </View>
+                              </View>
+                              {
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
+                              }
+                           </Pressable>
+                        )
+                     }
+                     )
+                     :
+                     <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
+               }
+            </ScrollView>
+         </View>
+      </SafeAreaView>
+   )
+}

app/(application)/project/create/task.tsx

@@ -1,15 +1,22 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -20,6 +27,7 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateProjectAddTask() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -33,11 +41,12 @@ export default function CreateProjectAddTask() {
    })
    const [title, setTitle] = useState('');
    const taskCreate = useSelector((state: any) => state.taskCreate)
+   const [dsbButton, setDsbButton] = useState(true)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate, "DD-MM-YYYY");
+   const to = formatDateOnly(range.endDate, "DD-MM-YYYY");
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -58,18 +67,45 @@ export default function CreateProjectAddTask() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          dispatch(setTaskCreate([...taskCreate, {
             title: title,
             dateStart: from,
             dateEnd: to,
-            dateStartFix: dayjs(range.startDate).format("YYYY-MM-DD"),
-            dateEndFix: dayjs(range.endDate).format("YYYY-MM-DD"),
+            dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+            dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+            dataDetail: dataDetailFix
          }]))
          router.back();
       } catch (error) {
@@ -101,7 +137,7 @@ export default function CreateProjectAddTask() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -115,6 +151,13 @@ export default function CreateProjectAddTask() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           month_selector_label: Styles.cBlack,
+                           year_label: Styles.cBlack,
+                           year_selector_label: Styles.cBlack,
+                           day_label: Styles.cBlack,
+                           time_label: Styles.cBlack,
+                           weekday_label: Styles.cBlack,
                         }}
                      />
                   </View>
@@ -140,6 +183,13 @@ export default function CreateProjectAddTask() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -157,6 +207,14 @@ export default function CreateProjectAddTask() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/project/index.tsx

@@ -178,7 +178,7 @@ export default function ListProject() {
                   n={4}
                />
             </ScrollView>
-            <View style={[Styles.rowSpaceBetween]}>
+            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
                <Pressable
                   onPress={() => {

app/(application)/project/update/[detail].tsx

@@ -1,20 +1,27 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditProjectTask, apiGetProjectTask } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
-import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native";
+import { KeyboardAvoidingView, Platform, Pressable, SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function UpdateProjectTask() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
    const { token, decryptToken } = useAuthSession();
@@ -24,6 +31,10 @@ export default function UpdateProjectTask() {
    const [year, setYear] = useState<any>()
    const [loading, setLoading] = useState(true)
    const [disableBtn, setDisableBtn] = useState(false)
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
    const [title, setTitle] = useState('')
    const [error, setError] = useState({
@@ -32,10 +43,8 @@ export default function UpdateProjectTask() {
       title: false,
    })
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : '';
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : '';
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    async function handleLoad() {
       try {
@@ -52,6 +61,23 @@ export default function UpdateProjectTask() {
          })
          setMonth(new Date(response.data.dateStart).getMonth())
          setYear(new Date(response.data.dateStart).getFullYear())
+
+         const response2 = await apiGetProjectTask({
+            user: hasil,
+            id: detail,
+            cat: "detailTask"
+         });
+         if (response2.data.length == 0) {
+            const datanya = getDatesInRange(response.data.dateStart, response.data.dateEnd)
+            setDataDetail(datanya.map((item: any) => ({
+               date: item,
+               timeStart: null,
+               timeEnd: null,
+            })))
+         } else {
+            setDataDetail(response2.data)
+         }
+
       } catch (error) {
          console.error(error);
       } finally {
@@ -65,15 +91,35 @@ export default function UpdateProjectTask() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditProjectTask({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
+         const response = await apiEditProjectTask({
+            data: {
+               title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            },
+            id: detail
+         });
          if (response.success) {
             dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoadingSubmit(false)
       }
    }
 
@@ -96,10 +142,32 @@ export default function UpdateProjectTask() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -108,7 +176,7 @@ export default function UpdateProjectTask() {
                headerTitle: 'Edit Tanggal dan Tugas',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={disableBtn}
+                  disable={disableBtn || loadingSubmit}
                   category="update"
                   onPress={() => { handleEdit() }}
                />
@@ -116,7 +184,7 @@ export default function UpdateProjectTask() {
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-            keyboardVerticalOffset={110}
+            keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
@@ -129,13 +197,19 @@ export default function UpdateProjectTask() {
                            startDate={range.startDate}
                            endDate={range.endDate}
                            onChange={(param) => setRange(param)}
-                           // styles={defaultStyles}
                            month={month}
                            year={year}
                            styles={{
                               selected: Styles.selectedDate,
                               selected_label: Styles.cWhite,
                               range_fill: Styles.selectRangeDate,
+                              month_label: Styles.cBlack,
+                              month_selector_label: Styles.cBlack,
+                              year_label: Styles.cBlack,
+                              year_selector_label: Styles.cBlack,
+                              day_label: Styles.cBlack,
+                              time_label: Styles.cBlack,
+                              weekday_label: Styles.cBlack,
                            }}
                         />
                      }
@@ -159,6 +233,13 @@ export default function UpdateProjectTask() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -176,6 +257,15 @@ export default function UpdateProjectTask() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
+
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    )
 }

app/(application)/search.tsx

@@ -3,6 +3,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader";
 import InputSearch from "@/components/inputSearch";
 import Text from '@/components/Text';
 import { ColorsStatus } from "@/constants/ColorsStatus";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetSearch } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -74,7 +75,6 @@ export default function Search() {
                   headerTitleAlign: 'center'
                }}
             />
-            {/* <ScrollView> */}
             <View style={[Styles.p15]}>
                <InputSearch onChange={handleSearch} />
                {
@@ -92,7 +92,7 @@ export default function Search() {
                                     <BorderBottomItem
                                        borderType="bottom"
                                        icon={<Image
-                                          source={{ uri: `https://wibu-storage.wibudev.com/api/files/${item.img}` }}
+                                          source={{ uri: `${ConstEnv.url_storage}/files/${item.img}` }}
                                           style={[Styles.userProfileSmall]}
                                        />}
                                        title={item.name}
@@ -162,13 +162,12 @@ export default function Search() {
 
                      </View>
                      :
-                     <View style={Styles.contentItemCenter}>
+                     <View style={[Styles.contentItemCenter, Styles.mt10]}>
                         <Text style={[Styles.textInformation, Styles.cGray]}>Tidak ada data</Text>
                      </View>
                }
 
             </View>
-            {/* </ScrollView> */}
          </SafeAreaView>
       </>
    )

app/_layout.tsx

@@ -4,9 +4,9 @@ import { Stack } from 'expo-router';
 import * as SplashScreen from 'expo-splash-screen';
 import { StatusBar } from 'expo-status-bar';
 import { useEffect } from 'react';
-import 'react-native-reanimated';
-import { NotifierWrapper } from 'react-native-notifier';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { NotifierWrapper } from 'react-native-notifier';
+import 'react-native-reanimated';
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();

app/index.tsx

@@ -1,7 +1,6 @@
 import ViewLogin from "@/components/auth/viewLogin";
 import ViewVerification from "@/components/auth/viewVerification";
 import Text from '@/components/Text';
-import ToastCustom from "@/components/toastCustom";
 import { requestPermission } from "@/lib/useNotification";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Redirect } from "expo-router";

app/verification.tsx

@@ -1,5 +1,6 @@
 import { ButtonForm } from "@/components/buttonForm";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { useAuthSession } from "@/providers/AuthProvider";
 import CryptoES from "crypto-es";
@@ -19,10 +20,7 @@ export default function Index() {
    const login = (): void => {
       const random: string = 'contohLoginMobileDarmasaba';
       var mytexttoEncryption = "contohLoginMobileDarmasaba"
-      const encrypted = CryptoES.AES.encrypt(mytexttoEncryption, "your password").toString();
-      // var C = require("crypto-js");
-      // var Decrypted = C.AES.decrypt(encrypted, "your password");
-      // var result = Decrypted.toString(C.enc.Utf8);
+      const encrypted = CryptoES.AES.encrypt(mytexttoEncryption, ConstEnv.pass_encrypt).toString();
       signIn(encrypted);
    }
    return (

bump-version.js

@@ -0,0 +1,38 @@
+const fs = require("fs");
+const path = require("path");
+
+const configPath = path.join(__dirname, "app.config.js");
+let configFile = fs.readFileSync(configPath, "utf8");
+
+// --- Update versionCode ---
+const codeRegex = /versionCode:\s*(\d+)/;
+const codeMatch = configFile.match(codeRegex);
+
+if (!codeMatch) {
+  console.error("❌ Tidak menemukan versionCode di app.config.js");
+  process.exit(1);
+}
+
+const currentCode = parseInt(codeMatch[1], 10);
+const newCode = currentCode + 1;
+configFile = configFile.replace(codeRegex, `versionCode: ${newCode}`);
+
+// --- Update versionName ---
+const nameRegex = /version:\s*"(.*?)"/;
+const nameMatch = configFile.match(nameRegex);
+
+if (!nameMatch) {
+  console.error("❌ Tidak menemukan version di app.config.js");
+  process.exit(1);
+}
+
+let [major, minor, patch] = nameMatch[1].split(".").map(Number);
+patch += 1; // bump patch version
+const newName = `${major}.${minor}.${patch}`;
+configFile = configFile.replace(nameRegex, `version: "${newName}"`);
+
+// --- Simpan file ---
+fs.writeFileSync(configPath, configFile, "utf8");
+
+console.log(`✅ versionCode: ${currentCode} → ${newCode}`);
+console.log(`✅ versionName: ${nameMatch[1]} → ${newName}`);

components/auth/viewLogin.tsx

@@ -1,8 +1,10 @@
 import Styles from "@/constants/Styles"
 import { apiCheckPhoneLogin, apiSendOtp } from "@/lib/api"
+import { useAuthSession } from "@/providers/AuthProvider"
 import AsyncStorage from "@react-native-async-storage/async-storage"
+import { StatusBar } from "expo-status-bar"
 import { useState } from "react"
-import { Image, SafeAreaView, View } from "react-native"
+import { Image, Platform, SafeAreaView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { ButtonForm } from "../buttonForm"
 import { InputForm } from "../inputForm"
@@ -10,7 +12,6 @@ import ModalLoading from "../modalLoading"
 import Text from "../Text"
 import ToastCustom from "../toastCustom"
 
-
 type Props = {
    onValidate: ({ phone, otp }: { phone: string, otp: number }) => void
 }
@@ -19,23 +20,29 @@ export default function ViewLogin({ onValidate }: Props) {
    const [loadingLogin, setLoadingLogin] = useState(false)
    const [disableLogin, setDisableLogin] = useState(true)
    const [phone, setPhone] = useState('')
+   const { signIn, encryptToken } = useAuthSession();
 
    const handleCheckPhone = async () => {
       try {
          setLoadingLogin(true)
-         const response = await apiCheckPhoneLogin({ phone: `62${phone}` });
+         const response = await apiCheckPhoneLogin({ phone: `62${phone}` })
          if (response.success) {
-            const otp = Math.floor(1000 + Math.random() * 9000)
-            const responseOtp = await apiSendOtp({ phone: `62${phone}`, otp })
-            if (responseOtp == 200) {
-               // localStorage.setItem('user', response.id)
-               await AsyncStorage.setItem('user', response.id);
-               return onValidate({ phone: `62${phone}`, otp })
+            if (response.isWithoutOTP) {
+               const encrypted = await encryptToken(response.id)
+               signIn(encrypted)
+            } else {
+               const otp = Math.floor(1000 + Math.random() * 9000)
+               const responseOtp = await apiSendOtp({ phone: `62${phone}`, otp })
+               if (responseOtp == 200) {
+                  await AsyncStorage.setItem('user', response.id)
+                  return onValidate({ phone: `62${phone}`, otp })
+               }
             }
+         } else {
+            return Toast.show({ type: 'small', text1: response.message, position: 'top' })
          }
-         return Toast.show({ type: 'small', text1: response.message, })
       } catch (error) {
-         return Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+         return Toast.show({ type: 'small', text1: 'Terjadi kesalahan', position: 'top' })
       } finally {
          setLoadingLogin(false)
       }
@@ -43,8 +50,9 @@ export default function ViewLogin({ onValidate }: Props) {
 
    return (
       <SafeAreaView>
+         <StatusBar style={Platform.OS === 'ios' ? 'auto' : 'light'} translucent={false} backgroundColor="black" />
          <ToastCustom />
-         <View style={Styles.p20}>
+         <View style={[Styles.p20, Styles.h100]}>
             <View style={{ alignItems: "center", marginVertical: 50 }}>
                <Image
                   source={require("../../assets/images/splash-icon.png")}

components/auth/viewVerification.tsx

@@ -2,8 +2,9 @@ import Styles from "@/constants/Styles";
 import { apiSendOtp } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import AsyncStorage from "@react-native-async-storage/async-storage";
+import { StatusBar } from "expo-status-bar";
 import { useState } from "react";
-import { Image, View } from "react-native";
+import { Image, Platform, View } from "react-native";
 import { OtpInput } from "react-native-otp-entry";
 import Toast from 'react-native-toast-message';
 import { ButtonForm } from "../buttonForm";
@@ -27,7 +28,7 @@ export default function ViewVerification({ phone, otp }: Props) {
          const encrypted = await encryptToken(valueUser);
          signIn(encrypted);
       } else {
-         return Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+         return Toast.show({ type: 'small', text1: 'Terjadi kesalahan', position: 'top' })
       }
    }
 
@@ -35,7 +36,7 @@ export default function ViewVerification({ phone, otp }: Props) {
       if (value === otpFix.toString()) {
          login()
       } else {
-         return Toast.show({ type: 'error', text1: 'Kode OTP tidak sesuai' });
+         return Toast.show({ type: 'small', text1: 'Kode OTP tidak sesuai', position: 'top' });
       }
    }
 
@@ -56,6 +57,7 @@ export default function ViewVerification({ phone, otp }: Props) {
 
    return (
       <>
+         <StatusBar style={Platform.OS === 'ios' ? 'auto' : 'light'} translucent={false} backgroundColor="black"/>
          <ToastCustom />
          <View style={Styles.wrapLogin} >
             <View style={{ alignItems: "center", marginVertical: 50 }}>

components/borderBottomItem.tsx

@@ -31,7 +31,7 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
          <View style={[Styles.rowItemsCenter]}>
             {icon}
             <View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
-               <View style={[Styles.ml10, rightTopInfo ? { width: lebar } : { width: '90%' },]}>
+               <View style={[Styles.ml10, rightTopInfo ? { width: '70%' } : { width: '90%' }]}>
                   <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={1} ellipsizeMode='tail'>{title}</Text>
                   {
                      subtitle &&
@@ -48,7 +48,7 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
             </View>
 
          </View>
-         {desc && <Text style={[Styles.textDefault, Styles.mt05, { textAlign: 'justify', color: textColorFix }]} numberOfLines={descEllipsize == false ? 0 : 2} ellipsizeMode='tail'>{desc}</Text>}
+         {desc && <Text style={[Styles.textDefault, Styles.mt05, { textAlign: 'left', color: textColorFix }]} numberOfLines={descEllipsize == false ? 0 : 2} ellipsizeMode='tail'>{desc}</Text>}
          {
             (leftBottomInfo || rightBottomInfo) &&
             (

components/calendar/itemDateCalendar.tsx

@@ -1,21 +1,22 @@
 import Styles from "@/constants/Styles";
-import { View } from "react-native";
+import { Pressable, View } from "react-native";
 import Text from "../Text";
 
 type Props = {
    text: string;
    isSelected: boolean;
    isSign: boolean;
+   onPress?: () => void;
 }
 
 
-export default function ItemDateCalendar({ text, isSelected, isSign }: Props) {
+export default function ItemDateCalendar({ text, isSelected, isSign, onPress }: Props) {
    return (
       <>
-         <View style={{ alignItems: 'center' }}>
+         <Pressable style={{ alignItems: 'center' }} onPress={onPress}>
             <Text style={[isSelected ? Styles.cWhite : Styles.cBlack]}>{text}</Text>
             <View style={[Styles.signDate, { backgroundColor: isSign ? 'red' : 'transparent' }]}></View>
-         </View>
+         </Pressable>
       </>
    )
 }

components/division/fileDivisionDetail.tsx

@@ -1,3 +1,4 @@
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -8,11 +9,11 @@ import { useLocalSearchParams } from "expo-router";
 import * as Sharing from 'expo-sharing';
 import React, { useEffect, useState } from "react";
 import { Alert, Dimensions, Platform, Pressable, View } from "react-native";
-import Text from "../Text";
 import * as mime from 'react-native-mime-types';
 import { ICarouselInstance } from "react-native-reanimated-carousel";
-import Skeleton from "../skeleton";
 import ModalLoading from "../modalLoading";
+import Skeleton from "../skeleton";
+import Text from "../Text";
 
 type Props = {
    id: string
@@ -51,14 +52,15 @@ export default function FileDivisionDetail() {
 
 
    const openFile = (item: Props) => {
-      setLoadingOpen(true)
-      let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
+      if (Platform.OS == 'android') setLoadingOpen(true)
+      let remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage;
       const fileName = item.name + '.' + item.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
       const mimeType = mime.lookup(fileName)
 
       FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
          const contentURL = await FileSystem.getContentUriAsync(uri);
+         setLoadingOpen(false)
          try {
             if (Platform.OS == 'android') {
                // open with android intent
@@ -79,7 +81,7 @@ export default function FileDivisionDetail() {
          } catch (error) {
             Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini');
          } finally {
-            setLoadingOpen(false)
+            if (Platform.OS == 'android') setLoadingOpen(false)
          }
       });
    };

components/division/taskDivisionDetail.tsx

@@ -2,12 +2,12 @@ import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
-import { useLocalSearchParams } from "expo-router";
+import { router, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
-import { Dimensions, View } from "react-native";
-import Text from "../Text";
-import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel";
+import { Dimensions, Pressable, View } from "react-native";
+import { ICarouselInstance } from "react-native-reanimated-carousel";
 import Skeleton from "../skeleton";
+import Text from "../Text";
 
 type Props = {
    id: string
@@ -46,34 +46,42 @@ export default function TaskDivisionDetail() {
    return (
       <View>
          <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Tugas Hari Ini</Text>
-
          {
             loading ?
                <Skeleton width={100} widthType="percent" height={60} borderRadius={10} />
                :
                data.length > 0 ?
-                  <Carousel
-                     ref={ref}
-                     style={{ width: "100%" }}
-                     width={width * 0.8}
-                     height={100}
-                     data={data}
-                     loop={true}
-                     autoPlay={false}
-                     autoPlayReverse={false}
-                     pagingEnabled={true}
-                     snapEnabled={true}
-                     vertical={false}
-                     renderItem={({ index }) => (
-                        <View style={[Styles.wrapPaper, { width: '95%' }]}>
-                           <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{data[index].title} - {data[index].projectTitle}</Text>
-                           <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                              <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
-                              <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{data[index].dateStart} - {data[index].dateEnd}</Text>
-                           </View>
+                  data.map((item, index) => (
+                     <Pressable key={index} style={[Styles.wrapPaper]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
+                        <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{item.title} - {item.projectTitle}</Text>
+                        <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                           <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
+                           <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
                         </View>
-                     )}
-                  />
+                     </Pressable>
+                  ))
+                  // <Carousel
+                  //    ref={ref}
+                  //    style={{ width: "100%" }}
+                  //    width={width * 0.8}
+                  //    height={100}
+                  //    data={data}
+                  //    loop={true}
+                  //    autoPlay={false}
+                  //    autoPlayReverse={false}
+                  //    pagingEnabled={true}
+                  //    snapEnabled={true}
+                  //    vertical={false}
+                  //    renderItem={({ index }) => (
+                  //       <View style={[Styles.wrapPaper, { width: '95%' }]}>
+                  //          <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{data[index].title} - {data[index].projectTitle}</Text>
+                  //          <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                  //             <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
+                  //             <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{data[index].dateStart} - {data[index].dateEnd}</Text>
+                  //          </View>
+                  //       </View>
+                  //    )}
+                  // />
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
          }

components/document/headerDocument.tsx

@@ -6,7 +6,7 @@ import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import * as DocumentPicker from "expo-document-picker";
 import { useLocalSearchParams } from "expo-router";
 import { useState } from "react";
-import { View } from "react-native";
+import { ActivityIndicator, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 import ButtonMenuHeader from "../buttonMenuHeader";
@@ -24,9 +24,11 @@ export default function HeaderRightDocument({ path }: { path: string }) {
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.dokumenUpdate)
    const [loading, setLoading] = useState(false)
+   const [loadingFolder, setLoadingFolder] = useState(false)
 
    async function handleCreateFolder() {
       try {
+         setLoadingFolder(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateFolderDocument({ data: { user: hasil, name, path, idDivision: id } })
          if (response.success) {
@@ -39,6 +41,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
+         setLoadingFolder(false)
          setNewFolder(false)
       }
    }
@@ -46,26 +49,31 @@ export default function HeaderRightDocument({ path }: { path: string }) {
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false,
+         multiple: true,
       });
       if (!result.canceled) {
-         if (result.assets?.[0].uri) {
-            handleUploadFile(result.assets?.[0])
+         let file: any[] = []
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets?.[i].uri) {
+               file.push(result.assets?.[i])
+            }
          }
+         handleUploadFile(file)
       }
    };
 
-   async function handleUploadFile(file: any) {
+   async function handleUploadFile(file: any[]) {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
-         fd.append("file", {
-            uri: file.uri,
-            type: "application/octet-stream",
-            name: file.name,
-         } as any);
-
+         for (let i = 0; i < file.length; i++) {
+            fd.append(`file${i}`, {
+               uri: file[i].uri,
+               type: "application/octet-stream",
+               name: file[i].name,
+            } as any);
+         }
          fd.append(
             "data",
             JSON.stringify({
@@ -73,7 +81,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
                idDivision: id,
                user: hasil,
             })
-         );
+         )
 
          const response = await apiUploadFileDocument({ data: fd })
          if (response.success) {
@@ -106,35 +114,44 @@ export default function HeaderRightDocument({ path }: { path: string }) {
             title="Menu"
          >
             <View style={Styles.rowItemsCenter}>
-               <MenuItemRow
-                  icon={
-                     <MaterialCommunityIcons
-                        name="folder-open"
-                        color="black"
-                        size={25}
-                     />
-                  }
-                  title="Tambah Folder"
-                  onPress={() => {
-                     setVisible(false);
-                     setTimeout(() => {
-                        setNewFolder(true);
-                     }, 600);
-                  }}
-               />
+               {
+                  loading ?
+                     <View style={[Styles.contentItemCenter, Styles.w100, Styles.h100]}>
+                        <ActivityIndicator size="large" />
+                     </View>
+                     :
+                     <>
+                        <MenuItemRow
+                           icon={
+                              <MaterialCommunityIcons
+                                 name="folder-open"
+                                 color="black"
+                                 size={25}
+                              />
+                           }
+                           title="Tambah Folder"
+                           onPress={() => {
+                              setVisible(false);
+                              setTimeout(() => {
+                                 setNewFolder(true);
+                              }, 600);
+                           }}
+                        />
 
-               <MenuItemRow
-                  icon={<MaterialIcons name="upload-file" color="black" size={25} />}
-                  title="Upload File"
-                  onPress={pickDocumentAsync}
-               />
+                        <MenuItemRow
+                           icon={<MaterialIcons name="upload-file" color="black" size={25} />}
+                           title="Upload File"
+                           onPress={pickDocumentAsync}
+                        />
+                     </>
+               }
             </View>
          </DrawerBottom>
          <ModalFloat
             title="Buat Folder Baru"
             isVisible={newFolder}
             setVisible={() => { setNewFolder(false) }}
-            disableSubmit={name == ""}
+            disableSubmit={name == "" || loadingFolder}
             onSubmit={() => { handleCreateFolder() }}
          >
             <View>

components/document/modalNewFolder.tsx

@@ -0,0 +1,65 @@
+import Styles from "@/constants/Styles";
+import { apiCreateFolderDocument } from "@/lib/api";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { useLocalSearchParams } from "expo-router";
+import { useState } from "react";
+import { Pressable, View } from "react-native";
+import Toast from "react-native-toast-message";
+import Text from "../Text";
+import { InputForm } from "../inputForm";
+import ModalFloat from "../modalFloat";
+
+export function ModalNewFolder({ path, onCreated }: { path: string, onCreated: () => void }) {
+   const { token, decryptToken } = useAuthSession()
+   const [newFolder, setNewFolder] = useState(false)
+   const [name, setName] = useState("")
+   const [loadingFolder, setLoadingFolder] = useState(false)
+   const { id } = useLocalSearchParams<{ id: string }>();
+
+
+   async function handleCreateFolder() {
+      try {
+         setLoadingFolder(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiCreateFolderDocument({ data: { user: hasil, name, path, idDivision: id } })
+         if (response.success) {
+            Toast.show({ type: 'small', text1: 'Berhasil membuat folder baru', })
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         onCreated()
+         setLoadingFolder(false)
+         setNewFolder(false)
+      }
+   }
+
+   return (
+      <>
+         <Pressable style={[Styles.pv05, Styles.borderRight, { width: '50%' }]} onPress={() => setNewFolder(true)}>
+            <Text style={[Styles.textDefaultSemiBold, { textAlign: 'center' }]}>FOLDER BARU</Text>
+         </Pressable>
+
+         <ModalFloat
+            title="Buat Folder Baru"
+            isVisible={newFolder}
+            setVisible={() => { setNewFolder(false) }}
+            disableSubmit={name == "" || loadingFolder}
+            onSubmit={() => { handleCreateFolder() }}
+         >
+            <View>
+               <InputForm
+                  type="default"
+                  placeholder="Nama Folder"
+                  required
+                  label="Nama Folder"
+                  onChange={(value: string) => { setName(value) }}
+               />
+            </View>
+         </ModalFloat>
+      </>
+   )
+}

components/document/modalSalinMove.tsx

@@ -8,6 +8,7 @@ import { Pressable, View } from "react-native"
 import BorderBottomItem from "../borderBottomItem"
 import DrawerBottom from "../drawerBottom"
 import Text from "../Text"
+import { ModalNewFolder } from "./modalNewFolder"
 
 type Props = {
    open: boolean
@@ -106,9 +107,7 @@ export default function ModalSalinMove({ open, close, category, onConfirm, dataC
             }
          </View>
          <View style={[Styles.rowOnly, Styles.mt15, Styles.absolute0]}>
-            <Pressable style={[Styles.pv05, Styles.borderRight, { width: '50%' }]} onPress={() => close(false)}>
-               <Text style={[Styles.textDefaultSemiBold, { textAlign: 'center' }]}>BATAL</Text>
-            </Pressable>
+            <ModalNewFolder path={path} onCreated={() => getData()} />
             <Pressable style={[Styles.pv05, { width: '50%' }]} onPress={() => onConfirm(path)}>
                <Text style={[Styles.textDefaultSemiBold, { textAlign: 'center' }]}>{category == 'copy' ? 'SALIN' : 'PINDAH'}</Text>
             </Pressable>

components/drawerBottom.tsx

@@ -44,7 +44,7 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
                >
                   <View style={[Styles.modalContentNew, { height: tinggiFix }]}>
                      <View style={[Styles.titleContainerNew]}>
-                        <Text style={Styles.textDefault}>{title}</Text>
+                        <Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefault, Styles.w90]}>{title}</Text>
                         <Pressable onPress={() => setVisible(false)}>
                            <MaterialIcons name="close" color="black" size={22} />
                         </Pressable>
@@ -57,7 +57,7 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
                :
                <View style={[Styles.modalContentNew, { height: tinggiFix }]}>
                   <View style={[Styles.titleContainerNew]}>
-                     <Text style={Styles.textDefault}>{title}</Text>
+                     <Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefault, Styles.w90]}>{title}</Text>
                      <Pressable onPress={() => setVisible(false)}>
                         <MaterialIcons name="close" color="black" size={22} />
                      </Pressable>

components/eventItem.tsx

@@ -1,5 +1,5 @@
-import Styles from "@/constants/Styles"
-import { Pressable, View } from "react-native"
+import Styles from "@/constants/Styles";
+import { Pressable, View } from "react-native";
 import Text from "./Text";
 
 type Props = {
@@ -17,8 +17,8 @@ export default function EventItem({ category, title, user, jamAwal, jamAkhir, on
          <View style={[Styles.dividerEvent, { backgroundColor: category == 'orange' ? '#FB804C' : '#535FCA' }]} />
          <View>
             <Text>{jamAwal} - {jamAkhir}</Text>
-            <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>{title}</Text>
-            <Text>Dibuat oleh : {user}</Text>
+            <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefaultSemiBold, Styles.mv05]}>{title}</Text>
+            <Text numberOfLines={1} ellipsizeMode="tail">Dibuat oleh : {user}</Text>
          </View>
       </Pressable>
    )

components/group/headerGroupList.tsx

@@ -48,9 +48,9 @@ export default function HeaderRightGroupList() {
       if (cat === 'title') {
          setTitle(val)
          if (val == "" || val.length < 3) {
-            setError({ ...error, title: true })
+            setError((prev) => ({ ...prev, title: true }))
          } else {
-            setError({ ...error, title: false })
+            setError((prev) => ({ ...prev, title: false }))
          }
       }
    }
@@ -91,7 +91,7 @@ export default function HeaderRightGroupList() {
                   />
                </View>
                <View>
-                  <ButtonForm text="SIMPAN" onPress={() => { onCheck() }} />
+                  <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || title == ""} onPress={() => { onCheck() }} />
                </View>
             </View>
          </DrawerBottom>

components/home/carouselHome.tsx

@@ -1,3 +1,4 @@
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetBanner, apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/bannerSlice";
@@ -8,6 +9,7 @@ import { Dimensions, Image, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
 import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel";
 import { useDispatch, useSelector } from "react-redux";
+import Text from "../Text";
 
 export default function CaraouselHome() {
    const { decryptToken, token } = useAuthSession()
@@ -20,7 +22,13 @@ export default function CaraouselHome() {
 
    async function handleBannerView() {
       const hasil = await decryptToken(String(token?.current))
-      apiGetBanner({ user: hasil }).then((data) => dispatch(setEntities(data.data)))
+      apiGetBanner({ user: hasil }).then((data) => {
+         if (data.data.length > 0) {
+            dispatch(setEntities(data.data))
+         } else {
+            dispatch(setEntities([]))
+         }
+      })
    }
 
    async function handleUser() {
@@ -39,22 +47,30 @@ export default function CaraouselHome() {
 
    return (
       <View style={[Styles.mv15]}>
-         <Carousel
-            ref={ref}
-            width={width}
-            height={width / 2.5}
-            data={entities}
-            loop={true}
-            autoPlay={true}
-            autoPlayInterval={5000}
-            onProgressChange={progress}
-            renderItem={({ index }) => (
-               <Image
-                  source={{ uri: `https://wibu-storage.wibudev.com/api/files/${entities[index].image}` }}
-                  style={[Styles.caraoselContent]}
+         {
+            entities.length > 0 ?
+               <Carousel
+                  ref={ref}
+                  width={width}
+                  height={width / 2.5}
+                  data={entities}
+                  loop={true}
+                  autoPlay={true}
+                  autoPlayInterval={5000}
+                  onProgressChange={progress}
+                  renderItem={({ index }) => (
+                     <Image
+                        source={{ uri: `${ConstEnv.url_storage}/files/${entities[index].image}` }}
+                        style={[Styles.caraoselContent]}
+                     />
+                  )}
                />
-            )}
-         />
+               :
+               <View style={[Styles.caraoselContent, { height: width / 2.5 }]}>
+                  <Text style={[Styles.textDefault, Styles.cWhite, { textAlign: 'center' }]}>BANNER</Text>
+               </View>
+         }
+
       </View>
    )
 }

components/imageWithLabel.tsx

@@ -11,7 +11,7 @@ type Props = {
 
 export default function ImageWithLabel({ src, label, onClick }: Props) {
    return (
-      <TouchableOpacity style={[Styles.contentItemCenter, Styles.mh05, { width: 70 }]} onPress={onClick}>
+      <TouchableOpacity style={[Styles.contentItemCenter, Styles.mh03, { width: 55 }]} onPress={onClick}>
          <ImageUser src={src} border />
          <Text numberOfLines={1} ellipsizeMode="tail" style={[{ textAlign: 'center' }]}>{label}</Text>
       </TouchableOpacity>

components/inputDate.tsx

@@ -1,11 +1,12 @@
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
-import { stringToDate } from "@/lib/fun_stringToDate";
+import { stringToDate, stringToDateTime } from "@/lib/fun_stringToDate";
 import DateTimePicker from "@react-native-community/datetimepicker";
 import dayjs from "dayjs";
-import { useState } from "react";
-import { Pressable, View } from "react-native";
+import { useEffect, useState } from "react";
+import { Platform, Pressable, View } from "react-native";
 import Text from "./Text";
+import ModalFloat from "./modalFloat";
 
 type Props = {
    label?: string;
@@ -26,20 +27,52 @@ type Props = {
 
 export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) {
    const [modal, setModal] = useState(false);
+   const [valueFix, setValueFix] = useState(new Date())
+   const [valueFirst, setValueFirst] = useState(mode == "date" ? dayjs(new Date()).format("DD-MM-YYYY") : mode == "time" ? dayjs(new Date()).format("HH:mm") : "")
 
    const onChangeDate = (type: string, selectedDate: any) => {
       if (type === "set") {
+         let formatted = ""
          if (mode == "date") {
-            onChange(dayjs(selectedDate).format("DD-MM-YYYY"))
+            formatted = dayjs(selectedDate).format("DD-MM-YYYY")
          } else if (mode == "time") {
-            onChange(dayjs(selectedDate).format("HH:mm"))
+            formatted = dayjs(selectedDate).format("HH:mm")
          }
+
+         setValueFirst(formatted)
+
+         if (Platform.OS == "android") {
+            onChange(formatted)
+            setModal(false)
+         }
+      } else if (type === "dismissed") {
          setModal(false)
-      } else {
-         setModal(false);
       }
    };
 
+   function onSetValue() {
+      onChange(valueFirst)
+      setModal(false)
+   }
+
+   function changeValue() {
+      if (value) {
+         let valDate = new Date()
+         if (mode == "date") {
+            valDate = stringToDate(value)
+         } else if (mode == "time") {
+            valDate = stringToDateTime("", value)
+         }
+         setValueFix(valDate)
+      }
+   }
+
+   useEffect(() => {
+      if (modal) changeValue()
+   }, [value, modal])
+
+
+
    return (
       <>
          <View style={[Styles.mb10]}>
@@ -58,14 +91,32 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
             {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)}
          </View>
          {
-            modal && (
-               <DateTimePicker
-                  value={new Date()}
-                  mode={mode}
-                  display="default"
-                  onChange={(event, date) => { onChangeDate(event.type, date) }}
-                  onTouchCancel={() => setModal(false)}
-               />
+            Platform.OS === 'ios' ? (
+               modal && (
+                  <ModalFloat
+                     isVisible={modal}
+                     setVisible={setModal}
+                     onSubmit={() => { onSetValue() }}
+                     title={mode == "date" ? "Pilih Tanggal" : mode == "time" ? "Pilih Jam" : "Pilih Tanggal & Jam"}>
+                     <DateTimePicker
+                        value={valueFix}
+                        mode={mode}
+                        display="spinner"
+                        onChange={(event, date) => { onChangeDate(event.type, date) }}
+                        onTouchCancel={() => setModal(false)}
+                     />
+                  </ModalFloat>
+               )
+            ) : (
+               modal && (
+                  <DateTimePicker
+                     value={valueFix}
+                     mode={mode}
+                     display="inline"
+                     onChange={(event, date) => { onChangeDate(event.type, date) }}
+                     onTouchCancel={() => { setModal(false) }}
+                  />
+               )
             )
          }
       </>

components/inputForm.tsx

@@ -1,5 +1,5 @@
 import Styles from "@/constants/Styles";
-import { Dimensions, TextInput, View } from "react-native";
+import { Dimensions, Platform, TextInput, View } from "react-native";
 import Text from "./Text";
 
 type Props = {
@@ -19,15 +19,16 @@ type Props = {
    value?: string
    disable?: boolean
    multiline?: boolean
+   mb?: boolean
 };
 
 
-export function InputForm({ label, value, placeholder, onChange, info, disable, error, errorText, required, itemLeft, itemRight, type, round, width, bg, multiline }: Props) {
+export function InputForm({ label, value, placeholder, onChange, info, disable, error, errorText, required, itemLeft, itemRight, type, round, width, bg, multiline, mb = true }: Props) {
    const lebar = Dimensions.get("window").width;
 
    if (itemLeft != undefined || itemRight != undefined) {
       return (
-         <View style={{ marginBottom: 10 }}>
+         <View style={[mb && Styles.mb10]}>
             {
                label != undefined && (
                   <Text style={[{ marginBottom: 5, textTransform: "capitalize" }, error && Styles.cError]}>
@@ -36,7 +37,14 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
                   </Text>
                )
             }
-            <View style={[Styles.inputRoundForm, itemRight != undefined ? Styles.inputRoundFormRight : Styles.inputRoundFormLeft, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, error && { borderColor: "red" }]}>
+            <View style={[
+               Styles.inputRoundForm,
+               itemRight != undefined ? Styles.inputRoundFormRight : Styles.inputRoundFormLeft,
+               round && Styles.round30,
+               { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' },
+               error && { borderColor: "red" },
+               Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0 },
+            ]}>
                {itemRight != undefined ? itemRight : itemLeft}
                <TextInput
                   editable={!disable}
@@ -45,7 +53,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
                   keyboardType={type}
                   onChangeText={onChange}
                   placeholderTextColor={'gray'}
-                  style={[Styles.mh05, { width: width ? lebar * width / 100 : lebar * 0.78, color: 'black' }]}
+                  style={[Styles.mh05, { width: width ? lebar * width / 100 : lebar * 0.78, color: 'black' }, Platform.OS == 'ios' ? { paddingVertical: 1 } : { paddingVertical: 5 }]}
                />
             </View>
             {error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
@@ -71,11 +79,11 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
             placeholder={placeholder}
             keyboardType={type}
             editable={!disable}
-            style={[Styles.inputRoundForm, error && { borderColor: "red" }, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, { color: 'black' }, multiline && { height: 100, textAlignVertical: 'top' }]}
+            style={[Styles.inputRoundForm, Platform.OS == 'ios' ? { paddingVertical: 11 } : { paddingVertical: 6 }, error && { borderColor: "red" }, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, { color: 'black' }, multiline && { height: 150, textAlignVertical: 'top' }]}
             onChangeText={onChange}
             placeholderTextColor={'gray'}
             multiline={multiline}
-            numberOfLines={multiline ? 4 : undefined}
+            numberOfLines={multiline ? 5 : undefined}
          />
          {error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
          {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)}

components/inputSearch.tsx

@@ -12,6 +12,7 @@ export default function InputSearch({ onChange, width, value }: { onChange?: (va
          width={width}
          bg="white"
          value={value}
+         mb={false}
       />
    )
 }

components/itemSectionTanggalTugas.tsx

@@ -33,7 +33,7 @@ export default function ItemSectionTanggalTugas({ done, title, dateStart, dateEn
 
          </View>
          <View style={[Styles.wrapPaper, Styles.mv10, Styles.p10]}>
-            <View style={[Styles.rowItemsCenter]}>
+            <View style={[Styles.rowItemsCenter, {alignItems:'flex-start'}]}>
                <MaterialCommunityIcons name="file-table-outline" size={25} color="black" style={[Styles.mr10]} />
                <View style={[Styles.w90]}>
                   <Text style={[Styles.textDefault]}>{title}</Text>

components/labelStatus.tsx

@@ -10,7 +10,7 @@ type Props = {
 }
 export default function LabelStatus({ category, text, size }: Props) {
    return (
-      <View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10]}>
+      <View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10, Styles.contentItemCenter]}>
          <Text style={[size == "small" ? Styles.textSmallSemiBold : Styles.textMediumSemiBold, Styles.cWhite, { textAlign: 'center' }]}>{text}</Text>
       </View>
    )

components/modalFilter.tsx

@@ -62,7 +62,7 @@ export default function ModalFilter({ open, close, page, category }: Props) {
                            <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
                               <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
                               {
-                                 chooseGroup == item.id && <AntDesign name="check" size={20} />
+                                 chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
                               }
                            </Pressable>
                         ))
@@ -71,7 +71,7 @@ export default function ModalFilter({ open, close, page, category }: Props) {
                            <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
                               <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
                               {
-                                 chooseGroup == item.id && <AntDesign name="check" size={20} />
+                                 chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
                               }
                            </Pressable>
                         ))

components/modalFloat.tsx

@@ -1,18 +1,19 @@
 import Styles from '@/constants/Styles';
 import { Pressable, View } from 'react-native';
-import Text from './Text';
 import Modal from 'react-native-modal';
+import Text from './Text';
 
 type Props = {
    isVisible: boolean
    setVisible: (value: boolean) => void
    title?: string
    children: React.ReactNode
-   onSubmit: () => void
+   onSubmit?: () => void
    disableSubmit?: boolean
+   buttonHide?: boolean
 }
 
-export default function ModalFloat({ isVisible, setVisible, title, children, onSubmit, disableSubmit }: Props) {
+export default function ModalFloat({ isVisible, setVisible, title, children, onSubmit, disableSubmit, buttonHide }: Props) {
    return (
       <Modal
          animationIn={"fadeIn"}
@@ -28,14 +29,18 @@ export default function ModalFloat({ isVisible, setVisible, title, children, onS
             <View style={[Styles.mb10]}>
                {children}
             </View>
-            <View style={[Styles.rowItemsCenter, { justifyContent: 'flex-end' }]}>
-               <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10, Styles.mr10]} onPress={() => { setVisible(false) }}>
-                  <Text style={[Styles.textDefault]}>Batal</Text>
-               </Pressable>
-               <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10]} onPress={onSubmit} disabled={disableSubmit}>
-                  <Text style={[Styles.textDefault, disableSubmit && Styles.cGray]}>Simpan</Text>
-               </Pressable>
-            </View>
+            {
+               !buttonHide && (
+                  <View style={[Styles.rowItemsCenter, { justifyContent: 'flex-end' }]}>
+                     <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10, Styles.mr10]} onPress={() => { setVisible(false) }}>
+                        <Text style={[Styles.textDefaultSemiBold]}>Batal</Text>
+                     </Pressable>
+                     <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10]} onPress={onSubmit} disabled={disableSubmit}>
+                        <Text style={[Styles.textDefaultSemiBold, disableSubmit && Styles.cGray]}>Simpan</Text>
+                     </Pressable>
+                  </View>
+               )
+            }
          </View>
       </Modal>
    )

components/modalLoading.tsx

@@ -13,7 +13,9 @@ export default function ModalLoading({ isVisible, setVisible }: Props) {
          animationOut={"slideOutDown"}
          isVisible={isVisible}
          hideModalContentWhileAnimating={true}
-         onBackdropPress={() => { setVisible(false) }}
+         onBackdropPress={() => {
+            // setVisible(false) 
+         }}
       >
          <ActivityIndicator size="large" />
       </Modal>

components/modalSelect.tsx

@@ -1,3 +1,4 @@
+import { ConstEnv } from "@/constants/ConstEnv"
 import { valueGender } from "@/constants/Gender"
 import { valueRoleUser } from "@/constants/RoleUser"
 import Styles from "@/constants/Styles"
@@ -9,13 +10,13 @@ import { useAuthSession } from "@/providers/AuthProvider"
 import { AntDesign } from "@expo/vector-icons"
 import { useEffect, useState } from "react"
 import { Pressable, ScrollView, View } from "react-native"
-import Text from "./Text";
 import { useDispatch, useSelector } from "react-redux"
 import { ButtonForm } from "./buttonForm"
 import DrawerBottom from "./drawerBottom"
 import ImageUser from "./imageNew"
 import ImageWithLabel from "./imageWithLabel"
 import InputSearch from "./inputSearch"
+import Text from "./Text"
 
 type Props = {
    open: boolean
@@ -89,8 +90,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
 
    useEffect(() => {
       if (category == 'group') {
-         if (entitiesGroup.length == 0)
-            handleLoadGroup()
+         handleLoadGroup()
          setData(entitiesGroup)
       } else if (category == 'position') {
          handleLoadPosition()
@@ -141,7 +141,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
                                  <ImageWithLabel
                                     key={index}
                                     label={item.name}
-                                    src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                    src={`${ConstEnv.url_storage}/files/${item.img}`}
                                     onClick={() => onChoose(item.idUser, item.name, item.img)}
                                  />
                               ))
@@ -165,7 +165,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
                                  category == 'member'
                                     ?
                                     <View style={[Styles.rowItemsCenter]}>
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                        <Text style={[Styles.textDefault, Styles.ml10]}>{item.name}</Text>
                                     </View>
                                     :
@@ -174,9 +174,9 @@ export default function ModalSelect({ open, close, title, category, idParent, on
                               {
                                  (category == 'member')
                                     ?
-                                    selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                    selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                                     :
-                                    chooseValue.val == item.id && <AntDesign name="check" size={20} />
+                                    chooseValue.val == item.id && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         ))
@@ -192,7 +192,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
                               }}>
                                  <Text style={[chooseValue.val == item.val ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.label}</Text>
                                  {
-                                    valChoose == item.val && <AntDesign name="check" size={20} />
+                                    valChoose == item.val && <AntDesign name="check" size={20} color={'black'} />
                                  }
                               </Pressable>
                            ))

components/modalSelectMultiple.tsx

@@ -161,7 +161,7 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
                                  <Text numberOfLines={1} style={[Styles.w80]}>{item.name}</Text>
                                  {
                                     selectedDivision.some((i: any) => i.id == item.id)
-                                       ? <AntDesign name="check" size={18} />
+                                       ? <AntDesign name="check" size={18} color={'black'}/>
                                        : <></>
                                  }
                               </Pressable>
@@ -177,9 +177,9 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
                               <Text style={[Styles.textMediumSemiBold]}>{item.name}</Text>
                               {
                                  checked[item.id] && checked[item.id]?.length === item.Division?.length
-                                    ? <AntDesign name="check" size={20} />
+                                    ? <AntDesign name="check" size={20} color={'black'}/>
                                     : (checked[item.id] && checked[item.id]?.length > 0 && checked[item.id]?.length < item.Division?.length)
-                                       ? <AntDesign name="minus" size={20} />
+                                       ? <AntDesign name="minus" size={20} color={'black'}/>
                                        : <></>
                               }
                            </Pressable>
@@ -189,7 +189,7 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
                                     <Pressable key={v} style={[Styles.itemSelectModal]} onPress={() => { handleCheck(item.id, child.id) }}>
                                        <Text style={[Styles.ml10, Styles.textMediumNormal, Styles.w80]} numberOfLines={1} ellipsizeMode="tail" >{child.name}</Text>
                                        {
-                                          checked[item.id] && checked[item.id].includes(child.id) && <AntDesign name="check" size={20} />
+                                          checked[item.id] && checked[item.id].includes(child.id) && <AntDesign name="check" size={20} color={'black'}/>
                                        }
                                     </Pressable>
                                  )

components/position/headerRightPositionList.tsx

@@ -1,96 +1,19 @@
 import Styles from "@/constants/Styles"
-import { apiCreatePosition } from "@/lib/api"
-import { setUpdatePosition } from "@/lib/positionSlice"
-import { useAuthSession } from "@/providers/AuthProvider"
 import { AntDesign } from "@expo/vector-icons"
 import { useState } from "react"
 import { View } from "react-native"
-import Toast from "react-native-toast-message"
-import { useDispatch, useSelector } from "react-redux"
-import { ButtonForm } from "../buttonForm"
+import { useSelector } from "react-redux"
 import ButtonMenuHeader from "../buttonMenuHeader"
 import DrawerBottom from "../drawerBottom"
-import { InputForm } from "../inputForm"
 import MenuItemRow from "../menuItemRow"
 import ModalFilter from "../modalFilter"
-import ModalSelect from "../modalSelect"
-import SelectForm from "../selectForm"
+import ModalFormCreatePosition from "./modalFormCreatePosition"
 
 export default function HeaderRightPositionList() {
-   const dispatch = useDispatch()
-   const update = useSelector((state: any) => state.positionUpdate)
-   const { token, decryptToken } = useAuthSession()
    const entityUser = useSelector((state: any) => state.user)
    const [isVisible, setVisible] = useState(false)
    const [isVisibleTambah, setVisibleTambah] = useState(false)
    const [isFilter, setFilter] = useState(false)
-   const [isSelect, setSelect] = useState(false)
-   const [choose, setChoose] = useState({ val: '', label: '' })
-   const [dataForm, setDataForm] = useState({
-      name: "",
-      idGroup: "",
-   })
-   const [error, setError] = useState({
-      name: false,
-      idGroup: false
-   });
-
-   function validationForm(val: any, cat: 'name' | 'idGroup') {
-      if (cat === 'name') {
-         setDataForm({ ...dataForm, name: val })
-         if (val == "") {
-            setError({ ...error, name: true })
-         } else {
-            setError({ ...error, name: false })
-         }
-      } else if (cat === "idGroup") {
-         setDataForm({ ...dataForm, idGroup: val })
-         if (val == "") {
-            setError({ ...error, idGroup: true })
-         } else {
-            setError({ ...error, idGroup: false })
-         }
-      }
-   }
-
-   function checkAll() {
-      let nilai = true
-      if (dataForm.name == "") {
-         setError(error => ({ ...error, name: true }))
-         nilai = false
-      }
-
-      if ((entityUser.role == "supadmin" || entityUser.role == "developer") && (dataForm.idGroup == "" || String(dataForm.idGroup) == "null")) {
-         setError(error => ({ ...error, idGroup: true }))
-         nilai = false
-      }
-
-      return nilai
-   }
-
-   function onCheck() {
-      const check = checkAll()
-      if (!check)
-         return false
-      handleTambah()
-   }
-
-
-   async function handleTambah() {
-      try {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreatePosition({ user: hasil, name: dataForm.name, idGroup: dataForm.idGroup })
-         dispatch(setUpdatePosition(!update))
-      } catch (error) {
-         console.error(error)
-      } finally {
-         setVisibleTambah(false)
-         setVisible(false)
-         Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
-      }
-
-   }
-
 
    return (
       <>
@@ -124,61 +47,13 @@ export default function HeaderRightPositionList() {
          </DrawerBottom>
 
          <DrawerBottom animation="slide" height={45} keyboard isVisible={isVisibleTambah} setVisible={() => setVisibleTambah(false)} title="Tambah Jabatan">
-            <View style={{ flex: 1, justifyContent: 'space-between' }}>
-               <View>
-                  {
-                     (entityUser.role == 'supadmin' || entityUser.role == 'developer') &&
-                     <SelectForm
-                        label="Lembaga Desa"
-                        placeholder="Pilih Lembaga Desa"
-                        value={choose.label}
-                        required
-                        onPress={() => {
-                           setVisibleTambah(false)
-                           setTimeout(() => {
-                              setSelect(true)
-                           }, 600)
-                        }}
-                        error={error.idGroup}
-                        errorText="Lembaga Desa harus diisi"
-                     />
-                  }
-                  <InputForm
-                     type="default"
-                     placeholder="Nama Jabatan"
-                     required
-                     label="Jabatan"
-                     onChange={(value) => { validationForm(value, 'name') }}
-                     error={error.name}
-                     errorText="Nama jabatan harus diisi"
-                     value={dataForm.name}
-                  />
-               </View>
-               <View style={Styles.mb30}>
-                  <ButtonForm text="SIMPAN" onPress={() => { onCheck() }} />
-               </View>
-            </View>
+            <ModalFormCreatePosition onClose={() => setVisibleTambah(false)} />
          </DrawerBottom>
 
          <ModalFilter close={() => {
             setFilter(false)
             setVisible(false)
          }} open={isFilter} page="position" />
-
-         <ModalSelect
-            category="group"
-            close={setSelect}
-            onSelect={(value) => {
-               validationForm(value.val, 'idGroup')
-               setChoose(value)
-               setSelect(false)
-               setTimeout(() => {
-                  setVisibleTambah(true)
-               }, 600)
-            }}
-            title="Lembaga Desa"
-            open={isSelect}
-         />
       </>
    )
 }

components/position/modalFormCreatePosition.tsx

@@ -0,0 +1,133 @@
+import Styles from "@/constants/Styles"
+import { apiCreatePosition } from "@/lib/api"
+import { setUpdatePosition } from "@/lib/positionSlice"
+import { useAuthSession } from "@/providers/AuthProvider"
+import { update } from "@react-native-firebase/database"
+import { useEffect, useState } from "react"
+import { View } from "react-native"
+import Toast from "react-native-toast-message"
+import { useDispatch, useSelector } from "react-redux"
+import { ButtonForm } from "../buttonForm"
+import { InputForm } from "../inputForm"
+import SelectForm from "../selectForm"
+import ModalSelect from "../modalSelect"
+
+export default function ModalFormCreatePosition({ onClose }: { onClose: () => void }) {
+   const dispatch = useDispatch()
+   const { token, decryptToken } = useAuthSession()
+   const entityUser = useSelector((state: any) => state.user)
+   const [choose, setChoose] = useState({ val: '', label: '' })
+   const [isSelect, setSelect] = useState(false)
+   const [disable, setDisable] = useState(true)
+   const [dataForm, setDataForm] = useState({
+      name: "",
+      idGroup: "",
+   })
+   const [error, setError] = useState({
+      name: false,
+      idGroup: false
+   });
+
+   function validationForm(val: any, cat: 'name' | 'idGroup') {
+      if (cat === 'name') {
+         setDataForm({ ...dataForm, name: val })
+         if (val == "") {
+            setError({ ...error, name: true })
+         } else {
+            setError({ ...error, name: false })
+         }
+      } else if (cat === "idGroup") {
+         setDataForm({ ...dataForm, idGroup: val })
+         if (val == "") {
+            setError({ ...error, idGroup: true })
+         } else {
+            setError({ ...error, idGroup: false })
+         }
+      }
+   }
+
+   function checkAll() {
+      let nilai = false
+      if (dataForm.name == "") {
+         nilai = true
+      }
+
+      if ((entityUser.role == "supadmin" || entityUser.role == "developer") && (dataForm.idGroup == "" || String(dataForm.idGroup) == "null")) {
+         nilai = true
+      }
+
+      setDisable(nilai)
+   }
+
+   useEffect(() => {
+      checkAll()
+   }, [dataForm])
+
+   async function handleTambah() {
+      try {
+         setDisable(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiCreatePosition({ user: hasil, name: dataForm.name, idGroup: dataForm.idGroup })
+         dispatch(setUpdatePosition(!update))
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setDisable(false)
+         Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
+         onClose()
+      }
+
+   }
+
+   return (
+      <>
+         <View style={{ flex: 1, justifyContent: 'space-between' }}>
+            <View>
+               {
+                  (entityUser.role == 'supadmin' || entityUser.role == 'developer') &&
+                  <SelectForm
+                     label="Lembaga Desa"
+                     placeholder="Pilih Lembaga Desa"
+                     value={choose.label}
+                     required
+                     onPress={() => {
+                        setSelect(true)
+                     }}
+                     error={error.idGroup}
+                     errorText="Lembaga Desa harus diisi"
+                  />
+               }
+               <InputForm
+                  type="default"
+                  placeholder="Nama Jabatan"
+                  required
+                  label="Jabatan"
+                  onChange={(value) => { validationForm(value, 'name') }}
+                  error={error.name}
+                  errorText="Nama jabatan harus diisi"
+                  value={dataForm.name}
+               />
+            </View>
+            <View style={Styles.mb30}>
+               <ButtonForm
+                  text="SIMPAN"
+                  onPress={() => { handleTambah() }}
+                  disabled={disable} />
+            </View>
+         </View>
+
+         <ModalSelect
+            category="group"
+            close={setSelect}
+            onSelect={(value) => {
+               validationForm(value.val, 'idGroup')
+               setChoose(value)
+               setSelect(false)
+            }}
+            title="Lembaga Desa"
+            open={isSelect}
+            valChoose={choose.val}
+         />
+      </>
+   )
+}