From bfd5397cbd8034db663763913e0b25a5c7c5188b Mon Sep 17 00:00:00 2001
From: jsimonVA <88905347+jsimonVA@users.noreply.github.com>
Date: Mon, 29 Apr 2024 12:20:35 -0500
Subject: [PATCH] #VYE-360 #comment new format for enrollment logic (#29459)

* #VYE-360 #comment new format for enrollment logic

* #VYE-360 #comment updated unit tests

* #VYE-360 #comment updated e2e test

* #VYE-360 #comment update mock data

* #VYE-360 #comment update enrollment-verification cypress test

* #VYE-360 #comment removed old code not in use
---
 .../verify-your-enrollment/actions/index.js   |   4 +-
 .../components/Enrollmentcard.jsx             |  34 +-
 .../components/PeriodsToVerify.jsx            |  32 +-
 .../PreviousEnrollmentVerifications.jsx       | 163 +++-
 .../constants/mockData.js                     | 768 ++++++------------
 .../containers/VerificationReviewWrapper.jsx  |  52 +-
 .../verify-your-enrollment/helpers.jsx        | 366 +++++----
 .../reducers/mockData.js                      |   6 +-
 .../components/PeriodsToVerify.unit.spec.js   |  23 +-
 ...eviousEnrollmentVerifications.unit.spec.js |  48 +-
 .../enrollment-verification.cypress.spec.js   |   4 +-
 .../helpers/getPeriodsToVerify.unit.spec.js   |  69 +-
 12 files changed, 696 insertions(+), 873 deletions(-)

diff --git a/src/applications/verify-your-enrollment/actions/index.js b/src/applications/verify-your-enrollment/actions/index.js
index 5261654f67e1..4d1574af9422 100644
--- a/src/applications/verify-your-enrollment/actions/index.js
+++ b/src/applications/verify-your-enrollment/actions/index.js
@@ -1,6 +1,6 @@
 import { apiRequest } from '@department-of-veterans-affairs/platform-utilities/api';
 import environment from '@department-of-veterans-affairs/platform-utilities/environment';
-import { USER_MOCK_DATA } from '../constants/mockData';
+import { UPDATED_USER_MOCK_DATA } from '../constants/mockData';
 // Action Types
 export const UPDATE_PENDING_VERIFICATIONS = 'UPDATE_PENDING_VERIFICATIONS';
 export const UPDATE_VERIFICATIONS = 'UPDATE_VERIFICATIONS';
@@ -67,7 +67,7 @@ export const getData = () => {
     setTimeout(() => {
       disptach({
         type: GET_DATA_SUCCESS,
-        response: USER_MOCK_DATA,
+        response: UPDATED_USER_MOCK_DATA,
       });
     }, 1000);
   };
diff --git a/src/applications/verify-your-enrollment/components/Enrollmentcard.jsx b/src/applications/verify-your-enrollment/components/Enrollmentcard.jsx
index 8c693280cb16..dd6c0a0177bf 100644
--- a/src/applications/verify-your-enrollment/components/Enrollmentcard.jsx
+++ b/src/applications/verify-your-enrollment/components/Enrollmentcard.jsx
@@ -7,11 +7,7 @@ import {
   getPeriodsToVerify,
 } from '../helpers';
 
