From f2647cdb48edb5ed57ab572ca39e720a8a4b03f7 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 20:18:05 +0100
Subject: [PATCH] Fix wrong loadpoint title in error messages after UI reorder
 (#25800)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: andig <184815+andig@users.noreply.github.com>
Co-authored-by: naltatis <152287+naltatis@users.noreply.github.com>
---
 assets/js/components/Site/Site.vue         |  5 +----
 assets/js/components/Top/Notifications.vue | 10 ++++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/assets/js/components/Site/Site.vue b/assets/js/components/Site/Site.vue
index d8cdbb823..7c8810168 100644
--- a/assets/js/components/Site/Site.vue
+++ b/assets/js/components/Site/Site.vue
@@ -13,7 +13,7 @@
 				<div class="d-flex">
 					<Notifications
 						:notifications="notifications"
-						:loadpointTitles="loadpointTitles"
+						:loadpoints="loadpoints"
 						class="me-2"
 					/>
 					<TopNavigation v-bind="topNavigation" />
@@ -194,9 +194,6 @@ export default defineComponent({
 		energyflow() {
 			return this.collectProps(Energyflow);
 		},
-		loadpointTitles() {
-			return this.orderedVisibleLoadpoints.map((lp) => lp.displayTitle);
-		},
 		vehicleList() {
 			const vehicles = this.vehicles || {};
 			return Object.entries(vehicles).map(([name, vehicle]) => ({ name, ...vehicle }));
diff --git a/assets/js/components/Top/Notifications.vue b/assets/js/components/Top/Notifications.vue
index fea1b2b52..00f70f181 100644
--- a/assets/js/components/Top/Notifications.vue
+++ b/assets/js/components/Top/Notifications.vue
@@ -90,14 +90,14 @@
 import "@h2d2/shopicons/es/regular/exclamationtriangle";
 import formatter from "@/mixins/formatter";
 import { defineComponent, type PropType } from "vue";
-import type { Notification, Timeout } from "@/types/evcc";
+import type { Notification, Timeout, UiLoadpoint } from "@/types/evcc";
 
 export default defineComponent({
 	name: "Notifications",
 	mixins: [formatter],
 	props: {
 		notifications: { type: Array as PropType<Notification[]>, default: () => [] },
-		loadpointTitles: { type: Array as PropType<string[]>, default: () => [] },
+		loadpoints: { type: Array as PropType<UiLoadpoint[]>, default: () => [] },
 	},
 	data() {
 		return {
@@ -128,8 +128,10 @@ export default defineComponent({
 		message({ message, lp }: { message: string | string[]; lp?: number }) {
 			const lines = Array.isArray(message) ? message : [message];
 			if (lp) {
-				// add loadpoint title to first line
-				lines[0] = `${this.loadpointTitles[lp - 1] || lp}: ${lines[0]}`;
+				// Find loadpoint by id (which is the original 1-based index)
+				const loadpoint = this.loadpoints.find((l) => l.id === String(lp));
+				const title = loadpoint?.displayTitle || lp;
+				lines[0] = `${title}: ${lines[0]}`;
 			}
 			return lines;
 		},