From 0e8a06e24d28048f6c4dec01b4852fd85453adc7 Mon Sep 17 00:00:00 2001
From: Philip Allgaier <mail@spacegaier.de>
Date: Mon, 8 Nov 2021 11:41:17 +0100
Subject: [PATCH] Use correct darkMode flag for image variant selection
 (#10574)

---
 src/dialogs/config-flow/step-flow-pick-flow.ts                | 2 +-
 src/dialogs/config-flow/step-flow-pick-handler.ts             | 2 +-
 src/onboarding/onboarding-integrations.ts                     | 4 ++--
 src/panels/config/devices/ha-config-device-page.ts            | 2 +-
 .../config/energy/components/ha-energy-grid-settings.ts       | 4 ++--
 .../config/energy/dialogs/dialog-energy-solar-settings.ts     | 2 +-
 src/panels/config/info/integrations-card.ts                   | 2 +-
 src/panels/config/integrations/ha-integration-header.ts       | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/dialogs/config-flow/step-flow-pick-flow.ts b/src/dialogs/config-flow/step-flow-pick-flow.ts
index 82578354d3..2296d465a0 100644
--- a/src/dialogs/config-flow/step-flow-pick-flow.ts
+++ b/src/dialogs/config-flow/step-flow-pick-flow.ts
@@ -45,7 +45,7 @@ class StepFlowPickFlow extends LitElement {
                 domain: flow.handler,
                 type: "icon",
                 useFallback: true,
-                darkOptimized: this.hass.selectedTheme?.dark,
+                darkOptimized: this.hass.themes?.darkMode,
               })}
               referrerpolicy="no-referrer"
             />
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index e15a2d1316..d3b0028b3e 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -102,7 +102,7 @@ class StepFlowPickHandler extends LitElement {
                         domain: handler.slug,
                         type: "icon",
                         useFallback: true,
-                        darkOptimized: this.hass.selectedTheme?.dark,
+                        darkOptimized: this.hass.themes?.darkMode,
                       })}
                       referrerpolicy="no-referrer"
                     />
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 9b0370bb9b..d6874a6ae8 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -81,7 +81,7 @@ class OnboardingIntegrations extends LitElement {
               .domain=${entry.domain}
               .title=${title}
               .badgeIcon=${mdiCheck}
-              .darkOptimizedIcon=${this.hass.selectedTheme?.dark}
+              .darkOptimizedIcon=${this.hass.themes?.darkMode}
             ></integration-badge>
           `,
         ];
@@ -98,7 +98,7 @@ class OnboardingIntegrations extends LitElement {
                 clickable
                 .domain=${flow.handler}
                 .title=${title}
-                .darkOptimizedIcon=${this.hass.selectedTheme?.dark}
+                .darkOptimizedIcon=${this.hass.themes?.darkMode}
               ></integration-badge>
             </button>
           `,
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index dd0603faf7..9b4de45b9b 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -293,7 +293,7 @@ export class HaConfigDevicePage extends LitElement {
                             src=${brandsUrl({
                               domain: integrations[0],
                               type: "logo",
-                              darkOptimized: this.hass.selectedTheme?.dark,
+                              darkOptimized: this.hass.themes?.darkMode,
                             })}
                             referrerpolicy="no-referrer"
                             @load=${this._onImageLoad}
diff --git a/src/panels/config/energy/components/ha-energy-grid-settings.ts b/src/panels/config/energy/components/ha-energy-grid-settings.ts
index d0b3df4e76..700329dd1c 100644
--- a/src/panels/config/energy/components/ha-energy-grid-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-grid-settings.ts
@@ -202,7 +202,7 @@ export class EnergyGridSettings extends LitElement {
                 src=${brandsUrl({
                   domain: "co2signal",
                   type: "icon",
-                  darkOptimized: this.hass.selectedTheme?.dark,
+                  darkOptimized: this.hass.themes?.darkMode,
                 })}
               />
               <span class="content">${entry.title}</span>
@@ -223,7 +223,7 @@ export class EnergyGridSettings extends LitElement {
                     src=${brandsUrl({
                       domain: "co2signal",
                       type: "icon",
-                      darkOptimized: this.hass.selectedTheme?.dark,
+                      darkOptimized: this.hass.themes?.darkMode,
                     })}
                   />
                   <mwc-button @click=${this._addCO2Sensor}>
diff --git a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
index 320f94b1c0..25f6073e85 100644
--- a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
+++ b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
@@ -136,7 +136,7 @@ export class DialogEnergySolarSettings
                       src=${brandsUrl({
                         domain: entry.domain,
                         type: "icon",
-                        darkOptimized: this.hass.selectedTheme?.dark,
+                        darkOptimized: this.hass.themes?.darkMode,
                       })}
                     />${entry.title}
                   </div>`}
diff --git a/src/panels/config/info/integrations-card.ts b/src/panels/config/info/integrations-card.ts
index 68bd6625e9..979393eac1 100644
--- a/src/panels/config/info/integrations-card.ts
+++ b/src/panels/config/info/integrations-card.ts
@@ -98,7 +98,7 @@ class IntegrationsCard extends LitElement {
                           domain: domain,
                           type: "icon",
                           useFallback: true,
-                          darkOptimized: this.hass.selectedTheme?.dark,
+                          darkOptimized: this.hass.themes?.darkMode,
                         })}
                         referrerpolicy="no-referrer"
                       />
diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts
index 9f35837e14..30053e4405 100644
--- a/src/panels/config/integrations/ha-integration-header.ts
+++ b/src/panels/config/integrations/ha-integration-header.ts
@@ -84,7 +84,7 @@ export class HaIntegrationHeader extends LitElement {
           src=${brandsUrl({
             domain: this.domain,
             type: "icon",
-            darkOptimized: this.hass.selectedTheme?.dark,
+            darkOptimized: this.hass.themes?.darkMode,
           })}
           referrerpolicy="no-referrer"
           @error=${this._onImageError}