diff --git a/app/(application)/discussion/add-member/[id].tsx b/app/(application)/discussion/add-member/[id].tsx
index 1e9f4f5..31ce33c 100644
--- a/app/(application)/discussion/add-member/[id].tsx
+++ b/app/(application)/discussion/add-member/[id].tsx
@@ -94,7 +94,7 @@ export default function AddMemberDiscussionDetail() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -127,7 +127,7 @@ export default function AddMemberDiscussionDetail() {
                )
             }}
          />
-         <View style={[Styles.p15, { backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, {flex: 1,  backgroundColor: colors.background }]}>
             <InputSearch onChange={setSearch} value={search} />
 
             {
@@ -188,6 +188,6 @@ export default function AddMemberDiscussionDetail() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }
\ No newline at end of file
diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx
index de31cf5..d5ada9e 100644
--- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx
@@ -321,7 +321,6 @@ export default function DetailEventCalendar() {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Keluar"
             cancelText="Batal"
-            isDestructive
          />
       </SafeAreaView>
    )
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
index 3c04209..611a2c1 100644
--- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
@@ -1,4 +1,3 @@
-import ModalConfirmation from "@/components/ModalConfirmation";
 import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
@@ -8,6 +7,7 @@ import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
@@ -23,9 +23,9 @@ import {
 } from "@/lib/api";
 import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { ref } from "@react-native-firebase/database";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -386,6 +386,7 @@ export default function DiscussionDetail() {
                                  desc={item.comment}
                                  rightBottomInfo={item.isEdited ? "Edited" : ""}
                                  descEllipsize={detailMore.includes(item.id) ? false : true}
+                                 bgColor="transparent"
                                  onPress={() => {
                                     setDetailMore((prev: any) => {
                                        if (prev.includes(item.id)) {
@@ -562,7 +563,6 @@ export default function DiscussionDetail() {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </>
    );
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
index c4bac68..43e9f9c 100644
--- a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
@@ -192,6 +192,7 @@ export default function DiscussionDivision() {
                                     </View>
                                  }
                                  rightBottomInfo={item.total_komentar + ' Komentar'}
+                                 bgColor="transparent"
                               />
                            )
                         }}
diff --git a/app/(application)/division/[id]/(fitur-division)/document/index.tsx b/app/(application)/division/[id]/(fitur-division)/document/index.tsx
index c7dc164..1a2b057 100644
--- a/app/(application)/division/[id]/(fitur-division)/document/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/document/index.tsx
@@ -619,7 +619,6 @@ export default function DocumentDivision() {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </SafeAreaView>
    );
diff --git a/app/(application)/division/[id]/info.tsx b/app/(application)/division/[id]/info.tsx
index c473939..16e6f47 100644
--- a/app/(application)/division/[id]/info.tsx
+++ b/app/(application)/division/[id]/info.tsx
@@ -298,7 +298,6 @@ export default function InformationDivision() {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Keluar"
             cancelText="Batal"
-            isDestructive
          />
       </SafeAreaView>
    )
diff --git a/app/(application)/profile.tsx b/app/(application)/profile.tsx
index 22ada5d..ff7e115 100644
--- a/app/(application)/profile.tsx
+++ b/app/(application)/profile.tsx
@@ -160,7 +160,6 @@ export default function Profile() {
             onCancel={() => setShowLogoutModal(false)}
             confirmText="Keluar"
             cancelText="Batal"
-            isDestructive
          />
       </SafeAreaView>
    )
diff --git a/components/announcement/headerAnnouncementDetail.tsx b/components/announcement/headerAnnouncementDetail.tsx
index 7141706..336fcef 100644
--- a/components/announcement/headerAnnouncementDetail.tsx
+++ b/components/announcement/headerAnnouncementDetail.tsx
@@ -80,7 +80,6 @@ export default function HeaderRightAnnouncementDetail({ id }: Props) {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </>
    )
diff --git a/components/calendar/headerCalendarDetail.tsx b/components/calendar/headerCalendarDetail.tsx
index 1584986..b7a2839 100644
--- a/components/calendar/headerCalendarDetail.tsx
+++ b/components/calendar/headerCalendarDetail.tsx
@@ -91,7 +91,6 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </>
    )
diff --git a/components/document/menuBottomSelectDocument.tsx b/components/document/menuBottomSelectDocument.tsx
index 76bb956..6bf9fe2 100644
--- a/components/document/menuBottomSelectDocument.tsx
+++ b/components/document/menuBottomSelectDocument.tsx
@@ -219,7 +219,6 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </>
    )
diff --git a/components/project/headerProjectDetail.tsx b/components/project/headerProjectDetail.tsx
index 117e488..3f5a562 100644
--- a/components/project/headerProjectDetail.tsx
+++ b/components/project/headerProjectDetail.tsx
@@ -184,7 +184,6 @@ export default function HeaderRightProjectDetail({ id, status }: Props) {
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
 
          <ModalFloat
diff --git a/components/project/sectionFile.tsx b/components/project/sectionFile.tsx
index fe72af0..435f4b2 100644
--- a/components/project/sectionFile.tsx
+++ b/components/project/sectionFile.tsx
@@ -206,7 +206,6 @@ export default function SectionFile({ status, member, refreshing }: { status: nu
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </>
    )
diff --git a/components/project/sectionLink.tsx b/components/project/sectionLink.tsx
index 71e5e77..f24e511 100644
--- a/components/project/sectionLink.tsx
+++ b/components/project/sectionLink.tsx
@@ -143,7 +143,6 @@ export default function SectionLink({ status, member, refreshing }: { status: nu
                   onCancel={() => setShowDeleteModal(false)}
                   confirmText="Hapus"
                   cancelText="Batal"
-                  isDestructive
                />
             </>
          }
diff --git a/components/project/sectionMember.tsx b/components/project/sectionMember.tsx
index db6bf8a..5050309 100644
--- a/components/project/sectionMember.tsx
+++ b/components/project/sectionMember.tsx
@@ -190,7 +190,6 @@ export default function SectionMember({ status, refreshing }: { status: number |
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Keluarkan"
             cancelText="Batal"
-            isDestructive
          />
       </>
    );
diff --git a/components/project/sectionTanggalTugas.tsx b/components/project/sectionTanggalTugas.tsx
index ad27bbe..a5619fa 100644
--- a/components/project/sectionTanggalTugas.tsx
+++ b/components/project/sectionTanggalTugas.tsx
@@ -235,7 +235,6 @@ export default function SectionTanggalTugasProject({ status, member, refreshing
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
 
          <ModalSelect
diff --git a/components/task/headerTaskDetail.tsx b/components/task/headerTaskDetail.tsx
index 1d36ddd..83fe4db 100644
--- a/components/task/headerTaskDetail.tsx
+++ b/components/task/headerTaskDetail.tsx
@@ -190,7 +190,6 @@ export default function HeaderRightTaskDetail({ id, division, status, isAdminDiv
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
 
          <ModalFloat
diff --git a/components/task/sectionFileTask.tsx b/components/task/sectionFileTask.tsx
index dd6bbda..3349753 100644
--- a/components/task/sectionFileTask.tsx
+++ b/components/task/sectionFileTask.tsx
@@ -201,7 +201,6 @@ export default function SectionFileTask({ refreshing, isMemberDivision }: { refr
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
       </>
    )
diff --git a/components/task/sectionLinkTask.tsx b/components/task/sectionLinkTask.tsx
index 37bc4e1..7ed3ae1 100644
--- a/components/task/sectionLinkTask.tsx
+++ b/components/task/sectionLinkTask.tsx
@@ -136,7 +136,6 @@ export default function SectionLinkTask({ refreshing, isMemberDivision }: { refr
                   onCancel={() => setShowDeleteModal(false)}
                   confirmText="Hapus"
                   cancelText="Batal"
-                  isDestructive
                />
             </>
          }
diff --git a/components/task/sectionMemberTask.tsx b/components/task/sectionMemberTask.tsx
index a878991..7e2cc45 100644
--- a/components/task/sectionMemberTask.tsx
+++ b/components/task/sectionMemberTask.tsx
@@ -201,7 +201,6 @@ export default function SectionMemberTask({ refreshing, isAdminDivision }: { ref
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Keluarkan"
             cancelText="Batal"
-            isDestructive
          />
       </>
    );
diff --git a/components/task/sectionTanggalTugasTask.tsx b/components/task/sectionTanggalTugasTask.tsx
index 5443caa..e365afd 100644
--- a/components/task/sectionTanggalTugasTask.tsx
+++ b/components/task/sectionTanggalTugasTask.tsx
@@ -234,7 +234,6 @@ export default function SectionTanggalTugasTask({ refreshing, isMemberDivision }
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"
-            isDestructive
          />
 
          <ModalSelect