From e89e92e25c55b8a9709cc6dae4c5cf15b4f86148 Mon Sep 17 00:00:00 2001
From: Bill Thornton <billt2006@gmail.com>
Date: Sat, 26 Feb 2022 01:56:41 -0500
Subject: [PATCH] Fix minor issues with card padder icons

---
 src/components/cardbuilder/cardBuilder.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index 197e0efca..a7dceee54 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -1354,8 +1354,13 @@ import ServerConnections from '../ServerConnections';
 
             let cardPadderIcon = '';
 
-            if (imgUrl) {
-                cardPadderIcon = getDefaultText(item, options);
+            // TV Channel logos are transparent so skip the placeholder to avoid overlapping
+            if (imgUrl && item.Type !== 'TvChannel') {
+                cardPadderIcon = getDefaultText(item, {
+                    ...options,
+                    // Always use an icon
+                    defaultCardImageIcon: 'folder'
+                });
             }
 
             cardImageContainerOpen = `<div class="${cardBoxClass}"><div class="${cardScalableClass}"><div class="cardPadder cardPadder-${shape}">${cardPadderIcon}</div>${cardImageContainerOpen}`;
@@ -1514,6 +1519,8 @@ import ServerConnections from '../ServerConnections';
                 case 'Episode':
                 case 'Series':
                     return '<span class="cardImageIcon material-icons tv" aria-hidden="true"></span>';
+                case 'Program':
+                    return '<span class="cardImageIcon material-icons live_tv" aria-hidden="true"></span>';
                 case 'Book':
                     return '<span class="cardImageIcon material-icons book" aria-hidden="true"></span>';
                 case 'Folder':
@@ -1526,7 +1533,7 @@ import ServerConnections from '../ServerConnections';
                     return '<span class="cardImageIcon material-icons photo_album" aria-hidden="true"></span>';
             }
 
-            if (options && options.defaultCardImageIcon) {
+            if (options?.defaultCardImageIcon) {
                 return '<span class="cardImageIcon material-icons ' + options.defaultCardImageIcon + '" aria-hidden="true"></span>';
             }