From b460e6ec200cbf6d5b6f535d51f01ee4e3229c09 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Tue, 1 Apr 2025 17:20:00 +0200
Subject: [PATCH] Fix null issue when searching in popup (#732)

---
 .../src/entrypoints/popup/pages/CredentialsList.tsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx b/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx
index d01ac870c..ba5acdb99 100644
--- a/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx
+++ b/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx
@@ -107,8 +107,8 @@ const CredentialsList: React.FC = () => {
   const filteredCredentials = credentials.filter(cred => {
     const searchLower = searchTerm.toLowerCase();
     return (
-      cred.ServiceName.toLowerCase().includes(searchLower) ||
-      cred.Username.toLowerCase().includes(searchLower) ||
+      cred.ServiceName?.toLowerCase().includes(searchLower) ||
+      cred.Username?.toLowerCase().includes(searchLower) ||
       (cred.Email?.toLowerCase().includes(searchLower))
     );
   });