Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: removed default timezone and added the value from the user details and handle the value in timezone select (#6381)

guru_sainathcfdb3373c995
diff --git a/web/core/components/global/timezone-select.tsx b/web/core/components/global/timezone-select.tsx
index 55b9f5cf18..af20a7c88f 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 a35d8f2050..4dbbd2693a 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