diff --git a/app/(application)/division/[id]/(fitur-division)/_layout.tsx b/app/(application)/division/[id]/(fitur-division)/_layout.tsx
index 6735e5c..bcb0d79 100644
--- a/app/(application)/division/[id]/(fitur-division)/_layout.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/_layout.tsx
@@ -1,4 +1,5 @@
import ButtonBackHeader from "@/components/buttonBackHeader"
+import HeaderRightDiscussionList from "@/components/discussion/headerDiscussionList"
import HeaderRightTaskList from "@/components/task/headerTaskList"
import { Headers } from "@/constants/Headers"
import { router, Stack } from "expo-router"
@@ -14,6 +15,12 @@ export default function RootLayout() {
headerTitleAlign: 'center',
headerRight: () =>
}} />
+ { router.back() }} />,
+ title: 'Diskusi Divisi',
+ headerTitleAlign: 'center',
+ headerRight: () =>
+ }} />
>
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
new file mode 100644
index 0000000..e9570bb
--- /dev/null
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
@@ -0,0 +1,9 @@
+import { Text } from "react-native";
+
+export default function DiscussionDetail() {
+ return (
+ <>
+ Detail diskusi
+ >
+ )
+}
\ No newline at end of file
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
new file mode 100644
index 0000000..ef37c6e
--- /dev/null
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
@@ -0,0 +1,142 @@
+import BorderBottomItem from "@/components/borderBottomItem";
+import ButtonTab from "@/components/buttonTab";
+import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
+import Styles from "@/constants/Styles";
+import { AntDesign, Feather, Ionicons } from "@expo/vector-icons";
+import { router, useLocalSearchParams } from "expo-router";
+import { Image, SafeAreaView, ScrollView, Text, View } from "react-native";
+
+
+export default function DiscussionDivision() {
+ const { active } = useLocalSearchParams<{ active?: string }>()
+
+ return (
+
+
+
+
+ { router.push('./discussion?active=true') }}
+ label="Aktif"
+ icon={}
+ n={2} />
+ { router.push('./discussion?active=false') }}
+ label="Arsip"
+ icon={}
+ n={2} />
+
+
+
+ { router.push('./discussion/1') }}
+ borderType="bottom"
+ icon={
+
+ }
+ title="Amalia Dwi"
+ subtitle={
+
+ }
+ rightTopInfo="3 Jan 2025"
+ desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
+ leftBottomInfo={
+
+
+ Diskusikan
+
+ }
+ rightBottomInfo='15 Komentar'
+ />
+ { router.push('./discussion/1') }}
+ borderType="bottom"
+ icon={
+
+ }
+ title="Amalia Dwi"
+ subtitle={
+
+ }
+ rightTopInfo="3 Jan 2025"
+ desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
+ leftBottomInfo={
+
+
+ Diskusikan
+
+ }
+ rightBottomInfo='15 Komentar'
+ />
+ { router.push('./discussion/1') }}
+ borderType="bottom"
+ icon={
+
+ }
+ title="Amalia Dwi"
+ subtitle={
+
+ }
+ rightTopInfo="3 Jan 2025"
+ desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
+ leftBottomInfo={
+
+
+ Diskusikan
+
+ }
+ rightBottomInfo='15 Komentar'
+ />
+ { router.push('./discussion/1') }}
+ borderType="bottom"
+ icon={
+
+ }
+ title="Amalia Dwi"
+ subtitle={
+
+ }
+ rightTopInfo="3 Jan 2025"
+ desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
+ leftBottomInfo={
+
+
+ Diskusikan
+
+ }
+ rightBottomInfo='15 Komentar'
+ />
+ { router.push('./discussion/1') }}
+ borderType="bottom"
+ icon={
+
+ }
+ title="Amalia Dwi"
+ subtitle={
+
+ }
+ rightTopInfo="3 Jan 2025"
+ desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
+ leftBottomInfo={
+
+
+ Diskusikan
+
+ }
+ rightBottomInfo='15 Komentar'
+ />
+
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/components/discussion/headerDiscussionList.tsx b/components/discussion/headerDiscussionList.tsx
new file mode 100644
index 0000000..cc610ab
--- /dev/null
+++ b/components/discussion/headerDiscussionList.tsx
@@ -0,0 +1,30 @@
+import Styles from "@/constants/Styles"
+import { AntDesign } from "@expo/vector-icons"
+import { router } from "expo-router"
+import { useState } from "react"
+import { View } from "react-native"
+import ButtonMenuHeader from "../buttonMenuHeader"
+import DrawerBottom from "../drawerBottom"
+import MenuItemRow from "../menuItemRow"
+
+export default function HeaderRightDiscussionList() {
+ const [isVisible, setVisible] = useState(false)
+
+ return (
+ <>
+ { setVisible(true) }} />
+
+
+ }
+ title="Tambah Diskusi"
+ onPress={() => {
+ setVisible(false)
+ router.push('/discussion/create')
+ }}
+ />
+
+
+ >
+ )
+}
\ No newline at end of file
diff --git a/components/division/fiturDivisionDetail.tsx b/components/division/fiturDivisionDetail.tsx
index 7fb9336..e46abe0 100644
--- a/components/division/fiturDivisionDetail.tsx
+++ b/components/division/fiturDivisionDetail.tsx
@@ -51,6 +51,7 @@ export default function FiturDivisionDetail() {
title="Diskusi"
subtitle='5 Diskusi'
width={28}
+ onPress={() => {router.push('/division/123/discussion?active=true')}}
/>