Energyid bugfix (home-assistant#157343)

Molier · web-flow · commit 0e3bab3ce4e3 · 2025-11-26T14:29:28.000+01:00
diff --git a/homeassistant/components/energyid/config_flow.py b/homeassistant/components/energyid/config_flow.py
@@ -154,6 +154,7 @@ async def async_step_user(
                     title=self._flow_data["record_name"],
                     data=self._flow_data,
                     description="add_sensor_mapping_hint",
+                    description_placeholders={"integration_name": NAME},
                 )
 
             if auth_status == "needs_claim":
@@ -228,6 +229,7 @@ async def async_step_create_entry(
             title=self._flow_data["record_name"],
             data=self._flow_data,
             description="add_sensor_mapping_hint",
+            description_placeholders={"integration_name": NAME},
         )
 
     async def async_step_reauth(
diff --git a/homeassistant/components/energyid/energyid_sensor_mapping_flow.py b/homeassistant/components/energyid/energyid_sensor_mapping_flow.py
@@ -107,8 +107,9 @@ async def async_step_user(
 
             # Get current mappings by UUID
             current_mappings = {
-                sub.data[CONF_HA_ENTITY_UUID]
+                uuid
                 for sub in config_entry.subentries.values()
+                if (uuid := sub.data.get(CONF_HA_ENTITY_UUID)) is not None
             }
 
             errors = _validate_mapping_input(ha_entity_id, current_mappings, ent_reg)

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ async def async_step_user(`
`154`	`154`	`title=self._flow_data["record_name"],`
`155`	`155`	`data=self._flow_data,`
`156`	`156`	`description="add_sensor_mapping_hint",`
	`157`	`+ description_placeholders={"integration_name": NAME},`
`157`	`158`	`)`
`158`	`159`
`159`	`160`	`if auth_status == "needs_claim":`
`@@ -228,6 +229,7 @@ async def async_step_create_entry(`
`228`	`229`	`title=self._flow_data["record_name"],`
`229`	`230`	`data=self._flow_data,`
`230`	`231`	`description="add_sensor_mapping_hint",`
	`232`	`+ description_placeholders={"integration_name": NAME},`
`231`	`233`	`)`
`232`	`234`
`233`	`235`	`async def async_step_reauth(`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,9 @@ async def async_step_user(`
`107`	`107`
`108`	`108`	`# Get current mappings by UUID`
`109`	`109`	`current_mappings = {`
`110`		`- sub.data[CONF_HA_ENTITY_UUID]`
	`110`	`+ uuid`
`111`	`111`	`for sub in config_entry.subentries.values()`
	`112`	`+ if (uuid := sub.data.get(CONF_HA_ENTITY_UUID)) is not None`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`errors = _validate_mapping_input(ha_entity_id, current_mappings, ent_reg)`