Fix charging text in secondary_info field #54

maxwroc · May 19, 2020 · 7ff86de · 7ff86de
1 parent 40a1770
commit 7ff86de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "battery-state-card",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Battery State card for Home Assistant",
   "main": "dist/battery-state-card.js",
   "repository": {

diff --git a/src/battery-vm.ts b/src/battery-vm.ts
@@ -289,8 +289,12 @@ class BatteryViewModel {
      */
     private setSecondaryInfo(hass: HomeAssistant, entityData: HassEntity): string {
         if (this.config.secondary_info) {
-            if (this.config.secondary_info == "charging" && this.charging) {
-                return this.config.charging_state?.secondary_info_text || "Charging"; // todo: think about i18n
+            if (this.config.secondary_info == "charging") {
+                if (this.charging) {
+                    return this.config.charging_state?.secondary_info_text || "Charging"; // todo: think about i18n
+                }
+
+                return <any>null;
             }
             else {
                 const val = (<any>entityData)[this.config.secondary_info] || entityData.attributes[this.config.secondary_info] || this.config.secondary_info;

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,7 +1,7 @@
 import { HomeAssistant } from "./ha-types";
 
 console.info(
-    "%c BATTERY-STATE-CARD %c 1.3.1",
+    "%c BATTERY-STATE-CARD %c 1.3.2",
     "color: white; background: forestgreen; font-weight: 700;",
     "color: forestgreen; background: white; font-weight: 700;",
 );