From cbad8aafa541546c82e8079f6ef1a54ce8df83b3 Mon Sep 17 00:00:00 2001
From: Phillip Pan <phillippan@meta.com>
Date: Wed, 9 Apr 2025 18:17:57 -0700
Subject: [PATCH] cleanup rn_ama_new_arch_ios.bridge_batch_did_complete_fix
 (#50598)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/50598

changelog: [ios][breaking] delete BridgeModuleBatchDidComplete config helpers

this is not used anywhere, cleanup

Reviewed By: srinathvijay

Differential Revision: D72692359

fbshipit-source-id: 42220a64be59bc0d32efe76c1f1d8fc4508a6b0e
---
 packages/react-native/React/Base/RCTBridge.h  |  3 ---
 packages/react-native/React/Base/RCTBridge.mm | 11 ---------
 .../React/CxxBridge/RCTCxxBridge.mm           | 24 +++++--------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/packages/react-native/React/Base/RCTBridge.h b/packages/react-native/React/Base/RCTBridge.h
index cdfd10f6f6d..6403591222a 100644
--- a/packages/react-native/React/Base/RCTBridge.h
+++ b/packages/react-native/React/Base/RCTBridge.h
@@ -82,9 +82,6 @@ void RCTSetTurboModuleInteropBridgeProxyLogLevel(RCTBridgeProxyLoggingLevel logL
 BOOL RCTTurboModuleInteropForAllTurboModulesEnabled(void);
 void RCTEnableTurboModuleInteropForAllTurboModules(BOOL enabled);
 
-BOOL RCTBridgeModuleBatchDidCompleteDisabled(void);
-void RCTDisableBridgeModuleBatchDidComplete(BOOL disabled);
-
 typedef enum {
   kRCTGlobalScope,
   kRCTGlobalScopeUsingRetainJSCallback,
diff --git a/packages/react-native/React/Base/RCTBridge.mm b/packages/react-native/React/Base/RCTBridge.mm
index 3f1cbeb7bb2..2fa60819d21 100644
--- a/packages/react-native/React/Base/RCTBridge.mm
+++ b/packages/react-native/React/Base/RCTBridge.mm
@@ -254,17 +254,6 @@ void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled)
   gTurboModuleEnableSyncVoidMethods = enabled;
 }
 
-static BOOL gBridgeModuleDisableBatchDidComplete = NO;
-BOOL RCTBridgeModuleBatchDidCompleteDisabled(void)
-{
-  return gBridgeModuleDisableBatchDidComplete;
-}
-
-void RCTDisableBridgeModuleBatchDidComplete(BOOL disabled)
-{
-  gBridgeModuleDisableBatchDidComplete = disabled;
-}
-
 BOOL kDispatchAccessibilityManagerInitOntoMain = NO;
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void)
 {
diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm
index 7348b2f4caf..780768d35af 100644
--- a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm
+++ b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm
@@ -1458,27 +1458,15 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
 
 - (void)batchDidComplete
 {
-  if (RCTBridgeModuleBatchDidCompleteDisabled()) {
-    id uiManager = [self moduleForName:@"UIManager"];
-    if ([uiManager respondsToSelector:@selector(batchDidComplete)] &&
-        [uiManager respondsToSelector:@selector(methodQueue)]) {
+  // TODO #12592471: batchDidComplete is only used by RCTUIManager,
+  // can we eliminate this special case?
+  for (RCTModuleData *moduleData in _moduleDataByID) {
+    if (moduleData.implementsBatchDidComplete) {
       [self
           dispatchBlock:^{
-            [uiManager batchDidComplete];
+            [moduleData.instance batchDidComplete];
           }
-                  queue:[uiManager methodQueue]];
-    }
-  } else {
-    // TODO #12592471: batchDidComplete is only used by RCTUIManager,
-    // can we eliminate this special case?
-    for (RCTModuleData *moduleData in _moduleDataByID) {
-      if (moduleData.implementsBatchDidComplete) {
-        [self
-            dispatchBlock:^{
-              [moduleData.instance batchDidComplete];
-            }
-                    queue:moduleData.methodQueue];
-      }
+                  queue:moduleData.methodQueue];
     }
   }
 }