diff --git a/homeassistant/components/samsungtv/entity.py b/homeassistant/components/samsungtv/entity.py index 2b6373efc24..dbfd7c44730 100644 --- a/homeassistant/components/samsungtv/entity.py +++ b/homeassistant/components/samsungtv/entity.py @@ -1,8 +1,6 @@ """Base SamsungTV Entity.""" from __future__ import annotations -from typing import cast - from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_MAC, CONF_MODEL, CONF_NAME from homeassistant.helpers import device_registry as dr @@ -16,17 +14,16 @@ from .const import CONF_MANUFACTURER, DOMAIN class SamsungTVEntity(Entity): """Defines a base SamsungTV entity.""" + _attr_has_entity_name = True + def __init__(self, *, bridge: SamsungTVBridge, config_entry: ConfigEntry) -> None: """Initialize the SamsungTV entity.""" self._bridge = bridge self._mac = config_entry.data.get(CONF_MAC) - self._attr_name = config_entry.data.get(CONF_NAME) # Fallback for legacy models that doesn't have a API to retrieve MAC or SerialNumber self._attr_unique_id = config_entry.unique_id or config_entry.entry_id self._attr_device_info = DeviceInfo( - # Instead of setting the device name to the entity name, samsungtv - # should be updated to set has_entity_name = True - name=cast(str | None, self.name), + name=config_entry.data.get(CONF_NAME), manufacturer=config_entry.data.get(CONF_MANUFACTURER), model=config_entry.data.get(CONF_MODEL), ) diff --git a/homeassistant/components/samsungtv/media_player.py b/homeassistant/components/samsungtv/media_player.py index 87174b13dd6..14589274da6 100644 --- a/homeassistant/components/samsungtv/media_player.py +++ b/homeassistant/components/samsungtv/media_player.py @@ -72,6 +72,7 @@ class SamsungTVDevice(SamsungTVEntity, MediaPlayerEntity): """Representation of a Samsung TV.""" _attr_source_list: list[str] + _attr_name = None _attr_device_class = MediaPlayerDeviceClass.TV def __init__( diff --git a/homeassistant/components/samsungtv/remote.py b/homeassistant/components/samsungtv/remote.py index 22857d96659..bbe65d2ac82 100644 --- a/homeassistant/components/samsungtv/remote.py +++ b/homeassistant/components/samsungtv/remote.py @@ -24,6 +24,7 @@ async def async_setup_entry( class SamsungTVRemote(SamsungTVEntity, RemoteEntity): """Device that sends commands to a SamsungTV.""" + _attr_name = None _attr_should_poll = False async def async_turn_off(self, **kwargs: Any) -> None: diff --git a/tests/components/samsungtv/snapshots/test_init.ambr b/tests/components/samsungtv/snapshots/test_init.ambr index f8b11bd864a..25d8edb15ac 100644 --- a/tests/components/samsungtv/snapshots/test_init.ambr +++ b/tests/components/samsungtv/snapshots/test_init.ambr @@ -36,7 +36,7 @@ 'domain': 'media_player', 'entity_category': None, 'entity_id': 'media_player.any', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -45,7 +45,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'any', + 'original_name': None, 'platform': 'samsungtv', 'supported_features': , 'translation_key': None,