From 6f807930f61b58f6d0c0d7e797cacee362e7cd58 Mon Sep 17 00:00:00 2001
From: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date: Tue, 13 Sep 2022 21:13:24 +0100
Subject: [PATCH] Tidy up settings calendars (#4430)

---
 .../components/v2/settings/CalendarSwitch.tsx |  2 +-
 .../v2/settings/my-account/calendars.tsx      | 50 +++++++++++--------
 .../integrations/DisconnectIntegration.tsx    | 12 +++--
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/apps/web/components/v2/settings/CalendarSwitch.tsx b/apps/web/components/v2/settings/CalendarSwitch.tsx
index 73eadd384e..5cf5f1a32a 100644
--- a/apps/web/components/v2/settings/CalendarSwitch.tsx
+++ b/apps/web/components/v2/settings/CalendarSwitch.tsx
@@ -76,7 +76,7 @@ export function CalendarSwitch(props: {
       />
       {props.defaultSelected && (
         <Badge variant="gray">
-          <Icon.FiArrowLeft /> {t("adding_events_to")}
+          <Icon.FiArrowLeft className="mr-1" /> {t("adding_events_to")}
         </Badge>
       )}
     </div>
diff --git a/apps/web/pages/v2/settings/my-account/calendars.tsx b/apps/web/pages/v2/settings/my-account/calendars.tsx
index 4c1cf8582f..d9b37cd431 100644
--- a/apps/web/pages/v2/settings/my-account/calendars.tsx
+++ b/apps/web/pages/v2/settings/my-account/calendars.tsx
@@ -38,32 +38,38 @@ const CalendarsView = () => {
       <QueryCell
         query={query}
         success={({ data }) => {
-          console.log("🚀 ~ file: calendars.tsx ~ line 28 ~ CalendarsView ~ data", data);
           return data.connectedCalendars.length ? (
             <div>
-              <div className="mt-4 rounded-md border-neutral-200 bg-white p-2 sm:mx-0 sm:p-10 md:border md:p-6 xl:mt-0">
-                <div className="mt-4 rounded-md  border-neutral-200 bg-white p-2 sm:mx-0 sm:p-10 md:border md:p-2 xl:mt-0">
-                  <Icon.FiCalendar className="h-5 w-5" />
+              <div className="mt-4 flex space-x-4 rounded-md border-gray-200 bg-gray-50 p-2 sm:mx-0 sm:p-10 md:border md:p-6 xl:mt-0">
+                <div className=" flex h-9 w-9 items-center justify-center rounded-md border-2 border-gray-200 bg-white p-[6px]">
+                  <Icon.FiCalendar className="h-6 w-6" />
+                </div>
+
+                <div className="flex flex-col space-y-3">
+                  <div>
+                    <h4 className=" pb-2 text-base font-semibold leading-5 text-black">
+                      {t("add_to_calendar")}
+                    </h4>
+                    <p className=" text-sm leading-5 text-gray-600">
+                      <Trans i18nKey="add_to_calendar_description">
+                        Where to add events when you re booked. You can override this on a per-event basis in
+                        advanced settings in the event type.
+                      </Trans>
+                    </p>
+                  </div>
+                  <DestinationCalendarSelector
+                    hidePlaceholder
+                    value={data.destinationCalendar?.externalId}
+                    onChange={mutation.mutate}
+                    isLoading={mutation.isLoading}
+                  />
                 </div>
-                <h4 className="leading-20 mt-2 text-xl font-semibold text-black">{t("add_to_calendar")}</h4>
-                <p className="pb-2 text-sm text-gray-600">
-                  <Trans i18nKey="add_to_calendar_description">
-                    Where to add events when you re booked. You can override this on a per-event basis in
-                    advanced settings in the event type.
-                  </Trans>
-                </p>
-                <DestinationCalendarSelector
-                  hidePlaceholder
-                  value={data.destinationCalendar?.externalId}
-                  onChange={mutation.mutate}
-                  isLoading={mutation.isLoading}
-                />
               </div>
 
-              <h4 className="leading-20 mt-12 text-xl font-semibold text-black">
+              <h4 className="mt-12 text-base font-semibold leading-5 text-black">
                 {t("check_for_conflicts")}
               </h4>
-              <p className="pb-2 text-sm text-gray-600">{t("select_calendars")}</p>
+              <p className="pb-2 text-sm leading-5 text-gray-600">{t("select_calendars")}</p>
               <List>
                 {data.connectedCalendars.map((item) => (
                   <Fragment key={item.credentialId}>
@@ -92,7 +98,11 @@ const CalendarsView = () => {
                             <ListItemText component="p">{item.integration.description}</ListItemText>
                           </div>
                           <div>
-                            <DisconnectIntegration credentialId={item.credentialId} label={t("disconnect")} />
+                            <DisconnectIntegration
+                              trashIcon
+                              credentialId={item.credentialId}
+                              buttonProps={{ size: "icon", color: "secondary" }}
+                            />
                           </div>
                         </div>
                         <div className="w-full border-t border-gray-200">
diff --git a/packages/ui/v2/modules/integrations/DisconnectIntegration.tsx b/packages/ui/v2/modules/integrations/DisconnectIntegration.tsx
index 52f76bbb59..88a23d247e 100644
--- a/packages/ui/v2/modules/integrations/DisconnectIntegration.tsx
+++ b/packages/ui/v2/modules/integrations/DisconnectIntegration.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Icon } from "@calcom/ui";
-import { Button } from "@calcom/ui/v2/core/Button";
+import { Button, ButtonProps } from "@calcom/ui/v2/core/Button";
 import { Dialog, DialogTrigger, DialogContent } from "@calcom/ui/v2/core/Dialog";
 import showToast from "@calcom/ui/v2/core/notifications";
 
@@ -12,11 +12,13 @@ export default function DisconnectIntegration({
   label,
   trashIcon,
   isGlobal,
+  buttonProps,
 }: {
   credentialId: number;
-  label: string;
+  label?: string;
   trashIcon?: boolean;
   isGlobal?: boolean;
+  buttonProps?: ButtonProps;
 }) {
   const { t } = useLocale();
   const [modalOpen, setModalOpen] = useState(false);
@@ -36,7 +38,11 @@ export default function DisconnectIntegration({
     <>
       <Dialog open={modalOpen} onOpenChange={setModalOpen}>
         <DialogTrigger asChild>
-          <Button color="destructive" StartIcon={trashIcon ? Icon.FiTrash : undefined} disabled={isGlobal}>
+          <Button
+            color={buttonProps?.color || "destructive"}
+            StartIcon={trashIcon ? Icon.FiTrash : undefined}
+            disabled={isGlobal}
+            {...buttonProps}>
             {label}
           </Button>
         </DialogTrigger>