From bd995d44deb7691ce76ff24504c6e30dab2d0cc2 Mon Sep 17 00:00:00 2001
From: Toppanto Bence <bence.toppanto@instructure.com>
Date: Wed, 18 Sep 2024 01:27:31 +0200
Subject: [PATCH] fix(ui-calendar): fix code to remove unnecessary warnings

Closes: INSTUI-4222
---
 packages/ui-calendar/src/Calendar/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/ui-calendar/src/Calendar/index.tsx b/packages/ui-calendar/src/Calendar/index.tsx
index 4ff0038b56..ec686f86f3 100644
--- a/packages/ui-calendar/src/Calendar/index.tsx
+++ b/packages/ui-calendar/src/Calendar/index.tsx
@@ -401,7 +401,14 @@ class Calendar extends Component<CalendarProps, CalendarState> {
         <Calendar.Day
           key={dateStr}
           date={dateStr}
-          isSelected={selectedDate ? date.isSame(selectedDate, 'day') : false}
+          isSelected={
+            selectedDate
+              ? date.isSame(
+                  DateTime.parse(selectedDate, this.locale(), this.timezone()),
+                  'day'
+                )
+              : false
+          }
           isToday={date.isSame(today, 'day')}
           isOutsideMonth={!date.isSame(visibleMonth, 'month')}
           label={date.format('D MMMM YYYY')} // used by screen readers