fix: jarak keyboard

Deskripsi:
- otomatis jarak input dengan keyboard ios

No Issues

app.json

@@ -42,6 +42,7 @@
         }
       ],
       "expo-font",
+      "expo-image-picker",
       "expo-web-browser",
       [
         "@react-native-firebase/app",

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 || loading ? true : false}
                      category="create"
                      onPress={() => {
                         divisionMember.length == 0

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

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

@@ -30,11 +30,12 @@ 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({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1535, 450],
       });
@@ -71,6 +72,7 @@ export default function EditBanner() {
 
    const handleUpdateEntity = async () => {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData();
 
@@ -105,6 +107,8 @@ export default function EditBanner() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+      } finally {
+         setLoading(false)
       }
    };
 
@@ -122,7 +126,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,11 +29,12 @@ 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({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1535, 450],
       });
@@ -57,32 +58,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 +110,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)/discussion/[id].tsx

@@ -17,6 +17,7 @@ import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
 import { useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 type Props = {
    id: string
@@ -49,6 +50,7 @@ export default function DetailDiscussionGeneral() {
    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 headerHeight = useHeaderHeight();
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
@@ -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

@@ -31,6 +31,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 +71,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 +100,7 @@ export default function AddMemberDiscussionDetail() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -149,7 +156,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

@@ -31,6 +31,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: "",
@@ -84,6 +85,9 @@ export default function CreateDiscussionGeneral() {
       checkForm();
    }, [error, dataForm]);
 
+   useEffect(() => {
+      dispatch(setMemberChoose([]))
+   }, [])
 
    function handleBack() {
       dispatch(setMemberChoose([]))
@@ -92,6 +96,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 },
@@ -101,12 +106,14 @@ export default function CreateDiscussionGeneral() {
             dispatch(setUpdateDiscussionGeneralDetail(!update))
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             router.back()
-         }else{
+         } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -124,7 +131,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', })
@@ -171,6 +178,7 @@ export default function CreateDiscussionGeneral() {
                   error={error.desc}
                   errorText="Diskusi tidak boleh kosong"
                   onChange={(val) => { validationForm("desc", val) }}
+                  multiline
                />
                <ButtonSelect
                   value="Pilih Anggota"

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() }}
                   />
@@ -135,6 +140,7 @@ export default function EditDiscussionGeneral() {
                   value={dataForm.desc}
                   errorText="Diskusi tidak boleh kosong"
                   onChange={(val) => validationForm("desc", val)}
+                  multiline
                />
             </View>
          </ScrollView>

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

@@ -31,6 +31,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 +79,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 +92,8 @@ export default function AddMemberCalendarEvent() {
       } catch (error) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -104,7 +108,7 @@ export default function AddMemberCalendarEvent() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -159,7 +163,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

@@ -21,6 +21,7 @@ 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 [error, setError] = useState({
       title: false,
@@ -140,6 +141,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 +152,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 +168,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()

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

@@ -6,6 +6,7 @@ import DrawerBottom from "@/components/drawerBottom"
 import ImageUser from "@/components/imageNew"
 import MenuItemRow from "@/components/menuItemRow"
 import Skeleton from "@/components/skeleton"
+import Text from "@/components/Text"
 import Styles from "@/constants/Styles"
 import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api"
 import { setUpdateCalendar } from "@/lib/calendarUpdate"
@@ -13,7 +14,7 @@ import { useAuthSession } from "@/providers/AuthProvider"
 import { MaterialCommunityIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, Text, View } from "react-native"
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
@@ -52,7 +53,7 @@ export default function DetailEventCalendar() {
    const entityUser = useSelector((state: any) => state.user);
    const [isMemberDivision, setIsMemberDivision] = useState(false);
    const [loading, setLoading] = useState(true)
-   const arrSkeleton = Array.from({ length: 5 })
+   const [refreshing, setRefreshing] = useState(false)
 
    async function handleCheckMember() {
       try {
@@ -69,9 +70,9 @@ export default function DetailEventCalendar() {
       }
    }
 
-   async function handleLoad() {
+   async function handleLoad(loading:boolean) {
       try {
-         setLoading(true)
+         setLoading(loading)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetCalendarOne({
             user: hasil,
@@ -105,7 +106,7 @@ export default function DetailEventCalendar() {
    }
 
    useEffect(() => {
-      handleLoad();
+      handleLoad(true);
       handleCheckMember()
    }, []);
 
@@ -133,6 +134,15 @@ export default function DetailEventCalendar() {
       }
    }
 
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      handleLoadMember()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -143,7 +153,15 @@ export default function DetailEventCalendar() {
                headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
             }}
          />
-         <ScrollView>
+         <ScrollView
+            style={[Styles.h100]}
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+         >
             <View style={[Styles.p15]}>
                <View style={[Styles.wrapPaper, Styles.mb15]}>
                   <View style={Styles.rowItemsCenter}>

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

@@ -31,6 +31,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 +59,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 +82,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 +98,7 @@ export default function CreateCalendarAddMember() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => { handleAddMember() }}
                   />
                )
@@ -142,7 +146,7 @@ export default function CreateCalendarAddMember() {
                                  </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

@@ -10,11 +10,14 @@ import { stringToDateTime } from "@/lib/fun_stringToDate";
 import { Stack, router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
    SafeAreaView,
    ScrollView,
    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 }>()
@@ -22,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,
@@ -141,94 +145,99 @@ export default function CalendarDivisionCreate() {
                ),
             }}
          />
-         <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/index.tsx

@@ -78,7 +78,9 @@ export default function CalendarDivision() {
       } catch (error) {
          console.error(error);
       } finally {
-         setLoadingBtn(false)
+         setTimeout(() => {
+            setLoadingBtn(false)
+         }, 500)
       }
    }
 
@@ -155,8 +157,16 @@ export default function CalendarDivision() {
                      date={selected}
                      month={month}
                      onChange={({ date }) => setSelected(date)}
+                     onMonthChange={(month) => setMonth(month)}
                      styles={{
                         selected: Styles.selectedDate,
+                        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>

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

@@ -18,8 +18,9 @@ import { Ionicons, MaterialIcons } from "@expo/vector-icons";
 import { firebase } from "@react-native-firebase/database";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, ScrollView, View } from "react-native";
+import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
 import { useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 type Props = {
    id: string;
@@ -58,6 +59,8 @@ export default function DiscussionDetail() {
    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 [refreshing, setRefreshing] = useState(false)
+   const headerHeight = useHeaderHeight();
 
 
    useEffect(() => {
@@ -165,6 +168,15 @@ export default function DiscussionDetail() {
       }
    }
 
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      handleLoadComment(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <>
          <Stack.Screen
@@ -189,7 +201,14 @@ export default function DiscussionDetail() {
             }}
          />
          <View style={{ flex: 1 }}>
-            <ScrollView>
+            <ScrollView
+               refreshControl={
+                  <RefreshControl
+                     refreshing={refreshing}
+                     onRefresh={handleRefresh}
+                  />
+               }
+            >
                <View style={[Styles.p15, Styles.mb100]}>
                   {
                      loading ?
@@ -264,63 +283,68 @@ export default function DiscussionDetail() {
                   </View>
                </View>
             </ScrollView>
-            <View
-               style={[
-                  Styles.contentItemCenter,
-                  Styles.absolute0,
-                  Styles.w100,
-                  { backgroundColor: "#f4f4f4" },
-               ]}
+            <KeyboardAvoidingView
+               behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+               keyboardVerticalOffset={headerHeight}
             >
-               <InputForm
-                  disable={
-                     data?.status == 2 ||
-                     data?.isActive == false ||
-                     ((entityUser.role == "user" || entityUser.role == "coadmin") &&
-                        !isMemberDivision)
-                  }
-                  bg="white"
-                  type="default"
-                  round
-                  placeholder="Kirim Komentar"
-                  onChange={setKomentar}
-                  value={komentar}
-                  itemRight={
-                     <Pressable
-                        onPress={() => {
-                           komentar != "" &&
-                              !loadingSend &&
-                              data?.status != 2 &&
-                              data?.isActive &&
-                              (((entityUser.role == "user" ||
-                                 entityUser.role == "coadmin") &&
-                                 isMemberDivision) ||
-                                 entityUser.role == "admin" ||
-                                 entityUser.role == "supadmin" ||
-                                 entityUser.role == "developer" ||
-                                 entityUser.role == "cosupadmin") &&
-                              handleKomentar();
-                        }}
-                     >
-                        <MaterialIcons
-                           name="send"
-                           size={25}
-                           style={
-                              komentar == "" ||
-                                 loadingSend ||
-                                 data?.status == 2 ||
-                                 data?.isActive == false ||
-                                 ((entityUser.role == "user" ||
+               <View
+                  style={[
+                     Styles.contentItemCenter,
+                     Styles.w100,
+                     { backgroundColor: "#f4f4f4" },
+                  ]}
+               >
+                  <InputForm
+                     disable={
+                        data?.status == 2 ||
+                        data?.isActive == false ||
+                        ((entityUser.role == "user" || entityUser.role == "coadmin") &&
+                           !isMemberDivision)
+                     }
+                     bg="white"
+                     type="default"
+                     round
+                     placeholder="Kirim Komentar"
+                     onChange={setKomentar}
+                     value={komentar}
+                     itemRight={
+                        <Pressable
+                           onPress={() => {
+                              komentar != "" &&
+                                 !loadingSend &&
+                                 data?.status != 2 &&
+                                 data?.isActive &&
+                                 (((entityUser.role == "user" ||
                                     entityUser.role == "coadmin") &&
-                                    !isMemberDivision)
-                                 ? Styles.cGray
-                                 : Styles.cDefault
-                           }
-                        />
-                     </Pressable>
-                  }
-               />
-            </View>
+                                    isMemberDivision) ||
+                                    entityUser.role == "admin" ||
+                                    entityUser.role == "supadmin" ||
+                                    entityUser.role == "developer" ||
+                                    entityUser.role == "cosupadmin") &&
+                                 handleKomentar();
+                           }}
+                        >
+                           <MaterialIcons
+                              name="send"
+                              size={25}
+                              style={
+                                 komentar == "" ||
+                                    loadingSend ||
+                                    data?.status == 2 ||
+                                    data?.isActive == false ||
+                                    ((entityUser.role == "user" ||
+                                       entityUser.role == "coadmin") &&
+                                       !isMemberDivision)
+                                    ? Styles.cGray
+                                    : Styles.cDefault
+                              }
+                           />
+                        </Pressable>
+                     }
+                  />
+               </View>
+            </KeyboardAvoidingView>
+
          </View>
       </>
    );

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)/document/index.tsx

@@ -110,10 +110,6 @@ export default function DocumentDivision() {
       }
    }
 
-   useEffect(() => {
-      handleLoad(true);
-   }, [path, update]);
-
    const handleCheckboxChange = (index: number) => {
       setDariSelectAll(false);
       if (selectedFiles.some((i: any) => i.id == data[index].id)) {
@@ -243,6 +239,7 @@ export default function DocumentDivision() {
 
    useEffect(() => {
       handleBatal();
+      handleLoad(false)
    }, [update]);
 
    async function handleShare(selectedDivision: any[]) {
@@ -270,7 +267,7 @@ export default function DocumentDivision() {
 
 
    const openFile = (item: Props) => {
-      setLoadingOpen(true)
+      if (Platform.OS == 'android') setLoadingOpen(true)
       let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
       const fileName = item.name + '.' + item.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
@@ -278,9 +275,9 @@ export default function DocumentDivision() {
 
       FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
          const contentURL = await FileSystem.getContentUriAsync(uri);
+         setLoadingOpen(false)
          try {
             if (Platform.OS == 'android') {
-               // open with android intent
                await startActivityAsync(
                   'android.intent.action.VIEW',
                   {
@@ -289,16 +286,13 @@ export default function DocumentDivision() {
                      type: mimeType as string,
                   }
                );
-               // or
-               // Sharing.shareAsync(localPath);
-
             } else if (Platform.OS == 'ios') {
                Sharing.shareAsync(localPath);
             }
          } 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)
          }
       });
    };
@@ -310,6 +304,10 @@ export default function DocumentDivision() {
       setRefreshing(false)
    };
 
+   useEffect(() => {
+      handleLoad(true);
+   }, [path]);
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -375,7 +373,7 @@ export default function DocumentDivision() {
                               }}
                            >
                               {item.id != "home" && (
-                                 <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} />
+                                 <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
                               )}
                               <Text> {item.name} </Text>
                            </Pressable>
@@ -538,13 +536,11 @@ export default function DocumentDivision() {
          <DrawerBottom
             animation="slide"
             isVisible={modalMore}
-            setVisible={setModalMore}
+            setVisible={() => { setModalMore(false) }}
             title=""
          >
             <ModalMore
-               onClose={() => {
-                  setModalMore(false);
-               }}
+               onClose={() => { setModalMore(false); }}
                data={selectedFiles}
                share={shareSelected}
             />
@@ -553,10 +549,8 @@ export default function DocumentDivision() {
          <ModalFloat
             title="Ganti Nama"
             isVisible={isRename}
-            setVisible={setRename}
-            onSubmit={() => {
-               handleRename();
-            }}
+            setVisible={() => { setRename(false) }}
+            onSubmit={() => { handleRename() }}
             disableSubmit={bodyRename.name == ""}
          >
             <View>
@@ -576,7 +570,7 @@ export default function DocumentDivision() {
             title="Bagikan"
             category="share-division"
             open={isShare}
-            close={setShare}
+            close={() => { setShare(false) }}
             onSelect={(value) => {
                handleShare(value)
             }}

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

@@ -32,20 +32,23 @@ 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({
          type: ["*/*"],
-         multiple: false,
+         multiple: true,
       });
       if (!result.canceled) {
-         if (result.assets?.[0].uri) {
-            const check = await handleCheckFile(result.assets?.[0]);
-            if (check) {
-               setFileForm([...fileForm, result.assets?.[0]]);
-               setListFile([...listFile, result.assets?.[0].name]);
-            } else {
-               Toast.show({ type: 'small', text1: 'File sudah ada', })
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets?.[i].uri) {
+               const check = await handleCheckFile(result.assets?.[i]);
+               if (check) {
+                  setFileForm((prev) => [...prev, result.assets?.[i]]);
+                  setListFile((prev) => [...prev, result.assets?.[i].name]);
+               } else {
+                  Toast.show({ type: 'small', text1: 'File sudah ada', })
+               }
             }
          }
       }
@@ -88,6 +91,7 @@ export default function TaskDivisionAddFile() {
 
    async function handleAddFile() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData();
 
@@ -117,6 +121,8 @@ export default function TaskDivisionAddFile() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -136,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() }}
                   />
                ),
@@ -169,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

@@ -30,6 +30,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 +73,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 +85,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 +102,7 @@ export default function AddMemberTask() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -154,7 +158,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

@@ -8,15 +8,18 @@ import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 import { useEffect, useState } from "react";
 import {
-   SafeAreaView,
+   KeyboardAvoidingView, Platform, 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";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function TaskDivisionAddTask() {
    const { token, decryptToken } = useAuthSession();
@@ -24,6 +27,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;
@@ -73,6 +78,7 @@ export default function TaskDivisionAddTask() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCreateTaskTugas({
             data: {
@@ -93,7 +99,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 +121,7 @@ export default function TaskDivisionAddTask() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={disable}
+                     disable={disable || loading}
                      onPress={() => {
                         handleCreate();
                      }}
@@ -121,59 +129,72 @@ export default function TaskDivisionAddTask() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        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>
+                  <View style={[Styles.mv10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
+                           </View>
+                        </View>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
+                           </View>
+                        </View>
+                     </View>
+                     {
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                     }
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <View style={[Styles.mv10]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Mulai <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{from}</Text>
-                        </View>
-                     </View>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Berakhir <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{to}</Text>
-                        </View>
-                     </View>
-                  </View>
-                  {
-                     (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+
       </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

@@ -10,7 +10,7 @@ import { apiGetTaskOne } from "@/lib/api";
 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 { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -29,6 +29,7 @@ export default function DetailTaskDivision() {
    const [loading, setLoading] = useState(true)
    const [progress, setProgress] = useState(0)
    const update = useSelector((state: any) => state.taskUpdate)
+   const [refreshing, setRefreshing] = useState(false)
 
 
    async function handleLoad(cat: 'data' | 'progress') {
@@ -56,6 +57,14 @@ export default function DetailTaskDivision() {
       handleLoad('progress')
    }, [update.progress])
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      await handleLoad('data')
+      await handleLoad('progress')
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -66,15 +75,22 @@ export default function DetailTaskDivision() {
                headerRight: () => <HeaderRightTaskDetail id={detail} division={id} status={data?.status} />,
             }}
          />
-         <ScrollView>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+         >
             <View style={[Styles.p15, Styles.mb100]}>
                {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasTask />
-               <SectionFileTask />
-               <SectionMemberTask />
+               <SectionTanggalTugasTask refreshing={refreshing}/>
+               <SectionFileTask refreshing={refreshing}/>
+               <SectionMemberTask refreshing={refreshing}/>
             </View>
          </ScrollView>
       </SafeAreaView>

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

@@ -38,6 +38,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(() => {
@@ -52,11 +53,13 @@ export default function CreateTaskDivision() {
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false
+         multiple: true
       });
       if (!result.canceled) {
-         if (result.assets[0].uri) {
-            setFileForm([...fileForm, result.assets[0]])
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
          }
       }
    };
@@ -75,6 +78,7 @@ export default function CreateTaskDivision() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -100,6 +104,9 @@ export default function CreateTaskDivision() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -119,7 +126,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() }}
                   />

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

@@ -25,7 +25,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('')
@@ -125,7 +124,7 @@ export default function AddMemberCreateTask() {
                                  </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

@@ -6,8 +6,12 @@ import Styles from "@/constants/Styles";
 import { setTaskCreate } from "@/lib/taskCreate";
 import dayjs from "dayjs";
 import { router, Stack } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
    SafeAreaView,
    ScrollView,
    View
@@ -16,8 +20,10 @@ import DateTimePicker, {
    DateType
 } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CreateTaskAddTugas() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -97,59 +103,71 @@ export default function CreateTaskAddTugas() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        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>
+                  <View style={[Styles.mv10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
+                           </View>
+                        </View>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
+                           </View>
+                        </View>
+                     </View>
+                     {
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                     }
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <View style={[Styles.mv10]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Mulai <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{from}</Text>
-                        </View>
-                     </View>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Berakhir <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{to}</Text>
-                        </View>
-                     </View>
-                  </View>
-                  {
-                     (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
       </SafeAreaView>
    );
 }

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

@@ -193,7 +193,7 @@ export default function ListTask() {
                   :
                   data.length > 0 ? (
                      isList ? (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               getItemCount={() => data.length}
@@ -241,7 +241,7 @@ export default function ListTask() {
                            ))} */}
                         </View>
                      ) : (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               getItemCount={() => data.length}

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

@@ -6,10 +6,15 @@ import Styles from "@/constants/Styles";
 import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useHeaderHeight } from '@react-navigation/elements';
 import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
    SafeAreaView,
    ScrollView,
    View
@@ -19,6 +24,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);
@@ -27,6 +33,7 @@ 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);
@@ -39,9 +46,9 @@ export default function UpdateProjectTaskDivision() {
    });
 
    const from = range.startDate
-      ? dayjs(range.startDate).format("MMM DD, YYYY")
+      ? dayjs(range.startDate).format("DD-MM-YYYY")
       : "";
-   const to = range.endDate ? dayjs(range.endDate).format("MMM DD, YYYY") : "";
+   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
 
    async function handleLoad() {
       try {
@@ -71,6 +78,7 @@ export default function UpdateProjectTaskDivision() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          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 });
          if (response.success) {
@@ -82,7 +90,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)
       }
    }
 
@@ -132,7 +142,7 @@ export default function UpdateProjectTaskDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loadingSubmit}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -141,65 +151,78 @@ export default function UpdateProjectTaskDivision() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  {!loading && (
-                     <DateTimePicker
-                        mode="range"
-                        startDate={range.startDate}
-                        endDate={range.endDate}
-                        onChange={(param) => setRange(param)}
-                        month={month}
-                        year={year}
-                        styles={{
-                           selected: Styles.selectedDate,
-                           selected_label: Styles.cWhite,
-                           range_fill: Styles.selectRangeDate,
-                        }}
-                     />
-                  )}
-               </View>
-               <View style={[Styles.mv10]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Mulai <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{from}</Text>
-                        </View>
-                     </View>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Berakhir <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{to}</Text>
-                        </View>
-                     </View>
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     {!loading && (
+                        <DateTimePicker
+                           mode="range"
+                           startDate={range.startDate}
+                           endDate={range.endDate}
+                           onChange={(param) => setRange(param)}
+                           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,
+                           }}
+                        />
+                     )}
                   </View>
-                  {(error.endDate || error.startDate) && (
-                     <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]} >
-                        Tanggal tidak boleh kosong
-                     </Text>
-                  )}
+                  <View style={[Styles.mv10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
+                           </View>
+                        </View>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
+                           </View>
+                        </View>
+                     </View>
+                     {(error.endDate || error.startDate) && (
+                        <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]} >
+                           Tanggal tidak boleh kosong
+                        </Text>
+                     )}
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
+                     }}
+                  />
                </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+
       </SafeAreaView>
    );
 }

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

@@ -31,9 +31,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 +74,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 +86,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 +103,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 +124,7 @@ export default function AddMemberDivision() {
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={item.img}
+                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -154,7 +159,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

@@ -134,11 +134,11 @@ export default function InformationDivision() {
                headerRight: () => <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />,
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView style={[Styles.h100]}>
+            <View style={[Styles.p15]}>
                {
                   dataDetail?.isActive == false && (
-                     <SectionCancel title={'Divisi dinonaktifkan'} />
+                     <SectionCancel title={'Divisi nonaktif'} />
                   )
                }
                <View style={[Styles.mb15]}>

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

@@ -29,6 +29,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,6 +49,7 @@ export default function CreateDivisionAddAdmin() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          dispatch(setFormCreateDivision({ ...update, admin: selectMember }))
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateDivision({ ...update, user: hasil })
@@ -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()
                      }}
@@ -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

@@ -121,7 +121,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)/edit-profile.tsx

@@ -46,7 +46,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,
@@ -150,6 +151,7 @@ export default function EditProfile() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -179,6 +181,8 @@ export default function EditProfile() {
       } catch (error) {
          console.error(error)
          Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -187,7 +191,7 @@ export default function EditProfile() {
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1, 1],
       });
@@ -217,7 +221,7 @@ export default function EditProfile() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => {
                         handleEdit()

app/(application)/group/index.tsx

@@ -42,14 +42,9 @@ 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() {
@@ -109,6 +104,17 @@ 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 }))
+         }
+      }
+   }
+
 
    return (
       <SafeAreaView>
@@ -207,10 +213,18 @@ 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 == ""} onPress={() => { handleEdit() }} />
                </View>
             </View>
          </DrawerBottom>

app/(application)/member/create.tsx

@@ -24,8 +24,10 @@ import {
 } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CreateMember() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -36,10 +38,12 @@ export default function CreateMember() {
    const [chooseGender, setChooseGender] = useState({ val: "", label: "" });
    const [selectedImage, setSelectedImage] = useState<string | undefined>(undefined);
    const entityUser = useSelector((state: any) => state.user);
+   const entities = useSelector((state: any) => state.entities)
    const [isSelect, setSelect] = useState(false);
    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,
@@ -142,9 +146,16 @@ export default function CreateMember() {
       checkForm()
    }, [error, dataForm])
 
+   useEffect(() => {
+      if(entityUser.role !="supadmin" && entityUser.role != "developer"){
+         validationForm("group", entities.idGroup, entities.group)
+      }
+   }, [])
+
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -162,7 +173,7 @@ export default function CreateMember() {
             fd.append("file", "undefined")
          }
 
-         const response = await apiCreateUser(fd)
+         const response = await apiCreateUser({data: fd})
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             dispatch(setUpdateMember(!update))
@@ -172,6 +183,9 @@ export default function CreateMember() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      }finally{
+         setLoading(false)
       }
    }
 
@@ -179,7 +193,7 @@ export default function CreateMember() {
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1, 1],
       });
@@ -208,7 +222,7 @@ export default function CreateMember() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
@@ -218,7 +232,7 @@ export default function CreateMember() {
          <KeyboardAvoidingView
              style={[Styles.h100]}
              behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-             keyboardVerticalOffset={110}
+             keyboardVerticalOffset={headerHeight}
          >
             <ScrollView>
                <View style={[Styles.p15]}>

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

@@ -22,6 +22,7 @@ import {
 } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 type Props = {
    id: string;
@@ -38,6 +39,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 +54,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: "",
@@ -175,6 +178,7 @@ export default function EditMember() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -203,7 +207,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)
       }
    }
 
@@ -212,7 +218,7 @@ export default function EditMember() {
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1, 1],
       });
