From 728f1fc90731cfae4545d4b3eba43d5e54300534 Mon Sep 17 00:00:00 2001
From: SeSo <sobhani.sepehr@gmail.com>
Date: Fri, 21 Jul 2023 16:17:27 -0700
Subject: [PATCH] chore: implement review suggestions

---
 app/data/jsonSchemaForm/emissionIntensityUiSchema.ts      | 1 -
 app/data/jsonSchemaForm/projectMilestoneUiSchema.ts       | 3 ---
 app/lib/theme/ReadOnlyFieldTemplate.tsx                   | 8 +++++++-
 .../widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx   | 3 +++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/data/jsonSchemaForm/emissionIntensityUiSchema.ts b/app/data/jsonSchemaForm/emissionIntensityUiSchema.ts
index 41c25c4f85..db2d05d3e7 100644
--- a/app/data/jsonSchemaForm/emissionIntensityUiSchema.ts
+++ b/app/data/jsonSchemaForm/emissionIntensityUiSchema.ts
@@ -59,7 +59,6 @@ export const emissionIntensityReportingRequirementUiSchema = {
     "ui:tooltip": {
       text: emissionsIntentityTooltips.adjustedEmissionsIntensityPerformance,
     },
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   calculatedEiPerformance: {
     isPercentage: true,
diff --git a/app/data/jsonSchemaForm/projectMilestoneUiSchema.ts b/app/data/jsonSchemaForm/projectMilestoneUiSchema.ts
index 38b1daaae5..ed94332ec6 100644
--- a/app/data/jsonSchemaForm/projectMilestoneUiSchema.ts
+++ b/app/data/jsonSchemaForm/projectMilestoneUiSchema.ts
@@ -90,7 +90,6 @@ const projectMilestoneUiSchema = {
     isMoney: true,
     hideOptional: true,
     calculatedValueFormContextProperty: "calculatedGrossAmount",
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   adjustedNetAmount: {
     "ui:widget": "AdjustableCalculatedValueWidget",
@@ -100,7 +99,6 @@ const projectMilestoneUiSchema = {
     isMoney: true,
     hideOptional: true,
     calculatedValueFormContextProperty: "calculatedNetAmount",
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   adjustedHoldbackAmount: {
     "ui:widget": "AdjustableCalculatedValueWidget",
@@ -110,7 +108,6 @@ const projectMilestoneUiSchema = {
     isMoney: true,
     hideOptional: true,
     calculatedValueFormContextProperty: "calculatedHoldbackAmount",
-    "ui:classNames": "adjustable-calculated-value-widget",
   },
   dateSentToCsnr: {
     "ui:widget": "DateWidget",
diff --git a/app/lib/theme/ReadOnlyFieldTemplate.tsx b/app/lib/theme/ReadOnlyFieldTemplate.tsx
index dc3b63d986..3b48e44585 100644
--- a/app/lib/theme/ReadOnlyFieldTemplate.tsx
+++ b/app/lib/theme/ReadOnlyFieldTemplate.tsx
@@ -15,7 +15,13 @@ const FieldTemplate: React.FC<FieldTemplateProps> = ({
 }) => {
   return (
     <div>
-      <div className={`${uiSchema["ui:classNames"] ?? "definition-container"}`}>
+      <div
+        className={
+          uiSchema.calculatedValueFormContextProperty
+            ? "adjustable-calculated-value-widget"
+            : "definition-container"
+        }
+      >
         {displayLabel && (
           <FieldLabel
             label={label}
diff --git a/app/lib/theme/widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx b/app/lib/theme/widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx
index d21ee4de65..0ad748983c 100644
--- a/app/lib/theme/widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx
+++ b/app/lib/theme/widgets/ReadOnlyAdjustableCalculatedValueWidget.tsx
@@ -47,6 +47,9 @@ const ReadOnlyAdjustableCalculatedValueWidget: React.FC<WidgetProps> = (
             dt {
               margin: 0 1em 0 0;
             }
+            dd {
+              margin-bottom: 0; // Override default margin-bottom for styling consistency
+            }
           `}</style>
         </div>
       )}