From 99d3234855f5a452dc61cf5ace15c528d01b7406 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 1 Nov 2025 10:56:04 -0500
Subject: [PATCH] Allow ignored leaone devices to be set up from the user flow
 (#155619)

---
 .../components/leaone/config_flow.py          |  2 +-
 tests/components/leaone/test_config_flow.py   | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/leaone/config_flow.py b/homeassistant/components/leaone/config_flow.py
index 8878f9af0655..5e139e594b20 100644
--- a/homeassistant/components/leaone/config_flow.py
+++ b/homeassistant/components/leaone/config_flow.py
@@ -35,7 +35,7 @@ class LeaoneConfigFlow(ConfigFlow, domain=DOMAIN):
                 title=self._discovered_devices[address], data={}
             )
 
-        current_addresses = self._async_current_ids()
+        current_addresses = self._async_current_ids(include_ignore=False)
         for discovery_info in async_discovered_service_info(self.hass, False):
             address = discovery_info.address
             if address in current_addresses or address in self._discovered_devices:
diff --git a/tests/components/leaone/test_config_flow.py b/tests/components/leaone/test_config_flow.py
index 9712fce9c149..da6199bd0d15 100644
--- a/tests/components/leaone/test_config_flow.py
+++ b/tests/components/leaone/test_config_flow.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 
 from homeassistant import config_entries
 from homeassistant.components.leaone.const import DOMAIN
+from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
@@ -93,3 +94,38 @@ async def test_async_step_user_with_found_devices_already_setup(
         )
     assert result["type"] is FlowResultType.ABORT
     assert result["reason"] == "no_devices_found"
+
+
+async def test_user_setup_replaces_ignored_device(hass: HomeAssistant) -> None:
+    """Test the user initiated form can replace an ignored device."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id="5F:5A:5C:52:D3:94",
+        source=SOURCE_IGNORE,
+        data={},
+    )
+    entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.leaone.config_flow.async_discovered_service_info",
+        return_value=[SCALE_SERVICE_INFO],
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    # Verify the ignored device is in the dropdown
+    assert "5F:5A:5C:52:D3:94" in result["data_schema"].schema["address"].container
+
+    with patch("homeassistant.components.leaone.async_setup_entry", return_value=True):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={"address": "5F:5A:5C:52:D3:94"},
+        )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == "TZC4 D394"
+    assert result2["data"] == {}
+    assert result2["result"].unique_id == "5F:5A:5C:52:D3:94"