From 207320cdb5b3b7179535865afbb0b8ac804ba07f Mon Sep 17 00:00:00 2001
From: Tanushree Chakravarty <tanushree@xola.com>
Date: Mon, 18 Sep 2023 14:05:37 +0530
Subject: [PATCH 1/3] X2-7088: Revert changes which are breaking selenium
 (#265)

---
 src/components/Buttons/SubmitButton.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Buttons/SubmitButton.jsx b/src/components/Buttons/SubmitButton.jsx
index 0895ffd51..ef90f042c 100644
--- a/src/components/Buttons/SubmitButton.jsx
+++ b/src/components/Buttons/SubmitButton.jsx
@@ -44,7 +44,6 @@ export const SubmitButton = ({
 
     return (
         <Button
-            type="submit"
             color={color}
             disabled={showTransition || disabled}
             variant={variant}

From 7cb0dcfe7c2ccd468c705680a24e9f053a1bcdb9 Mon Sep 17 00:00:00 2001
From: blkr4 <36671962+blkr4@users.noreply.github.com>
Date: Tue, 19 Sep 2023 12:06:55 +0530
Subject: [PATCH 2/3] X2-6916 Datepicker for same day shows text in white
 (v2.1.15) (#264)

* X2-6916 Datepicker for same day shows text in white (v2.1.15)

* X2-7088: Revert changes which are breaking selenium

* Revert changes for isSameDay

* X2-6916: Fix selenium failures

* Update src/components/DatePicker/DatePicker.jsx

* lint fix

* added comment

---------

Co-authored-by: Tanushree Chakravarty <tanushree@xola.com>
Co-authored-by: Rushi Vishavadia <rushi@xola.com>
---
 src/components/DatePicker/DatePicker.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx
index 0dd426ba7..59fb0b8b3 100644
--- a/src/components/DatePicker/DatePicker.jsx
+++ b/src/components/DatePicker/DatePicker.jsx
@@ -141,6 +141,8 @@ export const DatePicker = ({
 
     // Comparing `from` and `to` dates hides a weird CSS style when you select the same date twice in a date range.
     const useDateRangeStyle = isRangeVariant && value.from?.getTime() !== value.to?.getTime();
+    // Return the same value if it is already dayjs object or has range variant otherwise format it to dayJs object
+    const selectedDays = dayjs.isDayjs(value) || isRangeVariant ? value : dayjs(value).toDate();
 
     return (
         <>
@@ -189,7 +191,7 @@ export const DatePicker = ({
                         modifiers.waitlist ? "has-custom-content" : null,
                     )}
                     todayButton={variant === "single" ? "Today" : undefined}
-                    selectedDays={value}
+                    selectedDays={selectedDays}
                     month={currentMonth}
                     modifiers={{ ...modifiers, ...rangeModifier }}
                     numberOfMonths={isRangeVariant ? 2 : 1}

From e59f83fd5f5cfd9184673736d7c35e641cf8fe57 Mon Sep 17 00:00:00 2001
From: Manoj Vaibhav <manoj.r@xola.com>
Date: Tue, 19 Sep 2023 12:11:38 +0530
Subject: [PATCH 3/3] 2.1.18

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c14b32108..615d9900d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@xola/ui-kit",
-    "version": "2.1.17",
+    "version": "2.1.18",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@xola/ui-kit",
-            "version": "2.1.17",
+            "version": "2.1.18",
             "license": "MIT",
             "dependencies": {
                 "@headlessui/react": "^1.4.0",
diff --git a/package.json b/package.json
index 2bc9688d8..0fbc9e84d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@xola/ui-kit",
-    "version": "2.1.17",
+    "version": "2.1.18",
     "description": "Xola UI Kit",
     "license": "MIT",
     "files": [