From 5523cd6203e61e53b182129fc69b8980a34940b9 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:44:17 -0500
Subject: [PATCH] Fix a bug in energy batteryToGrid calculation (#19958)

---
 .../lovelace/cards/energy/hui-energy-distribution-card.ts   | 2 +-
 .../cards/energy/hui-energy-self-sufficiency-gauge-card.ts  | 2 +-
 .../lovelace/cards/energy/hui-energy-usage-graph-card.ts    | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

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 3a75287d23..534775bc5f 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
@@ -177,7 +177,7 @@ class HuiEnergyDistrubutionCard
       if (hasBattery) {
         batteryFromGrid = solarConsumption * -1;
         if (batteryFromGrid > totalFromGrid) {
-          batteryToGrid = Math.min(0, batteryFromGrid - totalFromGrid);
+          batteryToGrid = batteryFromGrid - totalFromGrid;
           batteryFromGrid = totalFromGrid;
         }
       }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-self-sufficiency-gauge-card.ts b/src/panels/lovelace/cards/energy/hui-energy-self-sufficiency-gauge-card.ts
index e39450c4ff..1b5a1bb8b0 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-self-sufficiency-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-self-sufficiency-gauge-card.ts
@@ -150,7 +150,7 @@ class HuiEnergySelfSufficiencyGaugeCard
       if (hasBattery) {
         batteryFromGrid = solarConsumption * -1;
         if (batteryFromGrid > totalFromGrid) {
-          batteryToGrid = Math.min(0, batteryFromGrid - totalFromGrid);
+          batteryToGrid = batteryFromGrid - totalFromGrid;
           batteryFromGrid = totalFromGrid;
         }
       }
diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
index 7b7c45db80..4cdd7eb1b0 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
@@ -434,10 +434,8 @@ export class HuiEnergyUsageGraphCard
           if (summedData.to_battery) {
             grid_to_battery[start] = used_solar[start] * -1;
             if (grid_to_battery[start] > (summedData.from_grid?.[start] || 0)) {
-              battery_to_grid[start] = Math.min(
-                0,
-                grid_to_battery[start] - (summedData.from_grid?.[start] || 0)
-              );
+              battery_to_grid[start] =
+                grid_to_battery[start] - (summedData.from_grid?.[start] || 0);
               grid_to_battery[start] = summedData.from_grid?.[start];
             }
           }