From 2c006e99f23f422e6e72ec40b30c22711b022713 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 11 Feb 2020 00:17:29 +0100
Subject: [PATCH] Use original id to remove entity (#4829)

---
 .../entities/entity-registry-settings.ts      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index a0090ff6a4..ac5ac1a30d 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -177,26 +177,27 @@ export class EntityRegistrySettings extends LitElement {
     }
   }
 
-  private async _deleteEntry(): Promise<void> {
+  private async _confirmDeleteEntry(): Promise<void> {
+    if (
+      !(await showConfirmationDialog(this, {
+        text: this.hass.localize(
+          "ui.dialogs.entity_registry.editor.confirm_delete"
+        ),
+      }))
+    ) {
+      return;
+    }
+
     this._submitting = true;
 
     try {
-      await removeEntityRegistryEntry(this.hass!, this._entityId);
+      await removeEntityRegistryEntry(this.hass!, this._origEntityId);
       fireEvent(this as HTMLElement, "close-dialog");
     } finally {
       this._submitting = false;
     }
   }
 
-  private _confirmDeleteEntry(): void {
-    showConfirmationDialog(this, {
-      text: this.hass.localize(
-        "ui.dialogs.entity_registry.editor.confirm_delete"
-      ),
-      confirm: () => this._deleteEntry(),
-    });
-  }
-
   private _disabledByChanged(ev: Event): void {
     this._disabledBy = (ev.target as HaSwitch).checked ? null : "user";
   }