From 2ef1c9632532c25a924b7a9e56cdb04e733e19a9 Mon Sep 17 00:00:00 2001
From: Arie Catsman <120491684+catsmanac@users.noreply.github.com>
Date: Sun, 8 Sep 2024 11:56:23 +0200
Subject: [PATCH] Include all enphase_envoy devices in
 async_remove_config_entry_device (#124533)

* Include all enphase_envoy devices in async_remove_config_entry_device

* refactor if tests
---
 homeassistant/components/enphase_envoy/__init__.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/enphase_envoy/__init__.py b/homeassistant/components/enphase_envoy/__init__.py
index f6438230789..ba590fa0337 100644
--- a/homeassistant/components/enphase_envoy/__init__.py
+++ b/homeassistant/components/enphase_envoy/__init__.py
@@ -60,8 +60,16 @@ async def async_remove_config_entry_device(
     envoy_serial_num = config_entry.unique_id
     if envoy_serial_num in dev_ids:
         return False
-    if envoy_data and envoy_data.inverters:
-        for inverter in envoy_data.inverters:
-            if str(inverter) in dev_ids:
+    if envoy_data:
+        if envoy_data.inverters:
+            for inverter in envoy_data.inverters:
+                if str(inverter) in dev_ids:
+                    return False
+        if envoy_data.encharge_inventory:
+            for encharge in envoy_data.encharge_inventory:
+                if str(encharge) in dev_ids:
+                    return False
+        if envoy_data.enpower:
+            if str(envoy_data.enpower.serial_number) in dev_ids:
                 return False
     return True