Feedback

apps/web/components/booking/BookingDescription.tsx

@@ -46,10 +46,7 @@ const BookingDescription: FC<Props> = (props) => {
   const { profile, eventType, isBookingPage = false, children } = props;
   const { date: bookingDate } = useRouterQuery("date");
   const { t } = useLocale();
-  const { duration, setQuery: setDuration } = useRouterQuery("duration", {
-    // Only set duration query parameter when event type has multiple durations
-    disabled: !eventType.metadata?.multipleDuration,
-  });
+  const { duration, setQuery: setDuration } = useRouterQuery("duration");
 
   useEffect(() => {
     if (

apps/web/lib/hooks/useRouterQuery.ts

@@ -1,6 +1,6 @@
 import { useRouter } from "next/router";
 
-export default function useRouterQuery<T extends string>(name: T, config?: { disabled: boolean }) {
+export default function useRouterQuery<T extends string>(name: T) {
   const router = useRouter();
   const existingQueryParams = router.asPath.split("?")[1];
 
@@ -26,12 +26,10 @@ export default function useRouterQuery<T extends string>(name: T, config?: { dis
   }
 
   const setQuery = (newValue: string | number | null | undefined) => {
-    // Only set query param if it is not disabled
-    if (!config?.disabled) {
-      router.replace({ pathname: router.asPath, query: { ...query, [name]: newValue } }, undefined, {
-        shallow: true,
-      });
-    }
+    router.replace({ query: { ...router.query, [name]: newValue } }, undefined, {
+      shallow: true,
+    });
+    router.replace({ query: { ...router.query, ...query, [name]: newValue } }, undefined, { shallow: true });
   };
 
   return { [name]: query[name], setQuery } as {

apps/web/pages/[user].tsx

@@ -256,7 +256,7 @@ const getEventTypesWithHiddenFromDB = async (userId: number) => {
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const ssr = await ssrInit(context);
   const crypto = await import("crypto");
-  const { isValidOrgDomain } = orgDomainConfig(context.req.headers.host ?? "");
+  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req.headers.host ?? "");
 
   const usernameList = getUsernameList(context.query.user as string);
   const dataFetchStart = Date.now();
@@ -265,6 +265,11 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       username: {
         in: usernameList,
       },
+      organization: isValidOrgDomain
+        ? {
+            slug: currentOrgDomain,
+          }
+        : null,
     },
     select: {
       id: true,

apps/web/pages/api/auth/forgot-password.ts

@@ -44,7 +44,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
   }
 
   try {
-    const maybeUser = await prisma.user.findFirst({
+    const maybeUser = await prisma.user.findUnique({
       where: {
         email: email.data,
       },

apps/web/pages/api/auth/reset-password.ts

@@ -26,7 +26,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return res.status(400).json({ message: "Couldn't find an account for this email" });
     }
 
-    const maybeUser = await prisma.user.findFirst({
+    const maybeUser = await prisma.user.findUnique({
       where: {
         email: maybeRequest.email,
       },

apps/web/pages/event-types/index.tsx

@@ -372,7 +372,7 @@ export const EventTypeList = ({ group, groupIndex, readOnly, types }: EventTypeL
         {types.map((type, index) => {
           const embedLink = `${group.profile.slug}/${type.slug}`;
           const calLink = `${
-            orgBranding ? `${orgBranding.slug}.${subdomainSuffix()}` : CAL_URL
+            orgBranding ? `${new URL(CAL_URL).protocol}//${orgBranding.slug}.${subdomainSuffix()}` : CAL_URL
           }/${embedLink}`;
           const isManagedEventType = type.schedulingType === SchedulingType.MANAGED;
           const isChildrenManagedEventType =

apps/web/pages/settings/my-account/profile.tsx

@@ -6,7 +6,6 @@ import { Controller, useForm } from "react-hook-form";
 import { z } from "zod";
 
 import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
-import { useOrgBrandingValues } from "@calcom/features/ee/organizations/hooks";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { FULL_NAME_LENGTH_MAX_LIMIT } from "@calcom/lib/constants";
 import { APP_NAME } from "@calcom/lib/constants";
@@ -81,7 +80,6 @@ const ProfileView = () => {
   const utils = trpc.useContext();
   const { data: user, isLoading } = trpc.viewer.me.useQuery();
   const { data: avatar, isLoading: isLoadingAvatar } = trpc.viewer.avatar.useQuery();
-  const orgBranding = useOrgBrandingValues();
   const mutation = trpc.viewer.updateProfile.useMutation({
     onSuccess: () => {
       showToast(t("settings_updated_successfully"), "success");