From 374f5ee1bea328008e22c1f8cb98b24b179a12e4 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 31 Jan 2024 00:58:03 +0100
Subject: [PATCH] Update thread preferred router (#19580)

---
 src/data/thread.ts                               |  7 +++++--
 .../thread/thread-config-panel.ts                | 16 ++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/data/thread.ts b/src/data/thread.ts
index cb1c1fa1da..82c19fbe03 100644
--- a/src/data/thread.ts
+++ b/src/data/thread.ts
@@ -22,6 +22,7 @@ export interface ThreadDataSet {
   network_name: string;
   pan_id: string | null;
   preferred_border_agent_id: string | null;
+  preferred_extended_address: string | null;
   preferred: boolean;
   source: string;
 }
@@ -107,10 +108,12 @@ export const setPreferredThreadDataSet = (
 export const setPreferredBorderAgent = (
   hass: HomeAssistant,
   dataset_id: string,
-  border_agent_id: string
+  border_agent_id: string | null,
+  extended_address: string
 ): Promise<void> =>
   hass.callWS({
-    type: "thread/set_preferred_border_agent_id",
+    type: "thread/set_preferred_border_agent",
     dataset_id,
     border_agent_id,
+    extended_address,
   });
diff --git a/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts b/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts
index 9fa27b18c1..e8e068ca22 100644
--- a/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts
+++ b/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts
@@ -210,8 +210,8 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
                 <span slot="secondary">${router.server}</span>
                 ${showOverflow
                   ? html`${network.dataset &&
-                      router.border_agent_id ===
-                        network.dataset.preferred_border_agent_id
+                      router.extended_address ===
+                        network.dataset.preferred_extended_address
                         ? html`<ha-svg-icon
                             .path=${mdiCellphoneKey}
                             .title=${this.hass.localize(
@@ -524,12 +524,12 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
     dataset: ThreadDataSet,
     router: ThreadRouter
   ) {
-    const datasetId = dataset.dataset_id;
-    const borderAgentId = router.border_agent_id;
-    if (!borderAgentId) {
-      return;
-    }
-    await setPreferredBorderAgent(this.hass, datasetId, borderAgentId);
+    await setPreferredBorderAgent(
+      this.hass,
+      dataset.dataset_id,
+      router.border_agent_id,
+      router.extended_address
+    );
     this._refresh();
   }