From 5803ab68c27eae27ce13a9f0bec0fde526f56039 Mon Sep 17 00:00:00 2001
From: Simon Lamon <32477463+silamon@users.noreply.github.com>
Date: Mon, 17 Mar 2025 22:07:27 +0100
Subject: [PATCH] Fix energy units (#24672)

---
 src/data/energy.ts                                  | 13 +++++--------
 src/panels/energy/ha-panel-energy.ts                | 11 +++++------
 .../cards/energy/hui-energy-distribution-card.ts    |  6 +++---
 .../cards/energy/hui-energy-gas-graph-card.ts       |  8 +++++---
 .../cards/energy/hui-energy-sources-table-card.ts   | 10 ++++++----
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/data/energy.ts b/src/data/energy.ts
index 7b5ea204da..ff7000e962 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -765,16 +765,13 @@ export const getEnergyGasUnit = (
   hass: HomeAssistant,
   prefs: EnergyPreferences,
   statisticsMetaData: Record<string, StatisticsMetaData> = {}
-): string | undefined => {
+): string => {
   const unitClass = getEnergyGasUnitClass(prefs, undefined, statisticsMetaData);
-  if (unitClass === undefined) {
-    return undefined;
+  if (unitClass === "energy") {
+    return "kWh";
   }
-  return unitClass === "energy"
-    ? "kWh"
-    : hass.config.unit_system.length === "km"
-      ? "m³"
-      : "ft³";
+
+  return hass.config.unit_system.length === "km" ? "m³" : "ft³";
 };
 
 export const getEnergyWaterUnit = (hass: HomeAssistant): string =>
diff --git a/src/panels/energy/ha-panel-energy.ts b/src/panels/energy/ha-panel-energy.ts
index f8f15aeb49..7bf69dbc23 100644
--- a/src/panels/energy/ha-panel-energy.ts
+++ b/src/panels/energy/ha-panel-energy.ts
@@ -150,12 +150,11 @@ class PanelEnergy extends LitElement {
       return;
     }
 
-    const gasUnit =
-      getEnergyGasUnit(
-        this.hass,
-        energyData.prefs,
-        energyData.state.statsMetadata
-      ) || "";
+    const gasUnit = getEnergyGasUnit(
+      this.hass,
+      energyData.prefs,
+      energyData.state.statsMetadata
+    );
     const waterUnit = getEnergyWaterUnit(this.hass);
     const electricUnit = "kWh";
 
diff --git a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
index 54fb147c27..b45ac3a4c5 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
@@ -353,7 +353,7 @@ class HuiEnergyDistrubutionCard
                           this.hass,
                           prefs,
                           this._data.statsMetadata
-                        ) || "m³"}
+                        )}
                       </div>
                       <svg width="80" height="30">
                         <path d="M40 0 v30" id="gas" />
@@ -386,7 +386,7 @@ class HuiEnergyDistrubutionCard
                           ${formatNumber(waterUsage || 0, this.hass.locale, {
                             maximumFractionDigits: 1,
                           })}
-                          ${getEnergyWaterUnit(this.hass) || "m³"}
+                          ${getEnergyWaterUnit(this.hass)}
                         </div>
                         <svg width="80" height="30">
                           <path d="M40 0 v30" id="water" />
@@ -606,7 +606,7 @@ class HuiEnergyDistrubutionCard
                         ${formatNumber(waterUsage || 0, this.hass.locale, {
                           maximumFractionDigits: 1,
                         })}
-                        ${getEnergyWaterUnit(this.hass) || "m³"}
+                        ${getEnergyWaterUnit(this.hass)}
                       </div>
                       <span class="label"
                         >${this.hass.localize(
diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
index 6612a58c8f..df572710be 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
@@ -163,9 +163,11 @@ export class HuiEnergyGasGraphCard
         (source) => source.type === "gas"
       ) as GasSourceTypeEnergyPreference[];
 
-    this._unit =
-      getEnergyGasUnit(this.hass, energyData.prefs, energyData.statsMetadata) ||
-      "m³";
+    this._unit = getEnergyGasUnit(
+      this.hass,
+      energyData.prefs,
+      energyData.statsMetadata
+    );
 
     const datasets: BarSeriesOption[] = [];
 
diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
index 59722c4527..8cdf9633cd 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
@@ -134,11 +134,13 @@ export class HuiEnergySourcesTableCard
           flow.stat_cost || flow.entity_energy_price || flow.number_energy_price
       );
 
-    const gasUnit =
-      getEnergyGasUnit(this.hass, this._data.prefs, this._data.statsMetadata) ||
-      "";
+    const gasUnit = getEnergyGasUnit(
+      this.hass,
+      this._data.prefs,
+      this._data.statsMetadata
+    );
 
-    const waterUnit = getEnergyWaterUnit(this.hass) || "m³";
+    const waterUnit = getEnergyWaterUnit(this.hass);
 
     const compare = this._data.statsCompare !== undefined;