From c0c1643efec8dbfa7e2e76ec5db53a0ca936b2ca Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 26 Sep 2026 01:31:05 +0100
Subject: [PATCH] [zigbee] Use register_apply_action for zigbee.factory_reset
 (#19690)

---
 esphome/components/zigbee/__init__.py  | 11 ++---------
 esphome/components/zigbee/automation.h | 19 -------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 esphome/components/zigbee/automation.h

diff --git a/esphome/components/zigbee/__init__.py b/esphome/components/zigbee/__init__.py
index 8e9824d42e..1fa6110f04 100644
--- a/esphome/components/zigbee/__init__.py
+++ b/esphome/components/zigbee/__init__.py
@@ -30,7 +30,6 @@ from .const import (
     POWER_SOURCE,
     REPORT,
     ZigbeeComponent,
-    zigbee_ns,
 )
 from .const_zephyr import (
     CONF_IEEE802154_VENDOR_OUI,
@@ -293,14 +292,8 @@ ZIGBEE_ACTION_SCHEMA = automation.maybe_simple_id(
     )
 )
 
-FactoryResetAction = zigbee_ns.class_(
-    "FactoryResetAction", automation.Action, cg.Parented.template(ZigbeeComponent)
-)
-
-
-automation.register_parented_action(
+automation.register_apply_action(
     "zigbee.factory_reset",
-    FactoryResetAction,
     ZIGBEE_ACTION_SCHEMA,
-    synchronous=True,
+    automation.ApplyCall("factory_reset()"),
 )
diff --git a/esphome/components/zigbee/automation.h b/esphome/components/zigbee/automation.h
deleted file mode 100644
index 1f953100d9..0000000000
--- a/esphome/components/zigbee/automation.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "esphome/core/defines.h"
-#ifdef USE_ZIGBEE
-#ifdef USE_ESP32
-#include "zigbee_esp32.h"
-#endif
-#ifdef USE_NRF52
-#include "zigbee_zephyr.h"
-#endif
-namespace esphome::zigbee {
-
-template<typename... Ts> class FactoryResetAction final : public Action<Ts...>, public Parented<ZigbeeComponent> {
- public:
-  void play(const Ts &...x) override { this->parent_->factory_reset(); }
-};
-
-}  // namespace esphome::zigbee
-
-#endif