From a65ad37c8bbfae31f0da27cc5813f0ab0cb5386a Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Wed, 18 Oct 2023 14:27:37 +0200
Subject: [PATCH] Change config entry title to Picnic (#102221)

---
 homeassistant/components/picnic/config_flow.py | 2 +-
 homeassistant/components/picnic/sensor.py      | 2 --
 tests/components/picnic/test_config_flow.py    | 2 +-
 tests/components/picnic/test_sensor.py         | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/picnic/config_flow.py b/homeassistant/components/picnic/config_flow.py
index 904b68e3d32..65ae201482a 100644
--- a/homeassistant/components/picnic/config_flow.py
+++ b/homeassistant/components/picnic/config_flow.py
@@ -107,7 +107,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             # Abort if we're adding a new config and the unique id is already in use, else create the entry
             if self.source != SOURCE_REAUTH:
                 self._abort_if_unique_id_configured()
-                return self.async_create_entry(title=info["title"], data=data)
+                return self.async_create_entry(title="Picnic", data=data)
 
             # In case of re-auth, only continue if an exiting account exists with the same unique id
             if existing_entry:
diff --git a/homeassistant/components/picnic/sensor.py b/homeassistant/components/picnic/sensor.py
index 6e35c27bbfb..fb4e756b1be 100644
--- a/homeassistant/components/picnic/sensor.py
+++ b/homeassistant/components/picnic/sensor.py
@@ -24,7 +24,6 @@ from homeassistant.helpers.update_coordinator import (
 from homeassistant.util import dt as dt_util
 
 from .const import (
-    ADDRESS,
     ATTRIBUTION,
     CONF_COORDINATOR,
     DOMAIN,
@@ -263,7 +262,6 @@ class PicnicSensor(SensorEntity, CoordinatorEntity):
             identifiers={(DOMAIN, cast(str, config_entry.unique_id))},
             manufacturer="Picnic",
             model=config_entry.unique_id,
-            name=f"Picnic: {coordinator.data[ADDRESS]}",
         )
 
     @property
diff --git a/tests/components/picnic/test_config_flow.py b/tests/components/picnic/test_config_flow.py
index 95ff762ef72..a649240bd21 100644
--- a/tests/components/picnic/test_config_flow.py
+++ b/tests/components/picnic/test_config_flow.py
@@ -59,7 +59,7 @@ async def test_form(hass: HomeAssistant, picnic_api) -> None:
         await hass.async_block_till_done()
 
     assert result2["type"] == "create_entry"
-    assert result2["title"] == "Teststreet 123b"
+    assert result2["title"] == "Picnic"
     assert result2["data"] == {
         CONF_ACCESS_TOKEN: picnic_api().session.auth_token,
         CONF_COUNTRY_CODE: "NL",
diff --git a/tests/components/picnic/test_sensor.py b/tests/components/picnic/test_sensor.py
index c47226d407e..6d5a56499b9 100644
--- a/tests/components/picnic/test_sensor.py
+++ b/tests/components/picnic/test_sensor.py
@@ -502,7 +502,7 @@ class TestPicnicSensor(unittest.IsolatedAsyncioTestCase):
             identifiers={(const.DOMAIN, DEFAULT_USER_RESPONSE["user_id"])}
         )
         assert picnic_service.model == DEFAULT_USER_RESPONSE["user_id"]
-        assert picnic_service.name == "Picnic: Commonstreet 123a"
+        assert picnic_service.name == "Mock Title"
         assert picnic_service.entry_type is dr.DeviceEntryType.SERVICE
 
     async def test_auth_token_is_saved_on_update(self):