@@ -242,7 +248,7 @@ export default function EditMember() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -255,7 +261,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]}>

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

@@ -26,20 +26,24 @@ 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({
          type: ["*/*"],
-         multiple: false
+         multiple: true
       });
+
       if (!result.canceled) {
-         if (result.assets?.[0].uri) {
-            const check = await handleCheckFile(result.assets?.[0])
-            if (check) {
-               setFileForm([...fileForm, result.assets?.[0]])
-               setListFile([...listFile, result.assets?.[0].name])
-            } else {
-               Toast.show({ type: 'small', text1: 'File sudah ada', })
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets?.[i].uri) {
+               const check = await handleCheckFile(result.assets?.[i])
+               if (check) {
+                  setFileForm((prev) => [...prev, result.assets?.[i]])
+                  setListFile((prev) => [...prev, result.assets?.[i].name])
+               } else {
+                  Toast.show({ type: 'small', text1: 'File yg telah terupload tidak bisa diupload ulang', })
+               }
             }
          }
       }
@@ -83,6 +87,7 @@ export default function ProjectAddFile() {
 
    async function handleAddFile() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData();
 
@@ -113,6 +118,8 @@ export default function ProjectAddFile() {
       } catch (error) {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -127,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() }} />
             }}
@@ -159,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

