From 3dc3a1a6e42192e7632a6b4ba82a14cf70153731 Mon Sep 17 00:00:00 2001
From: Paul Orffer <paul.orffer@gmail.com>
Date: Sat, 11 Jan 2025 12:20:53 +0200
Subject: [PATCH] fix: logic when using custom grid icons

---
 package.json              | 2 +-
 src/cards/compact-card.ts | 4 ++--
 src/cards/full-card.ts    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 46631499..a1b83c8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sunsynk-power-flow-card",
-  "version": "6.2.1",
+  "version": "6.2.2",
   "description": "A customizable Home Assistant card to emulate the Sunsynk System flow that's displayed on the Inverter screen.",
   "main": "sunsynk-power-flow-card.js",
   "scripts": {
diff --git a/src/cards/compact-card.ts b/src/cards/compact-card.ts
index f8164925..19838b96 100644
--- a/src/cards/compact-card.ts
+++ b/src/cards/compact-card.ts
@@ -1419,7 +1419,7 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                         ${config.grid?.navigate
                                 ? svg`
                                     <a href="#" @click=${(e) => Utils.handleNavigation(e, config.grid.navigate)}>
-                                        <g display="${config.show_grid || config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon ? '' : 'none'}">
+                                        <g display="${config.show_grid && (config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon) ? '' : 'none'}">
                                             <foreignObject x="-0.5" y="187.5" width="70" height="70">
                                                 <div xmlns="http://www.w3.org/1999/xhtml" style="position: fixed; width: 70px; height: 70px;">
                                                     <ha-icon icon="${data.customGridIcon}" class="grid-icon"></ha-icon>
@@ -1429,7 +1429,7 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                                     </a>`
                                 : svg`
                                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.grid_connected_status_194)}>
-                                        <g display="${config.show_grid || config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon ? '' : 'none'}">
+                                        <g display="${config.show_grid && (config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon) ? '' : 'none'}">
                                             <foreignObject x="-0.5" y="187.5" width="70" height="70">
                                                 <div xmlns="http://www.w3.org/1999/xhtml" style="position: fixed; width: 70px; height: 70px;">
                                                     <ha-icon icon="${data.customGridIcon}" class="grid-icon"></ha-icon>
diff --git a/src/cards/full-card.ts b/src/cards/full-card.ts
index 4a60f1df..d52939d4 100644
--- a/src/cards/full-card.ts
+++ b/src/cards/full-card.ts
@@ -1361,7 +1361,7 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                         ${config.grid?.navigate
                             ? svg`
                                 <a href="#" @click=${(e) => Utils.handleNavigation(e, config.grid.navigate)}>
-                                    <g display="${config.show_grid || config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon ? '' : 'none'}">
+                                    <g display="${config.show_grid && (config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon) ? '' : 'none'}">
                                         <foreignObject x="${config.inverter.three_phase ? '404' : '389'}" 
                                                     y="${config.inverter.three_phase ? '339' : '308'}" 
                                                     width="${config.inverter.three_phase ? '34' : '65'}" 
@@ -1375,7 +1375,7 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                                 </a>`
                             : svg`
                                 <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.grid_connected_status_194)}>
-                                    <g display="${config.show_grid || config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon ? '' : 'none'}">
+                                    <g display="${config.show_grid && (config.grid.import_icon || config.grid.disconnected_icon || config.grid.export_icon) ? '' : 'none'}">
                                         <foreignObject x="${config.inverter.three_phase ? '404' : '389'}" 
                                                     y="${config.inverter.three_phase ? '339' : '308'}" 
                                                     width="${config.inverter.three_phase ? '34' : '65'}"