From 3d8281fb7349f7e69ba491273c6825104fdb1676 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:05:34 +0100
Subject: [PATCH] fix: guard against null `expirationDate`

fix: NaN age
---
 .../src/pages/Transactions/DetailsCard.js     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index e33ca0a7..73051ac8 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -116,16 +116,27 @@ const DetailsRow = ({ it: tx, timezone }) => {
   const exchangeRate = BigNumber(fiat / crypto).toFormat(2)
   const displayExRate = `1 ${tx.cryptoCode} = ${exchangeRate} ${tx.fiatCode}`
 
+  const parseDateString = d => parse(new Date(), 'yyyyMMdd', d)
+
   const customer = tx.customerIdCardData && {
     name: `${onlyFirstToUpper(
       tx.customerIdCardData.firstName
     )} ${onlyFirstToUpper(tx.customerIdCardData.lastName)}`,
-    age: differenceInYears(tx.customerIdCardData.dateOfBirth, new Date()),
+    age:
+      (tx.customerIdCardData.dateOfBirth &&
+        differenceInYears(
+          parseDateString(tx.customerIdCardData.dateOfBirth),
+          new Date()
+        )) ??
+      '',
     country: tx.customerIdCardData.country,
     idCardNumber: tx.customerIdCardData.documentNumber,
-    idCardExpirationDate: format('yyyy-MM-dd')(
-      parse(new Date(), 'yyyyMMdd', tx.customerIdCardData.expirationDate)
-    )
+    idCardExpirationDate:
+      (tx.customerIdCardData.expirationDate &&
+        format('yyyy-MM-dd')(
+          parseDateString(tx.customerIdCardData.expirationDate)
+        )) ??
+      ''
   }
 
   const from = sub({ minutes: MINUTES_OFFSET }, tx.created)