@@ -31,6 +31,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 +44,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 +75,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 +85,9 @@ export default function AddMemberProject() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -96,7 +102,7 @@ export default function AddMemberProject() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -150,7 +156,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

@@ -6,10 +6,14 @@ import Styles from "@/constants/Styles";
 import { apiCreateProjectTask } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
    SafeAreaView,
    ScrollView,
    View
@@ -19,8 +23,10 @@ import DateTimePicker, {
    DateType
 } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function ProjectAddTask() {
+   const headerHeight = useHeaderHeight();
    const { token, decryptToken } = useAuthSession()
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
@@ -36,6 +42,7 @@ export default function ProjectAddTask() {
       title: false,
    })
    const [title, setTitle] = useState('');
+   const [loading, setLoading] = useState(false)
 
    const from = range.startDate
       ? dayjs(range.startDate).format("DD-MM-YYYY")
@@ -67,15 +74,21 @@ export default function ProjectAddTask() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          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 });
          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)
       }
    }
 
@@ -94,66 +107,78 @@ export default function ProjectAddTask() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        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>
+                  <View style={[Styles.mv10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
+                           </View>
+                        </View>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
+                           </View>
+                        </View>
+                     </View>
+                     {
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                     }
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <View style={[Styles.mv10]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Mulai <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{from}</Text>
-                        </View>
-                     </View>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Berakhir <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{to}</Text>
-                        </View>
-                     </View>
-                  </View>
-                  {
-                     (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
       </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 {
@@ -59,6 +60,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 +70,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 +98,7 @@ export default function EditProject() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="update"
                      onPress={() => { handleUpdate() }}
                   />

app/(application)/project/create.tsx

@@ -29,6 +29,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();
@@ -102,6 +103,7 @@ export default function CreateProject() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -127,6 +129,9 @@ export default function CreateProject() {
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      }finally{
+         setLoading(false)
       }
    }
 
@@ -146,11 +151,13 @@ export default function CreateProject() {
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false
+         multiple: true
       });
       if (!result.canceled) {
-         if (result.assets[0].uri) {
-            setFileForm([...fileForm, result.assets[0]])
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
          }
       }
    };
@@ -176,7 +183,7 @@ export default function CreateProject() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="create"
                      onPress={() => {
                         handleCreate()

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

@@ -6,8 +6,12 @@ import Styles from "@/constants/Styles";
 import { setTaskCreate } from "@/lib/taskCreate";
 import dayjs from "dayjs";
 import { router, Stack } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
    SafeAreaView,
    ScrollView,
    View
@@ -16,8 +20,10 @@ import DateTimePicker, {
    DateType
 } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CreateProjectAddTask() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -97,59 +103,71 @@ export default function CreateProjectAddTask() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        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>
+                  <View style={[Styles.mv10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
+                           </View>
+                        </View>
+                        <View style={[{ width: "48%" }]}>
+                           <Text style={[Styles.mb05]}>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                           </Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
+                           </View>
+                        </View>
+                     </View>
+                     {
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                     }
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <View style={[Styles.mv10]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Mulai <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{from}</Text>
-                        </View>
-                     </View>
-                     <View style={[{ width: "48%" }]}>
-                        <Text style={[Styles.mb05]}>
-                           Tanggal Berakhir <Text style={Styles.cError}>*</Text>
-                        </Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: "center" }}>{to}</Text>
-                        </View>
-                     </View>
-                  </View>
-                  {
-                     (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
       </SafeAreaView>
    );
 }

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

@@ -6,15 +6,19 @@ import Styles from "@/constants/Styles";
 import { apiEditProjectTask, apiGetProjectTask } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useHeaderHeight } from '@react-navigation/elements';
 import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 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";
 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 +28,7 @@ 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 [title, setTitle] = useState('')
    const [error, setError] = useState({
@@ -65,15 +70,21 @@ export default function UpdateProjectTask() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          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 });
          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)
       }
    }
 
@@ -108,69 +119,80 @@ export default function UpdateProjectTask() {
                headerTitle: 'Edit Tanggal dan Tugas',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={disableBtn}
+                  disable={disableBtn || loadingSubmit}
                   category="update"
                   onPress={() => { handleEdit() }}
                />
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  {
-                     !loading
-                     &&
-                     <DateTimePicker
-                        mode="range"
-                        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,
-                        }}
-                     />
-                  }
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     {
+                        !loading
+                        &&
+                        <DateTimePicker
+                           mode="range"
+                           startDate={range.startDate}
+                           endDate={range.endDate}
+                           onChange={(param) => setRange(param)}
+                           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,
+                           }}
+                        />
+                     }
 
