From 0d88e6eba2c47d157fc877fd5e47e7e77886b7e4 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Thu, 13 Jan 2022 18:25:33 +0100
Subject: [PATCH 1/3] fix: date parsing

---
 new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index 334ee3a5..e33ca0a7 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -1,7 +1,7 @@
 import { useLazyQuery, useMutation } from '@apollo/react-hooks'
 import { makeStyles, Box } from '@material-ui/core'
 import BigNumber from 'bignumber.js'
-import { add, differenceInYears, format, sub } from 'date-fns/fp'
+import { add, differenceInYears, format, sub, parse } from 'date-fns/fp'
 import FileSaver from 'file-saver'
 import gql from 'graphql-tag'
 import JSZip from 'jszip'
@@ -123,9 +123,8 @@ const DetailsRow = ({ it: tx, timezone }) => {
     age: differenceInYears(tx.customerIdCardData.dateOfBirth, new Date()),
     country: tx.customerIdCardData.country,
     idCardNumber: tx.customerIdCardData.documentNumber,
-    idCardExpirationDate: format(
-      'dd-MM-yyyy',
-      tx.customerIdCardData.expirationDate
+    idCardExpirationDate: format('yyyy-MM-dd')(
+      parse(new Date(), 'yyyyMMdd', tx.customerIdCardData.expirationDate)
     )
   }
 

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 2/3] 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)

From e89b1c233a6cec9891eaca0efb50e1bbb3ed6263 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:11:18 +0100
Subject: [PATCH 3/3] chore: eta reduction

---
 new-lamassu-admin/src/pages/Transactions/DetailsCard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index 73051ac8..c960a3ee 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -116,7 +116,7 @@ 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 parseDateString = parse(new Date(), 'yyyyMMdd')
 
   const customer = tx.customerIdCardData && {
     name: `${onlyFirstToUpper(