fix: removed default timezone and added the value from the user detai…

…ls and handle the value in timezone select (#6381)
makeplane · Jan 10, 2025 · cfdb337 · cfdb337
1 parent 95175ab
commit cfdb337
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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