diff --git a/components/calendar/calendar-widget.tsx b/components/calendar/calendar-widget.tsx index 83d92fe..49a7c77 100644 --- a/components/calendar/calendar-widget.tsx +++ b/components/calendar/calendar-widget.tsx @@ -1,6 +1,6 @@ "use client"; -import { useState, useEffect, useRef, useMemo } from "react"; +import { useState, useEffect, useRef } from "react"; import { format, isToday, isTomorrow, addDays } from "date-fns"; import { fr } from "date-fns/locale"; import { CalendarIcon, ChevronRight } from "lucide-react"; @@ -22,29 +22,23 @@ type Event = { }; export function CalendarWidget() { + const { data: session, status } = useSession(); const [events, setEvents] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); const { triggerNotification } = useWidgetNotification(); const lastEventCountRef = useRef(-1); - - // Declare useSession after other hooks to avoid TypeScript scope analysis issues - const sessionResult = useSession(); useEffect(() => { - // Capture values from sessionResult inside useEffect to avoid scope issues - const currentSession = sessionResult.data; - const currentStatus = sessionResult.status; - - console.log("Calendar Widget - Session Status:", currentStatus); - console.log("Calendar Widget - Session Data:", currentSession); + console.log("Calendar Widget - Session Status:", status); + console.log("Calendar Widget - Session Data:", session); - if (currentStatus === "loading") { + if (status === "loading") { console.log("Calendar Widget - Session is loading"); return; } - if (currentStatus !== "authenticated" || !currentSession) { + if (status !== "authenticated" || !session) { console.log("Calendar Widget - Not authenticated, skipping fetch"); setLoading(false); return; @@ -205,7 +199,7 @@ export function CalendarWidget() { }, 300000); return () => clearInterval(intervalId); - }, [sessionResult.data, sessionResult.status, triggerNotification]); + }, [session, status, triggerNotification]); const formatEventDate = (date: Date, isAllDay: boolean) => { let dateString = "";