alistair23
diff --git a/‎homeassistant/components/husqvarna_automower_ble/config_flow.py
Lines changed: 42 additions & 10 deletions b/‎homeassistant/components/husqvarna_automower_ble/config_flow.py
Lines changed: 42 additions & 10 deletions
diff --git a/‎tests/components/husqvarna_automower_ble/test_config_flow.py
Lines changed: 1 addition & 1 deletion b/‎tests/components/husqvarna_automower_ble/test_config_flow.py
Lines changed: 1 addition & 1 deletion
@@ -68,11 +68,11 @@ async def async_step_bluetooth(
     async def async_step_bluetooth_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Confirm discovery."""
+        """Confirm Bluetooth discovery."""
 
         if user_input is not None:
             self.pin = user_input[CONF_PIN]
-            return await self.async_step_confirm()
+            return await self.async_step_bluetooth_finalise()
 
         return self.async_show_form(
             step_id="bluetooth_confirm",
@@ -86,14 +86,14 @@ async def async_step_bluetooth_confirm(
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the initial step."""
+        """Handle the initial manual step."""
 
         if user_input is not None:
             self.address = user_input[CONF_ADDRESS]
             self.pin = user_input[CONF_PIN]
             await self.async_set_unique_id(self.address, raise_on_progress=False)
             self._abort_if_unique_id_configured()
-            return await self.async_step_confirm()
+            return await self.async_step_finalise()
 
         return self.async_show_form(
             step_id="user",
@@ -114,7 +114,7 @@ async def probe_mower(self, device) -> str | None:
                 channel_id, self.address
             ).probe_gatts(device)
         except (BleakError, TimeoutError) as exception:
-            LOGGER.exception("Failed to connect to device: %s", exception)
+            LOGGER.exception("Failed to probe device: %s", exception)
             return None
 
         title = manufacturer + " " + device_type
@@ -132,10 +132,12 @@ async def connect_mower(self, device) -> (int, Mower):
 
         return (channel_id, mower)
 
-    async def async_step_confirm(
-        self, user_input: dict[str, Any] | None = None
+    async def check_mower(
+        self,
+        ble_flow: bool,
+        user_input: dict[str, Any] | None = None,
     ) -> ConfigFlowResult:
-        """Confirm discovery."""
+        """Check that the mower exists and is setup."""
         device = bluetooth.async_ble_device_from_address(
             self.hass, self.address, connectable=True
         )
@@ -151,9 +153,25 @@ async def async_step_confirm(
             if not await mower.connect(device):
                 errors["base"] = "invalid_auth"
 
+                if ble_flow:
+                    return self.async_show_form(
+                        step_id="bluetooth_confirm",
+                        data_schema=vol.Schema(
+                            {
+                                vol.Required(CONF_ADDRESS): str,
+                                vol.Required(CONF_PIN): str,
+                            },
+                        ),
+                        errors=errors,
+                    )
                 return self.async_show_form(
-                    step_id="reauth_confirm",
-                    data_schema=vol.Schema({vol.Required(CONF_PIN): str}),
+                    step_id="user",
+                    data_schema=vol.Schema(
+                        {
+                            vol.Required(CONF_ADDRESS): str,
+                            vol.Required(CONF_PIN): str,
+                        },
+                    ),
                     errors=errors,
                 )
         except (TimeoutError, BleakError):
@@ -168,6 +186,20 @@ async def async_step_confirm(
             },
         )
 
+    async def async_step_bluetooth_finalise(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Finalise the Bluetooth setup."""
+        return await self.check_mower(True, user_input)
+
+    async def async_step_finalise(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Finalise the Manual setup."""
+        return await self.check_mower(False, user_input)
+
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
 
@@ -94,7 +94,7 @@ async def test_user_selection_incorrect_pin(
     )
 
     assert result["type"] is FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
+    assert result["step_id"] == "user"
 
     mock_automower_client.connect.return_value = True
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ async def test_user_selection_incorrect_pin(`
`94`	`94`	`)`
`95`	`95`
`96`	`96`	`assert result["type"] is FlowResultType.FORM`
`97`		`- assert result["step_id"] == "reauth_confirm"`
	`97`	`+ assert result["step_id"] == "user"`
`98`	`98`
`99`	`99`	`mock_automower_client.connect.return_value = True`
`100`	`100`