From 62ee1fbc647ae683eb94080d9506ed3295ea471e Mon Sep 17 00:00:00 2001
From: Manu <4445816+tr4nt0r@users.noreply.github.com>
Date: Tue, 29 Jul 2025 08:55:32 +0200
Subject: [PATCH] Remove unnecessary CONF_NAME usage in Habitica integration
 (#149595)

---
 homeassistant/components/habitica/config_flow.py | 2 --
 homeassistant/components/habitica/coordinator.py | 7 -------
 homeassistant/components/habitica/entity.py      | 4 ++--
 tests/components/habitica/test_config_flow.py    | 5 -----
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/homeassistant/components/habitica/config_flow.py b/homeassistant/components/habitica/config_flow.py
index 91a13bd7918..65d9be1bb7c 100644
--- a/homeassistant/components/habitica/config_flow.py
+++ b/homeassistant/components/habitica/config_flow.py
@@ -164,7 +164,6 @@ class HabiticaConfigFlow(ConfigFlow, domain=DOMAIN):
                     data={
                         CONF_API_USER: str(login.id),
                         CONF_API_KEY: login.apiToken,
-                        CONF_NAME: user.profile.name,  # needed for api_call action
                         CONF_URL: DEFAULT_URL,
                         CONF_VERIFY_SSL: True,
                     },
@@ -200,7 +199,6 @@ class HabiticaConfigFlow(ConfigFlow, domain=DOMAIN):
                     data={
                         **user_input,
                         CONF_URL: user_input.get(CONF_URL, DEFAULT_URL),
-                        CONF_NAME: user.profile.name,  # needed for api_call action
                     },
                 )
 
diff --git a/homeassistant/components/habitica/coordinator.py b/homeassistant/components/habitica/coordinator.py
index d0eb60312b4..b25edc7ceaf 100644
--- a/homeassistant/components/habitica/coordinator.py
+++ b/homeassistant/components/habitica/coordinator.py
@@ -23,7 +23,6 @@ from habiticalib import (
 )
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import (
     ConfigEntryAuthFailed,
@@ -106,12 +105,6 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
                 translation_placeholders={"reason": str(e)},
             ) from e
 
-        if not self.config_entry.data.get(CONF_NAME):
-            self.hass.config_entries.async_update_entry(
-                self.config_entry,
-                data={**self.config_entry.data, CONF_NAME: user.data.profile.name},
-            )
-
     async def _async_update_data(self) -> HabiticaData:
         try:
             user = (await self.habitica.get_user()).data
diff --git a/homeassistant/components/habitica/entity.py b/homeassistant/components/habitica/entity.py
index 692ea5e5ac1..6d320f93517 100644
--- a/homeassistant/components/habitica/entity.py
+++ b/homeassistant/components/habitica/entity.py
@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 
 from yarl import URL
 
-from homeassistant.const import CONF_NAME, CONF_URL
+from homeassistant.const import CONF_URL
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -37,7 +37,7 @@ class HabiticaBase(CoordinatorEntity[HabiticaDataUpdateCoordinator]):
             entry_type=DeviceEntryType.SERVICE,
             manufacturer=MANUFACTURER,
             model=NAME,
-            name=coordinator.config_entry.data[CONF_NAME],
+            name=coordinator.data.user.profile.name,
             configuration_url=(
                 URL(coordinator.config_entry.data[CONF_URL])
                 / "profile"
diff --git a/tests/components/habitica/test_config_flow.py b/tests/components/habitica/test_config_flow.py
index 5ec998ec82e..63001157695 100644
--- a/tests/components/habitica/test_config_flow.py
+++ b/tests/components/habitica/test_config_flow.py
@@ -16,7 +16,6 @@ from homeassistant.components.habitica.const import (
 from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import (
     CONF_API_KEY,
-    CONF_NAME,
     CONF_PASSWORD,
     CONF_URL,
     CONF_USERNAME,
@@ -96,7 +95,6 @@ async def test_form_login(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> N
         CONF_API_USER: TEST_API_USER,
         CONF_API_KEY: TEST_API_KEY,
         CONF_URL: DEFAULT_URL,
-        CONF_NAME: "test-user",
         CONF_VERIFY_SSL: True,
     }
     assert result["result"].unique_id == TEST_API_USER
@@ -151,7 +149,6 @@ async def test_form_login_errors(
         CONF_API_USER: TEST_API_USER,
         CONF_API_KEY: TEST_API_KEY,
         CONF_URL: DEFAULT_URL,
-        CONF_NAME: "test-user",
         CONF_VERIFY_SSL: True,
     }
     assert result["result"].unique_id == TEST_API_USER
@@ -219,7 +216,6 @@ async def test_form_advanced(hass: HomeAssistant, mock_setup_entry: AsyncMock) -
         CONF_API_USER: TEST_API_USER,
         CONF_API_KEY: TEST_API_KEY,
         CONF_URL: DEFAULT_URL,
-        CONF_NAME: "test-user",
         CONF_VERIFY_SSL: True,
     }
     assert result["result"].unique_id == TEST_API_USER
@@ -275,7 +271,6 @@ async def test_form_advanced_errors(
         CONF_API_USER: TEST_API_USER,
         CONF_API_KEY: TEST_API_KEY,
         CONF_URL: DEFAULT_URL,
-        CONF_NAME: "test-user",
         CONF_VERIFY_SSL: True,
     }
     assert result["result"].unique_id == TEST_API_USER