Conditionally run global event bus

src/App.native.tsx

@@ -16,6 +16,7 @@ import {useQueryClient} from '@tanstack/react-query'
 
 import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
+import {MessagesEventBusProvider} from '#/state/messages/events'
 import {init as initPersistedState} from '#/state/persisted'
 import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs'
 import {Provider as ModerationOptsProvider} from '#/state/preferences/moderation-opts'
@@ -97,6 +98,7 @@ function InnerApp() {
                 <QueryProvider currentDid={currentAccount?.did}>
                   <PushNotificationsListener>
                     <StatsigProvider>
+                      <MessagesEventBusProvider>
                         {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
                         <LabelDefsProvider>
                           <ModerationOptsProvider>
@@ -112,6 +114,7 @@ function InnerApp() {
                             </LoggedOutViewProvider>
                           </ModerationOptsProvider>
                         </LabelDefsProvider>
+                      </MessagesEventBusProvider>
                     </StatsigProvider>
                   </PushNotificationsListener>
                 </QueryProvider>

src/App.web.tsx

@@ -9,6 +9,7 @@ import {useLingui} from '@lingui/react'
 
 import {Provider as StatsigProvider} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
+import {MessagesEventBusProvider} from '#/state/messages/events'
 import {init as initPersistedState} from '#/state/persisted'
 import {Provider as LabelDefsProvider} from '#/state/preferences/label-defs'
 import {Provider as ModerationOptsProvider} from '#/state/preferences/moderation-opts'
@@ -84,6 +85,7 @@ function InnerApp() {
             key={currentAccount?.did}>
             <QueryProvider currentDid={currentAccount?.did}>
               <StatsigProvider>
+                <MessagesEventBusProvider>
                   {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
                   <LabelDefsProvider>
                     <ModerationOptsProvider>
@@ -98,6 +100,7 @@ function InnerApp() {
                       </LoggedOutViewProvider>
                     </ModerationOptsProvider>
                   </LabelDefsProvider>
+                </MessagesEventBusProvider>
               </StatsigProvider>
             </QueryProvider>
           </React.Fragment>

src/state/messages/events/index.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 import {AppState} from 'react-native'
 import {BskyAgent} from '@atproto-labs/api'
 
+import {useGate} from '#/lib/statsig/statsig'
 import {isWeb} from '#/platform/detection'
 import {MessagesEventBus} from '#/state/messages/events/agent'
 import {MessagesEventBusState} from '#/state/messages/events/types'
@@ -20,7 +21,7 @@ export function useMessagesEventBus() {
   return ctx
 }
 
-export function MessagesEventBusProvider({
+export function Temp_MessagesEventBusProvider({
   children,
 }: {
   children: React.ReactNode
@@ -65,3 +66,18 @@ export function MessagesEventBusProvider({
     </MessagesEventBusContext.Provider>
   )
 }
+
+export function MessagesEventBusProvider({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  const gate = useGate()
+  const {serviceUrl} = useDmServiceUrlStorage()
+  if (gate('dms') && serviceUrl) {
+    return (
+      <Temp_MessagesEventBusProvider>{children}</Temp_MessagesEventBusProvider>
+    )
+  }
+  return children
+}