From 060f6ce3d8f799c4b6ded47dd8d2c7c69afec738 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 4 May 2023 15:30:47 +0200
Subject: [PATCH] fix expose view for yaml config (#16408)

---
 .../ha-config-voice-assistants-expose.ts      | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts
index ee822e2dd4..98363e9bed 100644
--- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts
+++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts
@@ -334,6 +334,7 @@ export class VoiceAssistantsExpose extends LitElement {
             filteredAssistants.some(
               (assis) =>
                 !(assis === "cloud.alexa" && alexaManual) &&
+                !(assis === "cloud.google_assistant" && googleManual) &&
                 exposedEntities?.[entity.entity_id]?.[assis]
             )
           );
@@ -377,20 +378,10 @@ export class VoiceAssistantsExpose extends LitElement {
         );
         Object.keys(this.hass.states).forEach((entityId) => {
           const assistants: string[] = [];
-          if (
-            alexaManual &&
-            (!filteredAssistants ||
-              filteredAssistants.includes("cloud.alexa")) &&
-            manFilterFuncs.amazon(entityId)
-          ) {
+          if (alexaManual && manFilterFuncs.amazon(entityId)) {
             assistants.push("cloud.alexa");
           }
-          if (
-            googleManual &&
-            (!filteredAssistants ||
-              filteredAssistants.includes("cloud.google_assistant")) &&
-            manFilterFuncs.google(entityId)
-          ) {
+          if (googleManual && manFilterFuncs.google(entityId)) {
             assistants.push("cloud.google_assistant");
           }
           if (!assistants.length) {
@@ -399,7 +390,10 @@ export class VoiceAssistantsExpose extends LitElement {
           if (entityId in result) {
             result[entityId].assistants.push(...assistants);
             result[entityId].manAssistants = assistants;
-          } else {
+          } else if (
+            !filteredAssistants ||
+            filteredAssistants.some((ass) => assistants.includes(ass))
+          ) {
             const entityState = this.hass.states[entityId];
             const entry: ExtEntityRegistryEntry | undefined =
               entities[entityId];