Fix RCTRootView invalidation using the wrong bridge

Reviewed By: majak

Differential Revision: D3696533

fbshipit-source-id: e7ef4373e975e585f4c34df71966c8b5b30d3e9a

Libraries/Utilities/MessageQueue.js

@@ -218,8 +218,8 @@ class MessageQueue {
     const moduleMethods = this._callableModules[module];
     invariant(
       !!moduleMethods,
-      'Module %s is not a registered callable module.',
+      'Module %s is not a registered callable module (calling %s)',
-      module
+      module, method
     );
     invariant(
       !!moduleMethods[method],

React/Base/RCTRootView.m

@@ -15,6 +15,7 @@
 
 #import "RCTAssert.h"
 #import "RCTBridge.h"
+#import "RCTBridge+Private.h"
 #import "RCTEventDispatcher.h"
 #import "RCTKeyCommands.h"
 #import "RCTLog.h"
@@ -92,7 +93,7 @@ NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotificat
                                                object:self];
 
     if (!_bridge.loading) {
-      [self bundleFinishedLoading:_bridge];
+      [self bundleFinishedLoading:[_bridge batchedBridge]];
     }
 
     [self showLoadingView];
@@ -199,6 +200,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
 - (void)javaScriptDidLoad:(NSNotification *)notification
 {
   RCTAssertMainQueue();
+
+  // Use the (batched) bridge that's sent in the notification payload, so the
+  // RCTRootContentView is scoped to the right bridge
   RCTBridge *bridge = notification.userInfo[@"bridge"];
   [self bundleFinishedLoading:bridge];
 }