From 88ec7a10c923d23d6ecb4284cc14d839835dee40 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 12 Apr 2021 23:30:46 +0200
Subject: [PATCH 1/2] Show toast with call service error

---
 .../service/developer-tools-service.ts           | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index 4ad74bcd53dd..929bdbf88b54 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -28,6 +28,7 @@ import { haStyle } from "../../../resources/styles";
 import "../../../styles/polymer-ha-style";
 import { HomeAssistant } from "../../../types";
 import "../../../util/app-localstorage-document";
+import { showToast } from "../../../util/toast";
 
 class HaPanelDevService extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -267,11 +268,22 @@ class HaPanelDevService extends LitElement {
     }
   );
 
-  private _callService() {
+  private async _callService() {
     if (!this._serviceData?.service) {
       return;
     }
-    callExecuteScript(this.hass, [this._serviceData]);
+    try {
+      await callExecuteScript(this.hass, [this._serviceData]);
+    } catch (err) {
+      showToast(this, {
+        message:
+          this.hass.localize(
+            "ui.notification_toast.service_call_failed",
+            "service",
+            `${this._serviceData.service}`
+          ) + ` ${err.message}`,
+      });
+    }
   }
 
   private _toggleYaml() {

From eeef0db9b475388ef0761a7284ceff338bba611c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Mon, 12 Apr 2021 23:31:46 +0200
Subject: [PATCH 2/2] Update developer-tools-service.ts

---
 src/panels/developer-tools/service/developer-tools-service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index 929bdbf88b54..eef7f9ceb2c7 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -280,7 +280,7 @@ class HaPanelDevService extends LitElement {
           this.hass.localize(
             "ui.notification_toast.service_call_failed",
             "service",
-            `${this._serviceData.service}`
+            this._serviceData.service
           ) + ` ${err.message}`,
       });
     }