Merge pull request 'amalia/22-agustus-25' (#28) from amalia/22-agustus-25 into join

Reviewed-on: bip/mobile-darmasaba#28

app/(application)/announcement/index.tsx

@@ -87,7 +87,7 @@ export default function Announcement() {
          <View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {

app/(application)/banner/index.tsx

@@ -5,6 +5,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader"
 import DrawerBottom from "@/components/drawerBottom"
 import MenuItemRow from "@/components/menuItemRow"
 import ModalLoading from "@/components/modalLoading"
+import Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteBanner, apiGetBanner } from "@/lib/api"
@@ -121,26 +122,36 @@ export default function BannerList() {
             }
             style={[Styles.h100]}
          >
-            <View style={[Styles.p15, Styles.mb100]}>
+            {
-               {entities.map((index: any, key: number) => (
+               entities.length > 0
-                  <BorderBottomItem
+                  ?
-                     key={key}
+                  <View style={[Styles.p15, Styles.mb100]}>
-                     onPress={() => {
+                     {entities.map((index: any, key: number) => (
-                        setDataId(index.id)
+                        <BorderBottomItem
-                        setSelectFile(index)
+                           key={key}
-                        setModal(true)
+                           onPress={() => {
-                     }}
+                              setDataId(index.id)
-                     borderType="all"
+                              setSelectFile(index)
-                     icon={
+                              setModal(true)
-                        <Image
+                           }}
-                           source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
+                           borderType="all"
-                           style={[Styles.imgListBanner]}
+                           icon={
+                              <Image
+                                 source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
+                                 style={[Styles.imgListBanner]}
+                              />
+                           }
+                           title={index.title}
                         />
-                     }
+                     ))}
-                     title={index.title}
+                  </View>
-                  />
+                  :
-               ))}
+                  <View style={[Styles.p15, Styles.mb100]}>
-            </View>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                  </View>
+            }
+
+
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title="Menu">

app/(application)/discussion/index.tsx

@@ -122,7 +122,7 @@ export default function Discussion() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {

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

@@ -121,7 +121,7 @@ export default function DiscussionDivision() {
             <InputSearch onChange={setSearch} />
          </View>
 
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {

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

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

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

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

app/(application)/division/index.tsx

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

app/(application)/group/index.tsx

@@ -126,7 +126,7 @@ export default function Index() {
 
    return (
       <View style={[Styles.p15, { flex: 1 }]}>
-         <View>
+         <View style={[Styles.mb10]}>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -145,7 +145,7 @@ export default function Index() {
             </View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={{ flex: 2 }}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {

app/(application)/member/index.tsx

@@ -129,7 +129,7 @@ export default function Index() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {

app/(application)/position/index.tsx

@@ -165,7 +165,7 @@ export default function Index() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {

app/(application)/project/index.tsx

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

app/(application)/search.tsx

@@ -75,7 +75,6 @@ export default function Search() {
                   headerTitleAlign: 'center'
                }}
             />
-            {/* <ScrollView> */}
             <View style={[Styles.p15]}>
                <InputSearch onChange={handleSearch} />
                {
@@ -163,13 +162,12 @@ export default function Search() {
 
                      </View>
                      :
-                     <View style={Styles.contentItemCenter}>
+                     <View style={[Styles.contentItemCenter, Styles.mt10]}>
                         <Text style={[Styles.textInformation, Styles.cGray]}>Tidak ada data</Text>
                      </View>
                }
 
             </View>
-            {/* </ScrollView> */}
          </SafeAreaView>
       </>
    )

components/home/carouselHome.tsx

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

components/inputForm.tsx

@@ -19,15 +19,16 @@ type Props = {
    value?: string
    disable?: boolean
    multiline?: boolean
+   mb?: boolean
 };
 
 
-export function InputForm({ label, value, placeholder, onChange, info, disable, error, errorText, required, itemLeft, itemRight, type, round, width, bg, multiline }: Props) {
+export function InputForm({ label, value, placeholder, onChange, info, disable, error, errorText, required, itemLeft, itemRight, type, round, width, bg, multiline, mb = true }: Props) {
    const lebar = Dimensions.get("window").width;
 
    if (itemLeft != undefined || itemRight != undefined) {
       return (
-         <View style={{ marginBottom: 10 }}>
+         <View style={[mb && Styles.mb10]}>
             {
                label != undefined && (
                   <Text style={[{ marginBottom: 5, textTransform: "capitalize" }, error && Styles.cError]}>

components/inputSearch.tsx

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

components/task/headerTaskDetail.tsx

@@ -1,10 +1,10 @@
 import Styles from "@/constants/Styles"
-import { apiAddLinkTask, apiDeleteTask, apiGetDivisionOneFeature } from "@/lib/api"
+import { apiAddLinkTask, apiDeleteTask } from "@/lib/api"
 import { setUpdateTask } from "@/lib/taskUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { AntDesign, Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router } from "expo-router"
-import { useEffect, useState } from "react"
+import { useState } from "react"
 import { View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
@@ -18,46 +18,19 @@ import ModalFloat from "../modalFloat"
 type Props = {
    id: string | string[]
    division: string
-   status: number | undefined
+   status: number | undefined,
+   isAdminDivision: boolean
 }
 
-export default function HeaderRightTaskDetail({ id, division, status }: Props) {
+export default function HeaderRightTaskDetail({ id, division, status, isAdminDivision }: Props) {
    const { token, decryptToken } = useAuthSession()
    const [isVisible, setVisible] = useState(false)
    const entityUser = useSelector((state: any) => state.user);
-   const [isMemberDivision, setIsMemberDivision] = useState(false);
-   const [isAdminDivision, setIsAdminDivision] = useState(false);
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.taskUpdate)
    const [isAddLink, setAddLink] = useState(false)
    const [link, setLink] = useState("")
 
-   async function handleCheckMember() {
-      try {
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDivisionOneFeature({
-            id: division,
-            user: hasil,
-            cat: "check-member",
-         });
-
-         setIsMemberDivision(response.data);
-
-         const response2 = await apiGetDivisionOneFeature({
-            id: division,
-            user: hasil,
-            cat: "check-admin",
-         });
-         setIsAdminDivision(response2.data);
-      } catch (error) {
-         console.error(error);
-      }
-   }
-
-   useEffect(() => {
-      handleCheckMember()
-   }, [])
-
    async function handleDelete() {
       try {
          const hasil = await decryptToken(String(token?.current))
@@ -95,12 +68,7 @@ export default function HeaderRightTaskDetail({ id, division, status }: Props) {
 
    return (
       <>
-         {
+         <ButtonMenuHeader onPress={() => { setVisible(true) }} />
-            (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision
-               ? <></>
-               :
-               <ButtonMenuHeader onPress={() => { setVisible(true) }} />
-         }
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={30}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow

components/task/sectionFileTask.tsx

@@ -28,7 +28,7 @@ type Props = {
    idStorage: string
 }
 
-export default function SectionFileTask({ refreshing }: { refreshing: boolean }) {
+export default function SectionFileTask({ refreshing, isMemberDivision }: { refreshing: boolean, isMemberDivision: boolean }) {
    const [isModal, setModal] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const { detail } = useLocalSearchParams<{ detail: string }>()
@@ -39,6 +39,7 @@ export default function SectionFileTask({ refreshing }: { refreshing: boolean })
    const arrSkeleton = Array.from({ length: 5 })
    const [selectFile, setSelectFile] = useState<Props | null>(null)
    const [loadingOpen, setLoadingOpen] = useState(false)
+   const entityUser = useSelector((state: any) => state.user);
 
    async function handleLoad(loading: boolean) {
       try {
@@ -163,21 +164,28 @@ export default function SectionFileTask({ refreshing }: { refreshing: boolean })
                      openFile()
                   }}
                />
-               <MenuItemRow
+               {
-                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
-                  title="Hapus"
+                     ?
-                  onPress={() => {
+                     <MenuItemRow
-                     setModal(false)
+                        icon={<Ionicons name="trash" color="black" size={25} />}
-                     AlertKonfirmasi({
+                        title="Hapus"
-                        title: 'Konfirmasi',
+                        onPress={() => {
-                        desc: 'Apakah Anda yakin ingin menghapus file ini? File yang dihapus tidak dapat dikembalikan',
+                           setModal(false)
-                        onPress: () => {
+                           AlertKonfirmasi({
-                           handleDelete()
+                              title: 'Konfirmasi',
-                        }
+                              desc: 'Apakah Anda yakin ingin menghapus file ini? File yang dihapus tidak dapat dikembalikan',
-                     })
+                              onPress: () => {
+                                 handleDelete()
+                              }
+                           })
+
+                        }}
+                     />
+                     :
+                     <></>
+               }
 
-                  }}
-               />
             </View>
          </DrawerBottom>
       </>

components/task/sectionLinkTask.tsx

@@ -20,7 +20,7 @@ type Props = {
    link: string
 }
 
-export default function SectionLinkTask({ refreshing }: { refreshing: boolean }) {
+export default function SectionLinkTask({ refreshing, isMemberDivision }: { refreshing: boolean, isMemberDivision: boolean }) {
    const [isModal, setModal] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const { detail } = useLocalSearchParams<{ detail: string }>()
@@ -28,6 +28,7 @@ export default function SectionLinkTask({ refreshing }: { refreshing: boolean })
    const update = useSelector((state: any) => state.taskUpdate)
    const dispatch = useDispatch()
    const [selectLink, setSelectLink] = useState<Props | null>(null)
+   const entityUser = useSelector((state: any) => state.user);
 
    async function handleLoad() {
       try {
@@ -101,18 +102,25 @@ export default function SectionLinkTask({ refreshing }: { refreshing: boolean })
                            Linking.openURL(urlCompleted(String(selectLink?.link)))
                         }}
                      />
-                     <MenuItemRow
+                     {
-                        icon={<Ionicons name="trash" color="black" size={25} />}
+                        (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
-                        title="Hapus"
+                           ?
-                        onPress={() => {
+                           <MenuItemRow
-                           setModal(false)
+                              icon={<Ionicons name="trash" color="black" size={25} />}
-                           AlertKonfirmasi({
+                              title="Hapus"
-                              title: 'Konfirmasi',
+                              onPress={() => {
-                              desc: 'Apakah Anda yakin ingin menghapus link ini? Link yang dihapus tidak dapat dikembalikan',
+                                 setModal(false)
-                              onPress: () => { handleDelete() }
+                                 AlertKonfirmasi({
-                           })
+                                    title: 'Konfirmasi',
-                        }}
+                                    desc: 'Apakah Anda yakin ingin menghapus link ini? Link yang dihapus tidak dapat dikembalikan',
-                     />
+                                    onPress: () => { handleDelete() }
+                                 })
+                              }}
+                           />
+                           :
+                           <></>
+                     }
+
                   </View>
                </DrawerBottom>
             </>

components/task/sectionMemberTask.tsx

@@ -26,8 +26,9 @@ type Props = {
    position: string;
 };
 
-export default function SectionMemberTask({ refreshing }: { refreshing: boolean }) {
+export default function SectionMemberTask({ refreshing, isMemberDivision }: { refreshing: boolean, isMemberDivision: boolean }) {
    const [isModal, setModal] = useState(false);
+   const entityUser = useSelector((state: any) => state.user);
    const { token, decryptToken } = useAuthSession();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const [data, setData] = useState<Props[]>([]);
@@ -165,24 +166,31 @@ export default function SectionMemberTask({ refreshing }: { refreshing: boolean
                   }}
                />
 
-               <MenuItemRow
+
-                  icon={
+               {
-                     <MaterialCommunityIcons
+                  (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
-                        name="account-remove"
+                     ?
-                        color="black"
+                     <MenuItemRow
-                        size={25}
+                        icon={
+                           <MaterialCommunityIcons
+                              name="account-remove"
+                              color="black"
+                              size={25}
+                           />
+                        }
+                        title="Keluarkan"
+                        onPress={() => {
+                           setModal(false)
+                           AlertKonfirmasi({
+                              title: "Konfirmasi",
+                              desc: "Apakah Anda yakin ingin mengeluarkan anggota?",
+                              onPress: () => { handleDeleteMember() },
+                           });
+                        }}
                      />
-                  }
+                     :
-                  title="Keluarkan"
+                     <></>
-                  onPress={() => {
+               }
-                     setModal(false)
-                     AlertKonfirmasi({
-                        title: "Konfirmasi",
-                        desc: "Apakah Anda yakin ingin mengeluarkan anggota?",
-                        onPress: () => { handleDeleteMember() },
-                     });
-                  }}
-               />
             </View>
          </DrawerBottom>
       </>

components/task/sectionTanggalTugasTask.tsx

@@ -26,8 +26,9 @@ type Props = {
    dateEnd: string;
 }
 
-export default function SectionTanggalTugasTask({ refreshing }: { refreshing: boolean }) {
+export default function SectionTanggalTugasTask({ refreshing, isMemberDivision }: { refreshing: boolean, isMemberDivision: boolean }) {
    const dispatch = useDispatch()
+   const entityUser = useSelector((state: any) => state.user);
    const update = useSelector((state: any) => state.taskUpdate)
    const [isModal, setModal] = useState(false)
    const [isSelect, setSelect] = useState(false)
@@ -155,24 +156,6 @@ export default function SectionTanggalTugasTask({ refreshing }: { refreshing: bo
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
-               <MenuItemRow
-                  icon={<MaterialCommunityIcons name="list-status" color="black" size={25} />}
-                  title="Update Status"
-                  onPress={() => {
-                     setModal(false)
-                     setTimeout(() => {
-                        setSelect(true)
-                     }, 600);
-                  }}
-               />
-               <MenuItemRow
-                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
-                  title="Edit Tugas"
-                  onPress={() => {
-                     setModal(false)
-                     router.push(`./update/${tugas.id}`)
-                  }}
-               />
                <MenuItemRow
                   icon={
                      <MaterialCommunityIcons
@@ -189,24 +172,57 @@ export default function SectionTanggalTugasTask({ refreshing }: { refreshing: bo
                      }, 600)
                   }}
                />
-            </View>
+               {
-            <View style={[Styles.rowItemsCenter, Styles.mt15]}>
+                  (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
-               <MenuItemRow
+                     ?
-                  icon={<Ionicons name="trash" color="black" size={25} />}
+                     <>
-                  title="Hapus Tugas"
+                        <MenuItemRow
-                  onPress={() => {
+                           icon={<MaterialCommunityIcons name="list-status" color="black" size={25} />}
-                     setModal(false)
+                           title="Update Status"
-                     AlertKonfirmasi({
+                           onPress={() => {
-                        title: 'Konfirmasi',
+                              setModal(false)
-                        desc: 'Apakah anda yakin ingin menghapus data ini?',
+                              setTimeout(() => {
-                        onPress: () => {
+                                 setSelect(true)
-                           handleDelete()
+                              }, 600);
-                        }
+                           }}
-                     })
+                        />
+                        <MenuItemRow
+                           icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                           title="Edit Tugas"
+                           onPress={() => {
+                              setModal(false)
+                              router.push(`./update/${tugas.id}`)
+                           }}
+                        />
+                     </>
+                     :
+                     <></>
+               }
 
-                  }}
-               />
             </View>
+            {
+               (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
+                  ?
+                  <View style={[Styles.rowItemsCenter, Styles.mt15]}>
+                     <MenuItemRow
+                        icon={<Ionicons name="trash" color="black" size={25} />}
+                        title="Hapus Tugas"
+                        onPress={() => {
+                           setModal(false)
+                           AlertKonfirmasi({
+                              title: 'Konfirmasi',
+                              desc: 'Apakah anda yakin ingin menghapus data ini?',
+                              onPress: () => {
+                                 handleDelete()
+                              }
+                           })
+
+                        }}
+                     />
+                  </View>
+                  :
+                  <></>
+            }
          </DrawerBottom>
 
          <ModalSelect

constants/Styles.ts

@@ -515,7 +515,7 @@ const Styles = StyleSheet.create({
    wrapBtnTab: {
       justifyContent: 'space-between',
       flexDirection: 'row',
-      marginBottom: 15,
+      marginBottom: 10,
       borderRadius: 20,
       padding: 5,
       backgroundColor: 'white',