diff --git a/apps/web/core/components/analytics/total-insights.tsx b/apps/web/core/components/analytics/total-insights.tsx
index 0ac1f4f87..a822e7560 100644
--- a/apps/web/core/components/analytics/total-insights.tsx
+++ b/apps/web/core/components/analytics/total-insights.tsx
@@ -19,7 +19,7 @@ const getInsightLabel = (
   analyticsType: TAnalyticsTabsBase,
   item: IInsightField,
   isEpic: boolean | undefined,
-  t: (key: string, options?: any) => string
+  t: (key: string, params?: Record<string, unknown>) => string
 ) => {
   if (analyticsType === "work-items") {
     return isEpic
@@ -50,15 +50,7 @@ const TotalInsights: React.FC<{
   const params = useParams();
   const workspaceSlug = params.workspaceSlug.toString();
   const { t } = useTranslation();
-  const {
-    selectedDuration,
-    selectedProjects,
-    selectedDurationLabel,
-    selectedCycle,
-    selectedModule,
-    isPeekView,
-    isEpic,
-  } = useAnalytics();
+  const { selectedDuration, selectedProjects, selectedCycle, selectedModule, isPeekView, isEpic } = useAnalytics();
   const { data: totalInsightsData, isLoading } = useSWR(
     `total-insights-${analyticsType}-${selectedDuration}-${selectedProjects}-${selectedCycle}-${selectedModule}-${isEpic}`,
     () =>
diff --git a/apps/web/core/components/core/filters/date-filter-modal.tsx b/apps/web/core/components/core/filters/date-filter-modal.tsx
index dd7173959..244aa69ea 100644
--- a/apps/web/core/components/core/filters/date-filter-modal.tsx
+++ b/apps/web/core/components/core/filters/date-filter-modal.tsx
@@ -95,13 +95,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                         const date2Value = getDate(watch("date2"));
                         return (
                           <Calendar
-                            classNames={{
-                              root: ` border border-custom-border-200 p-3 rounded-md`,
-                            }}
+                            className="rounded-md border border-custom-border-200 p-3"
                             captionLayout="dropdown"
                             selected={dateValue}
                             defaultMonth={dateValue}
-                            onSelect={(date) => {
+                            onSelect={(date: Date | undefined) => {
                               if (!date) return;
                               onChange(date);
                             }}
@@ -120,13 +118,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                           const date1Value = getDate(watch("date1"));
                           return (
                             <Calendar
-                              classNames={{
-                                root: ` border border-custom-border-200 p-3 rounded-md`,
-                              }}
+                              className="rounded-md border border-custom-border-200 p-3"
                               captionLayout="dropdown"
                               selected={dateValue}
                               defaultMonth={dateValue}
-                              onSelect={(date) => {
+                              onSelect={(date: Date | undefined) => {
                                 if (!date) return;
                                 onChange(date);
                               }}
diff --git a/apps/web/core/components/dropdowns/date-range.tsx b/apps/web/core/components/dropdowns/date-range.tsx
index e0da93465..3cb07d970 100644
--- a/apps/web/core/components/dropdowns/date-range.tsx
+++ b/apps/web/core/components/dropdowns/date-range.tsx
@@ -271,10 +271,10 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
             {...attributes.popper}
           >
             <Calendar
+              className="rounded-md border border-custom-border-200 p-3"
               captionLayout="dropdown"
-              classNames={{ root: `p-3 rounded-md` }}
               selected={dateRange}
-              onSelect={(val) => {
+              onSelect={(val: DateRange | undefined) => {
                 onSelect?.(val);
               }}
               mode="range"
diff --git a/apps/web/core/components/dropdowns/date.tsx b/apps/web/core/components/dropdowns/date.tsx
index 4a1af03e2..87d783d9a 100644
--- a/apps/web/core/components/dropdowns/date.tsx
+++ b/apps/web/core/components/dropdowns/date.tsx
@@ -178,11 +178,11 @@ export const DateDropdown: React.FC<Props> = observer((props) => {
               {...attributes.popper}
             >
               <Calendar
+                className="rounded-md border border-custom-border-200 p-3"
                 captionLayout="dropdown"
-                classNames={{ root: `p-3 rounded-md` }}
                 selected={getDate(value)}
                 defaultMonth={getDate(value)}
-                onSelect={(date) => {
+                onSelect={(date: Date | undefined) => {
                   dropdownOnChange(date ?? null);
                 }}
                 showOutsideDays
diff --git a/apps/web/core/components/inbox/modals/snooze-issue-modal.tsx b/apps/web/core/components/inbox/modals/snooze-issue-modal.tsx
index 3f9040e5c..d137f6a03 100644
--- a/apps/web/core/components/inbox/modals/snooze-issue-modal.tsx
+++ b/apps/web/core/components/inbox/modals/snooze-issue-modal.tsx
@@ -49,11 +49,11 @@ export const InboxIssueSnoozeModal: FC<InboxIssueSnoozeModalProps> = (props) =>
               <Dialog.Panel className="relative flex transform rounded-lg bg-custom-background-100 px-5 py-8 text-left shadow-custom-shadow-md transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <div className="flex h-full w-full flex-col gap-y-1">
                   <Calendar
+                    className="rounded-md border border-custom-border-200 p-3"
                     captionLayout="dropdown"
-                    classNames={{ root: `rounded-md border border-custom-border-200 p-3` }}
                     selected={date ? new Date(date) : undefined}
                     defaultMonth={date ? new Date(date) : undefined}
-                    onSelect={(date) => {
+                    onSelect={(date: Date | undefined) => {
                       if (!date) return;
                       setDate(date);
                     }}