From 2944044a4a84293cce6e21390eb33b1b39baa63e Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Fri, 24 Nov 2023 23:51:52 +0100
Subject: [PATCH] fix template icons without <I></I>

---
 .../rootfs/usr/bin/mqtt-manager/ha_cards.py          |  2 +-
 .../rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py
index 98a308d1..27a9c3ed 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/ha_cards.py
@@ -18,7 +18,7 @@ class HAEntity(panel_cards.Entity):
 
         if self.icon_overwrite and self.icon_overwrite.startswith("ha:"):
             #icon_char = libs.home_assistant.render_template(self.icon_overwrite[3:])
-            self.icon_overwrite = ha_template.render(self.icon_overwrite[3:])
+            self.icon_overwrite = ha_template.render(self.icon_overwrite)
 
         if self.etype in ["delete", "navigate", "iText"]:
             out = super().render()
diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py
index b6398634..a291fd4d 100644
--- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py
+++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py
@@ -6904,16 +6904,14 @@ icons = {
 def get_icon_id(ma_name):
     if isinstance(ma_name, re.Match):
         ma_name = ma_name.group(0).replace('<I>', '').replace('</I>', '')
-        print(f"testxxxx  {ma_name}")
 
     if "text:" in ma_name:
         return ma_name.replace("text:", "")
-    if "<I>" in ma_name and "</I>" in ma_name:
-        print(f"testdddd  {ma_name}")
-        if isinstance(ma_name, str):
-            ma_name = re.sub(r'<I>.+?<\/I>', get_icon_id, ma_name)
-            print(f"test123d  {ma_name}")
-        return ma_name
+    if "ha:" in ma_name:
+        if "<I>" in ma_name and "</I>" in ma_name:
+            if isinstance(ma_name, str):
+                ma_name = re.sub(r'<I>.+?<\/I>', get_icon_id, ma_name)
+        return ma_name.replace("ha:", "")
 
     ma_name = ma_name.replace("mdi:", "")
     if ma_name in icons: