Merge branch 'integrationTesting' into B-21054-INT

transcom · Sep 16, 2024 · 6a1cd8d · 6a1cd8d
2 parents 3315a0b + 090d92b
commit 6a1cd8d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/src/pages/Office/MoveDetails/MoveDetails.jsx b/src/pages/Office/MoveDetails/MoveDetails.jsx
@@ -328,7 +328,7 @@ const MoveDetails = ({
       <div className={styles.container}>
         <LeftNav sections={sections}>
           <LeftNavTag
-            background="#d63e04"
+            background="#e34b11"
             associatedSectionName="orders"
             showTag={missingOrdersInfoCount !== 0}
             testID="tag"

diff --git a/src/pages/Office/MovePaymentRequests/MovePaymentRequests.jsx b/src/pages/Office/MovePaymentRequests/MovePaymentRequests.jsx
@@ -134,10 +134,10 @@ const MovePaymentRequests = ({
     setUnapprovedServiceItemCount(serviceItemCount);
   }, [mtoShipments, setUnapprovedServiceItemCount]);
 
+  const pendingCount = paymentRequests?.filter((pr) => pr.status === paymentRequestStatus.PENDING).length;
   useEffect(() => {
-    const pendingCount = paymentRequests?.filter((pr) => pr.status === paymentRequestStatus.PENDING).length;
     setPendingPaymentRequestCount(pendingCount);
-  }, [paymentRequests, setPendingPaymentRequestCount]);
+  }, [pendingCount, setPendingPaymentRequestCount]);
 
   const excludePPMShipments = mtoShipments?.filter((shipment) => shipment.shipmentType !== 'PPM');
 
@@ -221,11 +221,12 @@ const MovePaymentRequests = ({
       <div className={txoStyles.container} data-testid="MovePaymentRequests">
         <LeftNav sections={sections}>
           <LeftNavTag
+            background="#e34b11"
             associatedSectionName="payment-requests"
-            showTag={paymentRequests?.length > 0}
-            testID="numOfPaymentRequestsTag"
+            showTag={pendingCount > 0}
+            testID="numOfPendingPaymentRequestsTag"
           >
-            {paymentRequests.length}
+            {pendingCount}
           </LeftNavTag>
           <LeftNavTag
             className={classnames('usa-tag usa-tag--alert', styles.errorTag)}

diff --git a/src/pages/Office/MovePaymentRequests/MovePaymentRequests.module.scss b/src/pages/Office/MovePaymentRequests/MovePaymentRequests.module.scss
@@ -7,7 +7,7 @@
 }
 
 .warning {
-  color: $warning;
+  color: $error;
 
   &.errorTag {
     width: 20px;

diff --git a/src/pages/Office/MovePaymentRequests/MovePaymentRequests.test.jsx b/src/pages/Office/MovePaymentRequests/MovePaymentRequests.test.jsx
@@ -498,10 +498,10 @@ describe('MovePaymentRequests', () => {
       });
     });
 
-    it('displays the number of payment request on leftnav sidebar', async () => {
+    it('displays the number of pending payment requests on leftnav sidebar', async () => {
       renderMovePaymentRequests(testProps);
       await waitFor(() => {
-        expect(screen.getByTestId('numOfPaymentRequestsTag').textContent).toEqual('2');
+        expect(screen.getByTestId('numOfPendingPaymentRequestsTag').textContent).toEqual('1');
       });
     });
   });
@@ -525,10 +525,10 @@ describe('MovePaymentRequests', () => {
       expect(paymentRequstNavLink.text).toContain(name);
     });
 
-    it('displays the number of payment request on leftnav sidebar', async () => {
+    it('does not display the number of pending payment requests on leftnav sidebar if no pending exist', async () => {
       renderMovePaymentRequests(testProps);
       await waitFor(() => {
-        expect(screen.getByTestId('numOfPaymentRequestsTag').textContent).toEqual('1');
+        expect(screen.queryByTestId('numOfPendingPaymentRequestsTag')).not.toBeInTheDocument();
       });
     });
   });

diff --git a/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx b/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx
@@ -497,7 +497,7 @@ const ServicesCounselingMoveDetails = ({
             {shipmentConcernCount}
           </LeftNavTag>
           <LeftNavTag
-            background="#d63e04"
+            background="#e34b11"
             associatedSectionName="orders"
             showTag={missingOrdersInfoCount !== 0}
             testID="tag"

diff --git a/src/shared/styles/colors.scss b/src/shared/styles/colors.scss
@@ -19,8 +19,8 @@ $base-darker: #3d4551;
 $base-darkest: #171717;
 
 //Group 4: Form State colors
-$error: #d63e04;
-$error-dark: #A03003;
+$error: #e34b11;
+$error-dark: #a03003;
 $error-light: #f4e3db;
 $warning: #ffbe2e;
 $warning-light: #faf3d1;
@@ -39,7 +39,7 @@ $accent-nts: #d85bef;
 $accent-ntsr: #8168b3;
 $accent-boat: #5d92ba;
 $accent-mobile-home: #1fd819;
-$accent-pro-gear: #71767A;
+$accent-pro-gear: #71767a;
 $accent-default: $base-light;
 
 // Group 6 Info colors