From 8768304ec57ee3ac4c92499c119c9c9d32521e69 Mon Sep 17 00:00:00 2001
From: Mat Strange <mat@matstrange.net>
Date: Sat, 9 May 2020 20:30:44 +0100
Subject: [PATCH] Returned to no label on disarm/trigger as before

---
 src/panels/lovelace/cards/hui-alarm-panel-card.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
index fe829448cf..64001e5e62 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
@@ -170,7 +170,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
         <ha-label-badge
           class="${classMap({ [stateObj.state]: true })}"
           .icon="${ICONS[stateObj.state] || "hass:shield-outline"}"
-          .label="${this._stateDisplay(stateObj.state)}"
+          .label="${this._stateIconLabel(stateObj.state)}"
           @click=${this._handleMoreInfo}
         ></ha-label-badge>
         <div id="armActions" class="actions">
@@ -225,6 +225,15 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
     `;
   }
 
+  private _stateIconLabel(state: string): string {
+    const stateLabel = state.split("_").pop();
+    return stateLabel === "disarmed" ||
+      stateLabel === "triggered" ||
+      !stateLabel
+      ? ""
+      : this._stateDisplay(state);
+  }
+
   private _actionDisplay(state: string): string {
     return this.hass!.localize(`ui.card.alarm_control_panel.${state}`);
   }