diff --git a/src/context/todo.context.tsx b/src/context/todo.context.tsx
index 721aebda..5340c24b 100644
--- a/src/context/todo.context.tsx
+++ b/src/context/todo.context.tsx
@@ -14,6 +14,7 @@ import { useUpdateTodo } from '@/services/hooks/todo/update-todo.hook'
 import { useGetTodos } from '@/services/hooks/todo/get-todos.hook'
 import type { FetchedTodo, Todo } from '@/services/hooks/todo/todo.interface'
 import { playAlarm } from '@/common/playAlarm'
+import { sleep } from '@/common/utils/timeout'
 
 export enum TodoViewType {
 	Day = 'day',
@@ -159,17 +160,21 @@ export function TodoProvider({ children }: { children: React.ReactNode }) {
 				? Math.max(...sameDateTodos.map((t) => t.order || 0))
 				: 0
 
-		const [err, _] = await safeAwait(
-			addTodoAsync({
-				text: input.text,
-				completed: false,
-				date: input.date,
-				priority: input.priority || TodoPriority.Low,
-				category: input.category || '',
-				order: maxOrder + 1,
-				description: input.notes || '',
-			})
-		)
+		const item: any = {
+			text: input.text,
+			completed: false,
+			date: input.date,
+			priority: input.priority || TodoPriority.Low,
+			category: input.category || '',
+			order: maxOrder + 1,
+			description: input.notes || '',
+		}
+		const id = `temp-${Date.now()}`
+		old.unshift({ ...item, order: 0, id })
+		setTodos(() => old)
+
+		await sleep(3000)
+		const [err, _] = await safeAwait(addTodoAsync(item))
 		if (err) {
 			const content = translateError(err)
 			if (typeof content === 'string') {
@@ -201,6 +206,20 @@ export function TodoProvider({ children }: { children: React.ReactNode }) {
 			)
 		}
 		const isCompleted = !current.completed
+
+		setTodos((prev) => {
+			if (!prev) return prev
+			return prev.map((todo) => {
+				if (todo.id === id || todo.onlineId === id) {
+					return {
+						...todo,
+						completed: isCompleted,
+					}
+				}
+				return todo
+			})
+		})
+
 		const [err, _] = await safeAwait(
 			updateTodoAsync({
 				id: onlineId,
@@ -214,9 +233,9 @@ export function TodoProvider({ children }: { children: React.ReactNode }) {
 			showToast(translateError(err) as string, 'error')
 			return
 		}
-		refetch()
-		Analytics.event('todo_toggled')
+
 		if (isCompleted) playAlarm('done_todo')
+		Analytics.event('todo_toggled')
 	}
 
 	const updateTodo = async (id: string, updates: Partial<Omit<Todo, 'id'>>) => {
diff --git a/src/context/widget-visibility.context.tsx b/src/context/widget-visibility.context.tsx
index b2524d72..218751ac 100644
--- a/src/context/widget-visibility.context.tsx
+++ b/src/context/widget-visibility.context.tsx
@@ -12,8 +12,6 @@ import CalendarLayout from '@/layouts/widgets/calendar/calendar'
 import { ComboWidget } from '@/layouts/widgets/comboWidget/combo-widget.layout'
 import { NetworkLayout } from '@/layouts/widgets/network/network.layout'
 import { NewsLayout } from '@/layouts/widgets/news/news.layout'
-import { NotesLayout } from '@/layouts/widgets/notes/notes.layout'
-import { TodosLayout } from '@/layouts/widgets/todos/todos'
 import { ToolsLayout } from '@/layouts/widgets/tools/tools.layout'
 import { WeatherLayout } from '@/layouts/widgets/weather/weather.layout'
 import { WigiArzLayout } from '@/layouts/widgets/wigiArz/wigi_arz.layout'
@@ -22,6 +20,7 @@ import { useAuth } from './auth.context'
 import { CurrencyProvider } from './currency.context'
 import { showToast } from '@/common/toast'
 import { YadkarWidget } from '@/layouts/widgets/yadkar/yadkar'
+import { TodoProvider } from './todo.context'
 
 export enum WidgetKeys {
 	comboWidget = 'comboWidget',
@@ -65,7 +64,11 @@ export const widgetItems: WidgetItem[] = [
 		emoji: '📒',
 		label: 'یادکار (وظایف و یادداشت)',
 		order: 0,
-		node: <YadkarWidget />,
+		node: (
+			<TodoProvider>
+				<YadkarWidget />
+			</TodoProvider>
+		),
 		canToggle: true,
 		isNew: true,
 	},
@@ -139,24 +142,6 @@ export const widgetItems: WidgetItem[] = [
 		disabled: true,
 		soon: true,
 	},
-	{
-		id: WidgetKeys.todos,
-		emoji: '✅',
-		label: 'وظایف',
-		order: 2,
-		node: <TodosLayout />,
-		canToggle: false,
-		disabled: true,
-	},
-	{
-		id: WidgetKeys.notes,
-		emoji: '📝',
-		label: 'یادداشت‌ها',
-		order: 7,
-		node: <NotesLayout />,
-		canToggle: false,
-		disabled: true,
-	},
 ]
 
 interface WidgetVisibilityContextType {
diff --git a/src/layouts/widgetify-card/widgetify.layout.tsx b/src/layouts/widgetify-card/widgetify.layout.tsx
index 2d4787b8..a4c09ae6 100644
--- a/src/layouts/widgetify-card/widgetify.layout.tsx
+++ b/src/layouts/widgetify-card/widgetify.layout.tsx
@@ -5,7 +5,6 @@ import { useAuth } from '@/context/auth.context'
 import { useGeneralSetting } from '@/context/general-setting.context'
 import { WidgetContainer } from '../widgets/widget-container'
 import { NotificationCenter } from './notification-center/notification-center'
-import { TodoOverviewCard } from './overviewCards/todo-overviewCard'
 import { Pet } from './pets/pet'
 import { PetProvider } from './pets/pet.context'
 import Snowfall from 'react-snowfall'
@@ -26,7 +25,6 @@ export const WidgetifyLayout = () => {
 		const newBlurMode = !blurMode
 		updateSetting('blurMode', newBlurMode)
 	}
-
 	return (
 		<WidgetContainer className="overflow-hidden !h-72 !min-h-72 !max-h-72">
 			<div className="relative w-full h-full">
@@ -60,7 +58,7 @@ export const WidgetifyLayout = () => {
 						<div
 							className={`flex flex-col gap-1 ${blurMode ? 'blur-mode' : 'disabled-blur-mode'}`}
 						>
-							<TodoOverviewCard />
+							{/* <TodoOverviewCard /> */}
 							{/* <GoogleOverviewCard /> */}
 						</div>
 						<NotificationCenter />
diff --git a/src/layouts/widgets/calendar/calendar.tsx b/src/layouts/widgets/calendar/calendar.tsx
index 9226eabc..52057373 100644
--- a/src/layouts/widgets/calendar/calendar.tsx
+++ b/src/layouts/widgets/calendar/calendar.tsx
@@ -1,36 +1,112 @@
-import type React from 'react'
+import { type ReactNode, useState } from 'react'
+import GoogleCalendar from '@/assets/google-calendar.png'
 import { useDate } from '@/context/date.context'
 import { WidgetContainer } from '../widget-container'
 import { CalendarGrid } from './components/calendar-grid'
 import { CalendarHeader } from './components/calendar-header'
-import { DaySummary } from './components/day-summary'
+import { GoogleCalendarView } from './components/google-calendar/google-calendar-view'
+import { FcCalendar } from 'react-icons/fc' // استفاده از لوگوی رنگی گوگل برای جلوه بهتر
+import Analytics from '@/analytics'
 
-const CalendarLayout: React.FC<any> = () => {
-	const { currentDate, selectedDate, setCurrentDate, setSelectedDate, goToToday } =
-		useDate()
+interface TabItem {
+	label: string
+	value: string
+	icon?: ReactNode
+}
+
+interface CalendarTabSelectorProps {
+	tabs: TabItem[]
+	activeTab: string
+	setActiveTab: (tab: string) => void
+}
 
+const CalendarTabSelector: React.FC<CalendarTabSelectorProps> = ({
+	tabs,
+	activeTab,
+	setActiveTab,
+}) => {
 	return (
-		<WidgetContainer
-			className={
-				'flex flex-col overflow-hidden md:flex-1 w-full transition-all duration-300'
-			}
-		>
-			<CalendarHeader
-				currentDate={currentDate}
-				setCurrentDate={setCurrentDate}
-				selectedDate={selectedDate}
-				goToToday={goToToday}
-			/>
+		<div className="p-1 mt-1 shrink-0">
+			<div
+				role="tablist"
+				className="flex w-full gap-2 p-1.5 bg-base-200/50 rounded-2xl border border-base-300/30"
+			>
+				{tabs.map((tab) => (
+					<button
+						key={tab.value}
+						onClick={() => setActiveTab(tab.value)}
+						className={`flex-1 flex items-center justify-center gap-2 h-9 rounded-xl text-[11px] cursor-pointer font-bold transition-all duration-200 ${
+							activeTab === tab.value
+								? 'bg-base-100/30 text-primary-content border border-base-300 shadow-md scale-[1.02]'
+								: 'text-base-content border border-transparent opacity-60 hover:opacity-100 hover:bg-base-100/50'
+						}`}
+					>
+						{tab.icon}
+						{tab.label}
+					</button>
+				))}
+			</div>
+		</div>
+	)
+}
 
-			<CalendarGrid
-				currentDate={currentDate}
-				selectedDate={selectedDate}
-				setSelectedDate={setSelectedDate}
+const tabs = [
+	{
+		label: 'تقویم',
+		value: 'calendar',
+		icon: <FcCalendar size={18} />,
+	},
+	{
+		label: 'گوگل‌کلندر',
+		value: 'google',
+		icon: (
+			<img
+				src={GoogleCalendar}
+				alt="Google Calendar"
+				className="w-5 h-5 rounded-sm"
 			/>
+		),
+	},
+]
+const CalendarLayout: React.FC = () => {
+	const { currentDate, selectedDate, setCurrentDate, setSelectedDate, goToToday } =
+		useDate()
+	const [activeTab, setActiveTab] = useState<string>('calendar')
+
+	const onSetActiveTab = (tab: string) => {
+		setActiveTab(tab)
+		Analytics.event(`calendar_tab_switch_to_${tab}`)
+	}
 
-			<div className="flex-1 mt-2">
-				<DaySummary selectedDate={selectedDate} />
+	return (
+		<WidgetContainer className="flex flex-col w-full overflow-hidden transition-all duration-300 md:flex-1">
+			<div className="flex flex-col flex-1 overflow-hidden">
+				{activeTab === 'calendar' ? (
+					<>
+						<CalendarHeader
+							currentDate={currentDate}
+							selectedDate={selectedDate}
+							setCurrentDate={setCurrentDate}
+							goToToday={goToToday}
+						/>
+						<div className="h-full">
+							<CalendarGrid
+								currentDate={currentDate}
+								selectedDate={selectedDate}
+								setSelectedDate={setSelectedDate}
+							/>
+						</div>
+					</>
+				) : (
+					<GoogleCalendarView />
+				)}
 			</div>
+
+			<CalendarTabSelector
+				tabs={tabs}
+				activeTab={activeTab}
+				setActiveTab={onSetActiveTab}
+			/>
 		</WidgetContainer>
 	)
 }
diff --git a/src/layouts/widgets/calendar/components/calendar-grid.tsx b/src/layouts/widgets/calendar/components/calendar-grid.tsx
index e5c86a6c..2edc774a 100644
--- a/src/layouts/widgets/calendar/components/calendar-grid.tsx
+++ b/src/layouts/widgets/calendar/components/calendar-grid.tsx
@@ -1,6 +1,5 @@
 import { useAuth } from '@/context/auth.context'
 import { useGeneralSetting } from '@/context/general-setting.context'
-import { useTodoStore } from '@/context/todo.context'
 import { useGetEvents } from '@/services/hooks/date/getEvents.hook'
 import type React from 'react'
 import { useState } from 'react'
@@ -29,7 +28,12 @@ export const CalendarGrid: React.FC<CalendarGridProps> = ({
 	const [clickedElement, setClickedElement] = useState<HTMLDivElement | null>(null)
 
 	const { data: events } = useGetEvents()
-	const { todos } = useTodoStore()
+
+	const eventsForCalendar = events || {
+		gregorianEvents: [],
+		hijriEvents: [],
+		shamsiEvents: [],
+	}
 
 	const { data: calendarData, refetch } = useGetCalendarData(
 		isAuthenticated,
@@ -76,11 +80,10 @@ export const CalendarGrid: React.FC<CalendarGridProps> = ({
 						key={`day-${i}`}
 						currentDate={currentDate}
 						day={i + 1}
-						events={events}
+						events={eventsForCalendar}
 						googleEvents={calendarData?.googleEvents || []}
 						selectedDateStr={selectedDateStr}
 						setSelectedDate={setSelectedDate}
-						todos={todos}
 						timezone={timezone.value}
 						moods={calendarData?.moods ?? []}
 						onClick={(element) => {
@@ -109,8 +112,7 @@ export const CalendarGrid: React.FC<CalendarGridProps> = ({
 					triggerRef={{ current: clickedElement }}
 					content={
 						<CalendarDayDetails
-							events={events}
-							googleEvents={calendarData?.googleEvents || []}
+							events={eventsForCalendar}
 							moods={calendarData?.moods ?? []}
 							onMoodChange={() => refetch()}
 						/>
diff --git a/src/layouts/widgets/calendar/components/day-summary.tsx b/src/layouts/widgets/calendar/components/day-summary.tsx
index f1ca8703..9273f91c 100644
--- a/src/layouts/widgets/calendar/components/day-summary.tsx
+++ b/src/layouts/widgets/calendar/components/day-summary.tsx
@@ -1,11 +1,9 @@
 import type React from 'react'
-import { FiCalendar, FiClipboard } from 'react-icons/fi'
+import { FiCalendar } from 'react-icons/fi'
 import { useAuth } from '@/context/auth.context'
-import { useTodoStore } from '@/context/todo.context'
 import { useGetEvents } from '@/services/hooks/date/getEvents.hook'
 import { useGetGoogleCalendarEvents } from '@/services/hooks/date/getGoogleCalendarEvents.hook'
 import {
-	formatDateStr,
 	getGregorianEvents,
 	getHijriEvents,
 	getShamsiEvents,
@@ -18,7 +16,6 @@ interface DaySummaryProps {
 
 export const DaySummary: React.FC<DaySummaryProps> = ({ selectedDate }) => {
 	const { user } = useAuth()
-	const { todos } = useTodoStore()
 	const { data: events } = useGetEvents()
 
 	const startOfMonth = selectedDate.clone().startOf('jMonth').toDate()
@@ -30,8 +27,6 @@ export const DaySummary: React.FC<DaySummaryProps> = ({ selectedDate }) => {
 		endOfMonth
 	)
 
-	const selectedDateStr = formatDateStr(selectedDate)
-
 	const googleEventsForSelectedDate = googleEvents.filter((event) => {
 		if (!event || !event.start || !event.start.dateTime) {
 			return false
@@ -44,11 +39,6 @@ export const DaySummary: React.FC<DaySummaryProps> = ({ selectedDate }) => {
 
 	const googleEventCount = googleEventsForSelectedDate.length
 
-	const todosForSelectedDate = todos.filter((todo) => todo.date === selectedDateStr)
-
-	const completedTodos = todosForSelectedDate.filter((todo) => todo.completed).length
-	const totalTodos = todosForSelectedDate.length
-
 	const shamsiEvents = events ? getShamsiEvents(events, selectedDate) : []
 	const gregorianEvents = events ? getGregorianEvents(events, selectedDate) : []
 	const hijriEvents = events ? getHijriEvents(events, selectedDate) : []
@@ -59,8 +49,8 @@ export const DaySummary: React.FC<DaySummaryProps> = ({ selectedDate }) => {
 
 	return (
 		<div className={'overflow-hidden border border-content rounded-xl'}>
-			<div className="p-1.5">
-				<div className="grid grid-cols-2 gap-1.5">
+			<div className="p-0.5">
+				<div className="grid grid-cols-1 gap-1.5">
 					<div
 						className={
 							'p-1 rounded-lg cursor-pointer bg-base-300 flex items-center opacity-80 hover:opacity-100 transition-all duration-200'
@@ -69,7 +59,7 @@ export const DaySummary: React.FC<DaySummaryProps> = ({ selectedDate }) => {
 						<FiCalendar
 							className={`text-base ml-2 flex-shrink-0 ${totalEventsCount > 0 ? 'text-blue-500' : 'text-gray-400'}`}
 						/>
-						<div className="flex-1 min-w-0">
+						<div className="min-w-0 flex-">
 							<div className={'text-xs font-medium text-content truncate'}>
 								<span>{totalEventsCount}</span> مناسبت
 							</div>
@@ -84,30 +74,6 @@ export const DaySummary: React.FC<DaySummaryProps> = ({ selectedDate }) => {
 							</div>
 						</div>
 					</div>
-
-					{/* Todos card */}
-					<div
-						className={
-							'p-1 rounded-lg cursor-pointer bg-base-300 flex items-center opacity-80 hover:opacity-100 transition-all duration-200'
-						}
-					>
-						<FiClipboard
-							className={`text-base ml-2 flex-shrink-0 ${totalTodos > 0 ? 'text-green-500' : 'text-gray-400'}`}
-						/>
-						<div className="flex-1 min-w-0">
-							{' '}
-							<div className={'text-xs font-medium text-content truncate'}>
-								<span>{totalTodos}</span> وظیفه
-							</div>
-							<div
-								className={'text-[.50rem] widget-item-sub-text truncate'}
-							>
-								{totalTodos > 0
-									? `${completedTodos} از ${totalTodos} تکمیل شده`
-									: 'بدون وظیفه'}
-							</div>
-						</div>
-					</div>
 				</div>
 			</div>
 		</div>
diff --git a/src/layouts/widgets/calendar/components/day/day.tsx b/src/layouts/widgets/calendar/components/day/day.tsx
index 55ab59a1..c92c2501 100644
--- a/src/layouts/widgets/calendar/components/day/day.tsx
+++ b/src/layouts/widgets/calendar/components/day/day.tsx
@@ -12,13 +12,11 @@ import {
 	getShamsiEvents,
 } from '../../utils'
 import { moodOptions } from './toolTipContent'
-import type { Todo } from '@/services/hooks/todo/todo.interface'
 
 interface DayItemProps {
 	day: number
 	currentDate: jalaliMoment.Moment
 	events: FetchedAllEvents
-	todos: Todo[]
 	selectedDateStr: string
 	setSelectedDate: (date: jalaliMoment.Moment) => void
 	googleEvents: GoogleCalendarEvent[]
@@ -31,8 +29,6 @@ export function DayItem({
 	day,
 	currentDate,
 	events,
-	googleEvents = [],
-	todos,
 	selectedDateStr,
 	setSelectedDate,
 	timezone,
@@ -46,17 +42,13 @@ export function DayItem({
 	const todayHijriEvents = getHijriEvents(events, cellDate)
 	const todayGregorianEvents = getGregorianEvents(events, cellDate)
 
-	const googleEventsForDay = filterGoogleEventsByDate(googleEvents, cellDate)
-	const hasGoogleEvents = googleEventsForDay.length > 0
-
-	const hasEvent = todayShamsiEvents.length || hasGoogleEvents
+	const hasEvent = todayShamsiEvents.length
 	const eventIcons = [
 		...todayGregorianEvents.filter((event) => event.icon).map((event) => event.icon),
 		...todayShamsiEvents.filter((event) => event.icon).map((event) => event.icon),
 		...todayHijriEvents.filter((event) => event.icon).map((event) => event.icon),
 	].filter(Boolean) as string[]
 
-	const hasTodo = todos.some((todo) => todo.date === dateStr)
 	const isSelected = selectedDateStr === dateStr
 	const isCurrentDay = isToday(cellDate, timezone)
 
@@ -134,7 +126,7 @@ export function DayItem({
 			)
 		}
 
-		if (!hasEvent && !hasTodo) return null
+		if (!hasEvent) return null
 
 		return (
 			<div className="flex items-center">
@@ -143,9 +135,6 @@ export function DayItem({
 						className={`w-0.5 h-0.5 rounded-full ${isHolidayEvent ? 'bg-red-500' : 'bg-blue-500/80'} shadow-sm`}
 					/>
 				)}
-				{hasTodo && (
-					<span className="w-0.5 h-0.5 rounded-full shadow-sm bg-green-500/80" />
-				)}
 			</div>
 		)
 	}
@@ -181,20 +170,3 @@ const isToday = (date: jalaliMoment.Moment, timezone: string) => {
 		date.jYear() === today.jYear()
 	)
 }
-
-const filterGoogleEventsByDate = (
-	googleEvents: GoogleCalendarEvent[],
-	date: jalaliMoment.Moment
-) => {
-	return googleEvents.filter((event) => {
-		if (event.eventType !== 'birthday') {
-			const eventDate = jalaliMoment(event.start.dateTime)
-			return (
-				eventDate.jDate() === date.jDate() &&
-				eventDate.jMonth() === date.jMonth() &&
-				eventDate.jYear() === date.jYear()
-			)
-		}
-		return undefined
-	})
-}
diff --git a/src/layouts/widgets/calendar/components/day/toolTipContent.tsx b/src/layouts/widgets/calendar/components/day/toolTipContent.tsx
index 47b53972..3c54b1a5 100644
--- a/src/layouts/widgets/calendar/components/day/toolTipContent.tsx
+++ b/src/layouts/widgets/calendar/components/day/toolTipContent.tsx
@@ -1,5 +1,3 @@
-import moment from 'jalali-moment'
-import { AiOutlineGoogle } from 'react-icons/ai'
 import { FaGlobeAsia } from 'react-icons/fa'
 import { FaMoon } from 'react-icons/fa6'
 import { HiSparkles } from 'react-icons/hi2'
@@ -7,13 +5,11 @@ import { useState } from 'react'
 import type { FetchedAllEvents } from '@/services/hooks/date/getEvents.hook'
 import {
 	convertShamsiToHijri,
-	filterGoogleEventsByDate,
 	getGregorianEvents,
 	getHijriEvents,
 	getShamsiEvents,
 } from '../../utils'
 import { useDate } from '@/context/date.context'
-import type { GoogleCalendarEvent } from '@/services/hooks/date/getGoogleCalendarEvents.hook'
 import type React from 'react'
 import { useAuth } from '@/context/auth.context'
 import {
@@ -30,7 +26,6 @@ import Analytics from '@/analytics'
 
 interface CalendarDayDetailsProps {
 	events: FetchedAllEvents
-	googleEvents: GoogleCalendarEvent[]
 	eventIcon?: string
 	moods: MoodEntry[]
 	onMoodChange?: (mood: MoodType) => void
@@ -69,7 +64,6 @@ export const moodOptions = [
 
 export const CalendarDayDetails: React.FC<CalendarDayDetailsProps> = ({
 	events,
-	googleEvents,
 	moods,
 	onMoodChange,
 }) => {
@@ -159,8 +153,7 @@ export const CalendarDayDetails: React.FC<CalendarDayDetailsProps> = ({
 	const jalali = selectedDate.format('jYYYY/jMM/jD')
 	const jalaliDay = selectedDate.format('dddd')
 
-	const dayGoogleEvents = filterGoogleEventsByDate(googleEvents, selectedDate)
-	const totalEvents = dayEvent.length + dayGoogleEvents.length
+	const totalEvents = dayEvent.length
 	const holidayStyle = isHoliday
 		? 'from-orange-600 to-red-700'
 		: 'from-sky-500 to-blue-700'
@@ -234,26 +227,6 @@ export const CalendarDayDetails: React.FC<CalendarDayDetailsProps> = ({
 
 				{totalEvents > 0 && (
 					<div className="pr-1 space-y-1 overflow-y-auto max-h-32 scrollbar-thin scrollbar-thumb-base-300 scrollbar-track-transparent">
-						{dayGoogleEvents.map((event, idx) => (
-							<div
-								key={`g-${idx}`}
-								className="flex items-center gap-1.5 p-1.5 rounded-2xl bg-info/10 border border-info/20"
-							>
-								<AiOutlineGoogle
-									className="flex-shrink-0 text-info"
-									size={12}
-								/>
-								<div className="flex-1 min-w-0">
-									<div className="text-[10px] text-content truncate">
-										{event.summary}
-									</div>
-									<div className="text-[8px] text-muted">
-										{moment(event.start.dateTime).format('HH:mm')}
-									</div>
-								</div>
-							</div>
-						))}
-
 						{dayEvent.map((event, idx) => (
 							<div
 								key={`e-${idx}`}
diff --git a/src/layouts/widgets/calendar/components/google-calendar/google-calendar-view.tsx b/src/layouts/widgets/calendar/components/google-calendar/google-calendar-view.tsx
new file mode 100644
index 00000000..d5f8e45f
--- /dev/null
+++ b/src/layouts/widgets/calendar/components/google-calendar/google-calendar-view.tsx
@@ -0,0 +1,202 @@
+import Analytics from '@/analytics'
+import { HiChevronLeft, HiChevronRight } from 'react-icons/hi2'
+import { useGetGoogleCalendarEvents } from '@/services/hooks/date/getGoogleCalendarEvents.hook'
+import { useDate } from '@/context/date.context'
+import { CalendarEvent } from './google-event.item'
+import { useAuth } from '@/context/auth.context'
+import { Button } from '@/components/button/button'
+import { callEvent } from '@/common/utils/call-event'
+
+const HOUR_HEIGHT = 80
+export const GoogleCalendarView: React.FC = () => {
+	const { user, isAuthenticated } = useAuth()
+	const { selectedDate, isToday, setSelectedDate, currentDate } = useDate()
+	const containerRef = useRef<HTMLDivElement>(null)
+	const [currentTime, setCurrentTime] = useState(new Date())
+
+	const isCalendarConnected = user?.connections?.includes('google') || false
+
+	useEffect(() => {
+		const timer = setInterval(() => setCurrentTime(new Date()), 60000)
+		return () => clearInterval(timer)
+	}, [])
+
+	useEffect(() => {
+		if (containerRef.current && isToday(selectedDate)) {
+			const now = new Date()
+			const scrollPos =
+				((now.getHours() * 60 + now.getMinutes()) / 60) * HOUR_HEIGHT - 100
+			containerRef.current.scrollTo({ top: scrollPos, behavior: 'smooth' })
+		}
+	}, [selectedDate])
+
+	const { data: events } = useGetGoogleCalendarEvents(
+		isCalendarConnected,
+		selectedDate.clone().startOf('day').toDate(),
+		selectedDate.clone().endOf('day').toDate()
+	)
+
+	const handleEventClick = (event: any) => {
+		Analytics.event('google_calendar_event_click')
+		if (event.hangoutLink) {
+			window.open(event.hangoutLink, '_blank')
+		} else if (event.location) {
+			window.open(
+				`https://www.google.com/maps/search/?api=1&query=${encodeURIComponent(event.location)}`,
+				'_blank'
+			)
+		}
+	}
+
+	const onNextDay = () => {
+		setSelectedDate(selectedDate.clone().add(1, 'jD'))
+		Analytics.event('google_calendar_next_day')
+	}
+
+	const onPrevDay = () => {
+		setSelectedDate(selectedDate.clone().add(-1, 'jD'))
+		Analytics.event('google_calendar_prev_day')
+	}
+
+	const onGoToToday = () => {
+		setSelectedDate(currentDate.clone())
+		Analytics.event('google_calendar_go_to_today')
+	}
+
+	const getInitials = (email: string) =>
+		email.split('@')[0].substring(0, 2).toUpperCase()
+
+	const hours = Array.from({ length: 24 }, (_, i) => i)
+
+	const nextEvent = events?.find((e) => new Date(e.start.dateTime) > currentTime)
+
+	if (!isCalendarConnected) {
+		return (
+			<div className="flex flex-col items-center justify-center h-full p-4 text-center">
+				<p className="mb-2 text-sm text-content">
+					{isAuthenticated
+						? 'برای مشاهده رویدادهای گوگل، لطفاً حساب گوگل خود را متصل کنید.'
+						: 'برای مشاهده رویدادهای گوگل، لطفاً وارد حساب کاربری خود شوید.'}
+				</p>
+				<Button
+					size="sm"
+					className="rounded-2xl text-xs! btn"
+					onClick={() => callEvent('openProfile')}
+				>
+					{isAuthenticated ? 'اتصال حساب گوگل' : 'ورود به حساب کاربری'}
+				</Button>
+			</div>
+		)
+	}
+
+	return (
+		<div className="relative flex flex-col h-full overflow-hidden">
+			<div className="sticky top-0 z-50 flex flex-row justify-between p-2 border-b border-content">
+				<div className="flex-1 text-xs font-bold text-content">
+					{events?.length || 0} رویداد
+				</div>
+				{nextEvent && (
+					<div className="text-[10px] truncate text-muted line-clamp-1">
+						بعدی: {new Date(nextEvent.start.dateTime).getHours()}:
+						{new Date(nextEvent.start.dateTime)
+							.getMinutes()
+							.toString()
+							.padStart(2, '0')}{' '}
+						- {nextEvent.summary}
+					</div>
+				)}
+			</div>
+
+			<div
+				ref={containerRef}
+				className="relative flex-1 pb-20 overflow-y-auto custom-scrollbar"
+			>
+				<div
+					className="relative w-full"
+					style={{ height: `${24 * HOUR_HEIGHT}px` }}
+				>
+					{hours.map((hour) => {
+						const isPast =
+							isToday(selectedDate) && currentTime.getHours() > hour
+						return (
+							<div
+								key={hour}
+								className="flex items-start border-b border-base-200/40"
+								style={{ height: `${HOUR_HEIGHT}px` }}
+							>
+								<div
+									className={`w-10 text-[10px] text-center pt-1 border-l border-base-200/50 sticky right-0 z-30 font-bold transition-opacity ${isPast ? 'opacity-30' : 'opacity-80'}`}
+								>
+									{hour === 0 ? '۱۲' : hour <= 12 ? hour : hour - 12}
+									<span className="block text-[8px] font-medium">
+										{hour < 12 ? 'ق.ظ' : 'ب.ظ'}
+									</span>
+								</div>
+								<div
+									className={`relative flex-1 h-full ${isPast ? 'bg-base-200/5' : ''}`}
+								/>
+							</div>
+						)
+					})}
+
+					{isToday(selectedDate) && (
+						<div
+							className="absolute left-0 z-40 flex items-center w-full pointer-events-none"
+							style={{
+								top: `${((currentTime.getHours() * 60 + currentTime.getMinutes()) / 60) * HOUR_HEIGHT}px`,
+							}}
+						>
+							<div className="w-2.5 h-2.5 bg-red-500 rounded-full sticky right-0 z-50 shadow-[0_0_8px_rgba(239,68,68,0.4)]" />
+							<div
+								className="flex-1 h-[1.5px] bg-red-500/80"
+								style={{ marginRight: '-4px' }}
+							/>
+						</div>
+					)}
+
+					{events?.map((event) => (
+						<CalendarEvent
+							key={event.id}
+							event={event}
+							isToday={isToday(selectedDate)}
+							currentTime={currentTime}
+							hourHeight={HOUR_HEIGHT}
+							onEventClick={handleEventClick}
+							getInitials={getInitials}
+						/>
+					))}
+				</div>
+			</div>
+
+			<div
+				className="absolute bottom-1 left-1/2 -translate-x-1/2 flex items-center gap-1 p-1.5  rounded-2xl w-[70%] max-w-50 justify-between bg-content bg-white/2 border border-white/8 z-50
+				"
+			>
+				<button
+					className="p-1.5 hover:bg-base-200 rounded-xl transition-colors cursor-pointer text-muted"
+					onClick={() => onPrevDay()}
+				>
+					<HiChevronRight size={18} />
+				</button>
+
+				<button
+					className={`px-3 py-1 text-[10px] font-black rounded-lg cursor-pointer transition-all ${
+						isToday(selectedDate)
+							? 'bg-primary/10 text-primary-content'
+							: 'hover:bg-base-200 text-content'
+					}`}
+					onClick={() => onGoToToday()}
+				>
+					{selectedDate.format('dddd')}
+				</button>
+
+				<button
+					className="p-1.5 hover:bg-base-200 rounded-xl transition-colors cursor-pointer text-muted"
+					onClick={() => onNextDay()}
+				>
+					<HiChevronLeft size={18} />
+				</button>
+			</div>
+		</div>
+	)
+}
diff --git a/src/layouts/widgets/calendar/components/google-calendar/google-event.item.tsx b/src/layouts/widgets/calendar/components/google-calendar/google-event.item.tsx
new file mode 100644
index 00000000..436d0a8c
--- /dev/null
+++ b/src/layouts/widgets/calendar/components/google-calendar/google-event.item.tsx
@@ -0,0 +1,118 @@
+import Tooltip from '@/components/toolTip'
+import { HiOutlineMapPin, HiOutlineVideoCamera } from 'react-icons/hi2'
+
+interface CalendarEventProps {
+	event: any
+	isToday: boolean
+	currentTime: Date
+	hourHeight: number
+	onEventClick: (event: any) => void
+	getInitials: (email: string) => string
+}
+
+export const CalendarEvent = ({
+	event,
+	isToday,
+	currentTime,
+	onEventClick,
+	getInitials,
+	hourHeight,
+}: CalendarEventProps) => {
+	const start = new Date(event.start.dateTime)
+	const end = new Date(event.end.dateTime)
+	const isNow = isToday && currentTime >= start && currentTime <= end
+	const duration = (end.getTime() - start.getTime()) / 60000
+	const isShort = duration <= 45
+	const hasAction = !!(event.hangoutLink || event.location)
+	const isEnd = end <= currentTime
+	const getEventStyle = (event: any) => {
+		const start = new Date(event.start.dateTime)
+		const end = new Date(event.end.dateTime)
+		const startMinutes = start.getHours() * 60 + start.getMinutes()
+		const duration = (end.getTime() - start.getTime()) / 60000
+
+		return {
+			top: `${(startMinutes / 60) * hourHeight + 2}px`,
+			right: '38px',
+			left: '10px',
+			height: `${Math.max((duration / 60) * hourHeight - 4, 42)}px`,
+		}
+	}
+
+	return (
+		<div
+			onClick={() => onEventClick(event)}
+			className={`absolute z-20 px-3 py-2 overflow-hidden transition-all border-r-2 rounded-xl shadow-sm
+                ${hasAction ? 'cursor-pointer hover:shadow-md active:scale-[0.98]' : 'cursor-default'}
+                ${isNow ? 'bg-primary/15 border-primary backdrop-blur-md ring-1 ring-primary/30' : 'bg-base-300/90 hover:bg-base-300 border-primary/40'}
+                ${isEnd && 'opacity-60! border-r!'}
+            `}
+			style={getEventStyle(event)}
+		>
+			<div className="flex flex-col h-full gap-1">
+				<div className="flex items-start justify-between gap-2">
+					<h4
+						className={`font-medium text-[11px] leading-tight line-clamp-2 ${isNow ? 'text-primary' : 'text-muted'}`}
+					>
+						{event.summary}
+					</h4>
+					{!isShort && event.hangoutLink && (
+						<div className="flex items-center gap-1 bg-primary/50 text-[8px] px-1.5 py-0.5 rounded-full font-bold">
+							<HiOutlineVideoCamera size={10} />
+							<span>میت</span>
+						</div>
+					)}
+				</div>
+
+				<div className="flex items-center gap-2 mt-auto">
+					<div className="flex items-center gap-1 opacity-70">
+						<span className="text-[9px] font-medium tracking-tighter">
+							{start.toLocaleTimeString('fa-IR', {
+								hour: '2-digit',
+								minute: '2-digit',
+							})}{' '}
+							{' - '}{' '}
+							{end.toLocaleTimeString('fa-IR', {
+								hour: '2-digit',
+								minute: '2-digit',
+							})}
+						</span>
+					</div>
+					{event.location && !isShort && (
+						<div className="flex items-center gap-1 opacity-60">
+							<HiOutlineMapPin size={10} />
+							<span className="text-[9px] truncate max-w-15">
+								{event.location}
+							</span>
+						</div>
+					)}
+				</div>
+
+				{!isShort && event.attendees && (
+					<div className="flex items-center mt-0.5">
+						<div className="flex -space-x-1.5 rtl:space-x-reverse">
+							{event.attendees
+								.slice(0, 3)
+								.map((attendee: any, idx: number) => (
+									<Tooltip
+										key={`attendee-${idx}`}
+										content={attendee.email}
+										position="top"
+									>
+										<div className="w-4 h-4 rounded-full bg-base-300 flex items-center justify-center text-[5px] font-bold text-base-content/50 border border-primary/30">
+											{getInitials(attendee.email)}
+										</div>
+									</Tooltip>
+								))}
+							{event.attendees.length > 3 && (
+								<div className="w-5 h-5 rounded-full border-2 border-base-100 bg-base-100 flex items-center justify-center text-[7px] font-bold text-muted text-center">
+									+{event.attendees.length - 3}
+								</div>
+							)}
+						</div>
+					</div>
+				)}
+			</div>
+		</div>
+	)
+}
diff --git a/src/layouts/widgets/todos/todo.item.tsx b/src/layouts/widgets/todos/todo.item.tsx
index ec78aa1e..9e9f1245 100644
--- a/src/layouts/widgets/todos/todo.item.tsx
+++ b/src/layouts/widgets/todos/todo.item.tsx
@@ -44,8 +44,17 @@ export function TodoItem({
 	const [showEditModal, setShowEditModal] = useState(false)
 	const isUpdating = useIsMutating({ mutationKey: ['updateTodo'] }) > 0
 	const { mutateAsync, isPending } = useRemoveTodo(todo.onlineId || todo.id)
+	const [isSyncing, setIsSyncing] = useState(todo.id.startsWith('temp-') || false)
 
+	const isTemp = todo.id.startsWith('temp-')
 	const handleDelete = (e: React.MouseEvent) => {
+		if (isTemp) {
+			return showToast(
+				'این وظیفه هنوز همگام‌سازی نشده است و نمی‌توان آن را حذف کرد.',
+				'error'
+			)
+		}
+
 		e.stopPropagation()
 		if (isPending) return
 		if (!isAuthenticated) return showToast('برای حذف وظیفه باید وارد شوید', 'error')
@@ -54,19 +63,21 @@ export function TodoItem({
 	}
 
 	const handleEdit = (e: React.MouseEvent) => {
+		if (isTemp) {
+			return showToast(
+				'این وظیفه هنوز همگام‌سازی نشده است و نمی‌توان آن را ویرایش کرد.',
+				'error'
+			)
+		}
+
 		e.stopPropagation()
 		if (!isAuthenticated)
 			return showToast('برای ویرایش وظیفه باید وارد شوید', 'error')
 		setShowEditModal(true)
 	}
 
-	const handleExpand = (e: React.MouseEvent) => {
-		e.stopPropagation()
-		setExpanded(!expanded)
-	}
-
 	const onConfirmDelete = async () => {
-		if (isPending) return
+		if (isPending || isSyncing) return
 
 		const onlineId = todo.onlineId || todo.id
 		if (validate(onlineId)) {
@@ -92,67 +103,24 @@ export function TodoItem({
 		refetchTodos()
 	}
 
-	const getBorderStyle = () => {
-		switch (todo.priority) {
-			case 'high':
-				return '!border-error'
-			case 'medium':
-				return '!border-warning'
-			case 'low':
-				return '!border-success'
-			default:
-				return '!border-primary'
-		}
-	}
-
-	const getCheckedCheckboxStyle = () => {
-		switch (todo.priority) {
-			case 'high':
-				return '!border-error !bg-error'
-			case 'medium':
-				return '!border-warning !bg-warning'
-			case 'low':
-				return '!border-success !bg-success'
-			default:
-				return '!border-primary !bg-primary'
-		}
-	}
-
-	const getUnCheckedCheckboxStyle = () => {
-		switch (todo.priority) {
-			case 'high':
-				return '!border-error'
-			case 'medium':
-				return '!border-warning'
-			case 'low':
-				return '!border-success'
-			default:
-				return '!border-primary'
-		}
-	}
-
-	const getPriorityColor = () => {
-		switch (todo.priority) {
-			case 'high':
-				return 'bg-error/10 text-error'
-			case 'medium':
-				return 'bg-warning/10 text-warning'
-			case 'low':
-				return 'bg-success/10 text-success'
-			default:
-				return 'bg-primary text-primary-content'
-		}
-	}
-
-	const onToggleClick = (e: React.MouseEvent) => {
+	const onToggleClick = async (e: React.MouseEvent) => {
 		e.stopPropagation()
-		if (isUpdating) return
+		if (isUpdating || isSyncing) return
 
 		if (!isAuthenticated) {
 			return showToast('برای تغییر وضعیت وظیفه باید وارد شوید', 'error')
 		}
+		setIsSyncing(true)
+		try {
+			await toggleTodo(todo.id)
+		} finally {
+			setIsSyncing(false)
+		}
+	}
 
-		toggleTodo(todo.id)
+	const handleExpand = (e: React.MouseEvent) => {
+		e.stopPropagation()
+		setExpanded(!expanded)
 	}
 
 	return (
@@ -172,10 +140,14 @@ export function TodoItem({
 					<div className="flex-shrink-0">
 						<CustomCheckbox
 							checked={todo.completed}
-							disabled={isUpdating}
-							className={`!w-[1.125rem] !h-[1.125rem] !border ${getBorderStyle()}`}
-							unCheckedCheckBoxClassName={getUnCheckedCheckboxStyle()}
-							checkedCheckBoxClassName={getCheckedCheckboxStyle()}
+							disabled={isUpdating || isSyncing}
+							className={`!w-[1.125rem] !h-[1.125rem] !border ${getBorderStyle(todo.priority)}`}
+							unCheckedCheckBoxClassName={getUnCheckedCheckboxStyle(
+								todo.priority
+							)}
+							checkedCheckBoxClassName={getCheckedCheckboxStyle(
+								todo.priority
+							)}
 							onClick={(e) => onToggleClick(e)}
 						/>
 					</div>
@@ -189,22 +161,28 @@ export function TodoItem({
 
 				{/* Actions */}
 				<div className="flex items-center gap-x-1">
-					<button
-						onClick={handleEdit}
-						className={
-							'p-1 rounded-full cursor-pointer hover:bg-blue-500/10 opacity-0 group-hover:opacity-100 transition-all duration-200 delay-100 group-hover:select-none'
-						}
-					>
-						<FiEdit3 size={13} />
-					</button>
-					<button
-						onClick={handleDelete}
-						className={
-							'p-1 rounded-full cursor-pointer hover:bg-red-500/10 opacity-0 group-hover:opacity-100 transition-all duration-200 delay-100 group-hover:select-none'
-						}
-					>
-						<FiTrash2 size={13} />
-					</button>
+					{isSyncing ? (
+						<IconLoading className="text-base-content/50 mx-0!" />
+					) : (
+						<>
+							<button
+								onClick={handleEdit}
+								className={
+									'p-1 rounded-full cursor-pointer hover:bg-blue-500/10 opacity-0 group-hover:opacity-100 transition-all duration-200 delay-100 group-hover:select-none'
+								}
+							>
+								<FiEdit3 size={13} />
+							</button>
+							<button
+								onClick={handleDelete}
+								className={
+									'p-1 rounded-full cursor-pointer hover:bg-red-500/10 opacity-0 group-hover:opacity-100 transition-all duration-200 delay-100 group-hover:select-none'
+								}
+							>
+								<FiTrash2 size={13} />
+							</button>
+						</>
+					)}
 
 					<button
 						onClick={handleExpand}
@@ -227,13 +205,13 @@ export function TodoItem({
 					<div className="flex items-center gap-1.5 mt-0.5 mb-1">
 						{todo.category && (
 							<span
-								className={`text-[10px] px-1 py-0.25 rounded-full ${getPriorityColor()}`}
+								className={`text-[10px] px-1 py-0.25 rounded-full ${getPriorityColor(todo.priority)}`}
 							>
 								{todo.category}
 							</span>
 						)}
 						<span
-							className={`text-[10px] px-1 py-0.25 rounded-full ${getPriorityColor()}`}
+							className={`text-[10px] px-1 py-0.25 rounded-full ${getPriorityColor(todo.priority)}`}
 						>
 							{translatedPriority[todo.priority as TodoPriority]}
 						</span>
@@ -289,3 +267,55 @@ function NoteLinkRenderer({ note }: NoteIsLinkProps): React.JSX.Element | null {
 
 	return <p className="mt-0.5 font-light">{note}</p>
 }
+
+const getBorderStyle = (priority: string) => {
+	switch (priority) {
+		case 'high':
+			return '!border-error'
+		case 'medium':
+			return '!border-warning'
+		case 'low':
+			return '!border-success'
+		default:
+			return '!border-primary'
+	}
+}
+
+const getCheckedCheckboxStyle = (priority: string) => {
+	switch (priority) {
+		case 'high':
+			return '!border-error !bg-error'
+		case 'medium':
+			return '!border-warning !bg-warning'
+		case 'low':
+			return '!border-success !bg-success'
+		default:
+			return '!border-primary !bg-primary'
+	}
+}
+
+const getUnCheckedCheckboxStyle = (priority: string) => {
+	switch (priority) {
+		case 'high':
+			return '!border-error'
+		case 'medium':
+			return '!border-warning'
+		case 'low':
+			return '!border-success'
+		default:
+			return '!border-primary'
+	}
+}
+
+const getPriorityColor = (priority: string) => {
+	switch (priority) {
+		case 'high':
+			return 'bg-error/10 text-error'
+		case 'medium':
+			return 'bg-warning/10 text-warning'
+		case 'low':
+			return 'bg-success/10 text-success'
+		default:
+			return 'bg-primary text-primary-content'
+	}
+}
diff --git a/src/layouts/widgets/wigiPad/date-display/dates/jalali.date.tsx b/src/layouts/widgets/wigiPad/date-display/dates/jalali.date.tsx
index e1b8272e..83ce8c67 100644
--- a/src/layouts/widgets/wigiPad/date-display/dates/jalali.date.tsx
+++ b/src/layouts/widgets/wigiPad/date-display/dates/jalali.date.tsx
@@ -6,7 +6,12 @@ import { HolidayBadge } from '../components/holiday.badge'
 export function JalaliDate() {
 	const { today, todayIsHoliday } = useDate()
 	const { data: events } = useGetEvents()
-	const sortedEvents = combineAndSortEvents(events, today.clone(), [])
+	const eventsForCalendar = events || {
+		gregorianEvents: [],
+		hijriEvents: [],
+		shamsiEvents: [],
+	}
+	const sortedEvents = combineAndSortEvents(eventsForCalendar, today.clone(), [])
 	const isHoliday = sortedEvents.some((event) => event.isHoliday) || todayIsHoliday
 
 	const textColor = 'text-content drop-shadow-md'
diff --git a/src/layouts/widgets/wigiPad/info-panel/info-panel.tsx b/src/layouts/widgets/wigiPad/info-panel/info-panel.tsx
index 6ea90077..ab4a26e3 100644
--- a/src/layouts/widgets/wigiPad/info-panel/info-panel.tsx
+++ b/src/layouts/widgets/wigiPad/info-panel/info-panel.tsx
@@ -2,7 +2,7 @@ import { useRef, useState } from 'react'
 import { NotificationItem } from './components/ann-item'
 import { useInfoPanelData } from './hooks/useInfoPanelData'
 import { BirthdayTab } from './tabs/birthday/birthday-tab'
-import { GoogleTab } from './tabs/google/google.tab'
+import { BsFillCalendar2WeekFill } from 'react-icons/bs'
 
 export function InfoPanel() {
 	const [activeSection, setActiveSection] = useState<string>('all')
@@ -10,12 +10,12 @@ export function InfoPanel() {
 	const tabContainerRef = useRef<HTMLDivElement>(null)
 	const sections = [
 		{ id: 'all', label: 'ویجی تب', icon: '📋' },
+		{ id: 'birthdays', label: 'تولدها', icon: '🎂' },
 		{
 			id: 'google-meetings',
 			label: 'گوگل کلندر',
 			icon: '📅',
 		},
-		{ id: 'birthdays', label: 'تولدها', icon: '🎂' },
 	]
 
 	const handleSectionClick = (
@@ -45,7 +45,14 @@ export function InfoPanel() {
 			case 'birthdays':
 				return <BirthdayTab birthdays={data.birthdays} />
 			case 'google-meetings':
-				return <GoogleTab />
+				return (
+					<div className="flex flex-col items-center py-1.5 text-center text-muted">
+						<BsFillCalendar2WeekFill className="mb-2 text-2xl" />
+						<p className="text-xs font-bold leading-normal max-w-44">
+							این قسمت رو به ویجت تقویم انتقال دادیم 🪄
+						</p>
+					</div>
+				)
 
 			default:
 				return (
@@ -72,7 +79,8 @@ export function InfoPanel() {
 							activeSection === section.id
 								? 'bg-primary text-white'
 								: 'text-muted bg-base-300/70 border border-base-300/70'
-						}`}
+						}
+						 ${section.id === 'google-meetings' ? 'line-through' : ''}`}
 					>
 						<span>{section.icon}</span>
 						<span>{section.label}</span>
diff --git a/src/layouts/widgets/wigiPad/info-panel/tabs/google/google-meeting-item.tsx b/src/layouts/widgets/wigiPad/info-panel/tabs/google/google-meeting-item.tsx
deleted file mode 100644
index 4a49eeb9..00000000
--- a/src/layouts/widgets/wigiPad/info-panel/tabs/google/google-meeting-item.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import moment from 'jalali-moment'
-import { CgMediaLive } from 'react-icons/cg'
-import { MdDateRange, MdLocationOn } from 'react-icons/md'
-import GoogleCalendar from '@/assets/google-calendar.png'
-import Tooltip from '@/components/toolTip'
-import { getCurrentDate } from '@/layouts/widgets/calendar/utils'
-import type { GoogleCalendarEvent } from '@/services/hooks/date/getGoogleCalendarEvents.hook'
-
-interface GoogleEventItemProps {
-	meeting: GoogleCalendarEvent
-	timezone: string
-}
-
-function formatEventTime(dateTimeStr: string) {
-	if (!dateTimeStr) return null
-	const date = new Date(dateTimeStr)
-	return date.toLocaleTimeString('fa-IR', { hour: '2-digit', minute: '2-digit' })
-}
-
-export function GoogleMeetingItem({ meeting, timezone }: GoogleEventItemProps) {
-	const handleJoinMeeting = () => {
-		const meetLink =
-			meeting.hangoutLink ||
-			meeting.conferenceData?.entryPoints?.find(
-				(ep: any) => ep.entryPointType === 'video'
-			)?.uri ||
-			meeting.htmlLink
-
-		if (meetLink) {
-			window.open(meetLink, '_blank')
-		}
-	}
-
-	const isPastEvent = () => {
-		if (!meeting.end || !meeting.end.dateTime) return false
-		const endDate = new Date(meeting.end.dateTime)
-		const now = getCurrentDate(timezone).toDate()
-		return endDate < now
-	}
-
-	const isCurrentEvent = () => {
-		if (
-			!meeting.start ||
-			!meeting.start.dateTime ||
-			!meeting.end ||
-			!meeting.end.dateTime
-		)
-			return false
-		const startDate = new Date(meeting.start.dateTime)
-		const endDate = new Date(meeting.end.dateTime)
-		const now = getCurrentDate(timezone).toDate()
-		return startDate <= now && endDate >= now
-	}
-
-	return (
-		<div
-			className={`p-2 bg-content cursor-pointer relative hover:bg-base-300 transition-all overflow-hidden rounded-2xl ${
-				isPastEvent() ? 'opacity-70 pointer-events-none' : 'hover:scale-95'
-			}`}
-			onClick={handleJoinMeeting}
-		>
-			{isPastEvent() && (
-				<div className="absolute px-2 py-0.5 text-xs transform -rotate-45 shadow-xl text-warning-content -left-10 w-32 top-4 bg-warning/80">
-					<div className="relative z-10 font-normal tracking-wide text-center">
-						اتمام یافته
-					</div>
-				</div>
-			)}
-			{isCurrentEvent() && (
-				<div className="absolute grid w-4 h-4 transition-all rounded-full left-2 place-items-center animate-ping">
-					<Tooltip content="در حال برگزاری...">
-						<CgMediaLive className="text-content" size={14} />
-					</Tooltip>
-				</div>
-			)}
-			<div className="flex items-center gap-3">
-				<div className="text-lg">
-					<img
-						src={GoogleCalendar}
-						alt="Gmail"
-						className="w-[1.2rem] h-[1.2rem]"
-					/>
-				</div>{' '}
-				<div className="flex-1 min-w-0">
-					<h4 className="text-sm font-medium truncate text-base-content">
-						{meeting.summary}
-					</h4>
-					<p className="flex items-center gap-1 text-xs text-muted">
-						<MdDateRange className="text-content" />
-						{moment(meeting.start.dateTime)
-							.locale('fa')
-							.format('dddd، jD jMMMM jYYYY') || 'نامشخص'}
-					</p>
-					<p className="flex items-center gap-1 text-xs text-muted">
-						{formatEventTime(meeting.start.dateTime) || 'نامشخص'} -{' '}
-						{formatEventTime(meeting.end.dateTime) || 'نامشخص'}
-					</p>
-					{meeting.location && (
-						<p className="flex items-center gap-1 mt-1 text-xs truncate text-muted">
-							<MdLocationOn className="text-red-500" />
-							{meeting.location}
-						</p>
-					)}
-				</div>
-			</div>
-		</div>
-	)
-}
diff --git a/src/layouts/widgets/wigiPad/info-panel/tabs/google/google.tab.tsx b/src/layouts/widgets/wigiPad/info-panel/tabs/google/google.tab.tsx
deleted file mode 100644
index c81f2578..00000000
--- a/src/layouts/widgets/wigiPad/info-panel/tabs/google/google.tab.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { LuLockKeyhole } from 'react-icons/lu'
-import { MdEvent } from 'react-icons/md'
-import { useAuth } from '@/context/auth.context'
-import { useDate } from '@/context/date.context'
-import { useGeneralSetting } from '@/context/general-setting.context'
-import { useGetGoogleCalendarEvents } from '@/services/hooks/date/getGoogleCalendarEvents.hook'
-import { GoogleMeetingItem } from './google-meeting-item'
-
-const LoadingSkeleton = () => (
-	<div className="space-y-2">
-		{[...Array(3)].map((_, index) => (
-			<div key={index} className="p-2 rounded-lg bg-content animate-pulse">
-				<div className="flex items-center gap-3">
-					<div className="w-5 h-5 bg-gray-300 rounded"></div>
-					<div className="flex-1 space-y-2">
-						<div className="w-3/4 h-4 bg-gray-300 rounded"></div>
-						<div className="w-1/2 h-3 bg-gray-300 rounded"></div>
-						<div className="w-2/3 h-3 bg-gray-300 rounded"></div>
-					</div>
-				</div>
-			</div>
-		))}
-	</div>
-)
-
-export function GoogleTab() {
-	const { today } = useDate()
-	const { selected_timezone } = useGeneralSetting()
-	const { isAuthenticated } = useAuth()
-	const { blurMode } = useGeneralSetting()
-	const { data: googleEvents, isLoading } = useGetGoogleCalendarEvents(
-		isAuthenticated,
-		today.clone().toDate(),
-		today.clone().add(30, 'day').toDate()
-	)
-
-	return (
-		<div className={`space-y-2 ${blurMode ? 'blur-mode' : 'disabled-blur-mode'}`}>
-			{!isAuthenticated ? (
-				<div className="flex flex-col items-center py-1.5 text-center text-muted">
-					<LuLockKeyhole className="mb-2 text-3xl" />
-					<p className="text-xs leading-normal max-w-44">
-						برای مشاهده رویدادهای گوگل، لطفاً وارد حساب کاربری خود شوید.
-					</p>
-				</div>
-			) : isLoading ? (
-				<LoadingSkeleton />
-			) : googleEvents && googleEvents.length > 0 ? (
-				googleEvents.map((event) => (
-					<GoogleMeetingItem
-						key={event.id}
-						timezone={selected_timezone.value}
-						meeting={event}
-					/>
-				))
-			) : (
-				<div
-					className={
-						'flex-1 flex flex-col items-center justify-center gap-y-1.5 px-5 py-1'
-					}
-				>
-					<div
-						className={
-							'flex items-center justify-center w-12 h-12 mx-auto rounded-full bg-base-300/70 border-base/70'
-						}
-					>
-						<MdEvent className="text-content" size={24} />
-					</div>
-					<p className="mt-1 text-center text-content">
-						هیچ مناسبت/جلسه گوگل امروز نیست
-					</p>
-				</div>
-			)}
-		</div>
-	)
-}
diff --git a/src/pages/home/content-section.tsx b/src/pages/home/content-section.tsx
index b6c7acef..210a17e1 100644
--- a/src/pages/home/content-section.tsx
+++ b/src/pages/home/content-section.tsx
@@ -117,79 +117,73 @@ export function ContentSection() {
 
 	return (
 		<DateProvider>
-			<TodoProvider>
-				<div
-					data-tour="content"
-					className={`flex flex-col items-center ${layoutPositions[contentAlignment]} flex-1 w-full gap-2 px-1 md:px-4 py-2`}
-				>
-					<div className="flex flex-col w-full gap-4 lg:flex-row lg:gap-2">
-						<div className="order-3 w-full lg:w-1/4 lg:order-1">
-							<WidgetifyLayout />
-						</div>
-
-						<div
-							className={
-								'order-1 w-full lg:w-2/4 lg:order-2 lg:px-2 space-y-2'
-							}
-						>
-							<SearchLayout />
-							<BookmarkProvider>
-								<BookmarksList />
-							</BookmarkProvider>
-						</div>
-
-						<div className="order-2 w-full lg:w-1/4 lg:order-3">
-							<WigiPadWidget />
-						</div>
+			<div
+				data-tour="content"
+				className={`flex flex-col items-center ${layoutPositions[contentAlignment]} flex-1 w-full gap-2 px-1 md:px-4 py-2`}
+			>
+				<div className="flex flex-col w-full gap-4 lg:flex-row lg:gap-2">
+					<div className="order-3 w-full lg:w-1/4 lg:order-1">
+						<WidgetifyLayout />
+					</div>
+
+					<div
+						className={'order-1 w-full lg:w-2/4 lg:order-2 lg:px-2 space-y-2'}
+					>
+						<SearchLayout />
+						<BookmarkProvider>
+							<BookmarksList />
+						</BookmarkProvider>
 					</div>
 
-					{sortedWidgets.length > 0 && (
-						<div className="w-full" id="widgets">
-							<DndContext
-								sensors={canReOrderWidget ? sensors : []}
-								collisionDetection={
-									canReOrderWidget ? closestCenter : undefined
-								}
-								onDragEnd={canReOrderWidget ? handleDragEnd : undefined}
+					<div className="order-2 w-full lg:w-1/4 lg:order-3">
+						<WigiPadWidget />
+					</div>
+				</div>
+
+				{sortedWidgets.length > 0 && (
+					<div className="w-full" id="widgets">
+						<DndContext
+							sensors={canReOrderWidget ? sensors : []}
+							collisionDetection={
+								canReOrderWidget ? closestCenter : undefined
+							}
+							onDragEnd={canReOrderWidget ? handleDragEnd : undefined}
+						>
+							<SortableContext
+								items={sortedWidgets.map((widget) => widget.id)}
+								strategy={rectSortingStrategy}
 							>
-								<SortableContext
-									items={sortedWidgets.map((widget) => widget.id)}
-									strategy={rectSortingStrategy}
-								>
-									<div className={layoutClasses}>
-										{sortedWidgets.map((widget) => {
-											if (totalWidgetCount === 2) {
-												return (
-													<div
-														key={widget.id}
-														className="flex-shrink-0 w-full lg:w-3/12"
-													>
-														{canReOrderWidget ? (
-															<SortableWidget
-																widget={widget}
-															/>
-														) : (
-															widget.node
-														)}
-													</div>
-												)
-											}
-											return canReOrderWidget ? (
-												<SortableWidget
+								<div className={layoutClasses}>
+									{sortedWidgets.map((widget) => {
+										if (totalWidgetCount === 2) {
+											return (
+												<div
 													key={widget.id}
-													widget={widget}
-												/>
-											) : (
-												widget.node
+													className="flex-shrink-0 w-full lg:w-3/12"
+												>
+													{canReOrderWidget ? (
+														<SortableWidget widget={widget} />
+													) : (
+														widget.node
+													)}
+												</div>
 											)
-										})}
-									</div>
-								</SortableContext>
-							</DndContext>
-						</div>
-					)}
-				</div>
-			</TodoProvider>
+										}
+										return canReOrderWidget ? (
+											<SortableWidget
+												key={widget.id}
+												widget={widget}
+											/>
+										) : (
+											widget.node
+										)
+									})}
+								</div>
+							</SortableContext>
+						</DndContext>
+					</div>
+				)}
+			</div>
 		</DateProvider>
 	)
 }
diff --git a/src/services/hooks/calendar/get-calendarData.hook.ts b/src/services/hooks/calendar/get-calendarData.hook.ts
index b0107801..d4b254f9 100644
--- a/src/services/hooks/calendar/get-calendarData.hook.ts
+++ b/src/services/hooks/calendar/get-calendarData.hook.ts
@@ -18,10 +18,8 @@ export const useGetCalendarData = (enabled: boolean, start: string, end: string)
 		queryFn: async () => getCalendarData(start, end),
 		retry: 0,
 		enabled: enabled && !!start && !!end,
-		initialData: {
-			moods: [],
-			googleEvents: [],
-		},
+		staleTime: 5 * 60 * 1000,
+		gcTime: 10 * 60 * 1000,
 		refetchOnWindowFocus: false,
 	})
 }
diff --git a/src/services/hooks/date/getEvents.hook.ts b/src/services/hooks/date/getEvents.hook.ts
index e440aa97..8ce34ab2 100644
--- a/src/services/hooks/date/getEvents.hook.ts
+++ b/src/services/hooks/date/getEvents.hook.ts
@@ -19,11 +19,7 @@ export const useGetEvents = () => {
 		queryKey: ['get-events'],
 		queryFn: async () => getEvents(),
 		retry: 0,
-		initialData: {
-			shamsiEvents: [],
-			gregorianEvents: [],
-			hijriEvents: [],
-		},
+		staleTime: 10 * 60 * 1000,
 	})
 }
 
diff --git a/src/services/hooks/date/getGoogleCalendarEvents.hook.ts b/src/services/hooks/date/getGoogleCalendarEvents.hook.ts
index f20bfa41..a364a3ae 100644
--- a/src/services/hooks/date/getGoogleCalendarEvents.hook.ts
+++ b/src/services/hooks/date/getGoogleCalendarEvents.hook.ts
@@ -82,7 +82,7 @@ export const useGetGoogleCalendarEvents = (
 	const cacheKey = `${startParam}-${endParam}`
 
 	return useQuery<GoogleCalendarEvent[]>({
-		queryKey: ['google-calendar-events', startParam, endParam],
+		queryKey: ['google-calendar-events', cacheKey],
 		queryFn: async () => {
 			if (cache.has(cacheKey)) {
 				return cache.get(cacheKey) || []
@@ -93,7 +93,6 @@ export const useGetGoogleCalendarEvents = (
 			return events
 		},
 		retry: 1,
-		// initialData: cache.get(cacheKey) || [],
 		enabled: enabled,
 	})
 }
diff --git a/src/styles/theme/esteghlal.css b/src/styles/theme/esteghlal.css
index ae419e61..c16866ee 100644
--- a/src/styles/theme/esteghlal.css
+++ b/src/styles/theme/esteghlal.css
@@ -1,34 +1,34 @@
 @plugin "daisyui/theme" {
     name: "esteghlal";
     default: false;
-    prefersdark: false;
+    prefersdark: true;
     color-scheme: "dark";
     --color-base-100: oklch(28% 0.091 267.935);
-    --color-base-200: oklch(37% 0.146 265.522);
-    --color-base-300: oklch(42% 0.199 265.638);
-    --color-base-content: oklch(93% 0.032 255.585);
-    --color-primary: oklch(68% 0.169 237.323);
-    --color-primary-content: oklch(27% 0.072 132.109);
-    --color-secondary: oklch(80% 0.105 251.813);
-    --color-secondary-content: oklch(28% 0.091 267.935);
-    --color-accent: oklch(83% 0.145 321.434);
-    --color-accent-content: oklch(29% 0.136 325.661);
-    --color-neutral: oklch(54% 0.245 262.881);
-    --color-neutral-content: oklch(97% 0.014 254.604);
-    --color-info: oklch(71% 0.143 215.221);
-    --color-info-content: oklch(98% 0.019 200.873);
-    --color-success: oklch(72% 0.219 149.579);
-    --color-success-content: oklch(98% 0.018 155.826);
-    --color-warning: oklch(79% 0.184 86.047);
-    --color-warning-content: oklch(98% 0.026 102.212);
-    --color-error: oklch(63% 0.237 25.331);
-    --color-error-content: oklch(97% 0.013 17.38);
-    --radius-selector: 1rem;
-    --radius-field: 0rem;
-    --radius-box: 0.25rem;
+    --color-base-200: oklch(35% 0.12 265.522);
+    --color-base-300: oklch(40% 0.15 265.638);
+    --color-base-content: oklch(95% 0.02 260);
+    --color-primary: oklch(65% 0.22 260);
+    --color-primary-content: oklch(100% 0 0);
+    --color-secondary: oklch(75% 0.15 251.813);
+    --color-secondary-content: oklch(20% 0.08 267.935);
+    --color-accent: oklch(80% 0.12 210);
+    --color-accent-content: oklch(20% 0.08 267.935);
+    --color-neutral: oklch(20% 0.06 267.935);
+    --color-neutral-content: oklch(90% 0.02 267.935);
+    --color-info: oklch(70% 0.16 245);
+    --color-info-content: oklch(100% 0 0);
+    --color-success: oklch(75% 0.18 150);
+    --color-success-content: oklch(20% 0.1 150);
+    --color-warning: oklch(82% 0.18 90);
+    --color-warning-content: oklch(20% 0.1 90);
+    --color-error: oklch(65% 0.22 25);
+    --color-error-content: oklch(100% 0 0);
+    --radius-selector: 0.5rem;
+    --radius-field: 0.25rem;
+    --radius-box: 0.5rem;
     --size-selector: 0.25rem;
     --size-field: 0.25rem;
     --border: 1px;
-    --depth: 0;
-    --noise: 1;
+    --depth: 1;
+    --noise: 0;
 }
\ No newline at end of file