From eda58e3f2277898145c0f5c74ef4c02ff7d0d7dd Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Sat, 3 May 2025 20:44:01 +0200
Subject: [PATCH] UI: fix CO2 format (#21032)

---
 assets/js/components/Energyflow/Energyflow.vue | 5 ++---
 assets/js/mixins/formatter.ts                  | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/assets/js/components/Energyflow/Energyflow.vue b/assets/js/components/Energyflow/Energyflow.vue
index b0142bfd1..254e9f465 100644
--- a/assets/js/components/Energyflow/Energyflow.vue
+++ b/assets/js/components/Energyflow/Energyflow.vue
@@ -527,12 +527,11 @@ export default defineComponent({
 			return this.fmtPricePerKWh(value, this.currency, true);
 		},
 		forecastFmt(value: number) {
-			if (value === null) {
-				return "";
-			}
+			if (typeof value !== "number") return "";
 			return `${this.fmtWh(value, POWER_UNIT.KW)}`;
 		},
 		kw(watt: number) {
+			if (typeof watt !== "number") return "";
 			return this.fmtW(watt, this.powerUnit);
 		},
 		toggleDetails() {
diff --git a/assets/js/mixins/formatter.ts b/assets/js/mixins/formatter.ts
index 6bcdece49..250f22738 100644
--- a/assets/js/mixins/formatter.ts
+++ b/assets/js/mixins/formatter.ts
@@ -96,13 +96,13 @@ export default defineComponent({
 				maximumFractionDigits: 0,
 			}).format(value);
 		},
-		fmtCo2Short(gramms?: number) {
-			return gramms ? `${this.fmtNumber(gramms, 0)} g` : "?";
+		fmtCo2Short(gramms = 0) {
+			return `${this.fmtNumber(gramms, 0)} g`;
 		},
-		fmtCo2Medium(gramms: number) {
+		fmtCo2Medium(gramms = 0) {
 			return `${this.fmtNumber(gramms, 0)} g/kWh`;
 		},
-		fmtCo2Long(gramms: number) {
+		fmtCo2Long(gramms = 0) {
 			return `${this.fmtNumber(gramms, 0)} gCO₂e/kWh`;
 		},
 		fmtNumberToLocale(val: number, pad = 0) {