From 1671bb6dd35152b9a0c6d213205a56f64d28daa9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 24 Sep 2026 13:54:03 +0100
Subject: [PATCH] [time] Use register_apply_condition for time.has_time
 (#19560)

---
 esphome/components/time/__init__.py       | 10 ++--------
 esphome/components/time/real_time_clock.h |  9 ---------
 tests/components/time/common.yaml         |  9 +++++++++
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/esphome/components/time/__init__.py b/esphome/components/time/__init__.py
index ecc448a96a..cedb9b3c9b 100644
--- a/esphome/components/time/__init__.py
+++ b/esphome/components/time/__init__.py
@@ -6,7 +6,6 @@ import logging
 import tzlocal
 
 from esphome import automation
-from esphome.automation import Condition
 import esphome.codegen as cg
 from esphome.components.zephyr import zephyr_add_prj_conf
 from esphome.config_helpers import filter_source_files_from_defines
@@ -18,7 +17,6 @@ from esphome.const import (
     CONF_DAYS_OF_WEEK,
     CONF_HOUR,
     CONF_HOURS,
-    CONF_ID,
     CONF_MINUTE,
     CONF_MINUTES,
     CONF_MONTHS,
@@ -49,7 +47,6 @@ time_ns = cg.esphome_ns.namespace("time")
 RealTimeClock = time_ns.class_("RealTimeClock", cg.PollingComponent)
 CronTrigger = time_ns.class_("CronTrigger", automation.Trigger.template(), cg.Component)
 SyncTrigger = time_ns.class_("SyncTrigger", automation.Trigger.template(), cg.Component)
-TimeHasTimeCondition = time_ns.class_("TimeHasTimeCondition", Condition)
 
 # C++ types for pre-parsed timezone struct generation
 DSTRuleType_cpp = time_ns.enum("DSTRuleType", is_class=True)
@@ -469,18 +466,15 @@ async def to_code(config):
     cg.add_global(time_ns.using)
 
 
-@automation.register_condition(
+automation.register_apply_condition(
     "time.has_time",
-    TimeHasTimeCondition,
     cv.Schema(
         {
             cv.GenerateID(): cv.use_id(RealTimeClock),
         }
     ),
+    "now().is_valid()",
 )
-async def time_has_time_to_code(config, condition_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(condition_id, template_arg, paren)
 
 
 # posix_tz.cpp is fully #ifdef'd on USE_TIME_TIMEZONE, set only when a
diff --git a/esphome/components/time/real_time_clock.h b/esphome/components/time/real_time_clock.h
index c449309c9f..90994d90f4 100644
--- a/esphome/components/time/real_time_clock.h
+++ b/esphome/components/time/real_time_clock.h
@@ -44,13 +44,4 @@ class RealTimeClock : public PollingComponent {
   LazyCallbackManager<void()> time_sync_callback_;
 };
 
-template<typename... Ts> class TimeHasTimeCondition final : public Condition<Ts...> {
- public:
-  TimeHasTimeCondition(RealTimeClock *parent) : parent_(parent) {}
-  bool check(const Ts &...x) override { return this->parent_->now().is_valid(); }
-
- protected:
-  RealTimeClock *parent_;
-};
-
 }  // namespace esphome::time
diff --git a/tests/components/time/common.yaml b/tests/components/time/common.yaml
index cd258c7aa6..776a67cc7a 100644
--- a/tests/components/time/common.yaml
+++ b/tests/components/time/common.yaml
@@ -12,3 +12,12 @@ time:
           - logger.log: "CronTrigger fired (every 10 seconds)"
   - platform: sntp
     id: sntp_time
+
+esphome:
+  on_boot:
+    - if:
+        condition:
+          time.has_time:
+            id: sntp_time
+        then:
+          - logger.log: "sntp_time has valid time"