diff --git a/src/app/(application)/layout.tsx b/src/app/(application)/layout.tsx
index d2839d0..8eb45f9 100644
--- a/src/app/(application)/layout.tsx
+++ b/src/app/(application)/layout.tsx
@@ -1,4 +1,4 @@
-import { ScrollProvider, WrapLayout } from "@/module/_global"
+import { WrapLayout } from "@/module/_global"
import { funDetectCookies, funGetUserByCookies } from "@/module/auth"
import _ from "lodash"
import { redirect } from "next/navigation"
@@ -11,9 +11,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
return (
<>
-
- {children}
-
+ {children}
);
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 2daadaa..8751385 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,7 +6,7 @@ import {
MantineProvider,
rem,
} from "@mantine/core";
-import { WARNA } from "@/module/_global";
+import { ScrollProvider, WARNA } from "@/module/_global";
import { Lato } from "next/font/google";
import '@mantine/carousel/styles.css';
import { Toaster } from 'react-hot-toast';
@@ -33,20 +33,23 @@ export default function RootLayout({
return (
-
+
-
+
-
-
- {children}
-
+
+
+
+ {children}
+
+
+
diff --git a/src/module/announcement/ui/list_announcement.tsx b/src/module/announcement/ui/list_announcement.tsx
index ce57010..966d95e 100644
--- a/src/module/announcement/ui/list_announcement.tsx
+++ b/src/module/announcement/ui/list_announcement.tsx
@@ -31,13 +31,11 @@ export default function ListAnnouncement() {
setLoading(true)
const response = await funGetAllAnnouncement('?search=' + searchQuery + '&page=' + isPage)
if (response.success) {
- // if (response.data.length > 0) {
if (isPage == 1) {
setIsData(response?.data)
} else {
setIsData([...isData, ...response?.data])
}
- // }
} else {
toast.error(response.message);
}
@@ -79,7 +77,6 @@ export default function ListAnnouncement() {
const scrollTop = containerRef.current.scrollTop;
const containerHeight = containerRef.current.clientHeight;
const scrollHeight = containerRef.current.scrollHeight;
-
if (scrollTop + containerHeight >= scrollHeight) {
setPage(isPage + 1)
}