From 86790a61624745cb8cd71c4afb5e162d256717f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 08:00:26 +0000
Subject: [PATCH 1/3] Bump cross-spawn from 7.0.3 to 7.0.6

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4d2683f08bd..2dea54c357e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7187,9 +7187,9 @@ cross-fetch@^3.1.5:
     node-fetch "2.6.7"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

From 94c1b5297bb786147ac3bdc48527682aabb16a22 Mon Sep 17 00:00:00 2001
From: joeydoyecaci <joseph.doye@caci.com>
Date: Wed, 20 Nov 2024 14:00:55 +0000
Subject: [PATCH 2/3] Removed unneeded import.

---
 src/pages/MyMove/Home/MoveHome.test.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/MyMove/Home/MoveHome.test.jsx b/src/pages/MyMove/Home/MoveHome.test.jsx
index 01c82067ef9..e86cff86bd3 100644
--- a/src/pages/MyMove/Home/MoveHome.test.jsx
+++ b/src/pages/MyMove/Home/MoveHome.test.jsx
@@ -4,7 +4,6 @@ import { v4 } from 'uuid';
 import { mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 
-import '@testing-library/jest-dom';
 import MoveHome from './MoveHome';
 
 import { MockProviders } from 'testUtils';

From 4a4fceed8ec6fbd6c3204e7be3f62b71407a21e8 Mon Sep 17 00:00:00 2001
From: Maria Traskowsky <maria.traskowsky@caci.com>
Date: Wed, 20 Nov 2024 17:44:59 +0000
Subject: [PATCH 3/3] handle 0 dependent value

---
 .../Office/DefinitionLists/AllowancesList.jsx | 41 ++++++++++---------
 src/pages/Office/MoveDetails/MoveDetails.jsx  |  2 +-
 .../ServicesCounselingMoveDetails.jsx         |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/Office/DefinitionLists/AllowancesList.jsx b/src/components/Office/DefinitionLists/AllowancesList.jsx
index db8fdc851a4..3d5c1e850cc 100644
--- 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
index 4f972ee9d50..608fc1d293c 100644
--- a/src/pages/Office/MoveDetails/MoveDetails.jsx
+++ b/src/pages/Office/MoveDetails/MoveDetails.jsx
@@ -360,7 +360,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
index bdd449eb222..ae70cc5c493 100644
--- a/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx
+++ b/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx
@@ -358,7 +358,7 @@ const ServicesCounselingMoveDetails = ({
     dependentsUnderTwelve: allowances.dependentsUnderTwelve,
     dependentsTwelveAndOver: allowances.dependentsTwelveAndOver,
     accompaniedTour: allowances.accompaniedTour,
-    ubAllowance: allowances.ubAllowance,
+    ubAllowance: allowances.unaccompaniedBaggageAllowance,
   };
 
   const ordersInfo = {