From e8b92dda8f6628eccc93e0e80a02ca92990dbe2f Mon Sep 17 00:00:00 2001
From: LJQ <leejunquan7@gmail.com>
Date: Tue, 17 Oct 2023 17:28:02 +0800
Subject: [PATCH 1/2] Fix Rename Device don't change device name in the devices
 page

---
 src/controllers/dashboard/devices/devices.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index da1ecfcff..72ae84eea 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -120,7 +120,7 @@ function load(page, devices) {
         }
 
         deviceHtml += "<div class='cardText'>";
-        deviceHtml += escapeHtml(device.Name);
+        deviceHtml += escapeHtml(device.CustomName||device.Name);
         deviceHtml += '</div>';
         deviceHtml += "<div class='cardText cardText-secondary'>";
         deviceHtml += escapeHtml(device.AppName + ' ' + device.AppVersion);

From 9b6de7868814607a37ac83d7a2aebec5007b91c6 Mon Sep 17 00:00:00 2001
From: LJQ <leejunquan7@gmail.com>
Date: Tue, 17 Oct 2023 17:37:59 +0800
Subject: [PATCH 2/2] Add spaces around ||

---
 src/controllers/dashboard/devices/devices.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index 72ae84eea..8525e2f1e 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -120,7 +120,7 @@ function load(page, devices) {
         }
 
         deviceHtml += "<div class='cardText'>";
-        deviceHtml += escapeHtml(device.CustomName||device.Name);
+        deviceHtml += escapeHtml(device.CustomName || device.Name);
         deviceHtml += '</div>';
         deviceHtml += "<div class='cardText cardText-secondary'>";
         deviceHtml += escapeHtml(device.AppName + ' ' + device.AppVersion);