-               </View>
-               <View style={[Styles.mv10]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <View style={[{ width: '48%' }]}>
-                        <Text style={[Styles.mb05]}>Tanggal Mulai <Text style={Styles.cError}>*</Text></Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: 'center' }}>{from}</Text>
-                        </View>
-                     </View>
-                     <View style={[{ width: '48%' }]}>
-                        <Text style={[Styles.mb05]}>Tanggal Berakhir <Text style={Styles.cError}>*</Text></Text>
-                        <View style={[Styles.wrapPaper, Styles.p10]}>
-                           <Text style={{ textAlign: 'center' }}>{to}</Text>
-                        </View>
-                     </View>
                   </View>
-                  {
-                     (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
-                  }
+                  <View style={[Styles.mv10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
+                        <View style={[{ width: '48%' }]}>
+                           <Text style={[Styles.mb05]}>Tanggal Mulai <Text style={Styles.cError}>*</Text></Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: 'center' }}>{from}</Text>
+                           </View>
+                        </View>
+                        <View style={[{ width: '48%' }]}>
+                           <Text style={[Styles.mb05]}>Tanggal Berakhir <Text style={Styles.cError}>*</Text></Text>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
+                              <Text style={{ textAlign: 'center' }}>{to}</Text>
+                           </View>
+                        </View>
+                     </View>
+                     {
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                     }
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
+                     }}
+                  />
                </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
       </SafeAreaView>
    )
 }

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";
@@ -23,11 +23,12 @@ export default function HeaderRightDocument({ path }: { path: string }) {
    const { token, decryptToken } = useAuthSession()
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.dokumenUpdate)
+   const [loading, setLoading] = useState(false)
 
    async function handleCreateFolder() {
       try {
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateFolderDocument({ user: hasil, name, path, idDivision: id })
+         const response = await apiCreateFolderDocument({ data: { user: hasil, name, path, idDivision: id } })
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil membuat folder baru', })
             dispatch(setUpdateDokumen(!update))
@@ -45,25 +46,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({
@@ -71,7 +78,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
                idDivision: id,
                user: hasil,
             })
-         );
+         )
 
          const response = await apiUploadFileDocument({ data: fd })
          if (response.success) {
@@ -85,6 +92,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setVisible(false)
+         setLoading(false)
       }
    }
 
