From 9db5b481be9aabf528ed95f7d940901b78a8bf82 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Thu, 26 Sep 2024 13:22:09 -0500
Subject: [PATCH] Fix ESPHome and VoIP Assist satellite entity names (#126229)

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
---
 homeassistant/components/esphome/strings.json     |  5 +++++
 homeassistant/components/voip/assist_satellite.py |  3 ++-
 homeassistant/components/voip/strings.json        | 10 ----------
 tests/components/esphome/test_assist_satellite.py |  1 +
 tests/components/voip/test_voip.py                |  1 +
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 026b2bd0690..ec7e6f674b3 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -59,6 +59,11 @@
     }
   },
   "entity": {
+    "assist_satellite": {
+      "assist_satellite": {
+        "name": "[%key:component::assist_satellite::entity_component::_::name%]"
+      }
+    },
     "binary_sensor": {
       "assist_in_progress": {
         "name": "[%key:component::assist_pipeline::entity::binary_sensor::assist_in_progress::name%]"
diff --git a/homeassistant/components/voip/assist_satellite.py b/homeassistant/components/voip/assist_satellite.py
index 6eb1aee209f..5e32585775c 100644
--- a/homeassistant/components/voip/assist_satellite.py
+++ b/homeassistant/components/voip/assist_satellite.py
@@ -21,6 +21,7 @@ from homeassistant.components.assist_satellite import (
     AssistSatelliteEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import EntityCategory
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -79,7 +80,7 @@ class VoipAssistSatellite(VoIPEntity, AssistSatelliteEntity, RtpDatagramProtocol
 
     entity_description = AssistSatelliteEntityDescription(key="assist_satellite")
     _attr_translation_key = "assist_satellite"
-    _attr_has_entity_name = True
+    _attr_entity_category = EntityCategory.CONFIG
     _attr_name = None
 
     def __init__(
diff --git a/homeassistant/components/voip/strings.json b/homeassistant/components/voip/strings.json
index 9da7cf7d534..c25c22f3f80 100644
--- a/homeassistant/components/voip/strings.json
+++ b/homeassistant/components/voip/strings.json
@@ -10,16 +10,6 @@
     }
   },
   "entity": {
-    "assist_satellite": {
-      "assist_satellite": {
-        "state": {
-          "listening_wake_word": "[%key:component::assist_satellite::entity_component::_::state::listening_wake_word%]",
-          "listening_command": "[%key:component::assist_satellite::entity_component::_::state::listening_command%]",
-          "responding": "[%key:component::assist_satellite::entity_component::_::state::responding%]",
-          "processing": "[%key:component::assist_satellite::entity_component::_::state::processing%]"
-        }
-      }
-    },
     "binary_sensor": {
       "call_in_progress": {
         "name": "Call in progress"
diff --git a/tests/components/esphome/test_assist_satellite.py b/tests/components/esphome/test_assist_satellite.py
index cfa25489013..43ca3c0a341 100644
--- a/tests/components/esphome/test_assist_satellite.py
+++ b/tests/components/esphome/test_assist_satellite.py
@@ -61,6 +61,7 @@ def get_satellite_entity(
     )
     if satellite_entity_id is None:
         return None
+    assert satellite_entity_id.endswith("_assist_satellite")
 
     component: EntityComponent[AssistSatelliteEntity] = hass.data[
         assist_satellite.DOMAIN
diff --git a/tests/components/voip/test_voip.py b/tests/components/voip/test_voip.py
index cf5148e8ba0..a0e032b65cb 100644
--- a/tests/components/voip/test_voip.py
+++ b/tests/components/voip/test_voip.py
@@ -57,6 +57,7 @@ def async_get_satellite_entity(
     )
     if satellite_entity_id is None:
         return None
+    assert not satellite_entity_id.endswith("none")
 
     component: EntityComponent[AssistSatelliteEntity] = hass.data[
         assist_satellite.DOMAIN