From 9ce71371a9419a8a48d38a76ed11f21a90bb58c1 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Sat, 17 Feb 2024 02:49:34 +0100
Subject: [PATCH] cx -> twMerge

---
 .../components/SecretApprovalRequestChanges.tsx               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx b/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
index a767a5b20..142a68050 100644
--- a/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
+++ b/frontend/src/views/SecretApprovalPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
@@ -9,7 +9,7 @@ import {
   faXmarkCircle
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { cx } from "cva";
+import { twMerge } from "tailwind-merge";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
 import { Button, ContentLoader, EmptyState, IconButton, Tooltip } from "@app/components/v2";
@@ -172,7 +172,7 @@ export const SecretApprovalRequestChanges = ({
             <FontAwesomeIcon icon={faArrowLeft} />
           </IconButton>
           <div
-            className={cx(
+            className={twMerge(
               "flex items-center space-x-2 rounded-3xl px-4 py-2 text-white",
               secretApprovalRequestDetails.status === "close" ? "bg-red-600" : "bg-green-600"
             )}