From 00c19ad2c806fcae979a8b46297c90dd6eb67db3 Mon Sep 17 00:00:00 2001
From: Prateek Shourya <prateekshourya29@gmail.com>
Date: Wed, 21 Aug 2024 16:42:25 +0530
Subject: [PATCH] [WEB-2258] fix: bugs (#895)

* fix: memeber picker z-index issue.

* fix: features list toggle always disabled for non-pro users.
---
 web/core/components/dropdowns/member/member-options.tsx | 2 +-
 web/core/components/project/settings/features-list.tsx  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/core/components/dropdowns/member/member-options.tsx b/web/core/components/dropdowns/member/member-options.tsx
index a2d262130e..8e7003f24a 100644
--- a/web/core/components/dropdowns/member/member-options.tsx
+++ b/web/core/components/dropdowns/member/member-options.tsx
@@ -88,7 +88,7 @@ export const MemberOptions = observer((props: Props) => {
   return createPortal(
     <Combobox.Options data-prevent-outside-click static>
       <div
-        className="my-1 w-48 rounded border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2.5 text-xs shadow-custom-shadow-rg focus:outline-none z-[19]"
+        className="my-1 w-48 rounded border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2.5 text-xs shadow-custom-shadow-rg focus:outline-none z-20"
         ref={setPopperElement}
         style={{
           ...styles.popper,
diff --git a/web/core/components/project/settings/features-list.tsx b/web/core/components/project/settings/features-list.tsx
index 40eb189150..796ad473a0 100644
--- a/web/core/components/project/settings/features-list.tsx
+++ b/web/core/components/project/settings/features-list.tsx
@@ -98,7 +98,10 @@ export const ProjectFeaturesList: FC<Props> = observer((props) => {
                   </div>
 
                   <ToggleSwitch
-                    value={Boolean(isWorklogEnabled && currentProjectDetails?.[featureItem.property as keyof IProject])}
+                    value={Boolean(
+                      currentProjectDetails?.[featureItem.property as keyof IProject] &&
+                        (featureItem.property === "is_time_tracking_enabled" ? isWorklogEnabled : true)
+                    )}
                     onChange={() => handleSubmit(featureItemKey, featureItem.property)}
                     disabled={
                       !featureItem.isEnabled || !isAdmin || featureItem.property === "is_time_tracking_enabled"