From 0a4e70dc12fa2848e116b288a093b9a6c9f43b9b Mon Sep 17 00:00:00 2001
From: Amandee Ellawala <amamandee.manushika.e@gmail.com>
Date: Thu, 7 Nov 2024 15:34:00 +0000
Subject: [PATCH] Fix edge cases in client side

---
 libs/ui/src/lib/assistant/assistant.component.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index 520eb1087..e189e4eb6 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -340,11 +340,11 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
         type: 'TAG'
       },
       {
-        id: this.filterForm.get('holdings').value.dataSource,
+        id: this.filterForm.get('holdings').value?.dataSource,
         type: 'DATA_SOURCE'
       },
       {
-        id: this.filterForm.get('holdings').value.symbol,
+        id: this.filterForm.get('holdings').value?.symbol,
         type: 'SYMBOL'
       }
     ]);
@@ -488,7 +488,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
 
   public holdingComparisonFunction(option, value): boolean {
     return (
-      option.dataSource === value.dataSource && option.symbol === value.symbol
+      option.dataSource === value?.dataSource && option.symbol === value?.symbol
     );
   }
 
@@ -515,7 +515,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       (h) => h.dataSource === dataSource && h.symbol === symbol
     );
 
-    const holding = selectedHolding[0];
+    const holding = selectedHolding[0] ?? null;
 
     this.filterForm.setValue(
       {