Update .devcontainer.json

.devcontainer.json

@@ -1,13 +1,20 @@
 {
   "name": "Home Assistant Frontend",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "context": ".."
-  },
+  "image": "mcr.microsoft.com/devcontainers/python:0-3.10",
   "appPort": "8124:8123",
   "postCreateCommand": "script/bootstrap",
   "containerEnv": {
-    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}",
+    "DEVCONTAINER": "true"
+  },
+  "remoteUser": "vscode",
+  "remoteEnv": {
+    "PATH": "${containerEnv:PATH}:${containerWorkspaceFolder}/node_modules/.bin:/home/vscode/.local/bin"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "16"
+    }
   },
   "customizations": {
     "vscode": {

.devcontainer/Dockerfile

@@ -1,13 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10
-
-ENV \
-  DEBIAN_FRONTEND=noninteractive \
-  DEVCONTAINER=true \
-  PATH=$PATH:./node_modules/.bin
-
-# Install nvm
-COPY .nvmrc /tmp/.nvmrc
-RUN \
-  su vscode -c \
-    "source /usr/local/share/nvm/nvm.sh && nvm install $(cat /tmp/.nvmrc) 2>&1"

.github/dependabot.yml

@@ -10,16 +10,9 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-      time: "03:00"
-    open-pull-requests-limit: 10
-    labels:
-      - "dependencies"
+      time: "06:00"
+    open-pull-requests-limit: 5
     ignore:
       # Ignore rollup and plugins until everything else is updated
       - dependency-name: "*rollup*"
       - dependency-name: "@rollup/*"
-      - dependency-name: "serve"
-      # Wait for fullcalendar v6+ to fix shadow DOM issue
-      - dependency-name: "@fullcalendar/*"
-        versions:
-          - ">=6"

hassio/src/dialogs/network/dialog-hassio-network.ts

@@ -138,10 +138,7 @@ export class DialogHassioNetwork
         )}
         ${this._interface?.type === "wireless"
           ? html`
-              <ha-expansion-panel
-                .header=${this.supervisor.localize("dialog.network.wifi")}
-                outlined
-              >
+              <ha-expansion-panel header="Wi-Fi" outlined>
                 ${this._interface?.wifi?.ssid
                   ? html`<p>
                       ${this.supervisor.localize(
@@ -180,11 +177,7 @@ export class DialogHassioNetwork
                                 >
                                   <span>${ap.ssid}</span>
                                   <span slot="secondary">
-                                    ${ap.mac} -
-                                    ${this.supervisor.localize(
-                                      "dialog.network.signal_strength"
-                                    )}:
-                                    ${ap.signal}
+                                    ${ap.mac} - Strength: ${ap.signal}
                                   </span>
                                 </mwc-list-item>
                               `
@@ -248,9 +241,7 @@ export class DialogHassioNetwork
                               class="flex-auto"
                               type="password"
                               id="psk"
-                              .label=${this.supervisor.localize(
-                                "dialog.network.wifi_password"
-                              )}
+                              label="Password"
                               version="wifi"
                               @value-changed=${this
                                 ._handleInputValueChangedWifi}

package.json

@@ -26,7 +26,7 @@
   "dependencies": {
     "@braintree/sanitize-url": "^6.0.0",
     "@codemirror/autocomplete": "^6.4.0",
-    "@codemirror/commands": "^6.2.0",
+    "@codemirror/commands": "^6.1.3",
     "@codemirror/language": "^6.4.0",
     "@codemirror/legacy-modes": "^6.3.1",
     "@codemirror/search": "^6.2.3",
@@ -36,14 +36,14 @@
     "@formatjs/intl-getcanonicallocales": "^2.0.5",
     "@formatjs/intl-locale": "^3.0.11",
     "@formatjs/intl-numberformat": "^7.2.5",
-    "@formatjs/intl-pluralrules": "^5.1.8",
-    "@formatjs/intl-relativetimeformat": "^11.1.8",
-    "@fullcalendar/common": "^5.11.4",
-    "@fullcalendar/core": "^5.11.4",
-    "@fullcalendar/daygrid": "^5.11.4",
-    "@fullcalendar/interaction": "^5.11.4",
-    "@fullcalendar/list": "^5.11.4",
-    "@fullcalendar/timegrid": "^5.11.4",
+    "@formatjs/intl-pluralrules": "^4.1.5",
+    "@formatjs/intl-relativetimeformat": "^9.3.2",
+    "@fullcalendar/common": "5.9.0",
+    "@fullcalendar/core": "5.9.0",
+    "@fullcalendar/daygrid": "5.9.0",
+    "@fullcalendar/interaction": "5.9.0",
+    "@fullcalendar/list": "5.9.0",
+    "@fullcalendar/timegrid": "5.9.0",
     "@lezer/highlight": "^1.1.3",
     "@lit-labs/motion": "^1.0.3",
     "@lit-labs/virtualizer": "^1.0.1",
@@ -88,8 +88,8 @@
     "@polymer/paper-tooltip": "^3.0.1",
     "@polymer/polymer": "3.4.1",
     "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "^23.3.6",
-    "@vaadin/vaadin-themable-mixin": "^23.3.6",
+    "@vaadin/combo-box": "^23.3.5",
+    "@vaadin/vaadin-themable-mixin": "^23.3.5",
     "@vibrant/color": "^3.2.1-alpha.1",
     "@vibrant/core": "^3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
@@ -111,7 +111,7 @@
     "hls.js": "^1.3.1",
     "home-assistant-js-websocket": "^8.0.1",
     "idb-keyval": "^5.1.3",
-    "intl-messageformat": "^10.3.0",
+    "intl-messageformat": "^10.2.5",
     "js-yaml": "^4.1.0",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
@@ -152,23 +152,23 @@
     "@babel/plugin-proposal-decorators": "^7.20.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.20.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.18.9",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-syntax-top-level-await": "^7.14.5",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
-    "@koa/cors": "^4.0.0",
-    "@octokit/auth-oauth-device": "^4.0.4",
+    "@koa/cors": "^3.1.0",
+    "@octokit/auth-oauth-device": "^4.0.2",
     "@octokit/rest": "^19.0.7",
-    "@open-wc/dev-server-hmr": "^0.1.3",
+    "@open-wc/dev-server-hmr": "^0.0.2",
     "@rollup/plugin-babel": "^5.2.1",
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-json": "^4.0.3",
     "@rollup/plugin-node-resolve": "^7.1.3",
     "@rollup/plugin-replace": "^2.3.2",
     "@types/chromecast-caf-receiver": "5.0.12",
-    "@types/chromecast-caf-sender": "^1.0.5",
+    "@types/chromecast-caf-sender": "^1.0.3",
     "@types/glob": "^8",
     "@types/hammerjs": "^2.0.41",
     "@types/js-yaml": "^4",
@@ -184,7 +184,7 @@
     "@typescript-eslint/parser": "^5.49.0",
     "@web/dev-server": "^0.0.24",
     "@web/dev-server-rollup": "^0.2.11",
-    "babel-loader": "^9.1.2",
+    "babel-loader": "^9.1.0",
     "chai": "^4.3.4",
     "del": "^7.0.0",
     "eslint": "^7.32.0",
@@ -192,7 +192,7 @@
     "eslint-config-airbnb-typescript": "^14.0.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-import-resolver-webpack": "^0.13.1",
-    "eslint-plugin-disable": "^2.0.3",
+    "eslint-plugin-disable": "^2.0.1",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-lit": "^1.6.1",
     "eslint-plugin-unused-imports": "^1.1.5",
@@ -208,14 +208,14 @@
     "gulp-zopfli-green": "^3.0.1",
     "html-minifier": "^4.0.0",
     "husky": "^8.0.3",
-    "instant-mocha": "^1.5.0",
+    "instant-mocha": "^1.3.1",
     "jszip": "^3.10.1",
     "lint-staged": "^13.1.0",
     "lit-analyzer": "^1.2.1",
     "lodash.template": "^4.5.0",
     "magic-string": "^0.25.7",
     "map-stream": "^0.0.7",
-    "merge-stream": "^2.0.0",
+    "merge-stream": "^1.0.1",
     "mocha": "^8.4.0",
     "object-hash": "^3.0.0",
     "open": "^8.4.0",
@@ -229,7 +229,7 @@
     "serve": "^11.3.2",
     "sinon": "^15.0.1",
     "source-map-url": "^0.4.0",
-    "systemjs": "^6.13.0",
+    "systemjs": "^6.3.2",
     "tar": "^6.1.11",
     "terser-webpack-plugin": "^5.2.4",
     "ts-lit-plugin": "^1.2.1",
@@ -239,7 +239,7 @@
     "webpack": "^5.55.1",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.11.1",
-    "webpack-manifest-plugin": "^5.0.0",
+    "webpack-manifest-plugin": "^4.0.2",
     "webpackbar": "^5.0.2",
     "workbox-build": "^6.5.4"
   },

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20230201.0"
+version      = "20230128.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

src/common/config/version.ts

@@ -22,11 +22,3 @@ export const atLeastVersion = (
       Number(haPatch) >= patch)
   );
 };
-
-export const isDevVersion = (version: string): boolean => {
-  if (__DEMO__) {
-    return false;
-  }
-
-  return version.includes("dev");
-};

src/components/chart/state-history-chart-line.ts

@@ -22,7 +22,7 @@ class StateHistoryChartLine extends LitElement {
 
   @property({ attribute: false }) public data: LineChartEntity[] = [];
 
-  @property() public names?: Record<string, string>;
+  @property() public names: boolean | Record<string, string> = false;
 
   @property() public unit?: string;
 

src/components/chart/state-history-chart-timeline.ts

@@ -19,7 +19,7 @@ export class StateHistoryChartTimeline extends LitElement {
 
   @property() public narrow!: boolean;
 
-  @property() public names?: Record<string, string>;
+  @property() public names: boolean | Record<string, string> = false;
 
   @property() public unit?: string;
 
@@ -64,8 +64,6 @@ export class StateHistoryChartTimeline extends LitElement {
     }
 
     if (
-      changedProps.has("startTime") ||
-      changedProps.has("endTime") ||
       changedProps.has("data") ||
       this._chartTime <
         new Date(this.endTime.getTime() - MIN_TIME_BETWEEN_UPDATES)

src/components/chart/state-history-charts.ts

@@ -38,14 +38,14 @@ declare global {
 }
 
 @customElement("state-history-charts")
-export class StateHistoryCharts extends LitElement {
+class StateHistoryCharts extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public historyData!: HistoryResult;
 
   @property() public narrow!: boolean;
 
-  @property() public names?: Record<string, string>;
+  @property({ type: Boolean }) public names = false;
 
   @property({ type: Boolean, attribute: "virtualize", reflect: true })
   public virtualize = false;
@@ -71,6 +71,7 @@ export class StateHistoryCharts extends LitElement {
   // @ts-ignore
   @restoreScroll(".container") private _savedScrollPos?: number;
 
+  @eventOptions({ passive: true })
   protected render(): TemplateResult {
     if (!isComponentLoaded(this.hass, "history")) {
       return html`<div class="info">

src/components/chart/statistics-chart.ts

@@ -66,7 +66,7 @@ class StatisticsChart extends LitElement {
     StatisticsMetaData
   >;
 
-  @property() public names?: Record<string, string>;
+  @property() public names: boolean | Record<string, string> = false;
 
   @property() public unit?: string;
 

src/components/entity/ha-entity-picker.ts

@@ -1,4 +1,4 @@
-import "../ha-list-item";
+import "@material/mwc-list/mwc-list-item";
 import { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
@@ -24,13 +24,13 @@ export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean;
 
 // eslint-disable-next-line lit/prefer-static-styles
 const rowRenderer: ComboBoxLitRenderer<HassEntityWithCachedName> = (item) =>
-  html`<ha-list-item graphic="avatar" .twoline=${!!item.entity_id}>
+  html`<mwc-list-item graphic="avatar" .twoline=${!!item.entity_id}>
     ${item.state
       ? html`<state-badge slot="graphic" .stateObj=${item}></state-badge>`
       : ""}
     <span>${item.friendly_name}</span>
     <span slot="secondary">${item.entity_id}</span>
-  </ha-list-item>`;
+  </mwc-list-item>`;
 
 @customElement("ha-entity-picker")
 export class HaEntityPicker extends LitElement {

src/components/ha-button.ts

@@ -1,24 +0,0 @@
-import { Button } from "@material/mwc-button";
-import { css } from "lit";
-import { customElement } from "lit/decorators";
-import { styles } from "@material/mwc-button/styles.css";
-
-@customElement("ha-button")
-export class HaButton extends Button {
-  static override styles = [
-    styles,
-    css`
-      ::slotted([slot="icon"]) {
-        margin-inline-start: 0px;
-        margin-inline-end: 8px;
-        direction: var(--direction);
-      }
-    `,
-  ];
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-button": HaButton;
-  }
-}

src/components/ha-check-list-item.ts

@@ -13,15 +13,6 @@ export class HaCheckListItem extends CheckListItemBase {
       :host {
         --mdc-theme-secondary: var(--primary-color);
       }
-
-      :host([graphic="avatar"]) .mdc-deprecated-list-item__graphic,
-      :host([graphic="medium"]) .mdc-deprecated-list-item__graphic,
-      :host([graphic="large"]) .mdc-deprecated-list-item__graphic,
-      :host([graphic="control"]) .mdc-deprecated-list-item__graphic {
-        margin-inline-end: var(--mdc-list-item-graphic-margin, 16px);
-        margin-inline-start: 0px;
-        direction: var(--direction);
-      }
     `,
   ];
 }

src/components/ha-combo-box.ts

@@ -1,3 +1,4 @@
+import "@material/mwc-list/mwc-list-item";
 import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
 import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit";
 import "@vaadin/combo-box/theme/material/vaadin-combo-box-light";
@@ -14,15 +15,15 @@ import { customElement, property, query } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
 import { HomeAssistant } from "../types";
-import "./ha-list-item";
 import "./ha-icon-button";
+import "./ha-textfield";
 import type { HaTextField } from "./ha-textfield";
 
 registerStyles(
   "vaadin-combo-box-item",
   css`
     :host {
-      padding: 0 !important;
+      padding: 0;
     }
     :host([focused]:not([disabled])) {
       background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12);
@@ -210,9 +211,9 @@ export class HaComboBox extends LitElement {
   private _defaultRowRenderer: ComboBoxLitRenderer<
     string | Record<string, any>
   > = (item) =>
-    html`<ha-list-item>
+    html`<mwc-list-item>
       ${this.itemLabelPath ? item[this.itemLabelPath] : item}
-    </ha-list-item>`;
+    </mwc-list-item>`;
 
   private _clearValue(ev: Event) {
     ev.stopPropagation();

src/components/ha-dialog-date-picker.ts

@@ -24,7 +24,7 @@ export class HaDialogDatePicker extends LitElement {
   @state() private _value?: string;
 
   public async showDialog(params: datePickerDialogParams): Promise<void> {
-    // app-datepicker has a bug, that it removes its handlers when disconnected, but doesn't add them back when reconnected.
+    // app-datpicker has a bug, that it removes its handlers when disconnected, but doesnt add them back when reconnected.
     // So we need to wait for the next render to make sure the element is removed and re-created so the handlers are added.
     await nextRender();
     this._params = params;

src/data/entity_registry.ts

@@ -30,6 +30,7 @@ export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
   device_class?: string;
   original_device_class?: string;
   aliases: string[];
+  options: EntityRegistryOptions | null;
 }
 
 export interface UpdateEntityRegistryEntryResult {
@@ -39,6 +40,7 @@ export interface UpdateEntityRegistryEntryResult {
 }
 
 export interface SensorEntityOptions {
+  precision?: number | null;
   unit_of_measurement?: string | null;
 }
 
@@ -54,6 +56,12 @@ export interface WeatherEntityOptions {
   wind_speed_unit?: string | null;
 }
 
+export interface EntityRegistryOptions {
+  number?: NumberEntityOptions;
+  sensor?: SensorEntityOptions;
+  weather?: WeatherEntityOptions;
+}
+
 export interface EntityRegistryEntryUpdateParams {
   name?: string | null;
   icon?: string | null;

src/data/history.ts

@@ -117,7 +117,7 @@ export const fetchDateWS = (
 
 export const subscribeHistory = (
   hass: HomeAssistant,
-  callbackFunction: (data: HistoryStates) => void,
+  callbackFunction: (message: HistoryStreamMessage) => void,
   startTime: Date,
   endTime: Date,
   entityIds: string[]
@@ -132,9 +132,8 @@ export const subscribeHistory = (
       entityIdHistoryNeedsAttributes(hass, entityId)
     ),
   };
-  const stream = new HistoryStream(hass);
   return hass.connection.subscribeMessage<HistoryStreamMessage>(
-    (message) => callbackFunction(stream.processMessage(message)),
+    (message) => callbackFunction(message),
     params
   );
 };
@@ -142,11 +141,11 @@ export const subscribeHistory = (
 class HistoryStream {
   hass: HomeAssistant;
 
-  hoursToShow?: number;
+  hoursToShow: number;
 
   combinedHistory: HistoryStates;
 
-  constructor(hass: HomeAssistant, hoursToShow?: number) {
+  constructor(hass: HomeAssistant, hoursToShow: number) {
     this.hass = hass;
     this.hoursToShow = hoursToShow;
     this.combinedHistory = {};
@@ -162,9 +161,8 @@ class HistoryStream {
       // indicate no more historical events
       return this.combinedHistory;
     }
-    const purgeBeforePythonTime = this.hoursToShow
-      ? (new Date().getTime() - 60 * 60 * this.hoursToShow * 1000) / 1000
-      : undefined;
+    const purgeBeforePythonTime =
+      (new Date().getTime() - 60 * 60 * this.hoursToShow * 1000) / 1000;
     const newHistory: HistoryStates = {};
     for (const entityId of Object.keys(this.combinedHistory)) {
       newHistory[entityId] = [];
@@ -197,7 +195,7 @@ class HistoryStream {
         newHistory[entityId] = streamMessage.states[entityId];
       }
       // Remove old history
-      if (purgeBeforePythonTime && entityId in this.combinedHistory) {
+      if (entityId in this.combinedHistory) {
         const expiredStates = newHistory[entityId].filter(
           (state) => state.lu < purgeBeforePythonTime
         );

src/dialogs/more-info/ha-more-info-history.ts

@@ -113,15 +113,20 @@ export class MoreInfoHistory extends LitElement {
 
   public disconnectedCallback() {
     super.disconnectedCallback();
-    this._unsubscribeHistory();
+    this._unsubscribeHistoryTimeWindow();
   }
 
-  private _unsubscribeHistory() {
-    clearInterval(this._interval);
-    if (this._subscribed) {
-      this._subscribed.then((unsub) => unsub?.());
-      this._subscribed = undefined;
+  private _unsubscribeHistoryTimeWindow() {
+    if (!this._subscribed) {
+      return;
     }
+    clearInterval(this._interval);
+    this._subscribed.then((unsubscribe) => {
+      if (unsubscribe) {
+        unsubscribe();
+      }
+      this._subscribed = undefined;
+    });
   }
 
   private _redrawGraph() {
@@ -160,7 +165,7 @@ export class MoreInfoHistory extends LitElement {
       return;
     }
     if (this._subscribed) {
-      this._unsubscribeHistory();
+      this._unsubscribeHistoryTimeWindow();
     }
     this._subscribed = subscribeHistoryStatesTimeWindow(
       this.hass!,

src/panels/config/automation/action/ha-automation-action.ts

@@ -11,7 +11,6 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
 import { LocalizeFunc } from "../../../../common/translations/localize";
 import "../../../../components/ha-button-menu";
-import "../../../../components/ha-button";
 import type { HaSelect } from "../../../../components/ha-select";
 import "../../../../components/ha-svg-icon";
 import { ACTION_TYPES } from "../../../../data/action";
@@ -133,7 +132,7 @@ export default class HaAutomationAction extends LitElement {
         @action=${this._addAction}
         .disabled=${this.disabled}
       >
-        <ha-button
+        <mwc-button
           slot="trigger"
           outlined
           .disabled=${this.disabled}
@@ -142,7 +141,7 @@ export default class HaAutomationAction extends LitElement {
           )}
         >
           <ha-svg-icon .path=${mdiPlus} slot="icon"></ha-svg-icon>
-        </ha-button>
+        </mwc-button>
         ${this._processedTypes(this.hass.localize).map(
           ([opt, label, icon]) => html`
             <mwc-list-item .value=${opt} graphic="icon">

src/panels/config/automation/action/types/ha-automation-action-choose.ts

@@ -4,7 +4,6 @@ import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { ensureArray } from "../../../../../common/array/ensure-array";
 import "../../../../../components/ha-icon-button";
-import "../../../../../components/ha-button";
 import { Condition } from "../../../../../data/automation";
 import { Action, ChooseAction } from "../../../../../data/script";
 import { haStyle } from "../../../../../resources/styles";
@@ -81,7 +80,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
           </div>
         </ha-card>`
       )}
-      <ha-button
+      <mwc-button
         outlined
         .label=${this.hass.localize(
           "ui.panel.config.automation.editor.actions.type.choose.add_option"
@@ -90,7 +89,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
         @click=${this._addOption}
       >
         <ha-svg-icon .path=${mdiPlus} slot="icon"></ha-svg-icon>
-      </ha-button>
+      </mwc-button>
       ${this._showDefault || action.default
         ? html`
             <h2>
@@ -197,9 +196,6 @@ export class HaChooseAction extends LitElement implements ActionElement {
         ha-icon-button {
           position: absolute;
           right: 0;
-          inset-inline-start: initial;
-          inset-inline-end: 0;
-          direction: var(--direction);
           padding: 4px;
         }
         ha-svg-icon {

src/panels/config/automation/condition/ha-automation-condition.ts

@@ -8,7 +8,6 @@ import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
 import type { SortableEvent } from "sortablejs";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import "../../../../components/ha-button";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-svg-icon";
 import type { Condition } from "../../../../data/automation";
@@ -178,7 +177,7 @@ export default class HaAutomationCondition extends LitElement {
         @action=${this._addCondition}
         .disabled=${this.disabled}
       >
-        <ha-button
+        <mwc-button
           slot="trigger"
           outlined
           .disabled=${this.disabled}
@@ -187,7 +186,7 @@ export default class HaAutomationCondition extends LitElement {
           )}
         >
           <ha-svg-icon .path=${mdiPlus} slot="icon"></ha-svg-icon>
-        </ha-button>
+        </mwc-button>
         ${this._processedTypes(this.hass.localize).map(
           ([opt, label, icon]) => html`
             <mwc-list-item .value=${opt} graphic="icon">

src/panels/config/automation/trigger/ha-automation-trigger.ts

@@ -11,7 +11,6 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { stringCompare } from "../../../../common/string/compare";
 import type { LocalizeFunc } from "../../../../common/translations/localize";
 import "../../../../components/ha-button-menu";
-import "../../../../components/ha-button";
 import type { HaSelect } from "../../../../components/ha-select";
 import "../../../../components/ha-svg-icon";
 import { Trigger } from "../../../../data/automation";
@@ -126,7 +125,7 @@ export default class HaAutomationTrigger extends LitElement {
         )}
         </div>
         <ha-button-menu @action=${this._addTrigger} .disabled=${this.disabled}>
-          <ha-button
+          <mwc-button
             slot="trigger"
             outlined
             .label=${this.hass.localize(
@@ -135,7 +134,7 @@ export default class HaAutomationTrigger extends LitElement {
             .disabled=${this.disabled}
           >
             <ha-svg-icon .path=${mdiPlus} slot="icon"></ha-svg-icon>
-          </ha-button>
+          </mwc-button>
           ${this._processedTypes(this.hass.localize).map(
             ([opt, label, icon]) => html`
               <mwc-list-item .value=${opt} graphic="icon">

src/panels/config/energy/components/ha-energy-grid-settings.ts

@@ -366,7 +366,6 @@ export class EnergyGridSettings extends LitElement {
       ev.currentTarget.closest(".row").source;
     showEnergySettingsGridFlowFromDialog(this, {
       source: { ...origSource },
-      metadata: this.statsMetadata?.[origSource.stat_energy_from],
       saveCallback: async (source) => {
         const flowFrom = energySourcesByType(this.preferences).grid![0]
           .flow_from;
@@ -394,7 +393,6 @@ export class EnergyGridSettings extends LitElement {
       ev.currentTarget.closest(".row").source;
     showEnergySettingsGridFlowToDialog(this, {
       source: { ...origSource },
-      metadata: this.statsMetadata?.[origSource.stat_energy_to],
       saveCallback: async (source) => {
         const flowTo = energySourcesByType(this.preferences).grid![0].flow_to;
 

src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts

@@ -13,7 +13,6 @@ import { HomeAssistant } from "../../../../types";
 import { EnergySettingsBatteryDialogParams } from "./show-dialogs-energy";
 import "@material/mwc-button/mwc-button";
 import "../../../../components/entity/ha-statistic-picker";
-import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 
 const energyUnitClasses = ["energy"];
 
@@ -28,8 +27,6 @@ export class DialogEnergyBatterySettings
 
   @state() private _source?: BatterySourceTypeEnergyPreference;
 
-  @state() private _energy_units?: string[];
-
   @state() private _error?: string;
 
   public async showDialog(
@@ -39,9 +36,6 @@ export class DialogEnergyBatterySettings
     this._source = params.source
       ? { ...params.source }
       : emptyBatteryEnergyPreference();
-    this._energy_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
-    ).units;
   }
 
   public closeDialog(): void {
@@ -56,8 +50,6 @@ export class DialogEnergyBatterySettings
       return html``;
     }
 
-    const pickableUnit = this._energy_units?.join(", ") || "";
-
     return html`
       <ha-dialog
         open
@@ -71,12 +63,6 @@ export class DialogEnergyBatterySettings
         @closed=${this.closeDialog}
       >
         ${this._error ? html`<p class="error">${this._error}</p>` : ""}
-        <div>
-          ${this.hass.localize(
-            "ui.panel.config.energy.battery.dialog.entity_para",
-            { unit: pickableUnit }
-          )}
-        </div>
 
         <ha-statistic-picker
           .hass=${this.hass}

src/panels/config/energy/dialogs/dialog-energy-device-settings.ts

@@ -13,7 +13,6 @@ import "../../../../components/entity/ha-statistic-picker";
 import "../../../../components/ha-radio";
 import "../../../../components/ha-formfield";
 import "../../../../components/entity/ha-entity-picker";
-import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 
 const energyUnitClasses = ["energy"];
 
@@ -28,17 +27,12 @@ export class DialogEnergyDeviceSettings
 
   @state() private _device?: DeviceConsumptionEnergyPreference;
 
-  @state() private _energy_units?: string[];
-
   @state() private _error?: string;
 
   public async showDialog(
     params: EnergySettingsDeviceDialogParams
   ): Promise<void> {
     this._params = params;
-    this._energy_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
-    ).units;
   }
 
   public closeDialog(): void {
@@ -53,8 +47,6 @@ export class DialogEnergyDeviceSettings
       return html``;
     }
 
-    const pickableUnit = this._energy_units?.join(", ") || "";
-
     return html`
       <ha-dialog
         open
@@ -70,8 +62,7 @@ export class DialogEnergyDeviceSettings
         ${this._error ? html`<p class="error">${this._error}</p>` : ""}
         <div>
           ${this.hass.localize(
-            "ui.panel.config.energy.device_consumption.dialog.selected_stat_intro",
-            { unit: pickableUnit }
+            `ui.panel.config.energy.device_consumption.dialog.selected_stat_intro`
           )}
         </div>
 

src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts

@@ -23,7 +23,6 @@ import {
   getDisplayUnit,
   isExternalStatistic,
 } from "../../../../data/recorder";
-import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 
 const gasDeviceClasses = ["gas", "energy"];
 const gasUnitClasses = ["volume", "energy"];
@@ -41,12 +40,10 @@ export class DialogEnergyGasSettings
 
   @state() private _costs?: "no-costs" | "number" | "entity" | "statistic";
 
+  @state() private _pickableUnit?: string;
+
   @state() private _pickedDisplayUnit?: string | null;
 
-  @state() private _energy_units?: string[];
-
-  @state() private _gas_units?: string[];
-
   @state() private _error?: string;
 
   public async showDialog(
@@ -68,17 +65,12 @@ export class DialogEnergyGasSettings
       : this._source.stat_cost
       ? "statistic"
       : "no-costs";
-    this._energy_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
-    ).units;
-    this._gas_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "gas")
-    ).units;
   }
 
   public closeDialog(): void {
     this._params = undefined;
     this._source = undefined;
+    this._pickableUnit = undefined;
     this._pickedDisplayUnit = undefined;
     this._error = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
@@ -90,19 +82,15 @@ export class DialogEnergyGasSettings
     }
 
     const pickableUnit =
-      this._params.allowedGasUnitClass === undefined
-        ? [...(this._gas_units || []), ...(this._energy_units || [])].join(", ")
+      this._pickableUnit ||
+      (this._params.allowedGasUnitClass === undefined
+        ? "ft³, m³, Wh, kWh, MWh or GJ"
         : this._params.allowedGasUnitClass === "energy"
-        ? this._energy_units?.join(", ") || ""
-        : this._gas_units?.join(", ") || "";
-
-    const unitPrice = this._pickedDisplayUnit
-      ? `${this.hass.config.currency}/${this._pickedDisplayUnit}`
-      : undefined;
+        ? "Wh, kWh, MWh or GJ"
+        : "ft³ or m³");
 
     const externalSource =
-      this._source.stat_energy_from &&
-      isExternalStatistic(this._source.stat_energy_from);
+      this._source.stat_cost && isExternalStatistic(this._source.stat_cost);
 
     return html`
       <ha-dialog
@@ -115,20 +103,6 @@ export class DialogEnergyGasSettings
         @closed=${this.closeDialog}
       >
         ${this._error ? html`<p class="error">${this._error}</p>` : ""}
-        <div>
-          <p>
-            ${this.hass.localize("ui.panel.config.energy.gas.dialog.paragraph")}
-          </p>
-          <p>
-            ${this.hass.localize(
-              "ui.panel.config.energy.gas.dialog.entity_para",
-              { unit: pickableUnit }
-            )}
-          </p>
-          <p>
-            ${this.hass.localize("ui.panel.config.energy.gas.dialog.note_para")}
-          </p>
-        </div>
 
         <ha-statistic-picker
           .hass=${this.hass}
@@ -136,20 +110,26 @@ export class DialogEnergyGasSettings
           gasUnitClasses}
           .includeDeviceClass=${gasDeviceClasses}
           .value=${this._source.stat_energy_from}
-          .label=${this.hass.localize(
+          .label=${`${this.hass.localize(
             "ui.panel.config.energy.gas.dialog.gas_usage"
-          )}
+          )} (${
+            this._params.allowedGasUnitClass === undefined
+              ? this.hass.localize(
+                  "ui.panel.config.energy.gas.dialog.m3_or_kWh"
+                )
+              : pickableUnit
+          })`}
           @value-changed=${this._statisticChanged}
           dialogInitialFocus
         ></ha-statistic-picker>
 
         <p>
-          ${this.hass.localize("ui.panel.config.energy.gas.dialog.cost_para")}
+          ${this.hass.localize(`ui.panel.config.energy.gas.dialog.cost_para`)}
         </p>
 
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.gas.dialog.no_cost"
+            `ui.panel.config.energy.gas.dialog.no_cost`
           )}
         >
           <ha-radio
@@ -161,13 +141,14 @@ export class DialogEnergyGasSettings
         </ha-formfield>
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.gas.dialog.cost_stat"
+            `ui.panel.config.energy.gas.dialog.cost_stat`
           )}
         >
           <ha-radio
             value="statistic"
             name="costs"
             .checked=${this._costs === "statistic"}
+            .disabled=${externalSource}
             @change=${this._handleCostChanged}
           ></ha-radio>
         </ha-formfield>
@@ -177,15 +158,15 @@ export class DialogEnergyGasSettings
               .hass=${this.hass}
               statistic-types="sum"
               .value=${this._source.stat_cost}
-              .label=${`${this.hass.localize(
-                "ui.panel.config.energy.gas.dialog.cost_stat_input"
-              )} (${this.hass.config.currency})`}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.gas.dialog.cost_stat_input`
+              )}
               @value-changed=${this._priceStatChanged}
             ></ha-statistic-picker>`
           : ""}
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.gas.dialog.cost_entity"
+            `ui.panel.config.energy.gas.dialog.cost_entity`
           )}
         >
           <ha-radio
@@ -202,36 +183,39 @@ export class DialogEnergyGasSettings
               .hass=${this.hass}
               include-domains='["sensor", "input_number"]'
               .value=${this._source.entity_energy_price}
-              .label=${`${this.hass.localize(
-                "ui.panel.config.energy.gas.dialog.cost_entity_input"
-              )} ${unitPrice ? ` (${unitPrice})` : ""}`}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.gas.dialog.cost_entity_input`,
+                { unit: this._pickedDisplayUnit || pickableUnit }
+              )}
               @value-changed=${this._priceEntityChanged}
             ></ha-entity-picker>`
           : ""}
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.gas.dialog.cost_number"
+            `ui.panel.config.energy.gas.dialog.cost_number`
           )}
         >
           <ha-radio
             value="number"
             name="costs"
             .checked=${this._costs === "number"}
-            .disabled=${externalSource}
             @change=${this._handleCostChanged}
           ></ha-radio>
         </ha-formfield>
         ${this._costs === "number"
           ? html`<ha-textfield
-              .label=${`${this.hass.localize(
-                "ui.panel.config.energy.gas.dialog.cost_number_input"
-              )} ${unitPrice ? ` (${unitPrice})` : ""}`}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.gas.dialog.cost_number_input`,
+                { unit: this._pickedDisplayUnit || pickableUnit }
+              )}
               class="price-options"
               step=".01"
               type="number"
               .value=${this._source.number_energy_price}
               @change=${this._numberPriceChanged}
-              .suffix=${unitPrice || ""}
+              .suffix=${`${this.hass.config.currency}/${
+                this._pickedDisplayUnit || pickableUnit
+              }`}
             >
             </ha-textfield>`
           : ""}

src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts

@@ -19,12 +19,6 @@ import "../../../../components/ha-radio";
 import "../../../../components/ha-formfield";
 import type { HaRadio } from "../../../../components/ha-radio";
 import "../../../../components/entity/ha-entity-picker";
-import {
-  getStatisticMetadata,
-  getDisplayUnit,
-  isExternalStatistic,
-} from "../../../../data/recorder";
-import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 
 const energyUnitClasses = ["energy"];
 
@@ -43,10 +37,6 @@ export class DialogEnergyGridFlowSettings
 
   @state() private _costs?: "no-costs" | "number" | "entity" | "statistic";
 
-  @state() private _pickedDisplayUnit?: string | null;
-
-  @state() private _energy_units?: string[];
-
   @state() private _error?: string;
 
   public async showDialog(
@@ -67,24 +57,11 @@ export class DialogEnergyGridFlowSettings
         ]
       ? "statistic"
       : "no-costs";
-    this._pickedDisplayUnit = getDisplayUnit(
-      this.hass,
-      this._source[
-        this._params.direction === "from"
-          ? "stat_energy_from"
-          : "stat_energy_to"
-      ],
-      params.metadata
-    );
-    this._energy_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
-    ).units;
   }
 
   public closeDialog(): void {
     this._params = undefined;
     this._source = undefined;
-    this._pickedDisplayUnit = undefined;
     this._error = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
@@ -94,26 +71,6 @@ export class DialogEnergyGridFlowSettings
       return html``;
     }
 
-    const pickableUnit = this._energy_units?.join(", ") || "";
-
-    const unitPrice = this._pickedDisplayUnit
-      ? `${this.hass.config.currency}/${this._pickedDisplayUnit}`
-      : undefined;
-
-    const externalSource =
-      this._source[
-        this._params.direction === "from"
-          ? "stat_energy_from"
-          : "stat_energy_to"
-      ] &&
-      isExternalStatistic(
-        this._source[
-          this._params.direction === "from"
-            ? "stat_energy_from"
-            : "stat_energy_to"
-        ]
-      );
-
     return html`
       <ha-dialog
         open
@@ -128,17 +85,9 @@ export class DialogEnergyGridFlowSettings
       >
         ${this._error ? html`<p class="error">${this._error}</p>` : ""}
         <div>
-          <p>
-            ${this.hass.localize(
-              `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.paragraph`
-            )}
-          </p>
-          <p>
-            ${this.hass.localize(
-              `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.entity_para`,
-              { unit: pickableUnit }
-            )}
-          </p>
+          ${this.hass.localize(
+            `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.paragraph`
+          )}
         </div>
 
         <ha-statistic-picker
@@ -196,9 +145,9 @@ export class DialogEnergyGridFlowSettings
                   ? "stat_cost"
                   : "stat_compensation"
               ]}
-              .label=${`${this.hass.localize(
+              .label=${this.hass.localize(
                 `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_stat_input`
-              )} (${this.hass.config.currency})`}
+              )}
               @value-changed=${this._priceStatChanged}
             ></ha-statistic-picker>`
           : ""}
@@ -211,7 +160,6 @@ export class DialogEnergyGridFlowSettings
             value="entity"
             name="costs"
             .checked=${this._costs === "entity"}
-            .disabled=${externalSource}
             @change=${this._handleCostChanged}
           ></ha-radio>
         </ha-formfield>
@@ -221,9 +169,9 @@ export class DialogEnergyGridFlowSettings
               .hass=${this.hass}
               include-domains='["sensor", "input_number"]'
               .value=${this._source.entity_energy_price}
-              .label=${`${this.hass.localize(
+              .label=${this.hass.localize(
                 `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_entity_input`
-              )} ${unitPrice ? ` (${unitPrice})` : ""}`}
+              )}
               @value-changed=${this._priceEntityChanged}
             ></ha-entity-picker>`
           : ""}
@@ -236,20 +184,22 @@ export class DialogEnergyGridFlowSettings
             value="number"
             name="costs"
             .checked=${this._costs === "number"}
-            .disabled=${externalSource}
             @change=${this._handleCostChanged}
           ></ha-radio>
         </ha-formfield>
         ${this._costs === "number"
           ? html`<ha-textfield
-              .label=${`${this.hass.localize(
+              .label=${this.hass.localize(
                 `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_number_input`
-              )} ${unitPrice ? ` (${unitPrice})` : ""}`}
+              )}
               class="price-options"
               step=".01"
               type="number"
               .value=${this._source.number_energy_price}
-              .suffix=${unitPrice || ""}
+              .suffix=${this.hass.localize(
+                `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_number_suffix`,
+                { currency: this.hass.config.currency }
+              )}
               @change=${this._numberPriceChanged}
             >
             </ha-textfield>`
@@ -311,17 +261,7 @@ export class DialogEnergyGridFlowSettings
     };
   }
 
-  private async _statisticChanged(ev: CustomEvent<{ value: string }>) {
-    if (ev.detail.value) {
-      const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]);
-      this._pickedDisplayUnit = getDisplayUnit(
-        this.hass,
-        ev.detail.value,
-        metadata[0]
-      );
-    } else {
-      this._pickedDisplayUnit = undefined;
-    }
+  private _statisticChanged(ev: CustomEvent<{ value: string }>) {
     this._source = {
       ...this._source!,
       [this._params!.direction === "from"

src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts

@@ -21,7 +21,6 @@ import type { HaRadio } from "../../../../components/ha-radio";
 import { showConfigFlowDialog } from "../../../../dialogs/config-flow/show-dialog-config-flow";
 import { ConfigEntry, getConfigEntries } from "../../../../data/config_entries";
 import { brandsUrl } from "../../../../util/brands-url";
-import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 
 const energyUnitClasses = ["energy"];
 
@@ -40,8 +39,6 @@ export class DialogEnergySolarSettings
 
   @state() private _forecast?: boolean;
 
-  @state() private _energy_units?: string[];
-
   @state() private _error?: string;
 
   public async showDialog(
@@ -53,9 +50,6 @@ export class DialogEnergySolarSettings
       ? { ...params.source }
       : emptySolarEnergyPreference();
     this._forecast = this._source.config_entry_solar_forecast !== null;
-    this._energy_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "energy")
-    ).units;
   }
 
   public closeDialog(): void {
@@ -70,8 +64,6 @@ export class DialogEnergySolarSettings
       return html``;
     }
 
-    const pickableUnit = this._energy_units?.join(", ") || "";
-
     return html`
       <ha-dialog
         open
@@ -83,12 +75,6 @@ export class DialogEnergySolarSettings
         @closed=${this.closeDialog}
       >
         ${this._error ? html`<p class="error">${this._error}</p>` : ""}
-        <div>
-          ${this.hass.localize(
-            "ui.panel.config.energy.solar.dialog.entity_para",
-            { unit: pickableUnit }
-          )}
-        </div>
 
         <ha-statistic-picker
           .hass=${this.hass}

src/panels/config/energy/dialogs/dialog-energy-water-settings.ts

@@ -14,16 +14,11 @@ import {
   emptyWaterEnergyPreference,
   WaterSourceTypeEnergyPreference,
 } from "../../../../data/energy";
-import {
-  getStatisticMetadata,
-  getDisplayUnit,
-  isExternalStatistic,
-} from "../../../../data/recorder";
+import { isExternalStatistic } from "../../../../data/recorder";
 import { HassDialog } from "../../../../dialogs/make-dialog-manager";
 import { haStyle, haStyleDialog } from "../../../../resources/styles";
 import { HomeAssistant } from "../../../../types";
 import { EnergySettingsWaterDialogParams } from "./show-dialogs-energy";
-import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor";
 
 @customElement("dialog-energy-water-settings")
 export class DialogEnergyWaterSettings
@@ -38,10 +33,6 @@ export class DialogEnergyWaterSettings
 
   @state() private _costs?: "no-costs" | "number" | "entity" | "statistic";
 
-  @state() private _pickedDisplayUnit?: string | null;
-
-  @state() private _water_units?: string[];
-
   @state() private _error?: string;
 
   public async showDialog(
@@ -51,11 +42,6 @@ export class DialogEnergyWaterSettings
     this._source = params.source
       ? { ...params.source }
       : emptyWaterEnergyPreference();
-    this._pickedDisplayUnit = getDisplayUnit(
-      this.hass,
-      params.source?.stat_energy_from,
-      params.metadata
-    );
     this._costs = this._source.entity_energy_price
       ? "entity"
       : this._source.number_energy_price
@@ -63,16 +49,12 @@ export class DialogEnergyWaterSettings
       : this._source.stat_cost
       ? "statistic"
       : "no-costs";
-    this._water_units = (
-      await getSensorDeviceClassConvertibleUnits(this.hass, "water")
-    ).units;
   }
 
   public closeDialog(): void {
     this._params = undefined;
     this._source = undefined;
     this._error = undefined;
-    this._pickedDisplayUnit = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -81,15 +63,8 @@ export class DialogEnergyWaterSettings
       return html``;
     }
 
-    const pickableUnit = this._water_units?.join(", ") || "";
-
-    const unitPrice = this._pickedDisplayUnit
-      ? `${this.hass.config.currency}/${this._pickedDisplayUnit}`
-      : undefined;
-
     const externalSource =
-      this._source.stat_energy_from &&
-      isExternalStatistic(this._source.stat_energy_from);
+      this._source.stat_cost && isExternalStatistic(this._source.stat_cost);
 
     return html`
       <ha-dialog
@@ -102,19 +77,6 @@ export class DialogEnergyWaterSettings
         @closed=${this.closeDialog}
       >
         ${this._error ? html`<p class="error">${this._error}</p>` : ""}
-        <div>
-          <p>
-            ${this.hass.localize(
-              "ui.panel.config.energy.water.dialog.paragraph"
-            )}
-          </p>
-          <p>
-            ${this.hass.localize(
-              "ui.panel.config.energy.water.dialog.entity_para",
-              { unit: pickableUnit }
-            )}
-          </p>
-        </div>
 
         <ha-statistic-picker
           .hass=${this.hass}
@@ -129,12 +91,12 @@ export class DialogEnergyWaterSettings
         ></ha-statistic-picker>
 
         <p>
-          ${this.hass.localize("ui.panel.config.energy.water.dialog.cost_para")}
+          ${this.hass.localize(`ui.panel.config.energy.water.dialog.cost_para`)}
         </p>
 
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.water.dialog.no_cost"
+            `ui.panel.config.energy.water.dialog.no_cost`
           )}
         >
           <ha-radio
@@ -146,13 +108,14 @@ export class DialogEnergyWaterSettings
         </ha-formfield>
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.water.dialog.cost_stat"
+            `ui.panel.config.energy.water.dialog.cost_stat`
           )}
         >
           <ha-radio
             value="statistic"
             name="costs"
             .checked=${this._costs === "statistic"}
+            .disabled=${externalSource}
             @change=${this._handleCostChanged}
           ></ha-radio>
         </ha-formfield>
@@ -162,15 +125,15 @@ export class DialogEnergyWaterSettings
               .hass=${this.hass}
               statistic-types="sum"
               .value=${this._source.stat_cost}
-              .label=${`${this.hass.localize(
-                "ui.panel.config.energy.water.dialog.cost_stat_input"
-              )} (${this.hass.config.currency})`}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.water.dialog.cost_stat_input`
+              )}
               @value-changed=${this._priceStatChanged}
             ></ha-statistic-picker>`
           : ""}
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.water.dialog.cost_entity"
+            `ui.panel.config.energy.water.dialog.cost_entity`
           )}
         >
           <ha-radio
@@ -187,36 +150,35 @@ export class DialogEnergyWaterSettings
               .hass=${this.hass}
               include-domains='["sensor", "input_number"]'
               .value=${this._source.entity_energy_price}
-              .label=${`${this.hass.localize(
-                "ui.panel.config.energy.water.dialog.cost_entity_input"
-              )}${unitPrice ? ` (${unitPrice})` : ""}`}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.water.dialog.cost_entity_input`
+              )}
               @value-changed=${this._priceEntityChanged}
             ></ha-entity-picker>`
           : ""}
         <ha-formfield
           .label=${this.hass.localize(
-            "ui.panel.config.energy.water.dialog.cost_number"
+            `ui.panel.config.energy.water.dialog.cost_number`
           )}
         >
           <ha-radio
             value="number"
             name="costs"
             .checked=${this._costs === "number"}
-            .disabled=${externalSource}
             @change=${this._handleCostChanged}
           ></ha-radio>
         </ha-formfield>
         ${this._costs === "number"
           ? html`<ha-textfield
-              .label=${`${this.hass.localize(
-                "ui.panel.config.energy.water.dialog.cost_number_input"
-              )}${unitPrice ? ` (${unitPrice})` : ""}`}
+              .label=${this.hass.localize(
+                `ui.panel.config.energy.water.dialog.cost_number_input`
+              )}
               class="price-options"
               step=".01"
               type="number"
               .value=${this._source.number_energy_price}
               @change=${this._numberPriceChanged}
-              .suffix=${unitPrice || ""}
+              .suffix=${`${this.hass.config.currency}/m³`}
             >
             </ha-textfield>`
           : ""}
@@ -268,16 +230,6 @@ export class DialogEnergyWaterSettings
   }
 
   private async _statisticChanged(ev: CustomEvent<{ value: string }>) {
-    if (ev.detail.value) {
-      const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]);
-      this._pickedDisplayUnit = getDisplayUnit(
-        this.hass,
-        ev.detail.value,
-        metadata[0]
-      );
-    } else {
-      this._pickedDisplayUnit = undefined;
-    }
     if (isExternalStatistic(ev.detail.value) && this._costs !== "statistic") {
       this._costs = "no-costs";
     }

src/panels/config/energy/dialogs/show-dialogs-energy.ts

@@ -16,7 +16,6 @@ export interface EnergySettingsGridFlowDialogParams {
   source?:
     | FlowFromGridSourceEnergyPreference
     | FlowToGridSourceEnergyPreference;
-  metadata?: StatisticsMetaData;
   direction: "from" | "to";
   saveCallback: (
     source:
@@ -27,13 +26,11 @@ export interface EnergySettingsGridFlowDialogParams {
 
 export interface EnergySettingsGridFlowFromDialogParams {
   source?: FlowFromGridSourceEnergyPreference;
-  metadata?: StatisticsMetaData;
   saveCallback: (source: FlowFromGridSourceEnergyPreference) => Promise<void>;
 }
 
 export interface EnergySettingsGridFlowToDialogParams {
   source?: FlowToGridSourceEnergyPreference;
-  metadata?: StatisticsMetaData;
   saveCallback: (source: FlowToGridSourceEnergyPreference) => Promise<void>;
 }
 

src/panels/config/entities/entity-registry-settings.ts

@@ -63,6 +63,7 @@ import {
   EntityRegistryEntry,
   EntityRegistryEntryUpdateParams,
   ExtEntityRegistryEntry,
+  SensorEntityOptions,
   fetchEntityRegistry,
   removeEntityRegistryEntry,
   updateEntityRegistryEntry,
@@ -126,6 +127,16 @@ const OVERRIDE_WEATHER_UNITS = {
 
 const SWITCH_AS_DOMAINS = ["cover", "fan", "light", "lock", "siren"];
 
+const PRECISIONS = [0, 1, 2, 3, 4, 5, 6];
+
+function precisionLabel(precision: number, _state?: string) {
+  const state_float =
+    _state === undefined || isNaN(parseFloat(_state))
+      ? 0.0
+      : parseFloat(_state);
+  return state_float.toFixed(precision);
+}
+
 @customElement("entity-registry-settings")
 export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -154,6 +165,8 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
 
   @state() private _unit_of_measurement?: string | null;
 
+  @state() private _precision?: number | null;
+
   @state() private _precipitation_unit?: string | null;
 
   @state() private _pressure_unit?: string | null;
@@ -251,6 +264,10 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
       this._unit_of_measurement = stateObj?.attributes?.unit_of_measurement;
     }
 
+    if (domain === "sensor") {
+      this._precision = this.entry.options?.sensor?.precision;
+    }
+
     if (domain === "weather") {
       const stateObj: HassEntity | undefined =
         this.hass.states[this.entry.entity_id];
@@ -468,6 +485,44 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
               </ha-select>
             `
           : ""}
+        ${domain === "sensor" &&
+        // Allow customizing the precision for a sensor with numerical device class,
+        // a unit of measurement or state class
+        ((this._deviceClass &&
+          !["date", "enum", "timestamp"].includes(this._deviceClass)) ||
+          stateObj?.attributes.unit_of_measurement ||
+          stateObj?.attributes.state_class)
+          ? html`
+              <ha-select
+                .label=${this.hass.localize(
+                  "ui.dialogs.entity_registry.editor.precision"
+                )}
+                .value=${this._precision == null
+                  ? "default"
+                  : this._precision.toString()}
+                naturalMenuWidth
+                fixedMenuPosition
+                @selected=${this._precisionChanged}
+                @closed=${stopPropagation}
+              >
+                <mwc-list-item .value=${"default"}
+                  >${this.hass.localize(
+                    "ui.dialogs.entity_registry.editor.precision_default"
+                  )}</mwc-list-item
+                >
+                ${PRECISIONS.map(
+                  (precision) => html`
+                    <mwc-list-item .value=${precision.toString()}>
+                      ${precisionLabel(
+                        precision,
+                        this.hass.states[this.entry.entity_id]?.state
+                      )}
+                    </mwc-list-item>
+                  `
+                )}
+              </ha-select>
+            `
+          : ""}
         ${domain === "weather"
           ? html`
               <ha-select
@@ -893,6 +948,12 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
     this._precipitation_unit = ev.target.value;
   }
 
+  private _precisionChanged(ev): void {
+    this._error = undefined;
+    this._precision =
+      ev.target.value === "default" ? null : Number(ev.target.value);
+  }
+
   private _pressureUnitChanged(ev): void {
     this._error = undefined;
     this._pressure_unit = ev.target.value;
@@ -1088,7 +1149,16 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
       stateObj?.attributes?.unit_of_measurement !== this._unit_of_measurement
     ) {
       params.options_domain = domain;
-      params.options = { unit_of_measurement: this._unit_of_measurement };
+      params.options = this.entry.options?.[domain] || {};
+      params.options.unit_of_measurement = this._unit_of_measurement;
+    }
+    if (
+      domain === "sensor" &&
+      this.entry.options?.[domain]?.precision !== this._precision
+    ) {
+      params.options_domain = domain;
+      params.options = params.options || this.entry.options?.[domain] || {};
+      (params.options as SensorEntityOptions).precision = this._precision;
     }
     if (
       domain === "weather" &&

src/panels/config/hardware/ha-config-hardware.ts

@@ -103,21 +103,17 @@ class HaConfigHardware extends SubscribeMixin(LitElement) {
                 fullUpdate = true;
               }
             } else if (message.type === "removed") {
-              if (this._configEntries) {
-                delete this._configEntries[message.entry.entry_id];
-              }
+              delete this._configEntries![message.entry.entry_id];
             } else if (message.type === "updated") {
-              if (this._configEntries) {
-                const newEntry = message.entry;
-                this._configEntries[message.entry.entry_id] = newEntry;
-              }
+              const newEntry = message.entry;
+              this._configEntries![message.entry.entry_id] = newEntry;
             }
           });
           if (!newEntries.length && !fullUpdate) {
             return;
           }
           const entries = [
-            ...(fullUpdate ? [] : Object.values(this._configEntries || {})),
+            ...(fullUpdate ? [] : Object.values(this._configEntries!)),
             ...newEntries,
           ];
           const configEntries: { [id: string]: ConfigEntry } = {};
@@ -224,6 +220,10 @@ class HaConfigHardware extends SubscribeMixin(LitElement) {
   }
 
   protected render(): TemplateResult {
+    if (!this._configEntries) {
+      return html``;
+    }
+
     let boardId: string | undefined;
     let boardName: string | undefined;
     let imageURL: string | undefined;
@@ -240,14 +240,14 @@ class HaConfigHardware extends SubscribeMixin(LitElement) {
         (!hw.config_entries.length ||
           hw.config_entries.some(
             (entryId) =>
-              this._configEntries?.[entryId] &&
-              !this._configEntries[entryId].disabled_by
+              this._configEntries![entryId] &&
+              !this._configEntries![entryId].disabled_by
           ))
     );
 
     if (boardData) {
       boardConfigEntries = boardData.config_entries
-        .map((id) => this._configEntries?.[id])
+        .map((id) => this._configEntries![id])
         .filter(
           (entry) => entry?.supports_options && !entry.disabled_by
         ) as ConfigEntry[];
@@ -376,7 +376,7 @@ class HaConfigHardware extends SubscribeMixin(LitElement) {
             ? html`<ha-card>
                 ${dongles.map((dongle) => {
                   const configEntry = dongle.config_entries
-                    .map((id) => this._configEntries?.[id])
+                    .map((id) => this._configEntries![id])
                     .filter(
                       (entry) => entry?.supports_options && !entry.disabled_by
                     )[0];

src/panels/config/integrations/ha-config-integrations.ts

@@ -822,9 +822,6 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
         }
         ha-button-menu {
           margin-left: 8px;
-          margin-inline-start: 8px;
-          margin-inline-end: initial;
-          direction: var(--direction);
         }
         .container {
           display: grid;
@@ -853,9 +850,6 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
           display: block;
           color: var(--secondary-text-color);
           margin-left: 8px;
-          margin-inline-start: 8px;
-          margin-inline-end: initial;
-          direction: var(--direction);
           --mdc-ripple-color: transparant;
         }
         .search {
@@ -880,22 +874,13 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
           position: relative;
           display: flex;
           align-items: center;
-          padding-top: 2px;
-          padding-bottom: 2px;
-          padding-right: 2px;
-          padding-left: 8px;
-          padding-inline-start: 8px;
-          padding-inline-end: 2px;
+          padding: 2px 2px 2px 8px;
           font-size: 14px;
           width: max-content;
           cursor: initial;
-          direction: var(--direction);
         }
         .active-filters mwc-button {
           margin-left: 8px;
-          margin-inline-start: 8px;
-          margin-inline-end: initial;
-          direction: var(--direction);
         }
         .active-filters::before {
           background-color: var(--primary-color);

src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts

@@ -15,7 +15,6 @@ import "../../../../../components/ha-alert";
 import { showPromptDialog } from "../../../../../dialogs/generic/show-dialog-box";
 import { navigate } from "../../../../../common/navigate";
 import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
-import { isDevVersion } from "../../../../../common/config/version";
 
 @customElement("matter-config-panel")
 export class MatterConfigPanel extends LitElement {
@@ -62,19 +61,15 @@ export class MatterConfigPanel extends LitElement {
                     >Commission device with mobile app</mwc-button
                   >`
                 : ""}
-              ${isDevVersion(this.hass.config.version)
-                ? html`<mwc-button @click=${this._commission}
-                      >Commission device</mwc-button
-                    >
-                    <mwc-button @click=${this._acceptSharedDevice}
-                      >Add shared device</mwc-button
-                    >`
-                : ""}
               <mwc-button @click=${this._setWifi}
                 >Set WiFi Credentials</mwc-button
               >
-              <mwc-button @click=${this._setThread}
-                >Set Thread Credentials</mwc-button
+              <mwc-button @click=${this._setThread}>Set Thread</mwc-button>
+              <mwc-button @click=${this._commission}
+                >Commission device</mwc-button
+              >
+              <mwc-button @click=${this._acceptSharedDevice}
+                >Add shared device</mwc-button
               >
             </div>
           </ha-card>

src/panels/config/logs/ha-config-logs.ts

@@ -4,7 +4,6 @@ import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { extractSearchParam } from "../../../common/url/search-params";
 import "../../../components/ha-button-menu";
-import "../../../components/ha-button";
 import "../../../components/search-input";
 import { LogProvider } from "../../../data/error_log";
 import { fetchHassioAddonsInfo } from "../../../data/hassio/addon";
@@ -116,7 +115,7 @@ export class HaConfigLogs extends LitElement {
         this.hass.userData?.showAdvanced
           ? html`
               <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
-                <ha-button
+                <mwc-button
                   slot="trigger"
                   .label=${this._logProviders.find(
                     (p) => p.key === this._selectedLogProvider
@@ -126,7 +125,7 @@ export class HaConfigLogs extends LitElement {
                     slot="trailingIcon"
                     .path=${mdiChevronDown}
                   ></ha-svg-icon>
-                </ha-button>
+                </mwc-button>
                 ${this._logProviders.map(
                   (provider) => html`
                     <mwc-list-item

src/panels/config/network/supervisor-network.ts

@@ -106,12 +106,7 @@ export class HassioNetwork extends LitElement {
         )}
         ${this._interface?.type === "wireless"
           ? html`
-              <ha-expansion-panel
-                .header=${this.hass.localize(
-                  "ui.panel.config.network.supervisor.wifi"
-                )}
-                outlined
-              >
+              <ha-expansion-panel header="Wi-Fi" outlined>
                 ${this._interface?.wifi?.ssid
                   ? html`<p>
                       ${this.hass.localize(
@@ -152,11 +147,7 @@ export class HassioNetwork extends LitElement {
                                 >
                                   <span>${ap.ssid}</span>
                                   <span slot="secondary">
-                                    ${ap.mac} -
-                                    ${this.hass.localize(
-                                      "ui.panel.config.network.supervisor.signal_strength"
-                                    )}:
-                                    ${ap.signal}
+                                    ${ap.mac} - Strength: ${ap.signal}
                                   </span>
                                 </mwc-list-item>
                               `
@@ -220,9 +211,7 @@ export class HassioNetwork extends LitElement {
                               class="flex-auto"
                               type="password"
                               id="psk"
-                              .label=${this.hass.localize(
-                                "ui.panel.config.network.supervisor.wifi_password"
-                              )}
+                              label="Password"
                               version="wifi"
                               @value-changed=${this
                                 ._handleInputValueChangedWifi}

src/panels/history/ha-panel-history.ts

@@ -3,7 +3,6 @@ import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
 import {
   addDays,
-  differenceInHours,
   endOfToday,
   endOfWeek,
   endOfYesterday,
@@ -16,19 +15,17 @@ import {
   UnsubscribeFunc,
 } from "home-assistant-js-websocket/dist/types";
 import { css, html, LitElement, PropertyValues } from "lit";
-import { property, query, state } from "lit/decorators";
-import { ensureArray } from "../../common/array/ensure-array";
+import { property, state } from "lit/decorators";
 import { firstWeekdayIndex } from "../../common/datetime/first_weekday";
 import { LocalStorage } from "../../common/decorators/local-storage";
+import { ensureArray } from "../../common/array/ensure-array";
 import { navigate } from "../../common/navigate";
 import {
   createSearchParam,
   extractSearchParamsObject,
 } from "../../common/url/search-params";
 import { computeRTL } from "../../common/util/compute_rtl";
-import { MIN_TIME_BETWEEN_UPDATES } from "../../components/chart/ha-chart-base";
 import "../../components/chart/state-history-charts";
-import type { StateHistoryCharts } from "../../components/chart/state-history-charts";
 import "../../components/ha-circular-progress";
 import "../../components/ha-date-range-picker";
 import type { DateRangePickerRanges } from "../../components/ha-date-range-picker";
@@ -47,11 +44,7 @@ import {
   subscribeDeviceRegistry,
 } from "../../data/device_registry";
 import { subscribeEntityRegistry } from "../../data/entity_registry";
-import {
-  computeHistory,
-  HistoryResult,
-  subscribeHistory,
-} from "../../data/history";
+import { computeHistory, fetchDateWS } from "../../data/history";
 import "../../layouts/ha-app-layout";
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { haStyle } from "../../resources/styles";
@@ -73,7 +66,7 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
 
   @state() private _isLoading = false;
 
-  @state() private _stateHistory?: HistoryResult;
+  @state() private _stateHistory?;
 
   @state() private _ranges?: DateRangePickerRanges;
 
@@ -83,37 +76,18 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
 
   @state() private _areaDeviceLookup?: AreaDeviceLookup;
 
-  @query("state-history-charts")
-  private _stateHistoryCharts?: StateHistoryCharts;
-
-  private _subscribed?: Promise<UnsubscribeFunc>;
-
-  private _interval?: number;
-
   public constructor() {
     super();
 
     const start = new Date();
-    start.setHours(start.getHours() - 1, 0, 0, 0);
+    start.setHours(start.getHours() - 2, 0, 0, 0);
     this._startDate = start;
 
     const end = new Date();
-    end.setHours(end.getHours() + 2, 0, 0, 0);
+    end.setHours(end.getHours() + 1, 0, 0, 0);
     this._endDate = end;
   }
 
-  public connectedCallback() {
-    super.connectedCallback();
-    if (this.hasUpdated) {
-      this._getHistory();
-    }
-  }
-
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubscribeHistory();
-  }
-
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       subscribeEntityRegistry(this.hass.connection!, (entities) => {
@@ -296,63 +270,24 @@ class HaPanelHistory extends SubscribeMixin(LitElement) {
 
     if (entityIds.length === 0) {
       this._isLoading = false;
-      this._stateHistory = { line: [], timeline: [] };
+      this._stateHistory = [];
       return;
     }
+    try {
+      const dateHistory = await fetchDateWS(
+        this.hass,
+        this._startDate,
+        this._endDate,
+        entityIds
+      );
 
-    if (this._subscribed) {
-      this._unsubscribeHistory();
-    }
-
-    const now = new Date();
-
-    this._subscribed = subscribeHistory(
-      this.hass,
-      (history) => {
-        this._isLoading = false;
-        this._stateHistory = computeHistory(
-          this.hass,
-          history,
-          this.hass.localize
-        );
-      },
-      this._startDate,
-      this._endDate,
-      entityIds
-    );
-    this._subscribed.catch(() => {
+      this._stateHistory = computeHistory(
+        this.hass,
+        dateHistory,
+        this.hass.localize
+      );
+    } finally {
       this._isLoading = false;
-      this._unsubscribeHistory();
-    });
-    if (this._endDate > now) {
-      this._setRedrawTimer();
-    }
-  }
-
-  private _setRedrawTimer() {
-    clearInterval(this._interval);
-    const now = new Date();
-    const end = this._endDate > now ? now : this._endDate;
-    const timespan = differenceInHours(this._startDate, end);
-    this._interval = window.setInterval(
-      () => this._stateHistoryCharts?.requestUpdate(),
-      // if timespan smaller than 1 hour, update every 10 seconds, smaller than 5 hours, redraw every minute, otherwise every 5 minutes
-      timespan < 2
-        ? 10000
-        : timespan < 10
-        ? 60 * 1000
-        : MIN_TIME_BETWEEN_UPDATES
-    );
-  }
-
-  private _unsubscribeHistory() {
-    if (this._interval) {
-      clearInterval(this._interval);
-      this._interval = undefined;
-    }
-    if (this._subscribed) {
-      this._subscribed.then((unsub) => unsub?.());
-      this._subscribed = undefined;
     }
   }
 

src/panels/lovelace/cards/hui-area-card.ts

@@ -563,7 +563,7 @@ export class HuiAreaCard
         --mdc-icon-button-size: 44px;
       }
       .on {
-        color: var(--state-light-active-color);
+        color: var(--state-light-color);
       }
     `;
   }

src/panels/lovelace/cards/hui-history-graph-card.ts

@@ -8,17 +8,18 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import "../../../components/chart/state-history-charts";
 import "../../../components/ha-card";
+import "../../../components/chart/state-history-charts";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import {
-  computeHistory,
   HistoryResult,
   subscribeHistoryStatesTimeWindow,
+  computeHistory,
 } from "../../../data/history";
 import { HomeAssistant } from "../../../types";
 import { hasConfigOrEntitiesChanged } from "../common/has-changed";
 import { processConfigEntities } from "../common/process-config-entities";
+import { EntityConfig } from "../entity-rows/types";
 import { LovelaceCard } from "../types";
 import { HistoryGraphCardConfig } from "./types";
 
@@ -40,7 +41,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
 
   @state() private _config?: HistoryGraphCardConfig;
 
-  @state() private _error?: { code: string; message: string };
+  private _configEntities?: EntityConfig[];
 
   private _names: Record<string, string> = {};
 
@@ -48,12 +49,16 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
 
   private _hoursToShow = 24;
 
+  private _error?: string;
+
   private _interval?: number;
 
   private _subscribed?: Promise<(() => Promise<void>) | void>;
 
   public getCardSize(): number {
-    return this._config?.title ? 2 : 0 + 2 * (this._entityIds?.length || 1);
+    return this._config?.title
+      ? 2
+      : 0 + 2 * (this._configEntities?.length || 1);
   }
 
   public setConfig(config: HistoryGraphCardConfig): void {
@@ -65,12 +70,11 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
       throw new Error("You must include at least one entity");
     }
 
-    const configEntities = config.entities
+    this._configEntities = config.entities
       ? processConfigEntities(config.entities)
       : [];
 
-    this._entityIds = [];
-    configEntities.forEach((entity) => {
+    this._configEntities.forEach((entity) => {
       this._entityIds.push(entity.entity);
       if (entity.name) {
         this._names[entity.entity] = entity.name;
@@ -85,16 +89,16 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
   public connectedCallback() {
     super.connectedCallback();
     if (this.hasUpdated) {
-      this._subscribeHistory();
+      this._subscribeHistoryTimeWindow();
     }
   }
 
   public disconnectedCallback() {
     super.disconnectedCallback();
-    this._unsubscribeHistory();
+    this._unsubscribeHistoryTimeWindow();
   }
 
-  private _subscribeHistory() {
+  private _subscribeHistoryTimeWindow() {
     if (!isComponentLoaded(this.hass!, "history") || this._subscribed) {
       return;
     }
@@ -132,12 +136,17 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
     this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60);
   }
 
-  private _unsubscribeHistory() {
-    clearInterval(this._interval);
-    if (this._subscribed) {
-      this._subscribed.then((unsub) => unsub?.());
-      this._subscribed = undefined;
+  private _unsubscribeHistoryTimeWindow() {
+    if (!this._subscribed) {
+      return;
     }
+    clearInterval(this._interval);
+    this._subscribed.then((unsubscribe) => {
+      if (unsubscribe) {
+        unsubscribe();
+      }
+      this._subscribed = undefined;
+    });
   }
 
   protected shouldUpdate(changedProps: PropertyValues): boolean {
@@ -168,11 +177,12 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
 
     if (
       changedProps.has("_config") &&
-      (oldConfig?.entities !== this._config.entities ||
-        oldConfig?.hours_to_show !== this._config.hours_to_show)
+      (!this._subscribed ||
+        oldConfig?.entities !== this._config.entities ||
+        oldConfig?.hours_to_show !== this._hoursToShow)
     ) {
-      this._unsubscribeHistory();
-      this._subscribeHistory();
+      this._unsubscribeHistoryTimeWindow();
+      this._subscribeHistoryTimeWindow();
     }
   }
 
@@ -181,6 +191,10 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
       return html``;
     }
 
+    if (this._error) {
+      return html`<div class="errors">${this._error}</div>`;
+    }
+
     return html`
       <ha-card .header=${this._config.title}>
         <div
@@ -188,25 +202,16 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
             "has-header": !!this._config.title,
           })}"
         >
-          ${this._error
-            ? html`
-                <div>
-                  ${this.hass.localize("ui.components.history_charts.error")} :
-                  ${this._error.message || this._error.code}
-                </div>
-              `
-            : html`
-                <state-history-charts
-                  .hass=${this.hass}
-                  .isLoadingData=${!this._stateHistory}
-                  .historyData=${this._stateHistory}
-                  .names=${this._names}
-                  up-to-now
-                  .showNames=${this._config.show_names !== undefined
-                    ? this._config.show_names
-                    : true}
-                ></state-history-charts>
-              `}
+          <state-history-charts
+            .hass=${this.hass}
+            .isLoadingData=${!this._stateHistory}
+            .historyData=${this._stateHistory}
+            .names=${this._names}
+            up-to-now
+            .showNames=${this._config.show_names !== undefined
+              ? this._config.show_names
+              : true}
+          ></state-history-charts>
         </div>
       </ha-card>
     `;

src/panels/lovelace/cards/hui-map-card.ts

@@ -40,7 +40,7 @@ import {
   formatTimeWeekday,
 } from "../../../common/datetime/format_time";
 
-const DEFAULT_HOURS_TO_SHOW = 0;
+const DEFAULT_HOURS_TO_SHOW = 24;
 @customElement("hui-map-card")
 class HuiMapCard extends LitElement implements LovelaceCard {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -191,16 +191,16 @@ class HuiMapCard extends LitElement implements LovelaceCard {
   public connectedCallback() {
     super.connectedCallback();
     if (this.hasUpdated && this._configEntities?.length) {
-      this._subscribeHistory();
+      this._subscribeHistoryTimeWindow();
     }
   }
 
   public disconnectedCallback() {
     super.disconnectedCallback();
-    this._unsubscribeHistory();
+    this._unsubscribeHistoryTimeWindow();
   }
 
-  private _subscribeHistory() {
+  private _subscribeHistoryTimeWindow() {
     if (!isComponentLoaded(this.hass!, "history") || this._subscribed) {
       return;
     }
@@ -213,7 +213,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
         }
         this._stateHistory = combinedHistory;
       },
-      this._config!.hours_to_show! ?? DEFAULT_HOURS_TO_SHOW,
+      this._config!.hours_to_show! || DEFAULT_HOURS_TO_SHOW,
       this._configEntities!,
       false,
       false
@@ -223,21 +223,26 @@ class HuiMapCard extends LitElement implements LovelaceCard {
     });
   }
 
-  private _unsubscribeHistory() {
-    if (this._subscribed) {
-      this._subscribed.then((unsub) => unsub?.());
-      this._subscribed = undefined;
+  private _unsubscribeHistoryTimeWindow() {
+    if (!this._subscribed) {
+      return;
     }
+    this._subscribed.then((unsubscribe) => {
+      if (unsubscribe) {
+        unsubscribe();
+      }
+      this._subscribed = undefined;
+    });
   }
 
   protected updated(changedProps: PropertyValues): void {
     if (this._configEntities?.length) {
       if (!this._subscribed || changedProps.has("_config")) {
-        this._unsubscribeHistory();
-        this._subscribeHistory();
+        this._unsubscribeHistoryTimeWindow();
+        this._subscribeHistoryTimeWindow();
       }
     } else {
-      this._unsubscribeHistory();
+      this._unsubscribeHistoryTimeWindow();
     }
     if (changedProps.has("_config")) {
       this._computePadding();
@@ -341,7 +346,7 @@ class HuiMapCard extends LitElement implements LovelaceCard {
           const p = {} as HaMapPathPoint;
           p.point = [latitude, longitude] as LatLngTuple;
           const t = new Date(entityState.lu * 1000);
-          if (config.hours_to_show! ?? DEFAULT_HOURS_TO_SHOW > 144) {
+          if (config.hours_to_show! || DEFAULT_HOURS_TO_SHOW > 144) {
             // if showing > 6 days in the history trail, show the full
             // date and time
             p.tooltip = formatDateTime(t, this.hass.locale);

src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts

@@ -90,9 +90,9 @@ export class HuiStatisticCardEditor
     if (!config || !config.period) {
       return config;
     }
-    for (const [periodKey, period] of Object.entries(periods)) {
+    for (const period of Object.values(periods)) {
       if (deepEqual(period, config.period)) {
-        return { ...config, period: periodKey };
+        return { ...config, period };
       }
     }
     return config;
@@ -102,7 +102,7 @@ export class HuiStatisticCardEditor
     (
       entity: string,
       icon: string,
-      selectedPeriodKey: string | undefined,
+      periodVal: any,
       entityState: HassEntity,
       localize: LocalizeFunc,
       metadata?: StatisticsMetaData
@@ -130,22 +130,22 @@ export class HuiStatisticCardEditor
         {
           name: "period",
           required: true,
-          selector:
-            selectedPeriodKey &&
-            Object.keys(periods).includes(selectedPeriodKey)
-              ? {
-                  select: {
-                    multiple: false,
-                    options: Object.keys(periods).map((periodKey) => ({
-                      value: periodKey,
+          selector: Object.values(periods).includes(periodVal)
+            ? {
+                select: {
+                  multiple: false,
+                  options: Object.entries(periods).map(
+                    ([periodKey, period]) => ({
+                      value: period,
                       label:
                         localize(
                           `ui.panel.lovelace.editor.card.statistic.periods.${periodKey}`
                         ) || periodKey,
-                    })),
-                  },
-                }
-              : { object: {} },
+                    })
+                  ),
+                },
+              }
+            : { object: {} },
         },
         {
           type: "grid",
@@ -183,7 +183,7 @@ export class HuiStatisticCardEditor
     const schema = this._schema(
       this._config.entity,
       this._config.icon,
-      typeof data.period === "string" ? data.period : undefined,
+      data.period,
       entityState,
       this.hass.localize,
       this._metadata
@@ -212,14 +212,6 @@ export class HuiStatisticCardEditor
   private async _valueChanged(ev: CustomEvent) {
     const config = ev.detail.value as StatisticCardConfig;
     Object.keys(config).forEach((k) => config[k] === "" && delete config[k]);
-
-    if (typeof config.period === "string") {
-      const period = periods[config.period];
-      if (period) {
-        config.period = period;
-      }
-    }
-
     if (
       config.stat_type &&
       config.entity &&
@@ -235,14 +227,12 @@ export class HuiStatisticCardEditor
         config.stat_type = "change";
       }
     }
-
     if (!config.stat_type && config.entity) {
       const metadata = (
         await getStatisticMetadata(this.hass!, [config.entity])
       )?.[0];
       config.stat_type = metadata?.has_sum ? "change" : "mean";
     }
-
     fireEvent(this, "config-changed", { config });
   }
 

src/panels/lovelace/editor/config-elements/hui-tile-card-features-editor.ts

@@ -15,7 +15,6 @@ import { fireEvent } from "../../../../common/dom/fire_event";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import "../../../../components/entity/ha-entity-picker";
 import "../../../../components/ha-icon-button";
-import "../../../../components/ha-button";
 import "../../../../components/ha-svg-icon";
 import { sortableStyles } from "../../../../resources/ha-sortable-style";
 import {
@@ -161,7 +160,7 @@ export class HuiTileCardFeaturesEditor extends LitElement {
                   @action=${this._addFeature}
                   @closed=${stopPropagation}
                 >
-                  <ha-button
+                  <mwc-button
                     slot="trigger"
                     outlined
                     .label=${this.hass!.localize(
@@ -169,7 +168,7 @@ export class HuiTileCardFeaturesEditor extends LitElement {
                     )}
                   >
                     <ha-svg-icon .path=${mdiPlus} slot="icon"></ha-svg-icon>
-                  </ha-button>
+                  </mwc-button>
                   ${this._supportedFeatureTypes.map(
                     (featureType) => html`<mwc-list-item .value=${featureType}>
                       <ha-svg-icon

src/panels/lovelace/header-footer/hui-graph-header-footer.ts

@@ -132,16 +132,16 @@ export class HuiGraphHeaderFooter
   public connectedCallback() {
     super.connectedCallback();
     if (this.hasUpdated) {
-      this._subscribeHistory();
+      this._subscribeHistoryTimeWindow();
     }
   }
 
   public disconnectedCallback() {
     super.disconnectedCallback();
-    this._unsubscribeHistory();
+    this._unsubscribeHistoryTimeWindow();
   }
 
-  private _subscribeHistory() {
+  private _subscribeHistoryTimeWindow() {
     if (!isComponentLoaded(this.hass!, "history") || this._subscribed) {
       return;
     }
@@ -185,12 +185,17 @@ export class HuiGraphHeaderFooter
     );
   }
 
-  private _unsubscribeHistory() {
+  private _unsubscribeHistoryTimeWindow() {
     clearInterval(this._interval);
-    if (this._subscribed) {
-      this._subscribed.then((unsub) => unsub?.());
-      this._subscribed = undefined;
+    if (!this._subscribed) {
+      return;
     }
+    this._subscribed.then((unsubscribe) => {
+      if (unsubscribe) {
+        unsubscribe();
+      }
+      this._subscribed = undefined;
+    });
   }
 
   protected updated(changedProps: PropertyValues) {
@@ -204,8 +209,8 @@ export class HuiGraphHeaderFooter
       !this._subscribed ||
       oldConfig.entity !== this._config.entity
     ) {
-      this._unsubscribeHistory();
-      this._subscribeHistory();
+      this._unsubscribeHistoryTimeWindow();
+      this._subscribeHistoryTimeWindow();
     }
   }
 

src/panels/media-browser/ha-bar-media-player.ts

@@ -30,7 +30,6 @@ import { computeStateName } from "../../common/entity/compute_state_name";
 import { domainIcon } from "../../common/entity/domain_icon";
 import { supportsFeature } from "../../common/entity/supports-feature";
 import "../../components/ha-button-menu";
-import "../../components/ha-button";
 import "../../components/ha-circular-progress";
 import "../../components/ha-icon-button";
 import { UNAVAILABLE } from "../../data/entity";
@@ -324,7 +323,7 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
                     ></ha-icon-button>
                   `
                 : html`
-                    <ha-button
+                    <mwc-button
                       slot="trigger"
                       .label=${this.narrow
                         ? ""
@@ -345,7 +344,7 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
                         slot="trailingIcon"
                         .path=${mdiChevronDown}
                       ></ha-svg-icon>
-                    </ha-button>
+                    </mwc-button>
                   `
             }
             <mwc-list-item
@@ -721,6 +720,11 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
         font-weight: bold;
       }
 
+      ha-svg-icon[slot="icon"] {
+        margin-inline-start: 8px !important;
+        margin-inline-end: 8px !important;
+        direction: var(--direction);
+      }
       ha-svg-icon[slot="trailingIcon"] {
         margin-inline-start: 8px !important;
         margin-inline-end: 0px !important;

src/resources/ha-style.ts

@@ -135,9 +135,9 @@ documentContainer.innerHTML = `<custom-style>
       --state-alarm_control_panel-triggered-color: var(--red-color);
       --state-alert-off-color: var(--orange-color);
       --state-alert-on-color: var(--red-color);
-      --state-binary_sensor-active-color: var(--amber-color);
       --state-binary_sensor-battery-on-color: var(--red-color);
       --state-binary_sensor-carbon_monoxide-on-color: var(--red-color);
+      --state-binary_sensor-color: var(--amber-color);
       --state-binary_sensor-gas-on-color: var(--red-color);
       --state-binary_sensor-heat-on-color: var(--red-color);
       --state-binary_sensor-lock-on-color: var(--red-color);

src/state/quick-bar-mixin.ts

@@ -2,6 +2,7 @@ import type { PropertyValues } from "lit";
 import tinykeys from "tinykeys";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { mainWindow } from "../common/dom/get_main_window";
+import { HaSelect } from "../components/ha-select";
 import {
   QuickBarParams,
   showQuickBar,
@@ -133,21 +134,21 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
     }
 
     private _canOverrideAlphanumericInput(e: KeyboardEvent) {
-      const el = e.composedPath()[0] as Element;
+      const el = e.composedPath()[0];
 
-      if (el.tagName === "TEXTAREA") {
+      if (el instanceof HTMLTextAreaElement) {
         return false;
       }
 
-      if (el.parentElement?.tagName === "HA-SELECT") {
+      if (el instanceof Element && el.parentElement instanceof HaSelect) {
         return false;
       }
 
-      if (el.tagName !== "INPUT") {
+      if (!(el instanceof HTMLInputElement)) {
         return true;
       }
 
-      switch ((el as HTMLInputElement).type) {
+      switch (el.type) {
         case "button":
         case "checkbox":
         case "hidden":

src/translations/en.json

@@ -488,8 +488,7 @@
       "history_charts": {
         "history_disabled": "History integration disabled",
         "loading_history": "Loading state history…",
-        "no_history_found": "No state history found.",
-        "error": "Unable to load history"
+        "no_history_found": "No state history found."
       },
       "statistics_charts": {
         "loading_statistics": "Loading statistics…",
@@ -906,6 +905,8 @@
           "entity_id": "Entity ID",
           "unit_of_measurement": "Unit of Measurement",
           "precipitation_unit": "Precipitation unit",
+          "precision": "Precision",
+          "precision_default": "Use default",
           "pressure_unit": "Barometric pressure unit",
           "temperature_unit": "Temperature unit",
           "visibility_unit": "Visibility unit",
@@ -1519,30 +1520,30 @@
               "from": {
                 "header": "Configure grid consumption",
                 "paragraph": "Grid consumption is the energy that flows from the energy grid to your home.",
-                "entity_para": "Pick a sensor which measures grid consumption in either of {unit}.",
-                "energy_stat": "Consumed Energy",
+                "energy_stat": "Consumed Energy (kWh)",
                 "cost_para": "Select how Home Assistant should keep track of the costs of the consumed energy.",
                 "no_cost": "Do not track costs",
                 "cost_stat": "Use an entity tracking the total costs",
-                "cost_stat_input": "Entity with the total costs",
+                "cost_stat_input": "Total Costs Entity",
                 "cost_entity": "Use an entity with current price",
                 "cost_entity_input": "Entity with the current price",
                 "cost_number": "Use a static price",
-                "cost_number_input": "Price"
+                "cost_number_input": "Price per kWh",
+                "cost_number_suffix": "{currency}/kWh"
               },
               "to": {
                 "header": "Configure grid production",
                 "paragraph": "Grid production is the energy that flows from your solar panels to the grid.",
-                "entity_para": "Pick a sensor which measures grid production in either of {unit}.",
-                "energy_stat": "Energy returned to the grid",
+                "energy_stat": "Energy returned to the grid (kWh)",
                 "cost_para": "Do you get money back when you return energy to the grid?",
                 "no_cost": "I do not get money back",
                 "cost_stat": "Use an entity tracking the total recieved money",
-                "cost_stat_input": "Entity with the total compensation",
+                "cost_stat_input": "Total Compensation Entity",
                 "cost_entity": "Use an entity with current rate",
                 "cost_entity_input": "Entity with the current rate",
                 "cost_number": "Use a static rate",
-                "cost_number_input": "Rate"
+                "cost_number_input": "Rate per kWh",
+                "cost_number_suffix": "{currency}/kWh"
               }
             }
           },
@@ -1559,8 +1560,7 @@
             "stat_predicted_production": "Prediction of your solar energy production",
             "dialog": {
               "header": "Configure solar panels",
-              "entity_para": "Pick a sensor which measures solar energy production in either of {unit}.",
-              "solar_production_energy": "Solar production energy",
+              "solar_production_energy": "Solar production energy (kWh)",
               "solar_production_forecast": "Solar production forecast",
               "solar_production_forecast_description": "Adding solar production forecast information will allow you to quickly see your expected production for today.",
               "dont_forecast_production": "Don't forecast production",
@@ -1578,9 +1578,8 @@
             "add_battery_system": "Add battery system",
             "dialog": {
               "header": "Configure battery system",
-              "entity_para": "Pick sensors which measure energy going in to and out of the battery in either of {unit}.",
-              "energy_into_battery": "Energy going in to the battery",
-              "energy_out_of_battery": "Energy coming out of the battery"
+              "energy_into_battery": "Energy going in to the battery (kWh)",
+              "energy_out_of_battery": "Energy coming out of the battery (kWh)"
             }
           },
           "gas": {
@@ -1593,18 +1592,18 @@
             "add_gas_source": "Add gas source",
             "dialog": {
               "header": "Configure gas consumption",
-              "paragraph": "Gas consumption is measured either as the volume of gas that flows to your home or as the amount of energy contained in the gas.",
-              "entity_para": "Pick a sensor which measures gas consumption in either of {unit}.",
-              "note_para": "Note: It is not possible to add both sensors measuring a volume of gas and sensors measuring the amount of energy contained in the gas.",
-              "cost_para": "Select how Home Assistant should keep track of the costs of the consumed gas.",
-              "no_cost": "[%key:ui::panel::config::energy::grid::flow_dialog::from::no_cost%]",
-              "cost_stat": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat%]",
-              "cost_stat_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat_input%]",
-              "cost_entity": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity%]",
-              "cost_entity_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity_input%]",
-              "cost_number": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]",
-              "cost_number_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]",
-              "gas_usage": "Gas usage"
+              "paragraph": "Gas consumption is the volume of gas that flows to your home.",
+              "energy_stat": "Consumed Energy (m³)",
+              "cost_para": "Select how Home Assistant should keep track of the costs of the consumed energy.",
+              "no_cost": "Do not track costs",
+              "cost_stat": "Use an entity tracking the total costs",
+              "cost_stat_input": "Total Costs Entity",
+              "cost_entity": "Use an entity with current price",
+              "cost_entity_input": "Entity with the current price per {unit}",
+              "cost_number": "Use a static price",
+              "cost_number_input": "Price per {unit}",
+              "gas_usage": "Gas usage",
+              "m3_or_kWh": "ft³, m³, Wh, kWh, MWh or GJ"
             }
           },
           "water": {
@@ -1618,16 +1617,16 @@
             "dialog": {
               "header": "Configure water consumption",
               "paragraph": "Water consumption is the volume of water that flows to your home.",
-              "entity_para": "Pick a sensor which measures gas consumption in either of {unit}.",
+              "energy_stat": "Consumed water (m³ or gl)",
               "cost_para": "Select how Home Assistant should keep track of the costs of the consumed water.",
-              "no_cost": "[%key:ui::panel::config::energy::grid::flow_dialog::from::no_cost%]",
-              "cost_stat": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat%]",
-              "cost_stat_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat_input%]",
-              "cost_entity": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity%]",
-              "cost_entity_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity_input%]",
-              "cost_number": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]",
-              "cost_number_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]",
-              "water_usage": "Water usage"
+              "no_cost": "Do not track costs",
+              "cost_stat": "Use an entity tracking the total costs",
+              "cost_stat_input": "Total Costs Entity",
+              "cost_entity": "Use an entity with current price",
+              "cost_entity_input": "Entity with the current price per m³ or gl",
+              "cost_number": "Use a static price",
+              "cost_number_input": "Price per m³ or gl",
+              "water_usage": "Water usage (m³ or gl)"
             }
           },
           "device_consumption": {
@@ -1640,8 +1639,8 @@
             "add_device": "Add device",
             "dialog": {
               "header": "Add a device",
-              "device_consumption_energy": "Device consumption energy",
-              "selected_stat_intro": "Select the energy sensor that measures the device's energy usage in either of {unit}."
+              "device_consumption_energy": "Device consumption energy (kWh)",
+              "selected_stat_intro": "Select the entity that represents the device energy usage."
             }
           }
         },
@@ -3679,12 +3678,9 @@
             "title": "Configure network interfaces",
             "connected_to": "Connected to {ssid}",
             "scan_ap": "Scan for access points",
-            "signal_strength": "Signal strength",
             "open": "Open",
             "wep": "WEP",
             "wpa": "wpa-psk",
-            "wifi": "Wi-Fi",
-            "wifi_password": "Wi-Fi password",
             "warning": "If you are changing the Wi-Fi, IP or gateway addresses, you might lose the connection!",
             "static": "Static",
             "dhcp": "DHCP",
@@ -5379,12 +5375,9 @@
         "title": "Network settings",
         "connected_to": "Connected to {ssid}",
         "scan_ap": "Scan for access points",
-        "signal_strength": "[%key:ui::panel::config::network::supervisor::signal_strength%]",
         "open": "Open",
         "wep": "WEP",
         "wpa": "wpa-psk",
-        "wifi": "[%key:ui::panel::config::network::supervisor::wifi%]",
-        "wifi_password": "[%key:ui::panel::config::network::supervisor::wifi_password%]",
         "warning": "If you are changing the Wi-Fi, IP or gateway addresses, you might lose the connection!",
         "static": "Static",
         "dhcp": "DHCP",

yarn.lock

@@ -419,7 +419,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-properties@npm:^7.18.6":
+"@babel/plugin-proposal-class-properties@npm:^7.12.1, @babel/plugin-proposal-class-properties@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6"
   dependencies:
@@ -558,16 +558,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-chaining@npm:^7.18.9, @babel/plugin-proposal-optional-chaining@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.20.7"
+"@babel/plugin-proposal-optional-chaining@npm:^7.18.9":
+  version: 7.18.9
+  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.18.9"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
+    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 274b8932335bd064ca24cf1a4da2b2c20c92726d4bfa8b0cb5023857479b8481feef33505c16650c7b9239334e5c6959babc924816324c4cf223dd91c7ca79bc
+  checksum: f2db40e26172f07c50b635cb61e1f36165de3ba868fcf608d967642f0d044b7c6beb0e7ecf17cbd421144b99e1eae7ad6031ded92925343bb0ed1d08707b514f
   languageName: node
   linkType: hard
 
@@ -1384,15 +1384,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/commands@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "@codemirror/commands@npm:6.2.0"
+"@codemirror/commands@npm:^6.1.3":
+  version: 6.1.3
+  resolution: "@codemirror/commands@npm:6.1.3"
   dependencies:
     "@codemirror/language": ^6.0.0
     "@codemirror/state": ^6.2.0
     "@codemirror/view": ^6.0.0
     "@lezer/common": ^1.0.0
-  checksum: 13475fcd348335b4c31e563cbe83b98fdaa99218da882e3fbe6bad66841c55a69030e4a1a5f475ba2607db194d3b43b91e38fd088f9f4196b1ed4eac5b523909
+  checksum: beca0248fa2528005e4088a46840bc2a057d34e5b51c60cb20703ca734761dc55f5e205f5dcf94280ffbb5c3366753f46f2d03a5abfd69bd95eac8a67c2e96bb
   languageName: node
   linkType: hard
 
@@ -1492,23 +1492,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/fast-memoize@npm:1.2.8":
-  version: 1.2.8
-  resolution: "@formatjs/fast-memoize@npm:1.2.8"
+"@formatjs/fast-memoize@npm:1.2.7":
+  version: 1.2.7
+  resolution: "@formatjs/fast-memoize@npm:1.2.7"
   dependencies:
     tslib: ^2.4.0
-  checksum: 19f7f04657363d3ca4854ba3e5ecf4ae5bf0575c12ba8b2b24a7128131b38d91cf2692aeab778d42e9aa2e27cd2ea3b1e23cabf8ce4dff42988dcf65582c3a94
+  checksum: ba372a3e931bd99729d993f5b95aeb43e7d07b9f71e759722cc20c4e2faa0af11a942f0df9023a029b03230dc4dfad5354755be1e385c465750f63e4b3372b7b
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.2.0":
-  version: 2.2.0
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.2.0"
+"@formatjs/icu-messageformat-parser@npm:2.1.14":
+  version: 2.1.14
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.1.14"
   dependencies:
     "@formatjs/ecma402-abstract": 1.14.3
     "@formatjs/icu-skeleton-parser": 1.3.18
     tslib: ^2.4.0
-  checksum: bd457714296a3503d57383ee9ba8c9fb01e0097379c2bcf18c827ff736f64cf83132f2ab539f534b716726d6554beede354c30180d543dd8a1cf8e4c8f842bd7
+  checksum: 4d13230af075a353eef4725bee67d46bfc40f4873e561c141a2e62b91e377ffa7fffe61ee6df6bb187a00e15ab6fe242014958d51e4c6056032801178eb7e1c8
   languageName: node
   linkType: hard
 
@@ -1581,86 +1581,86 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-pluralrules@npm:^5.1.8":
-  version: 5.1.8
-  resolution: "@formatjs/intl-pluralrules@npm:5.1.8"
+"@formatjs/intl-pluralrules@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "@formatjs/intl-pluralrules@npm:4.1.5"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.14.3
-    "@formatjs/intl-localematcher": 0.2.32
-    tslib: ^2.4.0
-  checksum: 89c2cb25ab073da29a7951ee381206f92458403c13481f9bebecdf488ae6e0d5dace3bead796c499ba7cbe38800b0b5d561fe849cdeb6365f9c0685ac8c43c91
+    "@formatjs/ecma402-abstract": 1.10.0
+    "@formatjs/intl-localematcher": 0.2.21
+    tslib: ^2.1.0
+  checksum: ad552ae374b5706929dfa6384fde50aa03e50995e4f71d402142d34caeef5c0778c2f4078cfca89b80dd064783f66ee9cdf460b906ef5ba99fb558e33944dc54
   languageName: node
   linkType: hard
 
-"@formatjs/intl-relativetimeformat@npm:^11.1.8":
-  version: 11.1.8
-  resolution: "@formatjs/intl-relativetimeformat@npm:11.1.8"
+"@formatjs/intl-relativetimeformat@npm:^9.3.2":
+  version: 9.3.2
+  resolution: "@formatjs/intl-relativetimeformat@npm:9.3.2"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.14.3
-    "@formatjs/intl-localematcher": 0.2.32
-    tslib: ^2.4.0
-  checksum: 2ca379c549d5998366e8648843e810ffcba88e42112d6b6a8bd8d5898d1bc84137245ee44f7ef83c3fe85e33c122bb366f261478facd2efd78c98718e53fe404
+    "@formatjs/ecma402-abstract": 1.10.0
+    "@formatjs/intl-localematcher": 0.2.21
+    tslib: ^2.1.0
+  checksum: 636a4ab27e003eda6d5310c270787a7622181f9c1be157b79fada3ac1bbf0867fb5d82def3ddf6641c311387d214e4e214b6b7092e3306a960d913b2f5014c12
   languageName: node
   linkType: hard
 
-"@fullcalendar/common@npm:^5.11.4, @fullcalendar/common@npm:~5.11.4":
-  version: 5.11.4
-  resolution: "@fullcalendar/common@npm:5.11.4"
+"@fullcalendar/common@npm:5.9.0, @fullcalendar/common@npm:~5.9.0":
+  version: 5.9.0
+  resolution: "@fullcalendar/common@npm:5.9.0"
   dependencies:
     tslib: ^2.1.0
-  checksum: 8fc0e05539ba83d310eb5a7163dcd10582d83465393cccb525022b20c954e29e6361b289a2d2eec1ae5b5d950700333739b81cb5e81bc8cb72f682484ca697af
+  checksum: b53bd70badb233ee31f628e6c03cfe6ba5f4c4b563b008e5de4b81a5c8095385ba9d461a7b0a857afd6350c1bc40de6553050d7c217064f0dd1078b96343bd19
   languageName: node
   linkType: hard
 
-"@fullcalendar/core@npm:^5.11.4":
-  version: 5.11.4
-  resolution: "@fullcalendar/core@npm:5.11.4"
+"@fullcalendar/core@npm:5.9.0":
+  version: 5.9.0
+  resolution: "@fullcalendar/core@npm:5.9.0"
   dependencies:
-    "@fullcalendar/common": ~5.11.4
+    "@fullcalendar/common": ~5.9.0
     preact: ^10.0.5
     tslib: ^2.1.0
-  checksum: 11652a58dc4a7af2b9c552ca71e4215c56d574f7d639deab0a6604afa0a67c7bfef445d5a6e364b6bc6b0ffb333ba9e7730e184d480e0113dce90c470d988d17
+  checksum: da187a1fe5fcf76725298b060fb688fccb94c7eb85ff1afae7699f82bcc2f0a0f1c88fc0ca0e01d47cc6d4436ba5a85103b0c718a29b9bbe6a5d2853776c5b13
   languageName: node
   linkType: hard
 
-"@fullcalendar/daygrid@npm:^5.11.4, @fullcalendar/daygrid@npm:~5.11.4":
-  version: 5.11.4
-  resolution: "@fullcalendar/daygrid@npm:5.11.4"
+"@fullcalendar/daygrid@npm:5.9.0, @fullcalendar/daygrid@npm:~5.9.0":
+  version: 5.9.0
+  resolution: "@fullcalendar/daygrid@npm:5.9.0"
   dependencies:
-    "@fullcalendar/common": ~5.11.4
+    "@fullcalendar/common": ~5.9.0
     tslib: ^2.1.0
-  checksum: a25d83cfe5b3ac3feeb49af47701c54e858d30b0b53871df2a83aa7edbcc7d49f435d59fdbf3d6e18b5699caced8133e9c4b1c919caca2c8717bd92f57c08ab4
+  checksum: 4f21cf44c90017d5b7f77211ead1585ff39ee5dd01d112a0c8bf6ffea9d072d4dfa4bbdd467beb8f4cfc9652f69d4847697604de6849b3fd2330093e16e15a37
   languageName: node
   linkType: hard
 
-"@fullcalendar/interaction@npm:^5.11.4":
-  version: 5.11.4
-  resolution: "@fullcalendar/interaction@npm:5.11.4"
+"@fullcalendar/interaction@npm:5.9.0":
+  version: 5.9.0
+  resolution: "@fullcalendar/interaction@npm:5.9.0"
   dependencies:
-    "@fullcalendar/common": ~5.11.4
+    "@fullcalendar/common": ~5.9.0
     tslib: ^2.1.0
-  checksum: 88231b925498b947f5af98fcabf564f7d72ecde6660696e5aec7aa5c4aca7988deab74c9486a30e0e461cdd31913c560bb016f54a61641d13359488e845e053f
+  checksum: 3b2591479a5d42f7dbbb11d840b81669e97daea9a0825badd5776ea1e22bc988fe574c3c2ec22b992dbd1874fa92831c745f0d2741bd127a178bd3fa2af7766e
   languageName: node
   linkType: hard
 
-"@fullcalendar/list@npm:^5.11.4":
-  version: 5.11.4
-  resolution: "@fullcalendar/list@npm:5.11.4"
+"@fullcalendar/list@npm:5.9.0":
+  version: 5.9.0
+  resolution: "@fullcalendar/list@npm:5.9.0"
   dependencies:
-    "@fullcalendar/common": ~5.11.4
+    "@fullcalendar/common": ~5.9.0
     tslib: ^2.1.0
-  checksum: e2cec5e89c57836a9ca4db57fbe67e16f78d91191df39ac0b5d0f18c1fdac9763f04647ae42e5f2d31ffa3cd245423d3aec449ed6c84fafc0195e62079a4eedc
+  checksum: f71a9ad0a42bebdd46dca0691e2f987596296e09521481f6b7a3c2fc5529b39d3466251830b735cd51748f46488a82ae309402533ae805f7b70159530060fbf9
   languageName: node
   linkType: hard
 
-"@fullcalendar/timegrid@npm:^5.11.4":
-  version: 5.11.4
-  resolution: "@fullcalendar/timegrid@npm:5.11.4"
+"@fullcalendar/timegrid@npm:5.9.0":
+  version: 5.9.0
+  resolution: "@fullcalendar/timegrid@npm:5.9.0"
   dependencies:
-    "@fullcalendar/common": ~5.11.4
-    "@fullcalendar/daygrid": ~5.11.4
+    "@fullcalendar/common": ~5.9.0
+    "@fullcalendar/daygrid": ~5.9.0
     tslib: ^2.1.0
-  checksum: 3a2fccac65198c5fffa53286fcbb2556b6e3885cfc6f7978b7ee21c57cbc2a58617e6c54eff977f5234163cef3281e50548327a06cf253acc43c6881bed00f2c
+  checksum: dedef1e1147cd17aa277b159c806e0f927715d67c513d940bec61cb97bfdf97c71b43c03166d8442e9683e2d7d6f03d81619a694de84e04e5995b9e8ef3585b9
   languageName: node
   linkType: hard
 
@@ -1876,12 +1876,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@koa/cors@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@koa/cors@npm:4.0.0"
+"@koa/cors@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@koa/cors@npm:3.1.0"
   dependencies:
     vary: ^1.1.2
-  checksum: e0760544823532f2d71d792e3076858e38bab9b1c090abea175f1319fd91ea58a1da384a2fe7f5108f1c681e3830b01f62a1cafe271d6406751976af443187aa
+  checksum: b6f18de404a967696fe19c9a8d35816e2a845be51f9aa49f1a8d31bbea095eaa20c35eceafe1b764a7e3a912052ca6eaf1965ac34b00020b1ec2823cb60a9b5d
   languageName: node
   linkType: hard
 
@@ -3166,15 +3166,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/auth-oauth-device@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@octokit/auth-oauth-device@npm:4.0.4"
+"@octokit/auth-oauth-device@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@octokit/auth-oauth-device@npm:4.0.2"
   dependencies:
     "@octokit/oauth-methods": ^2.0.0
     "@octokit/request": ^6.0.0
-    "@octokit/types": ^9.0.0
+    "@octokit/types": ^7.0.0
     universal-user-agent: ^6.0.0
-  checksum: 245e1fd77684d131793a52a45133ad2514dbb14e5bb6af99eeaccff58662b567327196a721e296ef5734c0988e85a7536ef22bbf04613b302eba595995c5c751
+  checksum: 49cd76ae8644fa537a6dd0155b85321a46a517d2064a0cb69ee2a9cfa5b081cd70a906958e002ee4e63895e966d942a28b2be9c527490f25b8685e229d17addd
   languageName: node
   linkType: hard
 
@@ -3368,18 +3368,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@open-wc/dev-server-hmr@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "@open-wc/dev-server-hmr@npm:0.1.3"
+"@open-wc/dev-server-hmr@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "@open-wc/dev-server-hmr@npm:0.0.2"
   dependencies:
     "@babel/core": ^7.12.3
-    "@babel/plugin-syntax-class-properties": ^7.12.13
+    "@babel/plugin-proposal-class-properties": ^7.12.1
     "@babel/plugin-syntax-import-assertions": ^7.12.1
     "@babel/plugin-syntax-top-level-await": ^7.12.1
-    "@web/dev-server-core": ^0.3.10
+    "@web/dev-server-core": ^0.2.18
     "@web/dev-server-hmr": ^0.1.6
     picomatch: ^2.2.2
-  checksum: 993ddbdea4d919d5414ce2cbed8d49253658f4a0311b66f2e45d03ab9ea7354596144d46622a915683f72ca2b3c045b47362104327b4033bede1456446e085ff
+  checksum: 4abb61cf6b13ef5bbc8ab7be6c3760d1791e2698b9fe1fcf6d281c2f0bb1e2acd2238e4f79f8e4079b200ca7ec422d3e113cc010d323b8416e687ccbdced2641
   languageName: node
   linkType: hard
 
@@ -4007,12 +4007,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/chromecast-caf-sender@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@types/chromecast-caf-sender@npm:1.0.5"
+"@types/chromecast-caf-sender@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "@types/chromecast-caf-sender@npm:1.0.3"
   dependencies:
     "@types/chrome": "*"
-  checksum: eea4016f8bfd90484415aa9109528001d68a55e477593fcfbf27a91842d1ea885ee7796e75755783e94ff55c72f137696df1c8d62dedd61a4c663b7e4b628376
+  checksum: e52ff73db274e2208eee5c4005aaef0c747c8d7707187833e0cce8601d57f62f56dbed6b46e6e49b588b3d4ffcca4eb5f92b794fc5f6360a3ec75f7812eb987d
   languageName: node
   linkType: hard
 
@@ -4317,7 +4317,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/parse5@npm:^6.0.0, @types/parse5@npm:^6.0.1":
+"@types/parse5@npm:^5.0.3":
+  version: 5.0.3
+  resolution: "@types/parse5@npm:5.0.3"
+  checksum: d6b7495cb1850f9f2e9c5e103ede9f2d30a5320669707b105c403868adc9e4bf8d3a7ff314cc23f67826bbbbbc0e6147346ce9062ab429f099dba7a01f463919
+  languageName: node
+  linkType: hard
+
+"@types/parse5@npm:^6.0.0":
   version: 6.0.3
   resolution: "@types/parse5@npm:6.0.3"
   checksum: ddb59ee4144af5dfcc508a8dcf32f37879d11e12559561e65788756b95b33e6f03ea027d88e1f5408f9b7bfb656bf630ace31a2169edf44151daaf8dd58df1b7
@@ -4445,12 +4452,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^7.2.6, @types/ws@npm:^7.4.0":
-  version: 7.4.7
-  resolution: "@types/ws@npm:7.4.7"
+"@types/ws@npm:^7.2.6":
+  version: 7.4.0
+  resolution: "@types/ws@npm:7.4.0"
   dependencies:
     "@types/node": "*"
-  checksum: b4c9b8ad209620c9b21e78314ce4ff07515c0cadab9af101c1651e7bfb992d7fd933bd8b9c99d110738fd6db523ed15f82f29f50b45510288da72e964dedb1a3
+  checksum: afc0060614ccc9382e0e2900220088bedbbdf9cf828b03990bcca9c9c0167bd2aa8b59cd001419ea804e5cc3b1668cc0c6c4aeb60f63c2a36814bed3f0d20528
   languageName: node
   linkType: hard
 
@@ -4635,110 +4642,110 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vaadin/combo-box@npm:^23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/combo-box@npm:23.3.6"
+"@vaadin/combo-box@npm:^23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/combo-box@npm:23.3.5"
   dependencies:
     "@open-wc/dedupe-mixin": ^1.3.0
     "@polymer/polymer": ^3.0.0
-    "@vaadin/component-base": ~23.3.6
-    "@vaadin/field-base": ~23.3.6
-    "@vaadin/input-container": ~23.3.6
-    "@vaadin/item": ~23.3.6
-    "@vaadin/lit-renderer": ~23.3.6
-    "@vaadin/overlay": ~23.3.6
-    "@vaadin/vaadin-lumo-styles": ~23.3.6
-    "@vaadin/vaadin-material-styles": ~23.3.6
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
-  checksum: fdd260a4adf89850fb058bc99a008e970ec7b58a2c576101548640a08577d497dc87778e2b3901f93249e2b21ac2e39d1d5c011762cff98c59fcf7cdc31200c0
+    "@vaadin/component-base": ~23.3.5
+    "@vaadin/field-base": ~23.3.5
+    "@vaadin/input-container": ~23.3.5
+    "@vaadin/item": ~23.3.5
+    "@vaadin/lit-renderer": ~23.3.5
+    "@vaadin/overlay": ~23.3.5
+    "@vaadin/vaadin-lumo-styles": ~23.3.5
+    "@vaadin/vaadin-material-styles": ~23.3.5
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
+  checksum: 8b6db6a902236d3adcc0b9f6694f66b65fd3e4c557b9cfc6aa04971a9eade1063f308d9f39d1ef52e51653934432a39b30a258a21ad859fcd4ebae794c5a1a7d
   languageName: node
   linkType: hard
 
-"@vaadin/component-base@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/component-base@npm:23.3.6"
+"@vaadin/component-base@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/component-base@npm:23.3.5"
   dependencies:
     "@open-wc/dedupe-mixin": ^1.3.0
     "@polymer/polymer": ^3.0.0
     "@vaadin/vaadin-development-mode-detector": ^2.0.0
     "@vaadin/vaadin-usage-statistics": ^2.1.0
     lit: ^2.0.0
-  checksum: d3301f12cbc2c7bc900aef87ccbc3513b58a7a23b846a8dea40a2b91dd82d37f02bc080523f4d9e4413c23a7f2b56fe9f709d9ed72d2d1a214c7205e7d429a6d
+  checksum: c77dff2138ec4140c2620bf8eb6d050d45c97d59ef3cd8eadb3f5cdda99a1443b5e9b4d00c6eb7d67b165ed4bf258109505d25e01a8a5b38d5b4cc0cafbf921c
   languageName: node
   linkType: hard
 
-"@vaadin/field-base@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/field-base@npm:23.3.6"
+"@vaadin/field-base@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/field-base@npm:23.3.5"
   dependencies:
     "@open-wc/dedupe-mixin": ^1.3.0
     "@polymer/polymer": ^3.0.0
-    "@vaadin/component-base": ~23.3.6
+    "@vaadin/component-base": ~23.3.5
     lit: ^2.0.0
-  checksum: cd37f85f2a52a2c0a46bbae959caa28bf2c64394ccdfec911eb9dd07b2cdac733def169738958b8dc421e82752c9fa6e201926d5a967113a8a48ccecdb61a887
+  checksum: 5fc9e4faf875dd4da06bab5927e9a46d88accd067ce0c96f5905af4c90dceb78fc068c64d650d247265326cd9ea71714f527f3436efc60c2235857f3d48704d4
   languageName: node
   linkType: hard
 
-"@vaadin/icon@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/icon@npm:23.3.6"
+"@vaadin/icon@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/icon@npm:23.3.5"
   dependencies:
     "@polymer/polymer": ^3.0.0
-    "@vaadin/component-base": ~23.3.6
-    "@vaadin/vaadin-lumo-styles": ~23.3.6
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
+    "@vaadin/component-base": ~23.3.5
+    "@vaadin/vaadin-lumo-styles": ~23.3.5
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
     lit: ^2.0.0
-  checksum: 5c559274e44bcab9aa4683f77a8078ff1f4b7af71f446091f321f1f47c954f918ee306341dd0415c743d78cde40601e3e381b215672d4cb91f92fe37debf44fa
+  checksum: 8cc3e553b835f3b474ee69dd33b1c0fb545090f2a0e87eff0a9c0eb8000604f20a008772cd2f022ba64a42b9d40947bd93b3e60034544aa7fdd6d2f71da6b339
   languageName: node
   linkType: hard
 
-"@vaadin/input-container@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/input-container@npm:23.3.6"
+"@vaadin/input-container@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/input-container@npm:23.3.5"
   dependencies:
     "@polymer/polymer": ^3.0.0
-    "@vaadin/component-base": ~23.3.6
-    "@vaadin/vaadin-lumo-styles": ~23.3.6
-    "@vaadin/vaadin-material-styles": ~23.3.6
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
-  checksum: c675f1daf9f51f1fc0987a85be1ed83bffc897be9a694b861a037a9c91438a1f02f232cd026c80ec88ffc409ae147ed415cadd8ed07b34e49b94b15e01753d0e
+    "@vaadin/component-base": ~23.3.5
+    "@vaadin/vaadin-lumo-styles": ~23.3.5
+    "@vaadin/vaadin-material-styles": ~23.3.5
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
+  checksum: 914c2099321261402827dac8b351fd6a843f944f42b034b56713eb726c2bd575bf103e1a8096de5487358f1bbe2f890d7eb684ecb09e20423c2e0cc17d649271
   languageName: node
   linkType: hard
 
-"@vaadin/item@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/item@npm:23.3.6"
+"@vaadin/item@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/item@npm:23.3.5"
   dependencies:
     "@open-wc/dedupe-mixin": ^1.3.0
     "@polymer/polymer": ^3.0.0
-    "@vaadin/component-base": ~23.3.6
-    "@vaadin/vaadin-lumo-styles": ~23.3.6
-    "@vaadin/vaadin-material-styles": ~23.3.6
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
-  checksum: 92236d255173a22cbbae9b83e521f2037228961bd675eead48c312f0a4311cdd488289418e1c9015559993c8a673f62c09dbdefc4b50bcaaa4b42b357c124073
+    "@vaadin/component-base": ~23.3.5
+    "@vaadin/vaadin-lumo-styles": ~23.3.5
+    "@vaadin/vaadin-material-styles": ~23.3.5
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
+  checksum: e5f930004f0e76d7b6cffcf8038cf008706bfd5363986d421b2ee7bbbf0d863b0200fe82676d24e130ba2cc352e9c84a19a8dac2d3561b78275e4ac5ae75f7a6
   languageName: node
   linkType: hard
 
-"@vaadin/lit-renderer@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/lit-renderer@npm:23.3.6"
+"@vaadin/lit-renderer@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/lit-renderer@npm:23.3.5"
   dependencies:
     lit: ^2.0.0
-  checksum: fcd411682943e7a8160c501a0063a1d6de51687d2b08864590c83111ae8ebcf50b471443f62a855bab6debce1520de320b6620ab4bc4a324fcc9c3eeab2bd769
+  checksum: fc39e3678b203ee3db8823aa736bdbd24ba33dd957e96ceb16829aa58fbee3d79456006d5ec9d1e1623eaa1c641de61a2434ec1dc43f40137819fb4bd051418e
   languageName: node
   linkType: hard
 
-"@vaadin/overlay@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/overlay@npm:23.3.6"
+"@vaadin/overlay@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/overlay@npm:23.3.5"
   dependencies:
     "@open-wc/dedupe-mixin": ^1.3.0
     "@polymer/polymer": ^3.0.0
-    "@vaadin/component-base": ~23.3.6
-    "@vaadin/vaadin-lumo-styles": ~23.3.6
-    "@vaadin/vaadin-material-styles": ~23.3.6
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
-  checksum: 9ff90980602bda7a10efe735eff973844e6b30112735389f9be60dee04fd51ab8752345c8a173d1ab6cc5583c26a67cfb4faa301db1b8c2c1a48c6164f4ce3bb
+    "@vaadin/component-base": ~23.3.5
+    "@vaadin/vaadin-lumo-styles": ~23.3.5
+    "@vaadin/vaadin-material-styles": ~23.3.5
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
+  checksum: e57b2b7ef295e7bcc5068c4ce2dbe4f3897e9ee23dc89db9726ecb8575cadf56c04bca5d5c22155b77d5b5f0da374243bfeddc1b146bf90bc43b6a1a039c798f
   languageName: node
   linkType: hard
 
@@ -4749,36 +4756,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vaadin/vaadin-lumo-styles@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/vaadin-lumo-styles@npm:23.3.6"
+"@vaadin/vaadin-lumo-styles@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/vaadin-lumo-styles@npm:23.3.5"
   dependencies:
     "@polymer/iron-icon": ^3.0.0
     "@polymer/iron-iconset-svg": ^3.0.0
     "@polymer/polymer": ^3.0.0
-    "@vaadin/icon": ~23.3.6
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
-  checksum: d3e4d47c0a0e8f786cba38f185a80a08274f1e93020896a1d1a67eff7518c9774c77b15622968128c823c08e7c789f08918aeb8c78f18c60b18078f63f67f7ff
+    "@vaadin/icon": ~23.3.5
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
+  checksum: 1a7c2ecf9c31799fa89fa5cbc53f1ea83d5ff649befde999d81090cc1670e06804335eb21e1f1a19007e2e9248a053dd5ae50e1ecfe75368a47f4646f5b1f89d
   languageName: node
   linkType: hard
 
-"@vaadin/vaadin-material-styles@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/vaadin-material-styles@npm:23.3.6"
+"@vaadin/vaadin-material-styles@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/vaadin-material-styles@npm:23.3.5"
   dependencies:
     "@polymer/polymer": ^3.0.0
-    "@vaadin/vaadin-themable-mixin": ~23.3.6
-  checksum: 7725bb7952b75724ac33de8abcca164689c545dad8675155ff72ef9dd2ae6eb082fdcad483e851a4ef6090c2f40834c6e401a304ab38af700eac0442189fa06b
+    "@vaadin/vaadin-themable-mixin": ~23.3.5
+  checksum: d406232985e4e3e51bb19daf68d9e0667b3b95a8048e7fc2782cf830d25b1c58f59dd01d8816d9e48a7e02a3c2dbade8bc485750ae525c81cfc019eb461396c6
   languageName: node
   linkType: hard
 
-"@vaadin/vaadin-themable-mixin@npm:^23.3.6, @vaadin/vaadin-themable-mixin@npm:~23.3.6":
-  version: 23.3.6
-  resolution: "@vaadin/vaadin-themable-mixin@npm:23.3.6"
+"@vaadin/vaadin-themable-mixin@npm:^23.3.5, @vaadin/vaadin-themable-mixin@npm:~23.3.5":
+  version: 23.3.5
+  resolution: "@vaadin/vaadin-themable-mixin@npm:23.3.5"
   dependencies:
     "@open-wc/dedupe-mixin": ^1.3.0
     lit: ^2.0.0
-  checksum: 5cdf75ad20e30d15daaa5f1428613a8c78c0159c61e1607ff3c3a3d374b8c8ae9a7a5c99a718d845228305518863e8ff3a4c86897f3dd350c507a3f317f42637
+  checksum: b57b7bf29179e62ee6ab380eae3317d3090ce223a3c1f8510aa62b539d43b2d5c7514f49eaa8b252c9a33afcc74f3cf2c10e671a190fc865b4f7ca4501293d33
   languageName: node
   linkType: hard
 
@@ -4942,32 +4949,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@web/dev-server-core@npm:^0.3.10":
-  version: 0.3.19
-  resolution: "@web/dev-server-core@npm:0.3.19"
-  dependencies:
-    "@types/koa": ^2.11.6
-    "@types/ws": ^7.4.0
-    "@web/parse5-utils": ^1.2.0
-    chokidar: ^3.4.3
-    clone: ^2.1.2
-    es-module-lexer: ^1.0.0
-    get-stream: ^6.0.0
-    is-stream: ^2.0.0
-    isbinaryfile: ^4.0.6
-    koa: ^2.13.0
-    koa-etag: ^4.0.0
-    koa-send: ^5.0.1
-    koa-static: ^5.0.0
-    lru-cache: ^6.0.0
-    mime-types: ^2.1.27
-    parse5: ^6.0.1
-    picomatch: ^2.2.2
-    ws: ^7.4.2
-  checksum: 00b3cafc7d9c25806ae4af824d34d44928b09e039c7cf87e66ddc7b2f7d3198ab667f860282f8f8287cf26aeea1e8f4b348609eba4e05259cc52f4a7451c174f
-  languageName: node
-  linkType: hard
-
 "@web/dev-server-hmr@npm:^0.1.6":
   version: 0.1.6
   resolution: "@web/dev-server-hmr@npm:0.1.6"
@@ -5016,13 +4997,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@web/parse5-utils@npm:^1.0.0, @web/parse5-utils@npm:^1.2.0":
-  version: 1.3.0
-  resolution: "@web/parse5-utils@npm:1.3.0"
+"@web/parse5-utils@npm:^1.0.0":
+  version: 1.1.2
+  resolution: "@web/parse5-utils@npm:1.1.2"
   dependencies:
-    "@types/parse5": ^6.0.1
+    "@types/parse5": ^5.0.3
     parse5: ^6.0.1
-  checksum: 379849c1b0a060d50037c7dc90d27231dc68f57b1034d87f89129c3cd87fa27d3a0f8e550e1ab3be00bb1c0d440a8fa95c153a481ed8c2c705fd46fbc8a8433d
+  checksum: 5158e8d2b95d653d8a4d74521c13acd9cc1855cdff574372c867c55a1378afb4600864f9406ba2403bdd418a6b04a18960028fcca43a7d4dff0b3f131937d1ff
   languageName: node
   linkType: hard
 
@@ -5325,7 +5306,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aggregate-error@npm:^3.0.0":
+"aggregate-error@npm:^3.0.0, aggregate-error@npm:^3.1.0":
   version: 3.1.0
   resolution: "aggregate-error@npm:3.1.0"
   dependencies:
@@ -5449,7 +5430,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^4.3.0":
+"ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.2":
   version: 4.3.2
   resolution: "ansi-escapes@npm:4.3.2"
   dependencies:
@@ -5922,16 +5903,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:^9.1.2":
-  version: 9.1.2
-  resolution: "babel-loader@npm:9.1.2"
+"babel-loader@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "babel-loader@npm:9.1.0"
   dependencies:
     find-cache-dir: ^3.3.2
     schema-utils: ^4.0.0
   peerDependencies:
     "@babel/core": ^7.12.0
     webpack: ">=5"
-  checksum: f0edb8e157f9806b810ba3f2c8ca8fa489d377ae5c2b7b00c2ace900a6925641ce4ec520b9c12f70e37b94aa5366e7003e0f6271b26821643e109966ce741cb7
+  checksum: 774758febd1e8ca804abcae3b8f65634330dc688837424d0946f06d1386914de43435cce691710fa144eccdf1292cf883439ac3598ce7320916acfaaa2372641
   languageName: node
   linkType: hard
 
@@ -7651,13 +7632,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "es-module-lexer@npm:1.1.0"
-  checksum: 3e9f5019b69c6b2f04eb8478c4fdb4ed72cb8b4c97511b5dd39c1f498386ed8f5083c32067c15efcfabc7e8460cb65ed4627dd32405475715a898009922f41fa
-  languageName: node
-  linkType: hard
-
 "es-to-primitive@npm:^1.2.1":
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
@@ -7825,14 +7799,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-disable@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "eslint-plugin-disable@npm:2.0.3"
+"eslint-plugin-disable@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "eslint-plugin-disable@npm:2.0.1"
   dependencies:
+    eslint: ">=0.16.0"
     resolve: ^1.1.6
   peerDependencies:
     eslint: ">=0.16.0"
-  checksum: 71893242172d633b63d3442393bf103f8f63ce97958ca63f6c5dacea0e4d4cdb4e35f1200b5e66c219034e26003177d18adf88e35af9ae1154739578832ec8ce
+  checksum: 55d541a6378fe2a4c7c6cee17c937df8bb372d907a0b6b79aabb8ded0bb2bbde5f333fdbdfc16af959425e42b679e7048ee9c4ee1524b9f545866e711775397e
   languageName: node
   linkType: hard
 
@@ -7959,7 +7934,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^7.32.0":
+"eslint@npm:>=0.16.0, eslint@npm:^7.32.0":
   version: 7.32.0
   resolution: "eslint@npm:7.32.0"
   dependencies:
@@ -8083,7 +8058,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"etag@npm:^1.3.0, etag@npm:^1.8.1, etag@npm:~1.8.1":
+"etag@npm:^1.3.0, etag@npm:~1.8.1":
   version: 1.8.1
   resolution: "etag@npm:1.8.1"
   checksum: 571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
@@ -8737,10 +8712,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-require@npm:^1.4.0":
-  version: 1.6.0
-  resolution: "fs-require@npm:1.6.0"
-  checksum: 085145a3021e142ae8d591d955f7e1d9cab17191666294e0ad394df5cb9ee379817b89c50de63bd861138dcb6adec589289d347c23de9bfe1ac82aeba6b1a128
+"fs-require@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "fs-require@npm:1.1.0"
+  checksum: c0fc2468a21f6264b29a5287920d63b4db8a21fd32b26774d6da95798c3a54a7542fbb2889173b5d8ac07c25468a04e45a8d76c816c9c37e568a77c3695f4822
   languageName: node
   linkType: hard
 
@@ -9372,7 +9347,7 @@ fsevents@^1.2.7:
     "@babel/plugin-proposal-decorators": ^7.20.7
     "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6
     "@babel/plugin-proposal-object-rest-spread": ^7.20.2
-    "@babel/plugin-proposal-optional-chaining": ^7.20.7
+    "@babel/plugin-proposal-optional-chaining": ^7.18.9
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
     "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/plugin-syntax-top-level-await": ^7.14.5
@@ -9380,7 +9355,7 @@ fsevents@^1.2.7:
     "@babel/preset-typescript": ^7.18.6
     "@braintree/sanitize-url": ^6.0.0
     "@codemirror/autocomplete": ^6.4.0
-    "@codemirror/commands": ^6.2.0
+    "@codemirror/commands": ^6.1.3
     "@codemirror/language": ^6.4.0
     "@codemirror/legacy-modes": ^6.3.1
     "@codemirror/search": ^6.2.3
@@ -9390,15 +9365,15 @@ fsevents@^1.2.7:
     "@formatjs/intl-getcanonicallocales": ^2.0.5
     "@formatjs/intl-locale": ^3.0.11
     "@formatjs/intl-numberformat": ^7.2.5
-    "@formatjs/intl-pluralrules": ^5.1.8
-    "@formatjs/intl-relativetimeformat": ^11.1.8
-    "@fullcalendar/common": ^5.11.4
-    "@fullcalendar/core": ^5.11.4
-    "@fullcalendar/daygrid": ^5.11.4
-    "@fullcalendar/interaction": ^5.11.4
-    "@fullcalendar/list": ^5.11.4
-    "@fullcalendar/timegrid": ^5.11.4
-    "@koa/cors": ^4.0.0
+    "@formatjs/intl-pluralrules": ^4.1.5
+    "@formatjs/intl-relativetimeformat": ^9.3.2
+    "@fullcalendar/common": 5.9.0
+    "@fullcalendar/core": 5.9.0
+    "@fullcalendar/daygrid": 5.9.0
+    "@fullcalendar/interaction": 5.9.0
+    "@fullcalendar/list": 5.9.0
+    "@fullcalendar/timegrid": 5.9.0
+    "@koa/cors": ^3.1.0
     "@lezer/highlight": ^1.1.3
     "@lit-labs/motion": ^1.0.3
     "@lit-labs/virtualizer": ^1.0.1
@@ -9428,9 +9403,9 @@ fsevents@^1.2.7:
     "@material/top-app-bar": =14.0.0-canary.53b3cad2f.0
     "@mdi/js": 7.1.96
     "@mdi/svg": 7.1.96
-    "@octokit/auth-oauth-device": ^4.0.4
+    "@octokit/auth-oauth-device": ^4.0.2
     "@octokit/rest": ^19.0.7
-    "@open-wc/dev-server-hmr": ^0.1.3
+    "@open-wc/dev-server-hmr": ^0.0.2
     "@polymer/app-layout": ^3.1.0
     "@polymer/iron-flex-layout": ^3.0.1
     "@polymer/iron-icon": ^3.0.1
@@ -9452,7 +9427,7 @@ fsevents@^1.2.7:
     "@rollup/plugin-replace": ^2.3.2
     "@thomasloven/round-slider": 0.6.0
     "@types/chromecast-caf-receiver": 5.0.12
-    "@types/chromecast-caf-sender": ^1.0.5
+    "@types/chromecast-caf-sender": ^1.0.3
     "@types/glob": ^8
     "@types/hammerjs": ^2.0.41
     "@types/js-yaml": ^4
@@ -9466,8 +9441,8 @@ fsevents@^1.2.7:
     "@types/webspeechapi": ^0.0.29
     "@typescript-eslint/eslint-plugin": ^5.46.1
     "@typescript-eslint/parser": ^5.49.0
-    "@vaadin/combo-box": ^23.3.6
-    "@vaadin/vaadin-themable-mixin": ^23.3.6
+    "@vaadin/combo-box": ^23.3.5
+    "@vaadin/vaadin-themable-mixin": ^23.3.5
     "@vibrant/color": ^3.2.1-alpha.1
     "@vibrant/core": ^3.2.1-alpha.1
     "@vibrant/quantizer-mmcq": ^3.2.1-alpha.1
@@ -9477,7 +9452,7 @@ fsevents@^1.2.7:
     "@webcomponents/scoped-custom-element-registry": ^0.0.5
     "@webcomponents/webcomponentsjs": ^2.2.10
     app-datepicker: ^5.1.0
-    babel-loader: ^9.1.2
+    babel-loader: ^9.1.0
     chai: ^4.3.4
     chart.js: ^3.3.2
     comlink: ^4.3.1
@@ -9493,7 +9468,7 @@ fsevents@^1.2.7:
     eslint-config-airbnb-typescript: ^14.0.0
     eslint-config-prettier: ^8.6.0
     eslint-import-resolver-webpack: ^0.13.1
-    eslint-plugin-disable: ^2.0.3
+    eslint-plugin-disable: ^2.0.1
     eslint-plugin-import: ^2.24.2
     eslint-plugin-lit: ^1.6.1
     eslint-plugin-unused-imports: ^1.1.5
@@ -9515,8 +9490,8 @@ fsevents@^1.2.7:
     html-minifier: ^4.0.0
     husky: ^8.0.3
     idb-keyval: ^5.1.3
-    instant-mocha: ^1.5.0
-    intl-messageformat: ^10.3.0
+    instant-mocha: ^1.3.1
+    intl-messageformat: ^10.2.5
     js-yaml: ^4.1.0
     jszip: ^3.10.1
     leaflet: ^1.7.1
@@ -9529,7 +9504,7 @@ fsevents@^1.2.7:
     map-stream: ^0.0.7
     marked: ^4.0.12
     memoize-one: ^6.0.0
-    merge-stream: ^2.0.0
+    merge-stream: ^1.0.1
     mocha: ^8.4.0
     node-vibrant: 3.2.1-alpha.1
     object-hash: ^3.0.0
@@ -9554,7 +9529,7 @@ fsevents@^1.2.7:
     sortablejs: ^1.14.0
     source-map-url: ^0.4.0
     superstruct: ^1.0.3
-    systemjs: ^6.13.0
+    systemjs: ^6.3.2
     tar: ^6.1.11
     terser-webpack-plugin: ^5.2.4
     tinykeys: ^1.1.3
@@ -9571,7 +9546,7 @@ fsevents@^1.2.7:
     webpack: ^5.55.1
     webpack-cli: ^5.0.1
     webpack-dev-server: ^4.11.1
-    webpack-manifest-plugin: ^5.0.0
+    webpack-manifest-plugin: ^4.0.2
     webpackbar: ^5.0.2
     weekstart: ^1.1.0
     workbox-build: ^6.5.4
@@ -9967,20 +9942,23 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"instant-mocha@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "instant-mocha@npm:1.5.0"
+"instant-mocha@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "instant-mocha@npm:1.3.1"
   dependencies:
-    fs-require: ^1.4.0
-    memfs: ^3.4.12
-    source-map-support: ^0.5.21
+    aggregate-error: ^3.1.0
+    ansi-escapes: ^4.3.2
+    fs-require: ^1.1.0
+    memfs: ^3.2.2
+    minimist: ^1.2.5
+    source-map-support: ^0.5.19
     yargs: ^16.2.0
   peerDependencies:
-    mocha: 8 || 9 || 10
-    webpack: 4 || 5
+    mocha: ^6.1.4 || ^8.3.2
+    webpack: ^4.40.0 || ^5.0.0
   bin:
-    instant-mocha: dist/cli.js
-  checksum: 77741864a0b6602e7599dc93e3bd3dfc3451c58e84881c7163b8fc9494c095528ba3cc2c8b74be41e885a659711d81777ff7fd761523c34d4eabcd9fb555156d
+    instant-mocha: bin/instant-mocha.js
+  checksum: f4313d75249b63ef58cf62bb92a44bc284c556d6ce8430483e564718fea75797a0f587640af7efe69252690df1c3f10fd9ebda4d445f4da3fac35f41249c2e8d
   languageName: node
   linkType: hard
 
@@ -10009,15 +9987,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:^10.3.0":
-  version: 10.3.0
-  resolution: "intl-messageformat@npm:10.3.0"
+"intl-messageformat@npm:^10.2.5":
+  version: 10.2.5
+  resolution: "intl-messageformat@npm:10.2.5"
   dependencies:
     "@formatjs/ecma402-abstract": 1.14.3
-    "@formatjs/fast-memoize": 1.2.8
-    "@formatjs/icu-messageformat-parser": 2.2.0
+    "@formatjs/fast-memoize": 1.2.7
+    "@formatjs/icu-messageformat-parser": 2.1.14
     tslib: ^2.4.0
-  checksum: a92b2fec9ed0ba992ecfefbe9968c0f80961d6d23d105b16f3437108c61fe57d6e91e04392c4092335136399e047572996bc45d197ec0899473a3aac3627fed2
+  checksum: 048d6e3e746bff5ea6d745c8cbc2d0049aadb42caf2bad0d47e0bcf9bede285ef48a1fbd3a87711b99587d270d2ab8d9488e51577b24a2227856cdf373dd25df
   languageName: node
   linkType: hard
 
@@ -10894,16 +10872,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"koa-etag@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "koa-etag@npm:4.0.0"
-  dependencies:
-    etag: ^1.8.1
-  checksum: b5f413574e1edbd60fbbd0d31720e66565d51bfcb407d1bc3f48d9dd5b45fa5a9e4f69a60e749fad7397348e90de23e943307578d007a69da30faaae432deaf6
-  languageName: node
-  linkType: hard
-
-"koa-send@npm:^5.0.0, koa-send@npm:^5.0.1":
+"koa-send@npm:^5.0.0":
   version: 5.0.1
   resolution: "koa-send@npm:5.0.1"
   dependencies:
@@ -11487,7 +11456,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"memfs@npm:^3.4.12, memfs@npm:^3.4.3":
+"memfs@npm:^3.2.2, memfs@npm:^3.4.3":
   version: 3.4.13
   resolution: "memfs@npm:3.4.13"
   dependencies:
@@ -11517,6 +11486,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"merge-stream@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "merge-stream@npm:1.0.1"
+  dependencies:
+    readable-stream: ^2.0.1
+  checksum: 3be7887dffd8899da0f930c0f85812ab8993252f467dcd61e60a8d085836ebbb23756b8e481a7f71824206342afe1b1a2b80c05a1cd0ed0e792a09c5812a9082
+  languageName: node
+  linkType: hard
+
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
@@ -14403,13 +14381,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:^0.5.21, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20":
-  version: 0.5.21
-  resolution: "source-map-support@npm:0.5.21"
+"source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20":
+  version: 0.5.20
+  resolution: "source-map-support@npm:0.5.20"
   dependencies:
     buffer-from: ^1.0.0
     source-map: ^0.6.0
-  checksum: 43e98d700d79af1d36f859bdb7318e601dfc918c7ba2e98456118ebc4c4872b327773e5a1df09b0524e9e5063bb18f0934538eace60cca2710d1fa687645d137
+  checksum: 43946aff452011960d16154304b11011e0185549493e65dd90da045959409fb2d266ba1c854fff3d5949f8e59382e3fcc7f7c5fa66136007a6750ad06c6c0baa
   languageName: node
   linkType: hard
 
@@ -14880,10 +14858,10 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"systemjs@npm:^6.13.0":
-  version: 6.13.0
-  resolution: "systemjs@npm:6.13.0"
-  checksum: df8d7374249778291f3a85278fdb3e1b9d81ac07767b0a7f9edeca0ee45d847c19bceb01522c817605e2908d32a4fcfed6bacd707bfb7bd577774ab900d3707d
+"systemjs@npm:^6.3.2":
+  version: 6.3.2
+  resolution: "systemjs@npm:6.3.2"
+  checksum: 640ee144b1bd85e41a1ed2fbd222a2341f996b8ec67cd8a22ee7d8afdf570cebd2953219862f6e780137a0d7fee77562c195f81dc9827edb4c648251c481b487
   languageName: node
   linkType: hard
 
@@ -16060,15 +16038,15 @@ typescript@^3.8.3:
   languageName: node
   linkType: hard
 
-"webpack-manifest-plugin@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "webpack-manifest-plugin@npm:5.0.0"
+"webpack-manifest-plugin@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "webpack-manifest-plugin@npm:4.0.2"
   dependencies:
     tapable: ^2.0.0
     webpack-sources: ^2.2.0
   peerDependencies:
-    webpack: ^5.47.0
-  checksum: 864d68f90870e194074756e71caf3df36b777d687a50286ba27eb1958480642b125c2cf47a2787beac52eba4b1ccf1fe8141f017c81f1e87e953481f852a7c48
+    webpack: ^4.44.2 || ^5.47.0
+  checksum: 7f8a338b977bb9a8be10196d17e033f965b97735d36258513e5104b148c8ad1da8441bb8f9c8580b9455f40201ac2ac2a2edcce6ef60e46f072519c0cc0d1f70
   languageName: node
   linkType: hard
 
@@ -16541,9 +16519,9 @@ typescript@^3.8.3:
   languageName: node
   linkType: hard
 
-"ws@npm:^7.3.1, ws@npm:^7.4.2":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+"ws@npm:^7.3.1":
+  version: 7.4.0
+  resolution: "ws@npm:7.4.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -16552,7 +16530,7 @@ typescript@^3.8.3:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
+  checksum: 83a19a742aa2254ac5d7aa5d8f9a3bf7f2312bd147427fed02fc13168545c938450f1da9d8371133b292f63d1a21dcf7e7a09c6f89b8603581a27ed6c8e24e09
   languageName: node
   linkType: hard