From c032166d4f7b83fa7e5ab949dd9c06a64161a5da Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 16 Apr 2025 19:04:56 -1000 Subject: [PATCH] fixes --- homeassistant/components/esphome/config_flow.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py index 9d1fd2b3a57..7941af96a5f 100644 --- a/homeassistant/components/esphome/config_flow.py +++ b/homeassistant/components/esphome/config_flow.py @@ -457,9 +457,8 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN): } if self.source == SOURCE_RECONFIGURE: assert self.unique_id is not None - assert self._reconfig_entry is not None assert self._reconfig_entry.unique_id is not None - if self._reauth_entry.unique_id != format_mac(self.unique_id): + if self._reconfig_entry.unique_id != format_mac(self.unique_id): return self.async_abort( reason="reconfigure_unique_id_changed", description_placeholders={ @@ -470,7 +469,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN): }, ) return self.async_update_reload_and_abort( - self._reconfig_entry, data=self._reauth_entry.data | config_data + self._reconfig_entry, data=self._reconfig_entry.data | config_data ) if self.source == SOURCE_REAUTH: return self.async_update_reload_and_abort(