From 2e4f4d814a65379e473714257e1e935a85e80bc6 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@meta.com>
Date: Fri, 1 Nov 2024 05:03:34 -0700
Subject: [PATCH] surface setup issues in EventBeat and Scheduler

Summary: changelog: [internal]

Differential Revision: D65333695
---
 .../ReactCommon/react/renderer/core/EventBeat.cpp   |  4 ++++
 .../react/renderer/scheduler/Scheduler.cpp          | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp
index 305c23752249..82f18533a9d8 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp
@@ -7,6 +7,7 @@
 
 #include "EventBeat.h"
 
+#include <react/debug/react_native_assert.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #include <utility>
 
@@ -18,6 +19,9 @@ EventBeat::EventBeat(
     : ownerBox_(std::move(ownerBox)), runtimeScheduler_(runtimeScheduler) {}
 
 void EventBeat::request() const {
+  react_native_assert(
+      beatCallback_ &&
+      "Unexpected state: EventBeat::setBeatCallback was not called before EventBeat::request.");
   isRequested_ = true;
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index 58e2805de36d..28998bd034ba 100644
--- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -50,17 +50,18 @@ Scheduler::Scheduler(
   auto weakRuntimeScheduler =
       contextContainer_->find<std::weak_ptr<RuntimeScheduler>>(
           "RuntimeScheduler");
-  auto runtimeScheduler = weakRuntimeScheduler.has_value()
-      ? weakRuntimeScheduler.value().lock()
-      : nullptr;
+  react_native_assert(
+      weakRuntimeScheduler.has_value() &&
+      "Unexpected state: RuntimeScheduler was not provided.");
+
+  auto runtimeScheduler = weakRuntimeScheduler.value().lock();
 
-  if (runtimeScheduler && ReactNativeFeatureFlags::enableUIConsistency()) {
+  if (ReactNativeFeatureFlags::enableUIConsistency()) {
     runtimeScheduler->setShadowTreeRevisionConsistencyManager(
         uiManager->getShadowTreeRevisionConsistencyManager());
   }
 
-  if (runtimeScheduler &&
-      ReactNativeFeatureFlags::enableReportEventPaintTime()) {
+  if (ReactNativeFeatureFlags::enableReportEventPaintTime()) {
     runtimeScheduler->setEventTimingDelegate(eventPerformanceLogger_.get());
   }