From e63578d8cefd9da756fa5285e43a260ea7838e68 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 5 Jun 2022 19:00:45 +0200
Subject: [PATCH] Feature/add guards to local comparison (#986)

* Add guards

* Improve labels
---
 apps/api/src/app/portfolio/portfolio-calculator.ts            | 4 ++--
 .../src/lib/activities-filter/activities-filter.component.ts  | 4 ++--
 .../src/lib/activities-table/activities-table.component.html  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.ts
index 555ad1cab..f117a9a5c 100644
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@@ -56,7 +56,7 @@ export class PortfolioCalculator {
     this.currentRateService = currentRateService;
     this.orders = orders;
 
-    this.orders.sort((a, b) => a.date.localeCompare(b.date));
+    this.orders.sort((a, b) => a.date?.localeCompare(b.date));
   }
 
   public computeTransactionPoints() {
@@ -125,7 +125,7 @@ export class PortfolioCalculator {
         (transactionPointItem) => transactionPointItem.symbol !== order.symbol
       );
       newItems.push(currentTransactionPointItem);
-      newItems.sort((a, b) => a.symbol.localeCompare(b.symbol));
+      newItems.sort((a, b) => a.symbol?.localeCompare(b.symbol));
       if (lastDate !== currentDate || lastTransactionPoint === null) {
         lastTransactionPoint = {
           date: currentDate,
diff --git a/libs/ui/src/lib/activities-filter/activities-filter.component.ts b/libs/ui/src/lib/activities-filter/activities-filter.component.ts
index 2be3f8a49..5085f2205 100644
--- a/libs/ui/src/lib/activities-filter/activities-filter.component.ts
+++ b/libs/ui/src/lib/activities-filter/activities-filter.component.ts
@@ -126,7 +126,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
 
           return filter;
         })
-        .sort((a, b) => a.label.localeCompare(b.label)),
+        .sort((a, b) => a.label?.localeCompare(b.label)),
       (filter) => {
         return filter.type;
       }
@@ -142,7 +142,7 @@ export class ActivitiesFilterComponent implements OnChanges, OnDestroy {
     }
 
     return filterGroups
-      .sort((a, b) => a.name.localeCompare(b.name))
+      .sort((a, b) => a.name?.localeCompare(b.name))
       .map((filterGroup) => {
         return {
           ...filterGroup,
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 60948d60d..af0a810cc 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -322,7 +322,7 @@
             (click)="onImport()"
           >
             <ion-icon class="mr-2" name="cloud-upload-outline"></ion-icon>
-            <span i18n>Import</span>
+            <span i18n>Import Activities</span>
           </button>
           <button
             *ngIf="hasPermissionToExportActivities"
@@ -332,7 +332,7 @@
             (click)="onExport()"
           >
             <ion-icon class="mr-2" name="cloud-download-outline"></ion-icon>
-            <span i18n>Export</span>
+            <span i18n>Export Activities</span>
           </button>
           <button
             *ngIf="hasPermissionToExportActivities"