From 029eba7ab8f2df588743ad1b0c16a7a97e4d337d Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 1 Dec 2025 22:08:36 -0800 Subject: [PATCH] Safer lookup of description_placeholders when service is invalid (#28273) --- src/components/ha-service-control.ts | 2 +- src/panels/developer-tools/action/developer-tools-action.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts index 28c1196479..67733abf38 100644 --- a/src/components/ha-service-control.ts +++ b/src/components/ha-service-control.ts @@ -467,7 +467,7 @@ export class HaServiceControl extends LitElement { const descriptionPlaceholders = domain && serviceName - ? this.hass.services[domain][serviceName].description_placeholders + ? this.hass.services[domain]?.[serviceName]?.description_placeholders : undefined; const description = diff --git a/src/panels/developer-tools/action/developer-tools-action.ts b/src/panels/developer-tools/action/developer-tools-action.ts index 12e4240bfe..3f23b0e0d4 100644 --- a/src/panels/developer-tools/action/developer-tools-action.ts +++ b/src/panels/developer-tools/action/developer-tools-action.ts @@ -137,7 +137,7 @@ class HaPanelDevAction extends LitElement { const descriptionPlaceholders = domain && serviceName - ? this.hass.services[domain][serviceName].description_placeholders + ? this.hass.services[domain]?.[serviceName]?.description_placeholders : undefined; return html`