From 1f379d4ea2f186a39ce54bfc0c95d0182944ef87 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:13:33 +0200
Subject: [PATCH] Improve error handling

---
 .../services/exchange-rate-data.service.ts    |  4 ++--
 .../app/pages/admin/admin-page.component.ts   | 22 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/api/src/services/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data.service.ts
index ee63e6729..9f14a6396 100644
--- a/apps/api/src/services/exchange-rate-data.service.ts
+++ b/apps/api/src/services/exchange-rate-data.service.ts
@@ -58,8 +58,8 @@ export class ExchangeRateDataService {
       if (!this.currencies[pair]) {
         // Not found, calculate indirectly via USD
         this.currencies[pair] =
-          resultExtended[`${currency1}${Currency.USD}`][date].marketPrice *
-          resultExtended[`${Currency.USD}${currency2}`][date].marketPrice;
+          resultExtended[`${currency1}${Currency.USD}`]?.[date]?.marketPrice *
+          resultExtended[`${Currency.USD}${currency2}`]?.[date]?.marketPrice;
 
         // Calculate the opposite direction
         this.currencies[`${currency2}${currency1}`] = 1 / this.currencies[pair];
diff --git a/apps/client/src/app/pages/admin/admin-page.component.ts b/apps/client/src/app/pages/admin/admin-page.component.ts
index 4c543cf9b..de2c163df 100644
--- a/apps/client/src/app/pages/admin/admin-page.component.ts
+++ b/apps/client/src/app/pages/admin/admin-page.component.ts
@@ -97,16 +97,20 @@ export class AdminPageComponent implements OnInit {
   }
 
   public formatDistanceToNow(aDateString: string) {
-    const distanceString = formatDistanceToNow(
-      sub(parseISO(aDateString), { seconds: 10 }),
-      {
-        addSuffix: true
-      }
-    );
+    if (aDateString) {
+      const distanceString = formatDistanceToNow(
+        sub(parseISO(aDateString), { seconds: 10 }),
+        {
+          addSuffix: true
+        }
+      );
+
+      return distanceString === 'less than a minute ago'
+        ? 'just now'
+        : distanceString;
+    }
 
-    return distanceString === 'less than a minute ago'
-      ? 'just now'
-      : distanceString;
+    return '';
   }
 
   public ngOnDestroy() {