Merge pull request #14246 from transcom/B-21667-I-13550-INT

B-21667 B-21374 I-13550 INT
transcom · Nov 21, 2024 · fb26888 · fb26888
2 parents dccd6dd + 701aae3
commit fb26888
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/src/components/Office/DefinitionLists/AllowancesList.jsx b/src/components/Office/DefinitionLists/AllowancesList.jsx
@@ -52,26 +52,27 @@ const AllowancesList = ({ info, showVisualCues }) => {
         it will be safe to assume it is an OCONUS order. With this, if one field is present
         we show all four. Otherwise, we show none */}
         {/* Wrap in FF */}
-        {enableUB && (info?.accompaniedTour || info?.dependentsTwelveAndOver || info?.dependentsUnderTwelve) && (
-          <>
-            <div className={descriptionListStyles.row}>
-              <dt>Accompanied tour</dt>
-              <dd data-testid="ordersAccompaniedTour">{info.accompaniedTour ? 'Yes' : 'No'}</dd>
-            </div>
-            <div className={descriptionListStyles.row}>
-              <dt>Dependents under age 12</dt>
-              <dd data-testid="ordersDependentsUnderTwelve">
-                {info.dependentsUnderTwelve ? info.dependentsUnderTwelve : DEFAULT_EMPTY_VALUE}
-              </dd>
-            </div>
-            <div className={descriptionListStyles.row}>
-              <dt>Dependents over age 12</dt>
-              <dd data-testid="ordersDependentsTwelveAndOver">
-                {info.dependentsTwelveAndOver ? info.dependentsTwelveAndOver : DEFAULT_EMPTY_VALUE}
-              </dd>
-            </div>
-          </>
-        )}
+        {enableUB &&
+          (info?.accompaniedTour || info?.dependentsTwelveAndOver > 0 || info?.dependentsUnderTwelve > 0) && (
+            <>
+              <div className={descriptionListStyles.row}>
+                <dt>Accompanied tour</dt>
+                <dd data-testid="ordersAccompaniedTour">{info.accompaniedTour ? 'Yes' : 'No'}</dd>
+              </div>
+              <div className={descriptionListStyles.row}>
+                <dt>Dependents under age 12</dt>
+                <dd data-testid="ordersDependentsUnderTwelve">
+                  {info.dependentsUnderTwelve ? info.dependentsUnderTwelve : DEFAULT_EMPTY_VALUE}
+                </dd>
+              </div>
+              <div className={descriptionListStyles.row}>
+                <dt>Dependents over age 12</dt>
+                <dd data-testid="ordersDependentsTwelveAndOver">
+                  {info.dependentsTwelveAndOver ? info.dependentsTwelveAndOver : DEFAULT_EMPTY_VALUE}
+                </dd>
+              </div>
+            </>
+          )}
         {enableUB && info?.ubAllowance >= 0 && (
           <div className={descriptionListStyles.row}>
             <dt>Unaccompanied baggage allowance</dt>

diff --git a/src/pages/Office/MoveDetails/MoveDetails.jsx b/src/pages/Office/MoveDetails/MoveDetails.jsx
@@ -375,7 +375,7 @@ const MoveDetails = ({
     dependentsUnderTwelve: allowances.dependentsUnderTwelve,
     dependentsTwelveAndOver: allowances.dependentsTwelveAndOver,
     accompaniedTour: allowances.accompaniedTour,
-    ubAllowance: allowances.ubAllowance,
+    ubAllowance: allowances.unaccompaniedBaggageAllowance,
   };
 
   const customerInfo = {

diff --git a/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx b/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx
@@ -374,7 +374,7 @@ const ServicesCounselingMoveDetails = ({
     dependentsUnderTwelve: allowances.dependentsUnderTwelve,
     dependentsTwelveAndOver: allowances.dependentsTwelveAndOver,
     accompaniedTour: allowances.accompaniedTour,
-    ubAllowance: allowances.ubAllowance,
+    ubAllowance: allowances.unaccompaniedBaggageAllowance,
   };
 
   const ordersInfo = {