From 78bdc551587c095dabed92b07a115c07f7f41331 Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Thu, 18 Apr 2024 17:57:13 +0530
Subject: [PATCH 1/3] flaky test (#7657)

---
 cypress/e2e/assets_spec/assets_creation.cy.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cypress/e2e/assets_spec/assets_creation.cy.ts b/cypress/e2e/assets_spec/assets_creation.cy.ts
index f8edc2bb172..cd3489a14d8 100644
--- a/cypress/e2e/assets_spec/assets_creation.cy.ts
+++ b/cypress/e2e/assets_spec/assets_creation.cy.ts
@@ -160,12 +160,10 @@ 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.64");
+    assetPage.configureVitalAsset("Host name", "192.168.1.20");
     assetPage.clickConfigureVital();
   });
 

From e84087a71225a70ad61b5560d8b27f898a6d648e Mon Sep 17 00:00:00 2001
From: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date: Sat, 20 Apr 2024 18:05:41 +0530
Subject: [PATCH 2/3] Fix round type display and qr field (#7666)

---
 .../DailyRounds/LogUpdateCardAttribute.tsx           | 12 ++++++++++++
 src/Components/Form/FormFields/TextFormField.tsx     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
index 3afed28dda8..d3e4b03be0a 100644
--- a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
+++ b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
@@ -62,6 +62,18 @@ 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 b2a84e51595..8f1ee341e34 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="relative inset-y-0 right-0 flex items-center pr-3">
+        <div className="absolute inset-y-0 right-0 flex items-center pr-3">
           {trailing}
         </div>
       ) : (

From 768a5b39b19156e59414175e03e7ff6a247c5970 Mon Sep 17 00:00:00 2001
From: Mohammed Nihal <57055998+nihal467@users.noreply.github.com>
Date: Sat, 20 Apr 2024 18:47:18 +0530
Subject: [PATCH 3/3] minor case issue (#7668)

---
 .../Consultations/DailyRounds/LogUpdateCardAttribute.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
index d3e4b03be0a..4e5b7408266 100644
--- a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
+++ b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
@@ -68,7 +68,7 @@ const LogUpdateCardAttribute = <T extends keyof DailyRoundsModel>({
           <AttributeLabel attributeKey={attributeKey} />
           <span className="text-sm font-semibold text-gray-700">
             {(attributeValue as string) === "VENTILATOR"
-              ? "Critical Care"
+              ? "CRITICAL CARE"
               : (attributeValue as string)}
           </span>
         </div>