From 77a09ab1d33b729dbb77de277f6ca6ded88b6993 Mon Sep 17 00:00:00 2001
From: Trevor North <trevor@bugsnag.com>
Date: Thu, 5 Oct 2023 10:24:25 +0100
Subject: [PATCH 1/3] Leverage entity state formatting added in 2023.9 a

---
 src/template.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/template.ts b/src/template.ts
index 91fabf7..72d0211 100644
--- a/src/template.ts
+++ b/src/template.ts
@@ -13,9 +13,13 @@ export function renderTemplateObject(template, hass) {
   if (!state) return;
 
   if (template.attribute) {
-    state = state.attributes[template.attribute];
+    state = hass.formatEntityAttributeValue
+      ? hass.formatEntityAttributeValue(state, template.attribute)
+      : state.attributes[template.attribute];
   } else {
-    state = state.state;
+    state = hass.formatEntityState
+      ? hass.formatEntityState(state)
+      : state.state;
   }
 
   let result = (template.prefix || "") + state + (template.postfix || "");

From a8c66f8bb69eb9819c3ce04a6e8b0d5429b51f63 Mon Sep 17 00:00:00 2001
From: Trevor North <trevor@bugsnag.com>
Date: Thu, 5 Oct 2023 10:25:37 +0100
Subject: [PATCH 2/3] Use ha-state-icon to ensure correct icon for all domains

custom-card-helpers domainIcon does not provide complete coverage.
---
 src/main.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 24a6bd3..ba53bf3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,7 +3,6 @@ import {
   ActionHandlerEvent,
   HomeAssistant,
   computeDomain,
-  stateIcon,
 } from "custom-card-helpers";
 import deepmerge from "deepmerge";
 import { HassEntity } from "home-assistant-js-websocket";
@@ -320,9 +319,7 @@ export class PaperButtonsRow extends LitElement {
   renderIcon(config: ButtonConfig, style: StyleInfo, entity?: HassEntity) {
     const icon =
       config.icon !== false && (config.icon || config.entity)
-        ? computeStateIcon(config) ||
-          config.icon ||
-          (entity && stateIcon(entity))
+        ? computeStateIcon(config) || config.icon
         : false;
 
     return config.image
@@ -332,8 +329,12 @@ export class PaperButtonsRow extends LitElement {
           style="${styleMap(style)}"
           alt="icon"
         />`
-      : icon
-      ? html` <ha-icon style="${styleMap(style)}" .icon="${icon}" />`
+      : icon || entity
+      ? html` <ha-state-icon
+          style="${styleMap(style)}"
+          .state="${entity}"
+          .icon="${icon}"
+        />`
       : "";
   }
 

From d70c169af3af3719ddf704d1459c125261aefaa9 Mon Sep 17 00:00:00 2001
From: Trevor North <trevor@freedisc.co.uk>
Date: Fri, 9 Feb 2024 08:10:28 +0000
Subject: [PATCH 3/3] 2024.2 compat

---
 src/main.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index ba53bf3..4948375 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -332,7 +332,9 @@ export class PaperButtonsRow extends LitElement {
       : icon || entity
       ? html` <ha-state-icon
           style="${styleMap(style)}"
-          .state="${entity}"
+          .hass=${this.hass}
+          .stateObj=${entity}
+          .state=${entity}
           .icon="${icon}"
         />`
       : "";