From 884c22f92b363587670eddfdd8561c725c00335b Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 30 Dec 2024 17:06:26 +0100
Subject: [PATCH] Add fallback for devices without name (#23513)

---
 src/components/device/ha-device-picker.ts | 4 +++-
 src/dialogs/quick-bar/ha-quick-bar.ts     | 4 +++-
 src/translations/en.json                  | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/device/ha-device-picker.ts b/src/components/device/ha-device-picker.ts
index 724dcbbf06..4182ee106a 100644
--- a/src/components/device/ha-device-picker.ts
+++ b/src/components/device/ha-device-picker.ts
@@ -222,7 +222,9 @@ export class HaDevicePicker extends LitElement {
 
         return {
           id: device.id,
-          name: name,
+          name:
+            name ||
+            this.hass.localize("ui.components.device-picker.unnamed_device"),
           area:
             device.area_id && areas[device.area_id]
               ? areas[device.area_id].name
diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index 4b8c56d7ee..8c108e1f5f 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -530,7 +530,9 @@ export class QuickBar extends LitElement {
           ? this.hass.areas[device.area_id]
           : undefined;
         const deviceItem = {
-          primaryText: computeDeviceName(device, this.hass),
+          primaryText:
+            computeDeviceName(device, this.hass) ||
+            this.hass.localize("ui.components.device-picker.unnamed_device"),
           deviceId: device.id,
           area: area?.name,
           action: () => navigate(`/config/devices/device/${device.id}`),
diff --git a/src/translations/en.json b/src/translations/en.json
index cd898e6b91..76c2f6ace4 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -651,6 +651,7 @@
         "no_devices": "You don't have any devices",
         "no_match": "No matching devices found",
         "device": "Device",
+        "unnamed_device": "Unnamed device",
         "no_area": "No area"
       },
       "category-picker": {