This commit is contained in:
Daniel Hougaard
2025-08-25 17:55:44 +02:00
parent 8123be4c14
commit 10cfbe0c74
2 changed files with 2 additions and 2 deletions
@@ -1,5 +1,6 @@
import { faInfoCircle } from "@fortawesome/free-solid-svg-icons"; import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { twMerge } from "tailwind-merge";
import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal"; import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
@@ -13,7 +14,6 @@ import {
} from "@app/context"; } from "@app/context";
import { useLogoutUser, useUpdateOrg } from "@app/hooks/api"; import { useLogoutUser, useUpdateOrg } from "@app/hooks/api";
import { usePopUp } from "@app/hooks/usePopUp"; import { usePopUp } from "@app/hooks/usePopUp";
import { twMerge } from "tailwind-merge";
enum EnforceAuthType { enum EnforceAuthType {
SAML = "saml", SAML = "saml",
@@ -1,3 +1,4 @@
/* eslint-disable no-nested-ternary */
import { ReactNode } from "react"; import { ReactNode } from "react";
import { Controller, useForm } from "react-hook-form"; import { Controller, useForm } from "react-hook-form";
import { import {
@@ -629,7 +630,6 @@ export const SecretApprovalRequestChanges = ({
<Tooltip <Tooltip
className="relative !z-[500]" className="relative !z-[500]"
content={ content={
// eslint-disable-next-line no-nested-ternary
!isOrgMembershipActive !isOrgMembershipActive
? "This user has been deactivated and no longer has an active organization membership." ? "This user has been deactivated and no longer has an active organization membership."
: `${reviewer.firstName || ""} ${reviewer.lastName || ""}` : `${reviewer.firstName || ""} ${reviewer.lastName || ""}`