From db05345b1c4cd5d476153ae2c875e36d6909f333 Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Sat, 20 Apr 2024 19:12:03 +0530
Subject: [PATCH] Revert "Merge develop to staging v24.16.0 (#7667)" (#7669)

This reverts commit a91230a7a4c032ccae699fd0435b2f9e2e200e8b.
---
 cypress/e2e/assets_spec/assets_creation.cy.ts        |  4 +++-
 .../DailyRounds/LogUpdateCardAttribute.tsx           | 12 ------------
 src/Components/Form/FormFields/TextFormField.tsx     |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/cypress/e2e/assets_spec/assets_creation.cy.ts b/cypress/e2e/assets_spec/assets_creation.cy.ts
index cd3489a14d8..f8edc2bb172 100644
--- a/cypress/e2e/assets_spec/assets_creation.cy.ts
+++ b/cypress/e2e/assets_spec/assets_creation.cy.ts
@@ -160,10 +160,12 @@ describe("Asset", () => {
     assetPage.interceptAssetCreation();
     assetPage.clickCreateAsset();
     assetPage.verifyAssetCreation();
+
     assetSearchPage.typeSearchKeyword("New Test Asset Vital");
     assetSearchPage.pressEnter();
+
     assetPage.openCreatedAsset();
-    assetPage.configureVitalAsset("Host name", "192.168.1.20");
+    assetPage.configureVitalAsset("Host name", "192.168.1.64");
     assetPage.clickConfigureVital();
   });
 
diff --git a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
index d3e4b03be0a..3afed28dda8 100644
--- a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
+++ b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
@@ -62,18 +62,6 @@ const LogUpdateCardAttribute = <T extends keyof DailyRoundsModel>({
         </div>
       );
 
-    case "rounds_type":
-      return (
-        <div className="flex flex-col items-center gap-2 md:flex-row">
-          <AttributeLabel attributeKey={attributeKey} />
-          <span className="text-sm font-semibold text-gray-700">
-            {(attributeValue as string) === "VENTILATOR"
-              ? "Critical Care"
-              : (attributeValue as string)}
-          </span>
-        </div>
-      );
-
     default:
       return (
         <div className="flex flex-col items-center gap-2 md:flex-row">
diff --git a/src/Components/Form/FormFields/TextFormField.tsx b/src/Components/Form/FormFields/TextFormField.tsx
index 8f1ee341e34..b2a84e51595 100644
--- a/src/Components/Form/FormFields/TextFormField.tsx
+++ b/src/Components/Form/FormFields/TextFormField.tsx
@@ -100,7 +100,7 @@ const TextFormField = forwardRef((props: TextFormFieldProps, ref) => {
       );
     const _trailing =
       trailing === trailingFocused ? (
-        <div className="absolute inset-y-0 right-0 flex items-center pr-3">
+        <div className="relative inset-y-0 right-0 flex items-center pr-3">
           {trailing}
         </div>
       ) : (