From e8422e2c29227ab629ada52605356d622aa38f94 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Sat, 9 Mar 2024 03:41:33 +0300
Subject: [PATCH 1/4] Remove escapeHTML

---
 src/components/cardbuilder/Card/cardHelper.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/cardbuilder/Card/cardHelper.ts b/src/components/cardbuilder/Card/cardHelper.ts
index ab40841073..4c28220540 100644
--- a/src/components/cardbuilder/Card/cardHelper.ts
+++ b/src/components/cardbuilder/Card/cardHelper.ts
@@ -6,7 +6,6 @@ import {
 } from '@jellyfin/sdk/lib/generated-client';
 import { Api } from '@jellyfin/sdk';
 import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
-import escapeHTML from 'escape-html';
 
 import { appRouter } from 'components/router/appRouter';
 import layoutManager from 'components/layoutManager';
@@ -78,15 +77,11 @@ export function getTextActionButton(
     text?: NullableString,
     serverId?: NullableString
 ): TextLine {
-    if (!text) {
-        text = itemHelper.getDisplayName(item);
-    }
-
-    text = escapeHTML(text);
+    const title = text || itemHelper.getDisplayName(item);
 
     if (layoutManager.tv) {
         return {
-            title: text
+            title
         };
     }
 
@@ -108,7 +103,7 @@ export function getTextActionButton(
     return {
         titleAction: {
             url,
-            title: text,
+            title,
             dataAttributes
         }
     };

From 8197e012a757237d99ee91f807d262f9bc7fd90d Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Sat, 9 Mar 2024 03:52:17 +0300
Subject: [PATCH 2/4] Uses an Image component to display the logo image

---
 src/components/cardbuilder/Card/CardFooterText.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/cardbuilder/Card/CardFooterText.tsx b/src/components/cardbuilder/Card/CardFooterText.tsx
index 9dae59b8f6..0d2f07423d 100644
--- a/src/components/cardbuilder/Card/CardFooterText.tsx
+++ b/src/components/cardbuilder/Card/CardFooterText.tsx
@@ -5,6 +5,7 @@ import layoutManager from 'components/layoutManager';
 import MoreVertIconButton from '../../common/MoreVertIconButton';
 import type { ItemDto } from 'types/base/models/item-dto';
 import type { CardOptions } from 'types/cardOptions';
+import Image from 'components/common/Image';
 
 const shouldShowDetailsMenu = (
     cardOptions: CardOptions,
@@ -23,9 +24,14 @@ interface LogoComponentProps {
     logoUrl: string;
 }
 
-const LogoComponent: FC<LogoComponentProps> = ({ logoUrl }) => {
-    return <Box className='lazy cardFooterLogo' data-src={logoUrl} />;
-};
+const LogoComponent: FC<LogoComponentProps> = ({ logoUrl }) => (
+    <Box className='cardFooterLogo'>
+        <Image
+            imgUrl={logoUrl}
+            containImage={true}
+        />
+    </Box>
+);
 
 interface CardFooterTextProps {
     item: ItemDto;
@@ -51,7 +57,7 @@ const CardFooterText: FC<CardFooterTextProps> = ({
     isOuterFooter
 }) => {
     const { cardTextLines } = useCardText({
-        item,
+        item: item.ProgramInfo || item,
         cardOptions,
         forceName,
         imgUrl,

From ca7e5338bda68de1355d0f781e3c5da20153ea98 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Sat, 9 Mar 2024 04:06:32 +0300
Subject: [PATCH 3/4] Replace '&nbsp;' with '\u00A0'

---
 src/components/cardbuilder/Card/cardHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/cardbuilder/Card/cardHelper.ts b/src/components/cardbuilder/Card/cardHelper.ts
index 4c28220540..78af3b0ff9 100644
--- a/src/components/cardbuilder/Card/cardHelper.ts
+++ b/src/components/cardbuilder/Card/cardHelper.ts
@@ -505,7 +505,7 @@ function getChannelName(item: ItemDto) {
             item.ChannelName
         );
     } else {
-        return { title: item.ChannelName || '' || '&nbsp;' };
+        return { title: item.ChannelName || '\u00A0' };
     }
 }
 

From 2d1efc06824ebf8849013d918758bddefeb16295 Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero@yahoo.com>
Date: Mon, 18 Mar 2024 21:20:42 +0300
Subject: [PATCH 4/4] apply suggestion

Co-authored-by: Bill Thornton <thornbill@users.noreply.github.com>
---
 src/components/cardbuilder/Card/CardFooterText.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/cardbuilder/Card/CardFooterText.tsx b/src/components/cardbuilder/Card/CardFooterText.tsx
index 0d2f07423d..934aa5c8a7 100644
--- a/src/components/cardbuilder/Card/CardFooterText.tsx
+++ b/src/components/cardbuilder/Card/CardFooterText.tsx
@@ -28,7 +28,7 @@ const LogoComponent: FC<LogoComponentProps> = ({ logoUrl }) => (
     <Box className='cardFooterLogo'>
         <Image
             imgUrl={logoUrl}
-            containImage={true}
+            containImage
         />
     </Box>
 );