@@ -99,40 +107,49 @@ export default function HeaderRightDocument({ path }: { path: string }) {
          <DrawerBottom
             animation="slide"
             isVisible={isVisible}
-            setVisible={setVisible}
+            setVisible={() => { setVisible(false) }}
             title="Menu"
          >
             <View style={Styles.rowItemsCenter}>
-               <MenuItemRow
-                  icon={
-                     <MaterialCommunityIcons
-                        name="folder-open"
-                        color="black"
-                        size={25}
-                     />
-                  }
-                  title="Tambah Dokumen"
-                  onPress={() => {
-                     setVisible(false);
-                     setNewFolder(true);
-                  }}
-               />
+               {
+                  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}
+            setVisible={() => { setNewFolder(false) }}
             disableSubmit={name == ""}
-            onSubmit={() => {
-               handleCreateFolder()
-            }}
+            onSubmit={() => { handleCreateFolder() }}
          >
             <View>
                <InputForm
@@ -140,9 +157,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
                   placeholder="Nama Folder"
                   required
                   label="Nama Folder"
-                  onChange={(value: string) => {
-                     setName(value);
-                  }}
+                  onChange={(value: string) => { setName(value) }}
                />
             </View>
          </ModalFloat>

components/document/modalInformasi.tsx

@@ -3,10 +3,11 @@ import { apiGetDocumentInformasi } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { Pressable, ScrollView, View } from "react-native";
+import { ActivityIndicator, Pressable, ScrollView, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
 import ItemAccordion from "../itemAccordion";
 import ItemDetailMember from "../itemDetailMember";
+import ModalLoading from "../modalLoading";
 import Text from "../Text";
 
 type Props = {
@@ -29,9 +30,11 @@ export default function ModalInformasi({ data }: { data: any }) {
    const [dataInformasi, setDataInformasi] = useState<Props>()
    const { token, decryptToken } = useAuthSession()
    const [dataShare, setDataShare] = useState<PropsShare[]>([])
+   const [loading, setLoading] = useState(true)
 
    async function handleInformasi() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDocumentInformasi({ user: hasil, item: data.id, cat: 'lainnya' })
          setDataInformasi(response.data)
@@ -40,6 +43,8 @@ export default function ModalInformasi({ data }: { data: any }) {
          setDataShare(responseShare.data)
       } catch (error) {
          console.error(error)
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -59,39 +64,47 @@ export default function ModalInformasi({ data }: { data: any }) {
             }
          </View>
 
-         <View>
-            <ItemDetailMember category="dokumen" value={dataInformasi?.category == 'FOLDER' ? dataInformasi?.name : `${dataInformasi?.name}.${dataInformasi?.extension}`} border />
-            <ItemDetailMember category="type" value={dataInformasi?.category} border />
-            <ItemDetailMember category="location" value={dataInformasi?.path} border />
-            <ItemDetailMember category="owner" value={dataInformasi?.division} border />
-            <ItemDetailMember category="calendar" value={dataInformasi?.createdAt} border />
-            <Pressable style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.wrapItemBorderBottom]} onPress={() => { open.value = !open.value; }}>
-               <View style={[Styles.rowItemsCenter]}>
-                  <MaterialCommunityIcons name="share-variant-outline" size={22} color="black" style={[Styles.mr10]} />
-                  <Text style={[Styles.textDefault]}>Telah dibagikan ke divisi</Text>
+         {
+            loading ? (
+               <View>
+                  <ActivityIndicator size="large" />
                </View>
-               <MaterialCommunityIcons name="chevron-down" size={22} color="black" />
-            </Pressable>
-            <ItemAccordion isExpanded={open} viewKey="Accordion" duration={500}>
-               <ScrollView style={[Styles.w100, { height: 200 }]} >
-                  {
-                     dataShare.length > 0 ? (
-                        dataShare.map((item, index) => (
-                           <View key={index} style={[Styles.rowOnly, Styles.ml10, Styles.mt02]}>
-                              <MaterialCommunityIcons name="account-group-outline" size={22} color="black" style={[Styles.mr10]} />
-                              <Text style={[Styles.textDefault]}>{item.name}</Text>
-                           </View>
-                        ))
-                     )
-                        : (
-                           <View style={[Styles.ml10, Styles.mt02]}>
-                              <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                           </View>
-                        )
-                  }
-               </ScrollView>
-            </ItemAccordion>
-         </View>
+            ) : (
+               <View>
+                  <ItemDetailMember category="dokumen" value={dataInformasi?.category == 'FOLDER' ? dataInformasi?.name : `${dataInformasi?.name}.${dataInformasi?.extension}`} border />
+                  <ItemDetailMember category="type" value={dataInformasi?.category} border />
+                  <ItemDetailMember category="location" value={dataInformasi?.path} border />
+                  <ItemDetailMember category="owner" value={dataInformasi?.division} border />
+                  <ItemDetailMember category="calendar" value={dataInformasi?.createdAt} border />
+                  <Pressable style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.wrapItemBorderBottom]} onPress={() => { open.value = !open.value; }}>
+                     <View style={[Styles.rowItemsCenter]}>
+                        <MaterialCommunityIcons name="share-variant-outline" size={22} color="black" style={[Styles.mr10]} />
+                        <Text style={[Styles.textDefault]}>Telah dibagikan ke divisi</Text>
+                     </View>
+                     <MaterialCommunityIcons name="chevron-down" size={22} color="black" />
+                  </Pressable>
+                  <ItemAccordion isExpanded={open} viewKey="Accordion" duration={500}>
+                     <ScrollView style={[Styles.w100, { height: 200 }]} >
+                        {
+                           dataShare.length > 0 ? (
+                              dataShare.map((item, index) => (
+                                 <View key={index} style={[Styles.rowOnly, Styles.ml10, Styles.mt02]}>
+                                    <MaterialCommunityIcons name="account-group-outline" size={22} color="black" style={[Styles.mr10]} />
+                                    <Text style={[Styles.textDefault]}>{item.name}</Text>
+                                 </View>
+                              ))
+                           )
+                              : (
+                                 <View style={[Styles.ml10, Styles.mt02]}>
+                                    <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                                 </View>
+                              )
+                        }
+                     </ScrollView>
+                  </ItemAccordion>
+               </View>
+            )
+         }
       </>
    )
 }

