Update after merge conflict

department-of-veterans-affairs · Jan 7, 2025 · a380b63 · a380b63
1 parent 3d353f9
commit a380b63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/applications/vaos/referral-appointments/components/ReferralTaskCardWithReferral.jsx b/src/applications/vaos/referral-appointments/components/ReferralTaskCardWithReferral.jsx
@@ -7,6 +7,9 @@ import ReferralTaskCard from './ReferralTaskCard';
 import { FETCH_STATUS } from '../../utils/constants';
 
 const isExpired = referral => {
+  if (!referral?.ReferralExpirationDate) {
+    return false;
+  }
   const expirationDate = referral.ReferralExpirationDate;
   const now = new Date();
   const expiration = new Date(expirationDate);

diff --git a/src/applications/vaos/referral-appointments/utils/referrals.js b/src/applications/vaos/referral-appointments/utils/referrals.js
@@ -95,8 +95,8 @@ const createReferrals = (
     referrals.push(
       createReferral(
         referralDate,
-        providerIds[i % providerIds.length],
         `${uuidBase}${i.toString().padStart(2, '0')}`,
+        providerIds[i % providerIds.length],
         isExpired ? format(addDays(startDate, 6), mydFormat) : undefined,
       ),
     );