From 407f305d21ce265b7dbfa18ee0f3c2b52b3a8615 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 3 Jun 2020 18:16:49 +0200
Subject: [PATCH] Fix for earlier loading the frontend (#6094)

---
 src/layouts/partial-panel-resolver.ts | 4 ++--
 src/state/disconnect-toast-mixin.ts   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/layouts/partial-panel-resolver.ts b/src/layouts/partial-panel-resolver.ts
index 0b766f697f..755584f0c2 100644
--- a/src/layouts/partial-panel-resolver.ts
+++ b/src/layouts/partial-panel-resolver.ts
@@ -131,13 +131,13 @@ class PartialPanelResolver extends HassRouterPage {
         hass: this.hass,
         narrow: this.narrow,
         route: this.routeTail,
-        panel: hass.panels[hass.panelUrl],
+        panel: hass.panels[this._currentPage],
       });
     } else {
       el.hass = hass;
       el.narrow = this.narrow;
       el.route = this.routeTail;
-      el.panel = hass.panels[hass.panelUrl];
+      el.panel = hass.panels[this._currentPage];
     }
   }
 
diff --git a/src/state/disconnect-toast-mixin.ts b/src/state/disconnect-toast-mixin.ts
index 376bbcfbcb..69d076ecc4 100644
--- a/src/state/disconnect-toast-mixin.ts
+++ b/src/state/disconnect-toast-mixin.ts
@@ -22,18 +22,20 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
       const oldHass = changedProperties.get("hass");
       if (
         !changedProperties.has("hass") ||
-        !oldHass?.config ||
-        oldHass.config.state === this.hass!.config.state
+        oldHass?.config?.state === this.hass!.config.state
       ) {
         return;
       }
       if (this.hass!.config.state === STATE_NOT_RUNNING) {
         showToast(this, {
-          message: this.hass!.localize("ui.notification_toast.starting"),
+          message:
+            this.hass!.localize("ui.notification_toast.starting") ||
+            "Home Assistant is starting, not everything will be available until it is finished.",
           duration: 0,
           dismissable: false,
         });
       } else if (
+        oldHass?.config &&
         oldHass.config.state === STATE_NOT_RUNNING &&
         (this.hass!.config.state === STATE_STARTING ||
           this.hass!.config.state === STATE_RUNNING)
@@ -47,7 +49,6 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
 
     protected hassReconnected() {
       super.hassReconnected();
-
       showToast(this, {
         message: "",
         duration: 1,