From 1d15f81b6c5721f54fae598bc61bd4d65c42c3c9 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Tue, 10 Jan 2023 18:28:07 +0100
Subject: [PATCH] Fixes moon badge icon (#15015)

---
 src/components/entity/ha-state-label-badge.ts | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts
index c51309ccfb..155294ef75 100644
--- a/src/components/entity/ha-state-label-badge.ts
+++ b/src/components/entity/ha-state-label-badge.ts
@@ -22,6 +22,7 @@ import {
   isNumericState,
 } from "../../common/number/format_number";
 import { isUnavailableState, UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import { EntityRegistryEntry } from "../../data/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
 import { HomeAssistant } from "../../types";
 import "../ha-label-badge";
@@ -103,8 +104,10 @@ export class HaStateLabelBadge extends LitElement {
     // 4. Icon determined via entity state
     // 5. Value string as fallback
     const domain = computeStateDomain(entityState);
+    const entry = this.hass?.entities[entityState.entity_id];
 
-    const showIcon = this.icon || this._computeShowIcon(domain, entityState);
+    const showIcon =
+      this.icon || this._computeShowIcon(domain, entityState, entry);
     const image = this.icon
       ? ""
       : this.image
@@ -112,7 +115,9 @@ export class HaStateLabelBadge extends LitElement {
       : entityState.attributes.entity_picture_local ||
         entityState.attributes.entity_picture;
     const value =
-      !image && !showIcon ? this._computeValue(domain, entityState) : undefined;
+      !image && !showIcon
+        ? this._computeValue(domain, entityState, entry)
+        : undefined;
 
     return html`
       <ha-label-badge
@@ -152,7 +157,11 @@ export class HaStateLabelBadge extends LitElement {
     }
   }
 
-  private _computeValue(domain: string, entityState: HassEntity) {
+  private _computeValue(
+    domain: string,
+    entityState: HassEntity,
+    entry?: EntityRegistryEntry
+  ) {
     switch (domain) {
       case "alarm_control_panel":
       case "binary_sensor":
@@ -165,7 +174,7 @@ export class HaStateLabelBadge extends LitElement {
         return null;
       // @ts-expect-error we don't break and go to default
       case "sensor":
-        if (entityState.attributes.device_class === "moon__phase") {
+        if (entry?.platform === "moon") {
           return null;
         }
       // eslint-disable-next-line: disable=no-fallthrough
@@ -188,7 +197,11 @@ export class HaStateLabelBadge extends LitElement {
     }
   }
 
-  private _computeShowIcon(domain: string, entityState: HassEntity): boolean {
+  private _computeShowIcon(
+    domain: string,
+    entityState: HassEntity,
+    entry?: EntityRegistryEntry
+  ): boolean {
     if (entityState.state === UNAVAILABLE) {
       return false;
     }
@@ -204,7 +217,7 @@ export class HaStateLabelBadge extends LitElement {
       case "timer":
         return true;
       case "sensor":
-        return entityState.attributes.device_class === "moon__phase";
+        return entry?.platform === "moon";
       default:
         return false;
     }