+ ${name}
${this.hass.user!.is_admin
? html`
diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index cab1b8b652..6893279f1a 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -143,6 +143,10 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
`;
}
+ const name = this._config.show_name
+ ? this._config.name || (stateObj ? computeStateName(stateObj) : "")
+ : "";
+
return html`
-
- `;
}
+ const name = entityConf.name ?? computeStateName(stateObj);
+
return html`
- ${this._config.name || computeStateName(stateObj)}
-
+ ${name}
- ${this._config.name || computeStateName(stateObj)}
-
+ ${name}
`;
}
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 40bfc833b8..fd1528c329 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -278,6 +278,8 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
${this._config!.show_name
- ? html`
-
- ${"name" in entityConf
- ? entityConf.name
- : computeStateName(stateObj)}
-
- `
+ ? html` ${name}
`
: ""}
${this._config!.show_icon
? html`
diff --git a/src/panels/lovelace/cards/hui-humidifier-card.ts b/src/panels/lovelace/cards/hui-humidifier-card.ts
index 1c418a259b..b1337abf0a 100644
--- a/src/panels/lovelace/cards/hui-humidifier-card.ts
+++ b/src/panels/lovelace/cards/hui-humidifier-card.ts
@@ -173,7 +173,7 @@ export class HuiHumidifierCard extends LitElement implements LovelaceCard {