Merge branch 'main' into bump-atoms-1.0.22

calcom · Apr 15, 2024 · 00abd64 · 00abd64
2 parents 47af1af + a788e07
commit 00abd64
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/apps/web/lib/team/[slug]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/getServerSideProps.tsx
@@ -213,6 +213,9 @@ function getTeamWithoutMetadata<T extends Pick<Team, "metadata">>(team: T) {
   const teamMetadata = teamMetadataSchema.parse(metadata);
   return {
     ...rest,
-    requestedSlug: teamMetadata?.requestedSlug,
+    // add requestedSlug if available.
+    ...(typeof teamMetadata?.requestedSlug !== "undefined"
+      ? { requestedSlug: teamMetadata?.requestedSlug }
+      : {}),
   };
 }
diff --git a/packages/emails/lib/sanitizeDisplayName.ts b/packages/emails/lib/sanitizeDisplayName.ts
@@ -10,7 +10,7 @@ export const sanitizeDisplayName = (nameAndEmail: string) => {
 };
 
 const sanitize = (name: string) => {
-  const charsToReplace = /[;,"<>()]/g;
+  const charsToReplace = /[;,"<>():]/g;
 
-  return name.replace(charsToReplace, " ");
+  return name.replace(charsToReplace, " ").replace(/\s+/g, " ");
 };
diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx
@@ -247,18 +247,6 @@ const BookerComponent = ({
     <>
       {event.data && !isPlatform ? <BookingPageTagManager eventType={event.data} /> : <></>}
 
-      {bookerState !== "booking" && event.data?.isInstantEvent && (
-        <div
-          className="animate-fade-in-up fixed bottom-2 z-40 my-2 opacity-0"
-          style={{ animationDelay: "1s" }}>
-          <InstantBooking
-            event={event.data}
-            onConnectNow={() => {
-              onConnectNowInstantMeeting();
-            }}
-          />
-        </div>
-      )}
       <div
         className={classNames(
           // In a popup embed, if someone clicks outside the main(having main class or main tag), it closes the embed
@@ -439,6 +427,22 @@ const BookerComponent = ({
             setDayCount(null);
           }}
         />
+
+        {bookerState !== "booking" && event.data?.isInstantEvent && (
+          <div
+            className={classNames(
+              "animate-fade-in-up  z-40 my-2 opacity-0",
+              layout === BookerLayouts.MONTH_VIEW && isEmbed ? "" : "fixed bottom-2"
+            )}
+            style={{ animationDelay: "1s" }}>
+            <InstantBooking
+              event={event.data}
+              onConnectNow={() => {
+                onConnectNowInstantMeeting();
+              }}
+            />
+          </div>
+        )}
         {!hideBranding && !isPlatform && (
           <m.span
             key="logo"

diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx
@@ -53,7 +53,6 @@ import { useFormbricks } from "@calcom/lib/formbricks-client";
 import getBrandColours from "@calcom/lib/getBrandColours";
 import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import useMediaQuery from "@calcom/lib/hooks/useMediaQuery";
 import useTheme from "@calcom/lib/hooks/useTheme";
 import { isKeyInObject } from "@calcom/lib/isKeyInObject";
 import { localStorage } from "@calcom/lib/webstorage";
@@ -217,14 +216,14 @@ const Layout = (props: LayoutProps) => {
   const banners = useBanners();
 
   const showIntercom = localStorage.getItem("showIntercom");
-  const isMobile = useMediaQuery("(max-width: 768px)");
   const { boot } = useIntercom();
   const pageTitle = typeof props.heading === "string" && !props.title ? props.heading : props.title;
 
   useEffect(() => {
-    if (showIntercom === "false" || isMobile) return;
+    // not using useMediaQuery as it toggles between true and false
+    if (showIntercom === "false" || window.innerWidth <= 768) return;
     boot();
-  }, [showIntercom, isMobile]);
+  }, [showIntercom]);
 
   const bannersHeight = useMemo(() => {
     const activeBanners =

diff --git a/packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts b/packages/trpc/server/routers/loggedInViewer/updateProfile.handler.ts
@@ -353,7 +353,7 @@ export const updateProfileHandler = async ({ ctx, input }: UpdateProfileOptions)
     });
   }
 
-  if (updatedUser) {
+  if (updatedUser && hasEmailBeenChanged) {
     // Skip sending verification email when user tries to change his primary email to a verified secondary email
     if (secondaryEmail?.emailVerified) {
       secondaryEmails.push({