diff --git a/src/auth/ha-password-manager-polyfill.ts b/src/auth/ha-password-manager-polyfill.ts
index 2adb35c0e0..94f8351636 100644
--- a/src/auth/ha-password-manager-polyfill.ts
+++ b/src/auth/ha-password-manager-polyfill.ts
@@ -92,6 +92,7 @@ export class HaPasswordManagerPolyfill extends LitElement {
`;
}
return html` {
const statIDs: string[] = [];
for (const source of prefs.energy_sources) {
- if (exclude?.includes(source.type)) {
+ if (includeTypes && !includeTypes.includes(source.type)) {
continue;
}
+
if (source.type === "solar") {
statIDs.push(source.stat_energy_from);
continue;
@@ -288,6 +289,7 @@ export const getReferencedStatisticIds = (
if (source.type === "gas" || source.type === "water") {
statIDs.push(source.stat_energy_from);
+
if (source.stat_cost) {
statIDs.push(source.stat_cost);
}
@@ -366,7 +368,6 @@ const getEnergyData = async (
}
}
- const waterStatIds: string[] = [];
const consumptionStatIDs: string[] = [];
for (const source of prefs.energy_sources) {
// grid source
@@ -375,11 +376,14 @@ const getEnergyData = async (
consumptionStatIDs.push(flowFrom.stat_energy_from);
}
}
- if (source.type === "water") {
- waterStatIds.push(source.stat_energy_from);
- }
}
- const energyStatIds = getReferencedStatisticIds(prefs, info, ["water"]);
+ const energyStatIds = getReferencedStatisticIds(prefs, info, [
+ "grid",
+ "solar",
+ "battery",
+ "gas",
+ ]);
+ const waterStatIds = getReferencedStatisticIds(prefs, info, ["water"]);
const allStatIDs = [...energyStatIds, ...waterStatIds];
diff --git a/src/layouts/ha-app-layout.js b/src/layouts/ha-app-layout.js
index e4649bafa2..b937574f3b 100644
--- a/src/layouts/ha-app-layout.js
+++ b/src/layouts/ha-app-layout.js
@@ -36,8 +36,6 @@ class HaAppLayout extends customElements.get("app-header-layout") {
*/
position: relative;
z-index: 0;
- padding: env(safe-area-inset-top) env(safe-area-inset-right)
- env(safe-area-inset-bottom) env(safe-area-inset-left);
}
#wrapper ::slotted([slot="header"]) {
@@ -82,6 +80,8 @@ class HaAppLayout extends customElements.get("app-header-layout") {
transform: translate(0);
margin-left: env(safe-area-inset-left);
margin-right: env(safe-area-inset-right);
+ padding-top: env(safe-area-inset-top);
+ padding-bottom: env(safe-area-inset-bottom);
}
@media print {
diff --git a/src/panels/config/cloud/login/cloud-login.ts b/src/panels/config/cloud/login/cloud-login.ts
index c2e56e635a..36dcf84d39 100644
--- a/src/panels/config/cloud/login/cloud-login.ts
+++ b/src/panels/config/cloud/login/cloud-login.ts
@@ -113,6 +113,7 @@ export class CloudLogin extends LitElement {
"ui.panel.config.cloud.login.email"
)}
id="email"
+ name="username"
type="email"
autocomplete="username"
required
@@ -125,6 +126,7 @@ export class CloudLogin extends LitElement {
>
;
period: {
fixed_period?: { start: string; end: string };
diff --git a/src/panels/profile/ha-change-password-card.ts b/src/panels/profile/ha-change-password-card.ts
index a9ddfee225..fda74d6ef6 100644
--- a/src/panels/profile/ha-change-password-card.ts
+++ b/src/panels/profile/ha-change-password-card.ts
@@ -51,6 +51,7 @@ class HaChangePasswordCard extends LitElement {