[WEB-2258] fix: bugs (#895)

* fix: memeber picker z-index issue.

* fix: features list toggle always disabled for non-pro users.
This commit is contained in:
Prateek Shourya
2024-08-21 16:42:25 +05:30
committed by GitHub
parent 240d9a3570
commit 00c19ad2c8
2 changed files with 5 additions and 2 deletions

View File

@@ -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,

View File

@@ -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"