From bc3255d2c711c12bd9b75d7deac61f15963256e2 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Wed, 26 Jul 2023 19:12:48 +0530
Subject: [PATCH] fixes #5938

---
 src/Components/Assets/AssetWarrantyCard.tsx | 5 ++++-
 src/Components/Common/Uptime.tsx            | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Components/Assets/AssetWarrantyCard.tsx b/src/Components/Assets/AssetWarrantyCard.tsx
index f9699e76cec..75645c0e6eb 100644
--- a/src/Components/Assets/AssetWarrantyCard.tsx
+++ b/src/Components/Assets/AssetWarrantyCard.tsx
@@ -1,6 +1,7 @@
 import moment from "moment";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import { AssetData } from "./AssetTypes";
+import { classNames } from "../../Utils/utils";
 
 export default function AssetWarrantyCard(props: { asset: AssetData }) {
   const { asset } = props;
@@ -53,7 +54,9 @@ export default function AssetWarrantyCard(props: { asset: AssetData }) {
                       }
                       className="border-b border-primary-300 text-primary-300 hover:text-primary-400"
                     >
-                      <CareIcon className={"care-l- mr-1 h-5" + item[2]} />
+                      <CareIcon
+                        className={classNames(`care-l-${item[2]}`, "mr-1")}
+                      />
                       {item[1]}
                     </a>
                   </>
diff --git a/src/Components/Common/Uptime.tsx b/src/Components/Common/Uptime.tsx
index c440fce8770..1b9e284ac4d 100644
--- a/src/Components/Common/Uptime.tsx
+++ b/src/Components/Common/Uptime.tsx
@@ -6,6 +6,7 @@ import { useDispatch } from "react-redux";
 import * as Notification from "../../Utils/Notifications.js";
 import { AssetStatus, AssetUptimeRecord } from "../Assets/AssetTypes";
 import { reverse } from "lodash";
+import { classNames } from "../../Utils/utils";
 
 const STATUS_COLORS = {
   Operational: "bg-green-500",
@@ -150,13 +151,14 @@ function UptimeInfoPopover({
   return (
     <Popover className="relative mt-10 hidden sm:block">
       <Popover.Panel
-        className={`absolute z-50 w-64 px-4 sm:px-0 lg:w-96${
+        className={classNames(
+          "absolute z-50 w-64 px-4 sm:px-0 lg:w-96",
           day > numDays - 10
             ? "-translate-x-6"
             : day < 10
             ? "-translate-x-full"
             : "-translate-x-1/2"
-        }`}
+        )}
         static
       >
         <UptimeInfo records={records} date={date} />