-const EnrollmentCard = ({
-  enrollmentPeriods,
-  confirmationPage = false,
-  confirmedEnrollment = false,
-}) => {
+const EnrollmentCard = ({ enrollmentPeriods, confirmationPage = false }) => {
   const getCards = () => {
     const combinedEnrollmentsObj = combineEnrollmentsWithStartMonth(
       enrollmentPeriods,
@@ -23,10 +19,10 @@ const EnrollmentCard = ({
     // if there are more than one enrollment periods that startd in the same month
     // then the records are combined into the same array
     // if else is in place to take account for arrays that have multiple objects
-    return combinedEnrollmentsValues.map(enrollment => {
+    return combinedEnrollmentsValues.map((enrollment, index) => {
       if (enrollment.length > 1) {
         return (
-          <div key={enrollment[0].id}>
+          <div key={index}>
             <div className="vads-u-margin-top--3">
               <h2 className="vye-highlighted-title-container">
                 {translateDateIntoMonthYearFormat(enrollment[0].awardBeginDate)}
@@ -37,17 +33,6 @@ const EnrollmentCard = ({
                 `This is the enrollment information we have on file for you for ${translateDateIntoMonthYearFormat(
                   enrollment[0].awardBeginDate,
                 )}.`}
-              {confirmationPage &&
-                confirmedEnrollment && (
-                  <>
-                    <i
-                      className="fas fa-check-circle vads-u-color--green "
-                      aria-hidden="true"
-                    />{' '}
-                    You are verifying that this month’s enrollment information
-                    is correct
-                  </>
-                )}
               {enrollment.map(nestedEnrollment => {
                 {
                   /* sending true as second argument turns on left border */
@@ -59,7 +44,7 @@ const EnrollmentCard = ({
         );
       }
       return (
-        <div key={enrollment[0].id}>
+        <div key={index}>
           <div className="vads-u-margin-top--3">
             <h2 className="vye-highlighted-title-container">
               {translateDateIntoMonthYearFormat(enrollment[0].awardBeginDate)}
@@ -70,17 +55,6 @@ const EnrollmentCard = ({
               `This is the enrollment information we have on file for you for ${translateDateIntoMonthYearFormat(
                 enrollment[0].awardBeginDate,
               )}.`}
-            {confirmationPage &&
-              confirmedEnrollment && (
-                <>
-                  <i
-                    className="fas fa-check-circle vads-u-color--green "
-                    aria-hidden="true"
-                  />{' '}
-                  You are verifying that this month’s enrollment information is
-                  correct
-                </>
-              )}
             {/* sending true as second argument turns on left border */}
             {getPeriodsToVerify(enrollment, true)}
           </div>
diff --git a/src/applications/verify-your-enrollment/components/PeriodsToVerify.jsx b/src/applications/verify-your-enrollment/components/PeriodsToVerify.jsx
index 30e9f5e6d9cb..5e133e4db536 100644
--- a/src/applications/verify-your-enrollment/components/PeriodsToVerify.jsx
+++ b/src/applications/verify-your-enrollment/components/PeriodsToVerify.jsx
@@ -27,25 +27,13 @@ const PeriodsToVerify = ({
   useEffect(
     () => {
       if (
-        userEnrollmentData?.['vye::UserInfo']?.awards &&
+        userEnrollmentData?.['vye::UserInfo']?.verifications &&
         userEnrollmentData?.['vye::UserInfo']?.pendingVerifications
       ) {
-        const { awards, pendingVerifications } = userEnrollmentData?.[
-          'vye::UserInfo'
-        ];
-        // add all previouslyVerified data into single array
-        const { awardIds } = pendingVerifications;
-        const toBeVerifiedEnrollmentsArray = [];
-        awardIds.forEach(id => {
-          // check for each id inside award_ids array
-          if (awards.some(award => award.id === id)) {
-            toBeVerifiedEnrollmentsArray.push(
-              awards.find(award => award.id === id),
-            );
-          }
-        });
+        const { pendingVerifications } = userEnrollmentData?.['vye::UserInfo'];
 
-        setPendingEnrollments(toBeVerifiedEnrollmentsArray);
+        // add all data to be verified into single array
+        setPendingEnrollments(pendingVerifications);
       }
     },
     [userEnrollmentData],
@@ -53,8 +41,8 @@ const PeriodsToVerify = ({
 
   return (
     <div id="verifications-pending-alert">
-      {userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.awardIds
-        .length > 0 && (
+      {userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.length >
+        0 && (
         <va-alert
           close-btn-aria-label="Close notification"
           status="info"
@@ -79,15 +67,15 @@ const PeriodsToVerify = ({
                 as it would always show the verified success statement if there are no pending
                 enrollments even if the user didn't just verify
             */}
-      {userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.awardIds
-        .length === 0 &&
+      {userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.length ===
+        0 &&
         justVerified && (
           <div>
             <VerifiedSuccessStatement />
           </div>
         )}
-      {userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.awardIds
-        .length === 0 &&
+      {userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.length ===
+        0 &&
         !justVerified && (
           <div className="vads-u-margin-top--2">
             <UpToDateVerificationStatement />
diff --git a/src/applications/verify-your-enrollment/components/PreviousEnrollmentVerifications.jsx b/src/applications/verify-your-enrollment/components/PreviousEnrollmentVerifications.jsx
index e09cd439ad30..59b64dd83052 100644
--- a/src/applications/verify-your-enrollment/components/PreviousEnrollmentVerifications.jsx
+++ b/src/applications/verify-your-enrollment/components/PreviousEnrollmentVerifications.jsx
@@ -16,12 +16,51 @@ const PreviousEnrollmentVerifications = ({ enrollmentData }) => {
   const [pageCount, setPageCount] = useState(0);
   const [subsetStart, setSubsetStart] = useState(0);
   const [subsetEnd, setSubsetEnd] = useState(0);
-  const totalEnrollmentCount = Object.keys(
-    combineEnrollmentsWithStartMonth(enrollmentData?.['vye::UserInfo']?.awards),
+
+  const totalEnrollmentVerificationsCount = Object.keys(
+    combineEnrollmentsWithStartMonth(
+      enrollmentData?.['vye::UserInfo']?.verifications,
+    ),
+  ).length;
+
+  const totalEnrollmentPendingVerificationsCount = Object.keys(
+    combineEnrollmentsWithStartMonth(
+      enrollmentData?.['vye::UserInfo']?.pendingVerifications,
+    ),
   ).length;
 
+  // get count of verified and unverified enrollments (Grouped by start month)
+  const totalEnrollmentCount =
+    totalEnrollmentPendingVerificationsCount +
+    totalEnrollmentVerificationsCount;
+
+  const sortDatesByMonthYear = array => {
+    // Helper function to convert "Month YYYY" or "Date unavailable" to a Date object
+    function parseDate(dateStr) {
+      if (dateStr === 'Date unavailable') {
+        // Return a date far in the past to ensure it sorts last
+        return new Date(0); // January 1, 1970, or can use a specific older date to be explicit
+      }
+      const [month, year] = dateStr.split(' ');
+      return new Date(`${month} 1, ${year}`);
+    }
+
+    // Sorting the array of objects in descending order based on date keys
+    array.sort((a, b) => {
+      const keyA = Object.keys(a)[0];
+      const keyB = Object.keys(b)[0];
+      const dateA = parseDate(keyA);
+      const dateB = parseDate(keyB);
+      return dateB - dateA; // descending sorting | ascending would be dateA - dateB
+    });
+
+    // Extracting and returning the React components from the sorted array of objects
+    return array.map(obj => Object.values(obj)[0]);
+  };
+
   const getPreviouslyVerified = () => {
     let enrollments = [];
+
     Object.values(pastAndCurrentAwards).forEach(month => {
       if (month.length > 1) {
         const tempGroupEnrollment = getGroupedPreviousEnrollments(month);
@@ -32,11 +71,74 @@ const PreviousEnrollmentVerifications = ({ enrollmentData }) => {
         enrollments.push(tempSingleEnrollment);
       }
     });
+    const tempEnrollmentArray = [];
+    /*
+     enrollments is an array of react components.
+     we want to go through each element in the enrollments array
+     and find the month/year each element is associated with.
+     once we have this, we can sort the array based on month year with
+     the latest date on top.
+    */
+    enrollments.forEach(enrollment => {
+      const topLevelEnrollment = enrollment?.props?.children;
+      const isAnArray = Array.isArray(topLevelEnrollment);
+
+      if (!isAnArray) {
+        const objectChildProps =
+          topLevelEnrollment.props?.children[0]?.props?.children;
+        const objectChildPropsIsArray = Array.isArray(objectChildProps);
+        if (!objectChildPropsIsArray) {
+          tempEnrollmentArray.push({
+            [objectChildProps]: enrollment,
+          });
+        }
+        if (objectChildPropsIsArray) {
+          tempEnrollmentArray.push({
+            [objectChildProps[0].props.children]: enrollment,
+          });
+        }
+      }
+
+      if (isAnArray) {
+        // find the first object within the array that is not undefined and is not null
+        const firstNotUndefined = topLevelEnrollment.find(
+          el => el !== undefined && el !== null && el !== false,
+        );
+        const firstChildProps =
+          firstNotUndefined.props?.children[0]?.props?.children;
+        const firstChildIsArray = Array.isArray(firstChildProps);
+
+        if (firstChildIsArray) {
+          tempEnrollmentArray.push({
+            [firstChildProps[0].props?.children]: enrollment,
+          });
+        }
+
+        if (!firstChildIsArray) {
+          const secondChildProps =
+            firstNotUndefined.props?.children[0]?.props?.children;
+          const secondChildPropsIsArray = Array.isArray(secondChildProps);
+          if (!secondChildPropsIsArray) {
+            tempEnrollmentArray.push({
+              [firstNotUndefined.props?.children[0]?.props
+                ?.children]: enrollment,
+            });
+          }
+        }
+      }
+    });
+
+    if (tempEnrollmentArray.length > 0) {
+      const sortedEnrollments = sortDatesByMonthYear(tempEnrollmentArray);
+      enrollments = sortedEnrollments;
+    }
+
     // Adjust based on subsetStart and subsetEnd to control the number of elements returned
-    enrollments = enrollments.reverse().slice(subsetStart, subsetEnd);
 
+    enrollments = enrollments.slice(subsetStart, subsetEnd);
     return enrollments;
   };
+
   const handlePageChange = useCallback(
     pageNumber => {
       setSubsetStart(pageNumber * ENROLLMETS_PER_PAGE - ENROLLMETS_PER_PAGE);
@@ -67,50 +169,23 @@ const PreviousEnrollmentVerifications = ({ enrollmentData }) => {
 
   useEffect(
     () => {
+      const allEnrollments = [];
       if (
-        userEnrollmentData?.['vye::UserInfo']?.awards &&
-        userEnrollmentData?.['vye::UserInfo']?.verifications
+        userEnrollmentData?.['vye::UserInfo']?.pendingVerifications?.length > 0
       ) {
-        const { awards, verifications } = userEnrollmentData?.['vye::UserInfo'];
-        // add all awards data into single array, verified and non-verified
-        const allEnrollments = awards.flatMap((award, index) => {
-          // check each award that has been verified and add the
-          // verified date to the enrollment period being returned
-          if (index < verifications.length) {
-            const {
-              awardIds,
-              createdOn,
-              PendingVerificationSubmitted,
-            } = verifications[index];
-            // check if record has been verified
-            if (awardIds?.some(id => id === award.id)) {
-              const tempData = award;
-              let updatedTempData = {};
-              if (createdOn) {
-                // add key/value when enrollment was verified
-                updatedTempData = { ...tempData, verifiedDate: createdOn };
-              }
-              if (PendingVerificationSubmitted) {
-                // add key/value when enrollment was verified
-                updatedTempData = {
-                  ...tempData,
-                  PendingVerificationSubmitted,
-                };
-              }
-              return updatedTempData;
-            }
-          }
-          // add enrollment that has not been verified
-          return award;
+        const { pendingVerifications } = userEnrollmentData?.['vye::UserInfo'];
+        pendingVerifications.forEach(pendingAward => {
+          allEnrollments.push(pendingAward);
         });
-
-        // array of all enrollment periods with verifiedDate
-        // add to enrollments that have been verified
-        // setPastAndCurrentAwards(allEnrollments);
-        setPastAndCurrentAwards(
-          combineEnrollmentsWithStartMonth(allEnrollments),
-        );
       }
+      if (userEnrollmentData?.['vye::UserInfo']?.verifications?.length > 0) {
+        const { verifications } = userEnrollmentData?.['vye::UserInfo'];
+        verifications.forEach(award => {
+          allEnrollments.push(award);
+        });
+      }
+
+      setPastAndCurrentAwards(combineEnrollmentsWithStartMonth(allEnrollments));
     },
     [userEnrollmentData],
   );
@@ -175,8 +250,6 @@ const PreviousEnrollmentVerifications = ({ enrollmentData }) => {
         </p>
       )}
       {totalEnrollmentCount > 0 && getPreviouslyVerified()}
-      {/* {totalEnrollmentCount > 0 && pastAndCurrentAwards.length > 0 &&
-        <EnrollmentCard enrollmentPeriods={pastAndCurrentAwards}/>} */}
       {totalEnrollmentCount === undefined && (
         <p className="vads-u-margin-bottom--6">
           <strong>You currently have no enrollments.</strong>
diff --git a/src/applications/verify-your-enrollment/constants/mockData.js b/src/applications/verify-your-enrollment/constants/mockData.js
index 33f50efa5496..e4d65c41bcc4 100644
--- a/src/applications/verify-your-enrollment/constants/mockData.js
+++ b/src/applications/verify-your-enrollment/constants/mockData.js
@@ -1,4 +1,4 @@
-export const USER_MOCK_DATA = {
+export const UPDATED_USER_MOCK_DATA = {
   'vye::UserInfo': {
     suffix: 'CPA',
     fullName: 'Ben Simonis MD',
@@ -10,315 +10,169 @@ export const USER_MOCK_DATA = {
     zip: '46786-3217',
     remEnt: '2854321', // 28(first 2 numbers) for months .54321 * 30 = res needs to be rounded
     certIssueDate: '2019-06-28T00:00:00.000Z',
-    delDate: '2021-09-03T00:00:00.000Z',
-    dateLastCertified: '2018-06-21T00:00:00.000Z',
+    delDate: '2026-09-03T00:00:00.000Z',
+    dateLastCertified: '2024-03-01',
     paymentAmt: '3989.36',
     indicator: 'B',
-    awards: [
-      {
-        id: 7,
-        curAwardInd: 'example',
-        awardBeginDate: '2023-12-15T16:12:43.447Z',
-        awardEndDate: '2024-01-22T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-01-01T16:12:43.447Z',
-        monthlyRate: '3200.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 8,
-        curAwardInd: 'example',
-        awardBeginDate: '2023-12-15T16:12:43.447Z',
-        awardEndDate: '2024-01-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-01-01T16:12:43.447Z',
-        monthlyRate: '3200.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 9,
-        curAwardInd: 'example',
-        awardBeginDate: '2024-01-15T16:12:43.447Z',
-        awardEndDate: '2024-02-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-01-02T16:12:43.447Z',
-        monthlyRate: '1250.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 10,
-        curAwardInd: 'example',
-        awardBeginDate: '2024-02-15T16:12:43.447Z',
-        awardEndDate: '2024-03-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-03-03T16:12:43.447Z',
-        monthlyRate: '420.36',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 11,
-        curAwardInd: 'example',
-        awardBeginDate: '2024-03-15T16:12:43.447Z',
-        awardEndDate: '2024-04-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-04-15T16:12:43.447Z',
-        monthlyRate: '760.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 12,
-        curAwardInd: 'P',
-        awardBeginDate: '2024-04-15T16:12:43.447Z',
-        awardEndDate: '2024-05-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-05-31T16:12:43.447Z',
-        monthlyRate: '1100.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 13,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-05-15T16:12:43.447Z',
-        awardEndDate: '2024-06-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-06-07T16:12:43.447Z',
-        monthlyRate: '250.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 14,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-06-15T16:12:43.447Z',
-        awardEndDate: '2024-07-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-07-21T16:12:43.447Z',
-        monthlyRate: '1100.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 15,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-07-15T16:12:43.447Z',
-        awardEndDate: '2024-08-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-08-21T16:12:43.447Z',
-        monthlyRate: '1100.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 16,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-08-15T16:12:43.447Z',
-        awardEndDate: '2024-09-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-09-18T16:12:43.447Z',
-        monthlyRate: '611.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 17,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-09-15T16:12:43.447Z',
-        awardEndDate: '2024-10-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-10-23T16:12:43.447Z',
-        monthlyRate: '400.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 18,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-11-15T16:12:43.447Z',
-        awardEndDate: '2024-12-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-12-15T16:12:43.447Z',
-        monthlyRate: '1000.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 19,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-12-15T16:12:43.447Z',
-        awardEndDate: '2025-01-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2025-01-15T16:12:43.447Z',
-        monthlyRate: '1000.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 20,
-        curAwardInd: 'C',
-        awardBeginDate: '2025-01-15T16:12:43.447Z',
-        awardEndDate: '2025-02-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2025-02-15T16:12:43.447Z',
-        monthlyRate: '675.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 21,
-        curAwardInd: 'C',
-        awardBeginDate: '2025-02-15T16:12:43.447Z',
-        awardEndDate: '2025-03-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2025-03-01T16:12:43.447Z',
-        monthlyRate: '590.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 22,
-        curAwardInd: 'C',
-        awardBeginDate: '2025-02-20T16:12:43.447Z',
-        awardEndDate: '2025-03-20T16:12:43.447Z',
-        trainingTime: 30,
-        paymentDate: '2025-03-01T16:12:43.447Z',
-        monthlyRate: '200.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-    ],
+
     pendingDocuments: [
       {
         docType: '1990',
         queueDate: '2023-12-04T22:24:20.000Z',
       },
     ],
-    pendingVerifications: {
-      awardIds: [18, 19, 20, 21, 22],
-    },
+    pendingVerifications: [
+      {
+        awardId: '00001',
+        awardBeginDate: '2024-03-01',
+        awardEndDate: '2024-03-24',
+        numberHours: 10,
+        monthlyRate: 600.0,
+        caseTrace: 'CASE 1b',
+      },
+      {
+        awardId: '00002',
+        awardBeginDate: '2024-03-25',
+        awardEndDate: '2024-03-31',
+        numberHours: 12,
+        monthlyRate: 1400.0,
+        caseTrace: 'CASE 7',
+      },
+      {
+        awardId: '00003',
+        awardBeginDate: '2024-02-05',
+        awardEndDate: '2024-02-31',
+        numberHours: 12,
+        monthlyRate: 1400.0,
+        caseTrace: 'CASE 7',
+      },
+    ],
     verifications: [
       {
-        createdOn: '2024-01-15T16:12:43.491Z',
-        awardIds: [7],
+        verifiedDate: '2020-06-01',
+        awardBeginDate: null,
+        awardEndDate: '2020-05-31',
+        numberHours: null,
+        monthlyRate: null,
+        paymentDate: '2020-06-01',
+        caseTrace: 'CASE 1b',
+      },
+      {
+        verifiedDate: '2020-05-15',
+        awardBeginDate: null,
+        // "awardBeginDate":'2020-04-01',
+        awardEndDate: '2020-04-30',
+        numberHours: 4,
+        monthlyRate: null,
+        paymentDate: '2020-05-15',
+        caseTrace: 'CASE 1b',
+      },
+      {
+        verifiedDate: '2023-03-01',
+        // "awardBeginDate":'2023-02-06',
+        awardBeginDate: '2020-04-06',
+        awardEndDate: null,
+        // "awardEndDate":'2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-01-15T16:12:43.491Z',
-        awardIds: [8],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2019-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-02-15T16:12:43.491Z',
-        awardIds: [9],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2018-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-03-15T16:12:43.491Z',
-        awardIds: [10],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2017-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-04-15T16:12:43.491Z',
-        awardIds: [11],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2016-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-05-15T16:12:43.491Z',
-        awardIds: [12],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2015-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-06-15T16:12:43.491Z',
-        awardIds: [13],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2014-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-07-15T16:12:43.491Z',
-        awardIds: [14],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2013-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-08-15T16:12:43.491Z',
-        awardIds: [15],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2012-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-09-15T16:12:43.491Z',
-        awardIds: [16],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2011-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-08-15T16:12:43.491Z',
-        awardIds: [17],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2010-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
-      // {
-      //   createdOn: '2024-07-15T16:12:43.491Z',
-      //   awardIds: [18],
-      // },
-      // {
-      //   createdOn: '2024-09-15T16:12:43.491Z',
-      //   awardIds: [19],
-      // },
-      // {
-      //   createdOn: '2024-10-15T16:12:43.491Z',
-      //   awardIds: [20],
-      // },
-      // {
-      //   createdOn: '2024-11-15T16:12:43.491Z',
-      //   awardIds: [21],
-      // },
-      // {
-      //   createdOn: '2024-11-15T16:12:43.491Z',
-      //   awardIds: [22],
-      // },
     ],
   },
 };
 
-export const USER_PENDINGVERIFICATION_MOCK_DATA = {
+export const PAGINATION_USER_MOCK_DATA = {
   'vye::UserInfo': {
     suffix: 'CPA',
     fullName: 'Ben Simonis MD',
@@ -328,275 +182,171 @@ export const USER_PENDINGVERIFICATION_MOCK_DATA = {
     addressLine5: 'Montana',
     addressLine6: '03729-2762',
     zip: '46786-3217',
-    remEnt: 'earum',
+    remEnt: '2854321', // 28(first 2 numbers) for months .54321 * 30 = res needs to be rounded
     certIssueDate: '2019-06-28T00:00:00.000Z',
-    delDate: '2021-09-03T00:00:00.000Z',
-    dateLastCertified: '2018-06-21T00:00:00.000Z',
+    delDate: '2026-09-03T00:00:00.000Z',
+    dateLastCertified: '2024-03-01',
     paymentAmt: '3989.36',
-    indicator: 'perferendis',
-    awards: [
-      {
-        id: 8,
-        curAwardInd: 'example',
-        awardBeginDate: '2023-12-15T16:12:43.447Z',
-        awardEndDate: '2024-01-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-01-01T16:12:43.447Z',
-        monthlyRate: '684.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 9,
-        curAwardInd: 'example',
-        awardBeginDate: '2024-01-15T16:12:43.447Z',
-        awardEndDate: '2024-02-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-01-02T16:12:43.447Z',
-        monthlyRate: '1250.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 10,
-        curAwardInd: 'example',
-        awardBeginDate: '2024-02-15T16:12:43.447Z',
-        awardEndDate: '2024-03-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-03-03T16:12:43.447Z',
-        monthlyRate: '420.36',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 11,
-        curAwardInd: 'example',
-        awardBeginDate: '2024-03-15T16:12:43.447Z',
-        awardEndDate: '2024-04-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-04-15T16:12:43.447Z',
-        monthlyRate: '760.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 12,
-        curAwardInd: 'P',
-        awardBeginDate: '2024-04-15T16:12:43.447Z',
-        awardEndDate: '2024-05-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-05-31T16:12:43.447Z',
-        monthlyRate: '1100.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 13,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-05-15T16:12:43.447Z',
-        awardEndDate: '2024-06-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-06-07T16:12:43.447Z',
-        monthlyRate: '250.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 14,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-06-15T16:12:43.447Z',
-        awardEndDate: '2024-07-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-07-21T16:12:43.447Z',
-        monthlyRate: '1100.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 15,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-07-15T16:12:43.447Z',
-        awardEndDate: '2024-08-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-08-21T16:12:43.447Z',
-        monthlyRate: '1100.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 16,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-08-15T16:12:43.447Z',
-        awardEndDate: '2024-09-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-09-18T16:12:43.447Z',
-        monthlyRate: '611.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 17,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-09-15T16:12:43.447Z',
-        awardEndDate: '2024-10-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-10-23T16:12:43.447Z',
-        monthlyRate: '400.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 18,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-11-15T16:12:43.447Z',
-        awardEndDate: '2024-12-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2024-12-15T16:12:43.447Z',
-        monthlyRate: '1000.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 19,
-        curAwardInd: 'C',
-        awardBeginDate: '2024-12-15T16:12:43.447Z',
-        awardEndDate: '2025-01-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2025-01-15T16:12:43.447Z',
-        monthlyRate: '1000.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 20,
-        curAwardInd: 'C',
-        awardBeginDate: '2025-01-15T16:12:43.447Z',
-        awardEndDate: '2025-02-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2025-02-15T16:12:43.447Z',
-        monthlyRate: '675.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-      {
-        id: 21,
-        curAwardInd: 'C',
-        awardBeginDate: '2025-02-15T16:12:43.447Z',
-        awardEndDate: '2025-03-15T16:12:43.447Z',
-        trainingTime: 40,
-        paymentDate: '2025-03-01T16:12:43.447Z',
-        monthlyRate: '590.0',
-        beginRsn: 'reason',
-        endRsn: 'reason',
-        typeTraining: 'type',
-        numberHours: 6,
-        typeHours: 'type',
-      },
-    ],
+    indicator: 'B',
+
     pendingDocuments: [
       {
-        docType: 'voluptatem',
+        docType: '1990',
         queueDate: '2023-12-04T22:24:20.000Z',
       },
     ],
-    pendingVerifications: {
-      awardIds: [],
-    },
+    pendingVerifications: [
+      {
+        awardId: '00001',
+        awardBeginDate: '2024-03-01',
+        awardEndDate: '2024-03-24',
+        numberHours: 10,
+        monthlyRate: 600.0,
+        caseTrace: 'CASE 1b',
+      },
+      {
+        awardId: '00002',
+        awardBeginDate: '2024-03-25',
+        awardEndDate: '2024-03-31',
+        numberHours: 12,
+        monthlyRate: 1400.0,
+        caseTrace: 'CASE 7',
+      },
+      {
+        awardId: '00003',
+        awardBeginDate: '2024-02-05',
+        awardEndDate: '2024-02-31',
+        numberHours: 12,
+        monthlyRate: 1400.0,
+        caseTrace: 'CASE 7',
+      },
+    ],
     verifications: [
       {
-        createdOn: '2024-01-15T16:12:43.491Z',
-        awardIds: [8],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2023-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-02-15T16:12:43.491Z',
-        awardIds: [9],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2022-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-03-15T16:12:43.491Z',
-        awardIds: [10],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2021-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-04-15T16:12:43.491Z',
-        awardIds: [11],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2020-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-05-15T16:12:43.491Z',
-        awardIds: [12],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2019-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-06-15T16:12:43.491Z',
-        awardIds: [13],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2018-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-07-15T16:12:43.491Z',
-        awardIds: [14],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2017-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-08-15T16:12:43.491Z',
-        awardIds: [15],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2016-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-09-15T16:12:43.491Z',
-        awardIds: [16],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2015-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        createdOn: '2024-08-15T16:12:43.491Z',
-        awardIds: [17],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2014-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        PendingVerificationSubmitted: '2024-01-02T21:06:10.238Z',
-        awardIds: [18],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2013-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        PendingVerificationSubmitted: '2024-01-02T21:06:10.238Z',
-        awardIds: [19],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2012-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        PendingVerificationSubmitted: '2024-01-02T21:06:10.238Z',
-        awardIds: [20],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2011-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
       {
-        PendingVerificationSubmitted: '2024-01-02T21:06:10.238Z',
-        awardIds: [21],
+        verifiedDate: '2023-03-01',
+        awardBeginDate: '2010-02-06',
+        awardEndDate: '2023-02-28',
+        numberHours: 6,
+        monthlyRate: 800.0,
+        paymentDate: '2023-03-01',
+        caseTrace: 'CASE 1b',
       },
     ],
   },
diff --git a/src/applications/verify-your-enrollment/containers/VerificationReviewWrapper.jsx b/src/applications/verify-your-enrollment/containers/VerificationReviewWrapper.jsx
index d773ca409a83..b720ef1211d0 100644
--- a/src/applications/verify-your-enrollment/containers/VerificationReviewWrapper.jsx
+++ b/src/applications/verify-your-enrollment/containers/VerificationReviewWrapper.jsx
@@ -21,6 +21,7 @@ import {
   updateVerifications,
   verifyEnrollmentAction,
 } from '../actions';
+import { toLocalISOString } from '../helpers';
 
 const VerificationReviewWrapper = ({
   children,
@@ -40,8 +41,7 @@ const VerificationReviewWrapper = ({
   const [enrollmentPeriodsToVerify, setEnrollmentPeriodsToVerify] = useState(
     [],
   );
-  const [currentPendingAwardIDs, setCurrentPendingAwardIDs] = useState([]);
-  // const userData = isUserLoggedIn ? loggedIEnenrollmentData : enrollmentData;
+
   const history = useHistory();
 
   const handleBackClick = () => {
@@ -56,16 +56,17 @@ const VerificationReviewWrapper = ({
   // used with mock data to mock what happens after
   // successfully verifying
   const handleVerification = () => {
-    const currentDateTime = new Date().toISOString();
-    // update awardIds to a blank array
-    dispatchUpdatePendingVerifications({ awardIds: [] });
-    const newVerifiedIDS = currentPendingAwardIDs?.map(id => {
+    const currentDateTime = toLocalISOString(new Date());
+    // update pendingVerifications to a blank array
+    dispatchUpdatePendingVerifications([]);
+    const newVerifiedEnrollments = enrollmentPeriodsToVerify.map(period => {
       return {
-        PendingVerificationSubmitted: currentDateTime,
-        awardIds: [id],
+        ...period,
+        verifiedDate: currentDateTime,
+        paymentDate: null,
       };
     });
-    dispatchUpdateVerifications(newVerifiedIDS);
+    dispatchUpdateVerifications(newVerifiedEnrollments);
     dispatchVerifyEnrollmentAction();
   };
 
@@ -77,27 +78,9 @@ const VerificationReviewWrapper = ({
 
   useEffect(
     () => {
-      if (
-        enrollmentData?.['vye::UserInfo']?.awards &&
-        enrollmentData?.['vye::UserInfo']?.pendingVerifications
-      ) {
-        const { awards, pendingVerifications } = enrollmentData?.[
-          'vye::UserInfo'
-        ];
-        // add all previouslyVerified data into single array
-        const { awardIds } = pendingVerifications;
-        const toBeVerifiedEnrollmentsArray = [];
-        setCurrentPendingAwardIDs(awardIds);
-        awardIds.forEach(id => {
-          // check for each id inside award_ids array
-          if (awards.some(award => award.id === id)) {
-            toBeVerifiedEnrollmentsArray.push(
-              awards.find(award => award.id === id),
-            );
-          }
-        });
-
-        setEnrollmentPeriodsToVerify(toBeVerifiedEnrollmentsArray);
+      if (enrollmentData?.['vye::UserInfo']?.pendingVerifications) {
+        const { pendingVerifications } = enrollmentData?.['vye::UserInfo'];
+        setEnrollmentPeriodsToVerify(pendingVerifications);
       }
     },
     [enrollmentData],
@@ -137,16 +120,15 @@ const VerificationReviewWrapper = ({
                     </span>{' '}
                     please do not submit the form. Instead, work with your
                     School Certifying Official (SCO) to ensure your enrollment
-                    information is updated with the VA before submitting this
-                    form.
+                    information is updated with the VA.
                   </p>
                   <p className="vads-u-margin-top--3">
                     <span className="vads-u-font-weight--bold">Note:</span>{' '}
-                    Please note that providing false reports concerning your
-                    benefits may result in a fine, imprisonment or both.
+                    Providing false reports concerning your benefits may result
+                    in a fine, imprisonment or both.
                   </p>
                 </div>
-                <div className="vads-u-margin-top--3">
+                <div className="vads-u-margin-top--8">
                   <VaRadio
                     error={errorStatement}
                     hint=""
diff --git a/src/applications/verify-your-enrollment/helpers.jsx b/src/applications/verify-your-enrollment/helpers.jsx
index e26dcafb1389..7c683e6dc7aa 100644
--- a/src/applications/verify-your-enrollment/helpers.jsx
+++ b/src/applications/verify-your-enrollment/helpers.jsx
@@ -2,6 +2,7 @@
 /* eslint-disable react/jsx-key */ // keys are defined, error being thrown in eslint even when key is defined
 import React from 'react';
 import ADDRESS_DATA from 'platform/forms/address/data';
+import { v4 as uuidv4 } from 'uuid';
 import {
   BAD_UNIT_NUMBER,
   MISSING_UNIT_NUMBER,
@@ -10,6 +11,10 @@ import {
 
 export const translateDateIntoMonthYearFormat = dateString => {
   // Parse the date string as UTC
+  if (dateString === null) {
+    return 'Date unavailable';
+  }
+
   const [year, month, day] = dateString
     .split('-')
     .map(num => parseInt(num, 10));
@@ -24,6 +29,23 @@ export const translateDateIntoMonthYearFormat = dateString => {
   });
 };
 
+export const toLocalISOString = date => {
+  const pad = num => num.toString().padStart(2, '0');
+
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1); // Months are zero-indexed
+  const day = pad(date.getDate());
+  const hour = pad(date.getHours());
+  const minute = pad(date.getMinutes());
+  const second = pad(date.getSeconds());
+  const ms = date
+    .getMilliseconds()
+    .toString()
+    .padStart(3, '0');
+
+  return `${year}-${month}-${day}T${hour}:${minute}:${second}.${ms}`;
+};
+
 export const translateDateIntoMonthDayYearFormat = dateString => {
   // Parse the date string as UTC
   if (!dateString) return null;
@@ -61,6 +83,7 @@ export const translateDateIntoMonthDayYearFormat = dateString => {
 
 export const translateDatePeriod = (startDateString, endDateString) => {
   // Parse the date strings into Date objects as UTC
+  const dateUnavailable = 'Date unavailable';
   const parseDateUTC = dateString => {
     const [year, month, day] = dateString
       .split('-')
@@ -68,8 +91,10 @@ export const translateDatePeriod = (startDateString, endDateString) => {
     return new Date(Date.UTC(year, month - 1, day));
   };
 
-  const date1 = parseDateUTC(startDateString);
-  const date2 = parseDateUTC(endDateString);
+  const date1 =
+    startDateString !== null ? parseDateUTC(startDateString) : dateUnavailable;
+  const date2 =
+    endDateString !== null ? parseDateUTC(endDateString) : dateUnavailable;
 
   // Function to format a date into MM/DD/YYYY in UTC
   function formatDate(date) {
@@ -80,7 +105,9 @@ export const translateDatePeriod = (startDateString, endDateString) => {
   }
 
   // Format both dates and concatenate them
-  return `${formatDate(date1)} - ${formatDate(date2)}`;
+  return `${date1 === dateUnavailable ? date1 : formatDate(date1)} - ${
+    date2 === dateUnavailable ? date2 : formatDate(date2)
+  }`;
 };
 
 export const formatCurrency = str => {
@@ -153,14 +180,15 @@ export const getPeriodsToVerify = (pendingEnrollments, review = false) => {
         awardEndDate,
         monthlyRate,
         numberHours,
-        id,
       } = enrollmentToBeVerified;
+      const myUUID = uuidv4();
+
       return (
         <div
           className={
             review ? 'vads-u-margin-y--2 vye-left-border' : 'vads-u-margin-y--2'
           }
-          key={`Enrollment-to-be-verified-${id}`}
+          key={`Enrollment-to-be-verified-${myUUID}`}
         >
           <p
             className={
@@ -183,7 +211,7 @@ export const getPeriodsToVerify = (pendingEnrollments, review = false) => {
             <span className="vads-u-font-weight--bold">
               Total Credit Hours:
             </span>{' '}
-            {numberHours}
+            {numberHours === null ? 'Data unavailable' : numberHours}
           </p>
           <p
             className={
@@ -193,7 +221,9 @@ export const getPeriodsToVerify = (pendingEnrollments, review = false) => {
             }
           >
             <span className="vads-u-font-weight--bold">Monthly Rate:</span>{' '}
-            {formatCurrency(monthlyRate)}
+            {monthlyRate === null
+              ? 'Data unavailable'
+              : formatCurrency(monthlyRate)}
           </p>
         </div>
       );
@@ -205,17 +235,21 @@ export const getGroupedPreviousEnrollments = month => {
   const {
     verifiedDate,
     awardBeginDate,
+    awardEndDate,
     id,
-    PendingVerificationSubmitted,
+    paymentDate,
   } = month[0];
+  const myUUID = uuidv4();
 
   return (
-    <div className="vye-top-border" key={id}>
-      {verifiedDate ? (
+    <div className="vye-top-border" key={id || myUUID}>
+      {verifiedDate && paymentDate ? (
         <>
           <h3 className="vads-u-font-size--h4 vads-u-display--flex vads-u-align-items--center">
             <span className="vads-u-display--inline-block ">
-              {translateDateIntoMonthYearFormat(awardBeginDate)}
+              {awardBeginDate !== null
+                ? translateDateIntoMonthYearFormat(awardBeginDate)
+                : translateDateIntoMonthYearFormat(awardEndDate)}
             </span>{' '}
             <va-icon
               icon="check_circle"
@@ -224,17 +258,21 @@ export const getGroupedPreviousEnrollments = month => {
             />{' '}
             <span className="vads-u-display--block">Verified</span>
           </h3>
-          <p>Payment for this month was processed.</p>
+          <p>Payment for this month has been processed.</p>
           <va-additional-info
-            trigger={`${translateDateIntoMonthYearFormat(
-              awardBeginDate,
-            )} verification details`}
+            trigger={`
+              ${
+                awardBeginDate !== null
+                  ? translateDateIntoMonthYearFormat(awardBeginDate)
+                  : translateDateIntoMonthYearFormat(awardEndDate)
+              } verification details
+            `}
             class="vads-u-margin-bottom--4"
           >
             {month.map((monthAward, index) => {
               const { numberHours, monthlyRate } = monthAward;
               return (
-                <div key={monthAward.id}>
+                <div key={index}>
                   <p className="vads-u-font-weight--bold vads-u-margin--0">
                     {translateDatePeriod(
                       monthAward.awardBeginDate,
@@ -245,20 +283,16 @@ export const getGroupedPreviousEnrollments = month => {
                     <span className="vads-u-font-weight--bold">
                       Total Credit Hours:
                     </span>{' '}
-                    {numberHours}
+                    {numberHours === null ? 'Data unavailable' : numberHours}
                   </p>
                   <p className="vads-u-margin--0">
                     <span className="vads-u-font-weight--bold">
                       Monthly Rate:
                     </span>{' '}
-                    {formatCurrency(monthlyRate)}
+                    {monthlyRate === null
+                      ? 'Data unavailable'
+                      : formatCurrency(monthlyRate)}
                   </p>
-                  {/* <p className="vads-u-margin--0">
-                    <span className="vads-u-font-weight--bold">
-                      Payment Deposited on:
-                    </span>{' '}
-                    {translateDateIntoMonthDayYearFormat(paymentDate)}
-                  </p> */}
                   <div className="vads-u-font-style--italic vads-u-margin--0">
                     You verified on{' '}
                     {translateDateIntoMonthDayYearFormat(
@@ -277,11 +311,13 @@ export const getGroupedPreviousEnrollments = month => {
             })}
           </va-additional-info>
         </>
-      ) : PendingVerificationSubmitted ? (
+      ) : verifiedDate && !paymentDate ? (
         <>
           <h3 className="vads-u-font-size--h4 vads-u-display--flex vads-u-align-items--center">
             <span className="vads-u-display--inline-block ">
-              {translateDateIntoMonthYearFormat(awardBeginDate)}
+              {awardBeginDate !== null
+                ? translateDateIntoMonthYearFormat(awardBeginDate)
+                : translateDateIntoMonthYearFormat(awardEndDate)}
             </span>{' '}
             <va-icon
               icon="check_circle"
@@ -299,7 +335,7 @@ export const getGroupedPreviousEnrollments = month => {
             {month.map((monthAward, index) => {
               const { numberHours, monthlyRate } = monthAward;
               return (
-                <div>
+                <div key={index}>
                   <p className="vads-u-font-weight--bold vads-u-margin--0">
                     {translateDatePeriod(
                       monthAward.awardBeginDate,
@@ -310,18 +346,20 @@ export const getGroupedPreviousEnrollments = month => {
                     <span className="vads-u-font-weight--bold">
                       Total Credit Hours:
                     </span>{' '}
-                    {numberHours}
+                    {numberHours === null ? 'Data unavailable' : numberHours}
                   </p>
                   <p className="vads-u-margin--0">
                     <span className="vads-u-font-weight--bold">
                       Monthly Rate:
                     </span>{' '}
-                    {formatCurrency(monthlyRate)}
+                    {monthlyRate === null
+                      ? 'Data unavailable'
+                      : formatCurrency(monthlyRate)}
                   </p>
                   <div className="vads-u-font-style--italic vads-u-margin--0">
                     You verified on{' '}
                     {translateDateIntoMonthDayYearFormat(
-                      monthAward.PendingVerificationSubmitted,
+                      monthAward.verifiedDate,
                     )}
                   </div>
                   <div
@@ -337,11 +375,11 @@ export const getGroupedPreviousEnrollments = month => {
           </va-additional-info>
         </>
       ) : (
-        <div key={id}>
+        <>
           <h3 className="vads-u-font-size--h4">
             {translateDateIntoMonthYearFormat(awardBeginDate)}
           </h3>
-          <div key={id}>
+          <div>
             <va-alert
               background-only
               class="vads-u-margin-bottom--3"
@@ -352,106 +390,129 @@ export const getGroupedPreviousEnrollments = month => {
               visible="true"
               slim
             >
-              <p
-                key={`not-verified-${id}`}
-                className="vads-u-margin-y--0 text-color vads-u-font-family--sans"
-              >
+              <p className="vads-u-margin-y--0 text-color vads-u-font-family--sans">
                 This month has not yet been verified.
               </p>
             </va-alert>
           </div>
-        </div>
+        </>
       )}
     </div>
   );
 };
 
 export const getSignlePreviousEnrollments = awards => {
+  const myUUID = uuidv4();
+
   return (
-    <div className="vye-top-border" key={awards.id}>
-      {awards.verifiedDate && (
-        <>
-          <h3 className="vads-u-font-size--h4 vads-u-display--flex vads-u-align-items--center">
-            <span className="vads-u-display--inline-block ">
-              {translateDateIntoMonthYearFormat(awards.awardBeginDate)}
-            </span>{' '}
-            <va-icon
-              icon="check_circle"
-              class="icon-color"
-              aria-hidden="true"
-            />{' '}
-            <span className="vads-u-display--block">Verified</span>
-          </h3>
-          <p>Payment for this month has been processed.</p>
-          <va-additional-info
-            trigger={`${translateDateIntoMonthYearFormat(
-              awards.awardBeginDate,
-            )} verification details`}
-            class="vads-u-margin-bottom--4"
-          >
-            <p className="vads-u-font-weight--bold">
-              {translateDatePeriod(awards.awardBeginDate, awards.awardEndDate)}
-            </p>
-            <p>
-              <span className="vads-u-font-weight--bold">
-                Total Credit Hours:
+    <div className="vye-top-border" key={myUUID}>
+      {awards.verifiedDate &&
+        awards.paymentDate && (
+          <>
+            <h3 className="vads-u-font-size--h4 vads-u-display--flex vads-u-align-items--center">
+              <span className="vads-u-display--inline-block ">
+                {awards.awardBeginDate !== null
+                  ? translateDateIntoMonthYearFormat(awards.awardBeginDate)
+                  : translateDateIntoMonthYearFormat(awards.awardEndDate)}
               </span>{' '}
-              {awards.numberHours}
-            </p>
-            <p>
-              <span className="vads-u-font-weight--bold">Monthly Rate:</span>{' '}
-              {formatCurrency(awards.monthlyRate)}
-            </p>
-            <div className="vads-u-font-style--italic">
-              You verified on{' '}
-              {translateDateIntoMonthDayYearFormat(awards.verifiedDate)}
-            </div>
-          </va-additional-info>
-        </>
-      )}
-      {awards.PendingVerificationSubmitted && (
-        <>
-          <h3 className="vads-u-font-size--h4 vads-u-display--flex vads-u-align-items--center">
-            <span className="vads-u-display--inline-block ">
-              {translateDateIntoMonthYearFormat(awards.awardBeginDate)}
-            </span>{' '}
-            <va-icon
-              icon="check_circle"
-              class="icon-color"
-              aria-hidden="true"
-            />{' '}
-            <span className="vads-u-display--block">Verified</span>
-          </h3>
-          <va-additional-info
-            trigger={`${translateDateIntoMonthYearFormat(
-              awards.awardBeginDate,
-            )} verification details`}
-            class="vads-u-margin-bottom--4"
-          >
-            <p className="vads-u-font-weight--bold">
-              {translateDatePeriod(awards.awardBeginDate, awards.awardEndDate)}
-            </p>
-            <p>
-              <span className="vads-u-font-weight--bold">
-                Total Credit Hours:
+              <va-icon
+                icon="check_circle"
+                class="icon-color"
+                aria-hidden="true"
+              />{' '}
+              <span className="vads-u-display--block">Verified</span>
+            </h3>
+            <p>Payment for this month has been processed.</p>
+            <va-additional-info
+              trigger={`
+            ${
+              awards.awardBeginDate !== null
+                ? translateDateIntoMonthYearFormat(awards.awardBeginDate)
+                : translateDateIntoMonthYearFormat(awards.awardEndDate)
+            } verification details
+          `}
+              class="vads-u-margin-bottom--4"
+            >
+              <p className="vads-u-font-weight--bold">
+                {translateDatePeriod(
+                  awards.awardBeginDate,
+                  awards.awardEndDate,
+                )}
+              </p>
+              <p>
+                <span className="vads-u-font-weight--bold">
+                  Total Credit Hours:
+                </span>{' '}
+                {awards.numberHours === null
+                  ? 'Data unavailable'
+                  : awards.numberHours}
+              </p>
+              <p>
+                <span className="vads-u-font-weight--bold">Monthly Rate:</span>{' '}
+                {awards.monthlyRate === null
+                  ? 'Data unavailable'
+                  : formatCurrency(awards.monthlyRate)}
+              </p>
+              <div className="vads-u-font-style--italic">
+                You verified on{' '}
+                {translateDateIntoMonthDayYearFormat(awards.verifiedDate)}
+              </div>
+            </va-additional-info>
+          </>
+        )}
+      {awards.verifiedDate &&
+        !awards.paymentDate && (
+          <>
+            <h3 className="vads-u-font-size--h4 vads-u-display--flex vads-u-align-items--center">
+              <span className="vads-u-display--inline-block ">
+                {awards.awardBeginDate !== null
+                  ? translateDateIntoMonthYearFormat(awards.awardBeginDate)
+                  : translateDateIntoMonthYearFormat(awards.awardEndDate)}
               </span>{' '}
-              {awards.numberHours}
-            </p>
-            <p>
-              <span className="vads-u-font-weight--bold">Monthly Rate:</span>{' '}
-              {formatCurrency(awards.monthlyRate)}
-            </p>
-            <div className="vads-u-font-style--italic">
-              You verified on{' '}
-              {translateDateIntoMonthDayYearFormat(
-                awards.PendingVerificationSubmitted,
-              )}
-            </div>
-          </va-additional-info>
-        </>
-      )}
+              <va-icon
+                icon="check_circle"
+                class="icon-color"
+                aria-hidden="true"
+              />{' '}
+              <span className="vads-u-display--block">Verified</span>
+            </h3>
+            <va-additional-info
+              trigger={`${translateDateIntoMonthYearFormat(
+                awards.awardBeginDate,
+              )} verification details`}
+              class="vads-u-margin-bottom--4"
+            >
+              <p className="vads-u-font-weight--bold">
+                {translateDatePeriod(
+                  awards.awardBeginDate,
+                  awards.awardEndDate,
+                )}
+              </p>
+              <p>
+                <span className="vads-u-font-weight--bold">
+                  Total Credit Hours:
+                </span>{' '}
+                {awards.numberHours === null
+                  ? 'Data unavailable'
+                  : awards.numberHours}
+              </p>
+              <p>
+                <span className="vads-u-font-weight--bold">Monthly Rate:</span>{' '}
+                {awards.monthlyRate === null
+                  ? 'Data unavailable'
+                  : formatCurrency(awards.monthlyRate)}
+              </p>
+              <div className="vads-u-font-style--italic">
+                You verified on{' '}
+                {translateDateIntoMonthDayYearFormat(
+                  awards.PendingVerificationSubmitted,
+                )}
+              </div>
+            </va-additional-info>
+          </>
+        )}
       {!awards.verifiedDate &&
-        !awards.PendingVerificationSubmitted && (
+        !awards.paymentDate && (
           <>
             <h3 className="vads-u-font-size--h4">
               {translateDateIntoMonthYearFormat(awards.awardBeginDate)}
@@ -477,28 +538,30 @@ export const getSignlePreviousEnrollments = awards => {
 };
 
 export const combineEnrollmentsWithStartMonth = enrollmentPeriods => {
-  const trackEndDate = [];
-  const combineMonths = {};
+  const isArray = Array.isArray(enrollmentPeriods);
 
-  enrollmentPeriods.forEach(period => {
-    const tempMonthYear = translateDateIntoMonthYearFormat(
-      period.awardBeginDate,
-    );
-    if (trackEndDate.includes(tempMonthYear)) {
-      combineMonths[tempMonthYear].push({
-        id: period.id,
-        awardBeginDate: period.awardBeginDate,
-        awardEndDate: period.awardEndDate,
-        numberHours: period.numberHours,
-        monthlyRate: period.monthlyRate,
-        verifiedDate: period.verifiedDate,
-        PendingVerificationSubmitted: period.PendingVerificationSubmitted,
-        paymentDate: period.paymentDate,
-      });
-    } else {
-      trackEndDate.push(tempMonthYear);
-      combineMonths[tempMonthYear] = [
-        {
+  const trackDate = [];
+  const combineMonths = {};
+  const dateUnavailable = 'Date unavailable';
+
+  if (isArray) {
+    enrollmentPeriods.forEach(period => {
+      // if award begin date is null, assign value as Date unavailable
+      let tempMonthYear =
+        period.awardBeginDate !== null
+          ? translateDateIntoMonthYearFormat(period.awardBeginDate)
+          : dateUnavailable;
+
+      // if value is Date unavailable and there is an award end date, use the award end date instead
+      if (tempMonthYear === dateUnavailable) {
+        tempMonthYear =
+          period.awardEndDate !== null
+            ? translateDateIntoMonthYearFormat(period.awardEndDate)
+            : dateUnavailable;
+      }
+
+      if (trackDate.includes(tempMonthYear)) {
+        combineMonths[tempMonthYear].push({
           id: period.id,
           awardBeginDate: period.awardBeginDate,
           awardEndDate: period.awardEndDate,
@@ -507,11 +570,26 @@ export const combineEnrollmentsWithStartMonth = enrollmentPeriods => {
           verifiedDate: period.verifiedDate,
           PendingVerificationSubmitted: period.PendingVerificationSubmitted,
           paymentDate: period.paymentDate,
-        },
-      ];
-    }
-  });
-  return combineMonths;
+        });
+      } else {
+        trackDate.push(tempMonthYear);
+        combineMonths[tempMonthYear] = [
+          {
+            id: period.id,
+            awardBeginDate: period.awardBeginDate,
+            awardEndDate: period.awardEndDate,
+            numberHours: period.numberHours,
+            monthlyRate: period.monthlyRate,
+            verifiedDate: period.verifiedDate,
+            PendingVerificationSubmitted: period.PendingVerificationSubmitted,
+            paymentDate: period.paymentDate,
+          },
+        ];
+      }
+    });
+    return combineMonths;
+  }
+  return enrollmentPeriods;
 };
 
 export const isMobileDevice = () => {
diff --git a/src/applications/verify-your-enrollment/reducers/mockData.js b/src/applications/verify-your-enrollment/reducers/mockData.js
index b341afee6135..9cc87508ce9b 100644
--- a/src/applications/verify-your-enrollment/reducers/mockData.js
+++ b/src/applications/verify-your-enrollment/reducers/mockData.js
@@ -1,10 +1,12 @@
 // import _ from 'lodash';
-import { USER_MOCK_DATA } from '../constants/mockData';
+// import { USER_MOCK_DATA } from '../constants/mockData';
+import { UPDATED_USER_MOCK_DATA } from '../constants/mockData';
 
 import { UPDATE_PENDING_VERIFICATIONS, UPDATE_VERIFICATIONS } from '../actions';
 
 const INITIAL_STATE = {
-  mockData: USER_MOCK_DATA,
+  // mockData: USER_MOCK_DATA,
+  mockData: UPDATED_USER_MOCK_DATA,
 };
 
 const mockData = (state = INITIAL_STATE, action) => {
diff --git a/src/applications/verify-your-enrollment/tests/components/PeriodsToVerify.unit.spec.js b/src/applications/verify-your-enrollment/tests/components/PeriodsToVerify.unit.spec.js
index 3ecc2a1234f5..9c44dd4fef01 100644
--- a/src/applications/verify-your-enrollment/tests/components/PeriodsToVerify.unit.spec.js
+++ b/src/applications/verify-your-enrollment/tests/components/PeriodsToVerify.unit.spec.js
@@ -5,14 +5,14 @@ import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { mount, shallow } from 'enzyme';
 import { waitFor } from '@testing-library/react';
-import { USER_MOCK_DATA } from '../../constants/mockData';
+import { UPDATED_USER_MOCK_DATA } from '../../constants/mockData';
 import PeriodsToVerify from '../../components/PeriodsToVerify';
 
 const mockStore = configureMockStore();
 const initialState = {
   getDataReducer: {
     data: {
-      ...USER_MOCK_DATA,
+      ...UPDATED_USER_MOCK_DATA,
     },
   },
   personalInfo: {
@@ -105,13 +105,11 @@ describe('<PeriodsToVerify />', () => {
     expect(alert).to.have.lengthOf(0);
     wrapper.unmount();
   });
-  it('should renders VerifiedSuccessStatement when there is no awardIds', () => {
+  it('should render VerifiedSuccessStatement when there are no pending verifications', () => {
     const props = {
       enrollmentData: {
         'vye::UserInfo': {
-          pendingVerifications: {
-            awardIds: [],
-          },
+          pendingVerifications: [],
         },
       },
       isUserLoggedIn: false,
@@ -134,9 +132,7 @@ describe('<PeriodsToVerify />', () => {
     const props = {
       enrollmentData: {
         'vye::UserInfo': {
-          pendingVerifications: {
-            awardIds: [],
-          },
+          pendingVerifications: [],
         },
       },
       isUserLoggedIn: false,
@@ -180,14 +176,7 @@ describe('<PeriodsToVerify />', () => {
   });
   it('renders the pending enrollments when there are awards and pending verifications', () => {
     const props = {
-      enrollmentData: {
-        'vye::UserInfo': {
-          awards: [{ id: '1', name: 'Award1' }],
-          pendingVerifications: {
-            awardIds: [28, 29, 30],
-          },
-        },
-      },
+      enrollmentData: UPDATED_USER_MOCK_DATA,
       isUserLoggedIn: false,
       link: () => {},
       toggleEnrollmentSuccess: false,
diff --git a/src/applications/verify-your-enrollment/tests/components/PreviousEnrollmentVerifications.unit.spec.js b/src/applications/verify-your-enrollment/tests/components/PreviousEnrollmentVerifications.unit.spec.js
index 35bf5bf56ffb..ac2d0352db9d 100644
--- a/src/applications/verify-your-enrollment/tests/components/PreviousEnrollmentVerifications.unit.spec.js
+++ b/src/applications/verify-your-enrollment/tests/components/PreviousEnrollmentVerifications.unit.spec.js
@@ -3,8 +3,8 @@ import { expect } from 'chai';
 import { mount } from 'enzyme';
 import { render, cleanup, waitFor } from '@testing-library/react';
 import {
-  USER_MOCK_DATA,
-  USER_PENDINGVERIFICATION_MOCK_DATA,
+  UPDATED_USER_MOCK_DATA,
+  PAGINATION_USER_MOCK_DATA,
 } from '../../constants/mockData';
 import PreviousEnrollmentVerifications from '../../components/PreviousEnrollmentVerifications';
 
@@ -15,46 +15,36 @@ describe('PreviousEnrollmentVerifications', () => {
 
   it('should render', () => {
     const { container } = render(
-      <PreviousEnrollmentVerifications enrollmentData={USER_MOCK_DATA} />,
+      <PreviousEnrollmentVerifications
+        enrollmentData={UPDATED_USER_MOCK_DATA}
+      />,
     );
     expect(container).to.be.ok;
   });
 
   it('should render with mock enrollment data', async () => {
     const { getByText } = render(
-      <PreviousEnrollmentVerifications enrollmentData={USER_MOCK_DATA} />,
+      <PreviousEnrollmentVerifications
+        enrollmentData={UPDATED_USER_MOCK_DATA}
+      />,
     );
 
     // added to hopefully address flaky test issues
     // test should wait for data to laod before assertion
     await waitFor(() => {
       // testing block that hasn't been verified
-      expect(getByText('January 2025')).to.exist;
-      // testing blovk that has been verified
-      expect(getByText('September 2024')).to.exist;
+      expect(getByText('March 2024')).to.exist;
+      // testing block that has been verified
+      expect(getByText('May 2020')).to.exist;
     });
   });
 
-  it('should render with mock enrollment data with pending verified data', async () => {
+  it('Ensure text from "What if I notice..." additional info component is displayed', async () => {
     const { getByText } = render(
       <PreviousEnrollmentVerifications
-        enrollmentData={USER_PENDINGVERIFICATION_MOCK_DATA}
+        enrollmentData={UPDATED_USER_MOCK_DATA}
       />,
     );
-    // added to hopefully address flaky test issues
-    // test should wait for data to laod before assertion
-    await waitFor(() => {
-      // testing block that has been verified but still pending processing
-      expect(getByText('February 2025')).to.exist;
-      // testing blovk that has been verified
-      expect(getByText('September 2024')).to.exist;
-    });
-  });
-
-  it('Ensure text from "What if I notice..." additional info component is displayed', async () => {
-    const { getByText } = render(
-      <PreviousEnrollmentVerifications enrollmentData={USER_MOCK_DATA} />,
-    );
     await waitFor(() => {
       const additionalInfoText =
         'Work with your School Certifying Official (SCO) to make sure they have the correct enrollment information and can update the information on file.';
@@ -64,7 +54,9 @@ describe('PreviousEnrollmentVerifications', () => {
 
   it('simulates page change in VaPagination to page 2', async () => {
     const wrapper = mount(
-      <PreviousEnrollmentVerifications enrollmentData={USER_MOCK_DATA} />,
+      <PreviousEnrollmentVerifications
+        enrollmentData={PAGINATION_USER_MOCK_DATA}
+      />,
     );
 
     const newPage = 2;
@@ -85,7 +77,7 @@ describe('PreviousEnrollmentVerifications', () => {
       const textContent = pElement.text();
 
       expect(textContent).to.equal(
-        'Showing 7-12 of 14 monthly enrollments listed by most recent',
+        'Showing 7-12 of 16 monthly enrollments listed by most recent',
       );
     });
     wrapper.unmount();
@@ -93,7 +85,9 @@ describe('PreviousEnrollmentVerifications', () => {
 
   it('simulates page change in VaPagination to last page', async () => {
     const wrapper = mount(
-      <PreviousEnrollmentVerifications enrollmentData={USER_MOCK_DATA} />,
+      <PreviousEnrollmentVerifications
+        enrollmentData={PAGINATION_USER_MOCK_DATA}
+      />,
     );
 
     const newPage = 3;
@@ -114,7 +108,7 @@ describe('PreviousEnrollmentVerifications', () => {
       const textContent = pElement.text();
 
       expect(textContent).to.equal(
-        'Showing 13-14 of 14 monthly enrollments listed by most recent',
+        'Showing 13-16 of 16 monthly enrollments listed by most recent',
       );
     });
 
diff --git a/src/applications/verify-your-enrollment/tests/e2e/enrollment-verification.cypress.spec.js b/src/applications/verify-your-enrollment/tests/e2e/enrollment-verification.cypress.spec.js
index 0577cafcbd57..7173f47f44db 100644
--- a/src/applications/verify-your-enrollment/tests/e2e/enrollment-verification.cypress.spec.js
+++ b/src/applications/verify-your-enrollment/tests/e2e/enrollment-verification.cypress.spec.js
@@ -104,7 +104,7 @@ describe('Enrollment Verification Page Tests', () => {
   });
   it("should  have focus around 'Showing x-y of z monthly enrollments listed by most recent' when pagination button is clicked", () => {
     cy.injectAxeThenAxeCheck();
-    cy.get('a[class="usa-pagination__button usa-current"]').click();
-    cy.get('[id="vye-pagination-page-status-text"]').focused();
+    cy.get('a[aria-label="page 1, first page"]').click();
+    cy.get('[id="vye-pagination-page-status-text"]').should('be.focused');
   });
 });
diff --git a/src/applications/verify-your-enrollment/tests/helpers/getPeriodsToVerify.unit.spec.js b/src/applications/verify-your-enrollment/tests/helpers/getPeriodsToVerify.unit.spec.js
index 0fc784b4d726..43860fe847f0 100644
--- a/src/applications/verify-your-enrollment/tests/helpers/getPeriodsToVerify.unit.spec.js
+++ b/src/applications/verify-your-enrollment/tests/helpers/getPeriodsToVerify.unit.spec.js
@@ -3,30 +3,40 @@ import { expect } from 'chai';
 import { shallow } from 'enzyme';
 import { getPeriodsToVerify } from '../../helpers';
 
+const pendingVerifications = [
+  {
+    awardId: '00001',
+    awardBeginDate: '2024-03-01',
+    awardEndDate: '2024-03-24',
+    numberHours: 10,
+    monthlyRate: 600.0,
+    caseTrace: 'CASE 1b',
+  },
+  {
+    awardId: '00002',
+    awardBeginDate: '2024-03-25',
+    awardEndDate: '2024-03-31',
+    numberHours: 12,
+    monthlyRate: 1400.0,
+    caseTrace: 'CASE 7',
+  },
+  {
+    awardId: '00003',
+    awardBeginDate: '2024-02-05',
+    awardEndDate: '2024-02-31',
+    numberHours: 12,
+    monthlyRate: 1400.0,
+    caseTrace: 'CASE 7',
+  },
+];
+
 describe('getPeriodsToVerify', () => {
   it('should return the correct JSX for each pending enrollment', () => {
-    const pendingEnrollments = [
-      {
-        id: 1,
-        awardBeginDate: '2022-01-01',
-        awardEndDate: '2022-01-31',
-        numberHours: 10,
-        monthlyRate: 100,
-      },
-      {
-        id: 2,
-        awardBeginDate: '2022-02-01',
-        awardEndDate: '2022-02-28',
-        numberHours: 20,
-        monthlyRate: 200,
-      },
-    ];
-
     const wrapper = shallow(
-      <div>{getPeriodsToVerify(pendingEnrollments, true)}</div>,
+      <div>{getPeriodsToVerify(pendingVerifications, true)}</div>,
     );
     const div = wrapper.find('div').at(1);
-    expect(div.key()).to.equal('Enrollment-to-be-verified-2');
+    expect(div.key()).to.include('Enrollment-to-be-verified');
     expect(div.prop('className')).to.include(
       'vads-u-margin-y--2 vye-left-border',
     );
@@ -35,30 +45,13 @@ describe('getPeriodsToVerify', () => {
         .find('div')
         .at(2)
         .key(),
-    ).to.equal('Enrollment-to-be-verified-1');
+    ).to.include('Enrollment-to-be-verified');
 
     wrapper.unmount();
   });
   it('should return just vads-u-margin-y--2 class in no review', () => {
-    const pendingEnrollments = [
-      {
-        id: 1,
-        awardBeginDate: '2022-01-01',
-        awardEndDate: '2022-01-31',
-        numberHours: 10,
-        monthlyRate: 100,
-      },
-      {
-        id: 2,
-        awardBeginDate: '2022-02-01',
-        awardEndDate: '2022-02-28',
-        numberHours: 20,
-        monthlyRate: 200,
-      },
-    ];
-
     const wrapper = shallow(
-      <div>{getPeriodsToVerify(pendingEnrollments)}</div>,
+      <div>{getPeriodsToVerify(pendingVerifications)}</div>,
     );
     const div = wrapper.find('div').at(1);
     expect(div.prop('className')).to.include('vads-u-margin-y--2');