From e00bcc9f48b76b9f331f5452d0a91a828621bb85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= <joasoe@gmail.com>
Date: Thu, 3 Jun 2021 19:01:12 +0200
Subject: [PATCH] Better exit navigation for my-ingress (#9342)

---
 hassio/src/ingress-view/hassio-ingress-view.ts | 13 ++++++++++---
 src/translations/en.json                       |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/hassio/src/ingress-view/hassio-ingress-view.ts b/hassio/src/ingress-view/hassio-ingress-view.ts
index 710cf3b5e3..24d050acb9 100644
--- a/hassio/src/ingress-view/hassio-ingress-view.ts
+++ b/hassio/src/ingress-view/hassio-ingress-view.ts
@@ -97,16 +97,23 @@ class HassioIngressView extends LitElement {
             title: requestedAddon,
           });
           await nextRender();
-          history.back();
+          navigate("/hassio/store", { replace: true });
           return;
         }
-        if (!addonInfo.ingress) {
+        if (!addonInfo.version) {
+          await showAlertDialog(this, {
+            text: this.supervisor.localize("my.error_addon_not_installed"),
+            title: addonInfo.name,
+          });
+          await nextRender();
+          navigate(`/hassio/addon/${addonInfo.slug}/info`, { replace: true });
+        } else if (!addonInfo.ingress) {
           await showAlertDialog(this, {
             text: this.supervisor.localize("my.error_addon_no_ingress"),
             title: addonInfo.name,
           });
           await nextRender();
-          history.back();
+          navigate(`/hassio/addon/${addonInfo.slug}/info`, { replace: true });
         } else {
           navigate(`/hassio/ingress/${addonInfo.slug}`, { replace: true });
         }
diff --git a/src/translations/en.json b/src/translations/en.json
index 458e140bc3..6d41d8e276 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3813,6 +3813,8 @@
       "faq_link": "[%key:ui::panel::my::faq_link%]",
       "error": "[%key:ui::panel::my::error%]",
       "error_addon_not_found": "Add-on not found",
+      "error_addon_not_started": "The requested add-on are not running. Please start it first",
+      "error_addon_not_installed": "The requested add-on is not installed. Please install it first",
       "error_addon_no_ingress": "The requested add-on does not support ingress"
     },
     "system": {