From ffbcb0a343136aa1feacb32b9ff7220883f9494e Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Wed, 2 Nov 2022 18:19:53 +0100
Subject: [PATCH 1/4] Fix iOS safe padding  (#14261)

---
 src/layouts/ha-app-layout.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 {

From 98a32041d45266e336907f2df593b59d12e50c67 Mon Sep 17 00:00:00 2001
From: Steve Repsher <steverep@users.noreply.github.com>
Date: Wed, 2 Nov 2022 13:22:02 -0400
Subject: [PATCH 2/4] Add name attribute to autocomplete fields (#14258)

---
 src/auth/ha-password-manager-polyfill.ts                | 1 +
 src/components/ha-form/ha-form-string.ts                | 1 +
 src/components/ha-form/ha-form.ts                       | 1 +
 src/components/ha-selector/ha-selector-text.ts          | 4 ++++
 src/components/ha-selector/ha-selector.ts               | 3 +++
 src/panels/config/cloud/login/cloud-login.ts            | 2 ++
 src/panels/config/cloud/register/cloud-register.ts      | 2 ++
 src/panels/config/users/dialog-admin-change-password.ts | 4 ++--
 src/panels/profile/ha-change-password-card.ts           | 1 +
 9 files changed, 17 insertions(+), 2 deletions(-)

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 {
       <input
         tabindex="-1"
         .id=${schema.name}
+        .name=${schema.name}
         .type=${inputType}
         .value=${this.stepData[schema.name] || ""}
         .autocomplete=${schema.autocomplete}
diff --git a/src/components/ha-form/ha-form-string.ts b/src/components/ha-form/ha-form-string.ts
index edc0a48754..032bab1e12 100644
--- a/src/components/ha-form/ha-form-string.ts
+++ b/src/components/ha-form/ha-form-string.ts
@@ -60,6 +60,7 @@ export class HaFormString extends LitElement implements HaFormElement {
         .disabled=${this.disabled}
         .required=${this.schema.required}
         .autoValidate=${this.schema.required}
+        .name=${this.schema.name}
         .autocomplete=${this.schema.autocomplete}
         .suffix=${isPassword
           ? // reserve some space for the icon.
diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
index 8148b30d26..140db7a27f 100644
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -81,6 +81,7 @@ export class HaForm extends LitElement implements HaFormElement {
               ? html`<ha-selector
                   .schema=${item}
                   .hass=${this.hass}
+                  .name=${item.name}
                   .selector=${item.selector}
                   .value=${getValue(this.data, item)}
                   .label=${this._computeLabel(item, this.data)}
diff --git a/src/components/ha-selector/ha-selector-text.ts b/src/components/ha-selector/ha-selector-text.ts
index a9d3de47d4..afaa3a1c0e 100644
--- a/src/components/ha-selector/ha-selector-text.ts
+++ b/src/components/ha-selector/ha-selector-text.ts
@@ -14,6 +14,8 @@ export class HaTextSelector extends LitElement {
 
   @property() public value?: any;
 
+  @property() public name?: string;
+
   @property() public label?: string;
 
   @property() public placeholder?: string;
@@ -31,6 +33,7 @@ export class HaTextSelector extends LitElement {
   protected render() {
     if (this.selector.text?.multiline) {
       return html`<ha-textarea
+        .name=${this.name}
         .label=${this.label}
         .placeholder=${this.placeholder}
         .value=${this.value || ""}
@@ -46,6 +49,7 @@ export class HaTextSelector extends LitElement {
       ></ha-textarea>`;
     }
     return html`<ha-textfield
+        .name=${this.name}
         .value=${this.value || ""}
         .placeholder=${this.placeholder || ""}
         .helper=${this.helper}
diff --git a/src/components/ha-selector/ha-selector.ts b/src/components/ha-selector/ha-selector.ts
index 09125e10a7..4f6ab51f0f 100644
--- a/src/components/ha-selector/ha-selector.ts
+++ b/src/components/ha-selector/ha-selector.ts
@@ -40,6 +40,8 @@ const LOAD_ELEMENTS = {
 export class HaSelector extends LitElement {
   @property() public hass!: HomeAssistant;
 
+  @property() public name?: string;
+
   @property() public selector!: Selector;
 
   @property() public value?: any;
@@ -74,6 +76,7 @@ export class HaSelector extends LitElement {
     return html`
       ${dynamicElement(`ha-selector-${this._type}`, {
         hass: this.hass,
+        name: this.name,
         selector: this.selector,
         value: this.value,
         label: this.label,
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 {
                 ></ha-textfield>
                 <ha-textfield
                   id="password"
+                  name="password"
                   .label=${this.hass.localize(
                     "ui.panel.config.cloud.login.password"
                   )}
diff --git a/src/panels/config/cloud/register/cloud-register.ts b/src/panels/config/cloud/register/cloud-register.ts
index 319e557c99..790ddcca5a 100644
--- a/src/panels/config/cloud/register/cloud-register.ts
+++ b/src/panels/config/cloud/register/cloud-register.ts
@@ -132,6 +132,7 @@ export class CloudRegister extends LitElement {
                 <ha-textfield
                   autofocus
                   id="email"
+                  name="email"
                   .label=${this.hass.localize(
                     "ui.panel.config.cloud.register.email_address"
                   )}
@@ -146,6 +147,7 @@ export class CloudRegister extends LitElement {
                 ></ha-textfield>
                 <ha-textfield
                   id="password"
+                  name="password"
                   label="Password"
                   .value=${this._password}
                   type="password"
diff --git a/src/panels/config/users/dialog-admin-change-password.ts b/src/panels/config/users/dialog-admin-change-password.ts
index c695d56230..1e200f5f89 100644
--- a/src/panels/config/users/dialog-admin-change-password.ts
+++ b/src/panels/config/users/dialog-admin-change-password.ts
@@ -20,7 +20,7 @@ const SCHEMA = [
     selector: {
       text: {
         type: "password",
-        autofill: "new-password",
+        autocomplete: "new-password",
       },
     },
   },
@@ -30,7 +30,7 @@ const SCHEMA = [
     selector: {
       text: {
         type: "password",
-        autofill: "new-password",
+        autocomplete: "new-password",
       },
     },
   },
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 {
 
             <ha-textfield
               id="currentPassword"
+              name="currentPassword"
               .label=${this.hass.localize(
                 "ui.panel.profile.change_password.current_password"
               )}

From 79c8b7dc2784767a626be23e49489a7066108912 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 2 Nov 2022 18:26:09 +0100
Subject: [PATCH 3/4] Fix statistic card default config (#14262)

---
 src/panels/lovelace/cards/hui-statistic-card.ts | 2 +-
 src/panels/lovelace/cards/types.ts              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-statistic-card.ts b/src/panels/lovelace/cards/hui-statistic-card.ts
index 61c286062b..951e68b6f7 100644
--- a/src/panels/lovelace/cards/hui-statistic-card.ts
+++ b/src/panels/lovelace/cards/hui-statistic-card.ts
@@ -61,7 +61,7 @@ export class HuiStatisticCard extends LitElement implements LovelaceCard {
 
     return {
       entity: foundEntities[0] || "",
-      period: { calendar: { period: "month", offset: 0 } },
+      period: { calendar: { period: "month" } },
     };
   }
 
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index b697e7c48f..fe8df228a0 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -311,7 +311,7 @@ export interface StatisticsGraphCardConfig extends LovelaceCardConfig {
 }
 
 export interface StatisticCardConfig extends LovelaceCardConfig {
-  title?: string;
+  name?: string;
   entities: Array<EntityConfig | string>;
   period: {
     fixed_period?: { start: string; end: string };

From 3cd64675dfbdbe736478bd58a8f8797cb3572875 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 2 Nov 2022 18:59:00 +0100
Subject: [PATCH 4/4] Fix water costs (#14263)

---
 src/data/energy.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/data/energy.ts b/src/data/energy.ts
index 2ec9df45e3..c0aac9ed0b 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -273,14 +273,15 @@ export interface EnergyData {
 export const getReferencedStatisticIds = (
   prefs: EnergyPreferences,
   info: EnergyInfo,
-  exclude?: string[]
+  includeTypes?: string[]
 ): string[] => {
   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];