From 0fec74a7fe91b80fe9cfd418d13f74930090d1c3 Mon Sep 17 00:00:00 2001
From: manurana26770 <148198578+manurana26770@users.noreply.github.com>
Date: Wed, 26 Mar 2025 20:21:39 +0530
Subject: [PATCH] fix: #11378 (#20384)

* fix:#11378

* fix: #11378

* final-changes

---------

Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>
Co-authored-by: Tushar <tusharbhatt0135@gmail.com>
---
 .env.example                                         |  4 +++-
 .../web/modules/settings/my-account/profile-view.tsx | 12 +++++++++---
 .../ui/components/editor/plugins/ToolbarPlugin.tsx   |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 3d24ff316b..58d941934a 100644
--- a/.env.example
+++ b/.env.example
@@ -429,4 +429,6 @@ NEXT_PUBLIC_QUERY_AVAILABLE_SLOTS_INTERVAL_SECONDS=
 # Used to invalidate available slots when navigating to booking form
 NEXT_PUBLIC_INVALIDATE_AVAILABLE_SLOTS_ON_BOOKING_FORM=0
 # Used to enable quick availability checks for x% of all visitors
-NEXT_PUBLIC_QUICK_AVAILABILITY_ROLLOUT=10
\ No newline at end of file
+NEXT_PUBLIC_QUICK_AVAILABILITY_ROLLOUT=10
+
+
diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsx
index 6a35bef890..919f17a8c9 100644
--- a/apps/web/modules/settings/my-account/profile-view.tsx
+++ b/apps/web/modules/settings/my-account/profile-view.tsx
@@ -22,17 +22,23 @@ import { IdentityProvider } from "@calcom/prisma/enums";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
-import { ImageUploader } from "@calcom/ui/components/image-uploader";
 import { Alert } from "@calcom/ui/components/alert";
 import { UserAvatar } from "@calcom/ui/components/avatar";
 import { Button } from "@calcom/ui/components/button";
-import { Dialog, DialogContent, DialogFooter, DialogTrigger, DialogClose } from "@calcom/ui/components/dialog";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogTrigger,
+  DialogClose,
+} from "@calcom/ui/components/dialog";
 import { Editor } from "@calcom/ui/components/editor";
 import { Form } from "@calcom/ui/components/form";
 import { PasswordField } from "@calcom/ui/components/form";
 import { Label } from "@calcom/ui/components/form";
 import { TextField } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
 import {
   SkeletonButton,
   SkeletonContainer,
@@ -706,7 +712,7 @@ const ProfileForm = ({
             disableLists
             firstRender={firstRender}
             setFirstRender={setFirstRender}
-            height="80px"
+            height="120px"
           />
         </div>
         {usersAttributes && usersAttributes?.length > 0 && (
diff --git a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
index a9961ef3a3..ca62a447bf 100644
--- a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
+++ b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
@@ -426,7 +426,7 @@ export default function ToolbarPlugin(props: TextEditorProps) {
     }
   }, [editor, isLink]);
 
-  if (!props.editable) return <></>;
+  if (!props.editable) return null;
   return (
     <div className="toolbar flex" ref={toolbarRef}>
       <>