From cfdb3373c9952f4088e1288306b3cdf03363312d Mon Sep 17 00:00:00 2001
From: guru_sainath <gurusainath007@gmail.com>
Date: Fri, 10 Jan 2025 18:41:12 +0530
Subject: [PATCH] fix: removed default timezone and added the value from the
 user details and handle the value in timezone select (#6381)

---
 web/core/components/global/timezone-select.tsx | 2 +-
 web/core/components/profile/form.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/core/components/global/timezone-select.tsx b/web/core/components/global/timezone-select.tsx
index 55b9f5cf186..af20a7c88f8 100644
--- a/web/core/components/global/timezone-select.tsx
+++ b/web/core/components/global/timezone-select.tsx
@@ -37,7 +37,7 @@ export const TimezoneSelect: FC<TTimezoneSelect> = observer((props) => {
     <div>
       <CustomSearchSelect
         value={value}
-        label={selectedValue ? selectedValue(value) : label}
+        label={value && selectedValue ? selectedValue(value) : label}
         options={isDisabled || disabled ? [] : timezones}
         onChange={onChange}
         buttonClassName={cn(buttonClassName, {
diff --git a/web/core/components/profile/form.tsx b/web/core/components/profile/form.tsx
index a35d8f2050c..4dbbd2693a6 100644
--- a/web/core/components/profile/form.tsx
+++ b/web/core/components/profile/form.tsx
@@ -62,7 +62,7 @@ export const ProfileForm = observer((props: TProfileFormProps) => {
       email: user.email || "",
       role: profile.role || "Product / Project Manager",
       language: profile.language || "en",
-      user_timezone: "Asia/Kolkata",
+      user_timezone: user.user_timezone || "Asia/Kolkata",
     },
   });
   // derived values