components/document/modalMore.tsx

@@ -155,7 +155,7 @@ export default function ModalMore({
          <DrawerBottom
             animation="slide"
             isVisible={isInformasi}
-            setVisible={setInformasi}
+            setVisible={() => setInformasi(false)}
             title="Informasi Dokumen"
             height={80}
          >

components/document/modalSalinMove.tsx

@@ -4,9 +4,10 @@ import { useAuthSession } from "@/providers/AuthProvider"
 import { AntDesign, Ionicons } from "@expo/vector-icons"
 import { useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { Pressable, Text, View } from "react-native"
+import { Pressable, View } from "react-native"
 import BorderBottomItem from "../borderBottomItem"
 import DrawerBottom from "../drawerBottom"
+import Text from "../Text"
 
 type Props = {
    open: boolean

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/inputDate.tsx

@@ -1,11 +1,11 @@
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
-import { stringToDate } 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 { Platform, Pressable, View } from "react-native";
 import Text from "./Text";
+import ModalFloat from "./modalFloat";
 
 type Props = {
    label?: string;
@@ -27,7 +27,7 @@ type Props = {
 export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) {
    const [modal, setModal] = useState(false);
 
-   const onChangeDate = ({ type }: { type: string }, selectedDate: any) => {
+   const onChangeDate = (type: string, selectedDate: any) => {
       if (type === "set") {
          if (mode == "date") {
             onChange(dayjs(selectedDate).format("DD-MM-YYYY"))
@@ -58,14 +58,34 @@ 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={value ? stringToDate(value) : new Date()}
-                  mode={mode}
-                  display="default"
-                  onChange={onChangeDate}
-                  onTouchCancel={() => setModal(false)}
-               />
+            Platform.OS === 'ios' ? (
+               modal && (
+                  <ModalFloat
+                     isVisible={modal}
+                     setVisible={setModal}
+                     onSubmit={() => { }}
+                     buttonHide
+                     disableSubmit
+                     title={mode == "date" ? "Pilih Tanggal" : mode == "time" ? "Pilih Jam" : "Pilih Tanggal & Jam"}>
+                     <DateTimePicker
+                        value={new Date()}
+                        mode={mode}
+                        display="spinner"
+                        onChange={(event, date) => { onChangeDate(event.type, date) }}
+                        onTouchCancel={() => setModal(false)}
+                     />
+                  </ModalFloat>
+               )
+            ) : (
+               modal && (
+                  <DateTimePicker
+                     value={new Date()}
+                     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 = {
@@ -36,7 +36,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 },
+            ]}>
                {itemRight != undefined ? itemRight : itemLeft}
                <TextInput
                   editable={!disable}

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,7 +1,7 @@
 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
@@ -10,9 +10,10 @@ type Props = {
    children: React.ReactNode
    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.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>
+               )
+            }
          </View>
       </Modal>
    )

components/modalSelect.tsx

@@ -9,13 +9,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 +89,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()
@@ -174,9 +173,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 +191,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/project/headerProjectList.tsx

@@ -30,19 +30,16 @@ export default function HeaderRightProjectList() {
                      }}
                   />
                }
-               {
-                  (entityUser.role == 'supadmin' || entityUser.role == 'developer') &&
-                  <MenuItemRow
-                     icon={<AntDesign name="filter" color="black" size={25} />}
-                     title="Filter"
-                     onPress={() => {
-                        setVisible(false)
-                        setTimeout(() => {
-                           setFilter(true)
-                        }, 600)
-                     }}
-                  />
-               }
+               <MenuItemRow
+                  icon={<AntDesign name="filter" color="black" size={25} />}
+                  title="Filter"
+                  onPress={() => {
+                     setVisible(false)
+                     setTimeout(() => {
+                        setFilter(true)
+                     }, 600)
+                  }}
+               />
             </View>
          </DrawerBottom>
          <ModalFilter

components/sectionCancel.tsx

@@ -13,7 +13,7 @@ export default function SectionCancel({ text, title }: Props) {
    return (
       <View style={[ColorsStatus.lightRed, Styles.p10, Styles.round10, Styles.mb15]}>
          <View style={[Styles.rowItemsCenter]}>
-            <AntDesign name="warning" size={22} style={[Styles.mr10]} />
+            <AntDesign name="warning" size={22} style={[Styles.mr10]} color={'black'}/>
             <Text style={[Styles.textDefaultSemiBold]}>{title ? title : 'Kegiatan Dibatalkan'}</Text>
          </View>
          {

components/task/sectionFileTask.tsx

@@ -27,7 +27,7 @@ type Props = {
    idStorage: string
 }
 
-export default function SectionFileTask() {
+export default function SectionFileTask({refreshing}: {refreshing: boolean}) {
    const [isModal, setModal] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const { detail } = useLocalSearchParams<{ detail: string }>()
@@ -56,6 +56,11 @@ export default function SectionFileTask() {
       handleLoad(false)
    }, [update.file])
 
+   useEffect(() => {
+      if (refreshing)
+         handleLoad(false);
+   }, [refreshing]);
+
    useEffect(() => {
       handleLoad(true)
    }, [])

components/task/sectionMemberTask.tsx

@@ -25,7 +25,7 @@ type Props = {
    position: string;
 };
 
-export default function SectionMemberTask() {
+export default function SectionMemberTask({ refreshing }: { refreshing: boolean }) {
    const [isModal, setModal] = useState(false);
    const { token, decryptToken } = useAuthSession();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
@@ -64,6 +64,10 @@ export default function SectionMemberTask() {
       handleLoad(true);
    }, [])
 
+   useEffect(() => {
+      if (refreshing)
+         handleLoad(false);
+   }, [refreshing]);
 
    async function handleDeleteMember() {
       try {

components/task/sectionTanggalTugasTask.tsx

@@ -25,7 +25,7 @@ type Props = {
    dateEnd: string;
 }
 
-export default function SectionTanggalTugasTask() {
+export default function SectionTanggalTugasTask({refreshing}: {refreshing: boolean}) {
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.taskUpdate)
    const [isModal, setModal] = useState(false)
@@ -79,6 +79,11 @@ export default function SectionTanggalTugasTask() {
       handleLoad(false)
    }, [update.task])
 
+   useEffect(() => {
+      if (refreshing)
+         handleLoad(false);
+   }, [refreshing]);
+
 
    useEffect(() => {
       handleLoad(true)
@@ -153,7 +158,9 @@ export default function SectionTanggalTugasTask() {
                   title="Update Status"
                   onPress={() => {
                      setModal(false)
-                     setSelect(true)
+                     setTimeout(() => {
+                        setSelect(true)
+                     }, 600);
                   }}
                />
                <MenuItemRow
@@ -185,10 +192,8 @@ export default function SectionTanggalTugasTask() {
 
          <ModalSelect
             category="status-task"
-            close={setSelect}
-            onSelect={(value) => {
-               handleUpdate(Number(value.val))
-            }}
+            close={() => setSelect(false)}
+            onSelect={(value) => { handleUpdate(Number(value.val)) }}
             title="Status"
             open={isSelect}
             valChoose={String(tugas.status)}

lib/api.ts

@@ -3,7 +3,7 @@ import axios from 'axios';
 const api = axios.create({
    // baseURL: 'http://10.0.2.2:3000/api',
    baseURL: 'https://stg-darmasaba.wibudev.com/api',
-   // baseURL: 'http://192.168.1.135:3000/api',
+   // baseURL: 'http://192.168.1.89:3000/api',
 });
 
 export const apiCheckPhoneLogin = async (body: { phone: string }) => {
@@ -150,7 +150,7 @@ export const apiGetUser = async ({ user, active, search, group, page }: { user:
 };
 
 
-export const apiCreateUser = async (data: FormData) => {
+export const apiCreateUser = async ({data}: {data: FormData}) => {
    const response = await api.post('/mobile/user', data, {
       headers: {
          'Content-Type': 'multipart/form-data',
@@ -219,7 +219,7 @@ export const apiEditDiscussionGeneral = async (data: { user: string, title: stri
 };
 
 export const apiCreateDiscussionGeneral = async ({ data }: { data: { idGroup: string, title: string, desc: string, user: string, member: [] } }) => {
-   const response = await api.post(`/mobile/discussion-general/`, data)
+   const response = await api.post(`/mobile/discussion-general`, data)
    return response.data;
 };
 
@@ -604,7 +604,7 @@ export const apiGetDocumentInformasi = async ({ user, item, cat }: { user: strin
 };
 
 export const apiDocumentRename = async (data: { name: string, user: string, id: string, path: string, idDivision: string, extension: string }) => {
-   const response = await api.put(`/mobile/document/`, data)
+   const response = await api.put(`/mobile/document`, data)
    return response.data;
 };
 
@@ -613,8 +613,8 @@ export const apiDocumentDelete = async (data: { user: string, data: any[] }) =>
    return response.data
 };
 
-export const apiCreateFolderDocument = async (data: { name: string, path: string, idDivision: string, user: string }) => {
-   const response = await api.post(`/mobile/document/`, data)
+export const apiCreateFolderDocument = async ({ data }: { data: { name: string, path: string, idDivision: string, user: string } }) => {
+   const response = await api.post(`/mobile/document`, data)
    return response.data;
 };
 
@@ -646,12 +646,12 @@ export const apiShareDocument = async (data: { dataDivision: any[], dataItem: an
 };
 
 export const apiRegisteredToken = async (data: { user: string, token: string }) => {
-   const response = await api.post(`/mobile/auth-token/`, data)
+   const response = await api.post(`/mobile/auth-token`, data)
    return response.data;
 };
 
 export const apiUnregisteredToken = async (data: { user: string, token: string }) => {
-   const response = await api.put(`/mobile/auth-token/`, data)
+   const response = await api.put(`/mobile/auth-token`, data)
    return response.data;
 };
 
@@ -661,6 +661,6 @@ export const apiGetNotification = async ({ user, page }: { user: string, page?:
 };
 
 export const apiReadOneNotification = async (data: { user: string, id: string }) => {
-   const response = await api.put(`/mobile/home/notification/`, data)
+   const response = await api.put(`/mobile/home/notification`, data)
    return response.data;
 };