From 9911aa4ede2e81bf9df5ff924518555bc8c625a8 Mon Sep 17 00:00:00 2001
From: Thomas55555 <59625598+Thomas55555@users.noreply.github.com>
Date: Thu, 15 Aug 2024 08:29:06 +0200
Subject: [PATCH] Enable confirm error button in Husqvarna Automower by default
 (#123927)

---
 homeassistant/components/husqvarna_automower/button.py | 5 +++--
 tests/components/husqvarna_automower/test_button.py    | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/husqvarna_automower/button.py b/homeassistant/components/husqvarna_automower/button.py
index a9747108393..810dd4df92d 100644
--- a/homeassistant/components/husqvarna_automower/button.py
+++ b/homeassistant/components/husqvarna_automower/button.py
@@ -25,7 +25,9 @@ async def async_setup_entry(
     """Set up button platform."""
     coordinator = entry.runtime_data
     async_add_entities(
-        AutomowerButtonEntity(mower_id, coordinator) for mower_id in coordinator.data
+        AutomowerButtonEntity(mower_id, coordinator)
+        for mower_id in coordinator.data
+        if coordinator.data[mower_id].capabilities.can_confirm_error
     )
 
 
@@ -33,7 +35,6 @@ class AutomowerButtonEntity(AutomowerAvailableEntity, ButtonEntity):
     """Defining the AutomowerButtonEntity."""
 
     _attr_translation_key = "confirm_error"
-    _attr_entity_registry_enabled_default = False
 
     def __init__(
         self,
diff --git a/tests/components/husqvarna_automower/test_button.py b/tests/components/husqvarna_automower/test_button.py
index 6cc465df74b..5cbb9b893a8 100644
--- a/tests/components/husqvarna_automower/test_button.py
+++ b/tests/components/husqvarna_automower/test_button.py
@@ -34,7 +34,6 @@ from tests.common import (
 
 
 @pytest.mark.freeze_time(datetime.datetime(2024, 2, 29, 11, tzinfo=datetime.UTC))
-@pytest.mark.usefixtures("entity_registry_enabled_by_default")
 async def test_button_states_and_commands(
     hass: HomeAssistant,
     mock_automower_client: AsyncMock,