From 9f647ead4687e412fc8756e70066fb68612e06ce Mon Sep 17 00:00:00 2001
From: David Oksman <oksman.dav@gmail.com>
Date: Thu, 24 Aug 2023 23:57:11 +0300
Subject: [PATCH] fix: missing timezones in dropdown list (#10823)

---
 .../form/timezone-select/TimezoneSelect.tsx          | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/ui/components/form/timezone-select/TimezoneSelect.tsx b/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
index 2f05968518..c0bcd700f6 100644
--- a/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
+++ b/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
@@ -1,6 +1,6 @@
 import { useMemo, useState } from "react";
 import type { ITimezoneOption, ITimezone, Props as SelectProps } from "react-timezone-select";
-import BaseSelect, { allTimezones } from "react-timezone-select";
+import BaseSelect from "react-timezone-select";
 
 import { classNames } from "@calcom/lib";
 import { filterByCities, addCitiesToDropdown, handleOptionLabel } from "@calcom/lib/timezone";
@@ -34,13 +34,6 @@ export function TimezoneSelect({
     });
   }, [components]);
 
-  // We use modifiedTimezones in place of the allTimezones object replacing any underscores in the curly braces
-  // with spaces and removing the America/Detroit timezone, adding the America/New_York timezone instead.
-  const modifiedTimezones = useMemo(() => {
-    const { "America/Detroit": _, ...rest } = allTimezones;
-    return { ...rest, "America/New_York": "New York" };
-  }, []);
-
   return (
     <BaseSelect
       className={className}
@@ -48,9 +41,8 @@ export function TimezoneSelect({
       isDisabled={isLoading}
       {...reactSelectProps}
       timezones={{
-        ...modifiedTimezones,
+        ...(data ? addCitiesToDropdown(data) : {}),
         ...addCitiesToDropdown(cities),
-        "America/Asuncion": "Asuncion",
       }}
       onInputChange={handleInputChange}
       {...props}