expo-dev-menu 2.2.0 → 3.0.0

package/CHANGELOG.md

@@ -10,23 +10,43 @@
 
 ### 💡 Others
 
-## 2.2.0 — 2023-04-13
+## 3.0.0 — 2023-05-08
 
-### 🎉 New features
-
-- Added experimental react-devtools integration. ([#21462](https://github.com/expo/expo/pull/21462) by [@kudo](https://github.com/kudo))
+### 🛠 Breaking changes
 
-## 2.1.4 — 2023-03-20
+- Update iOS and Android entry points to support custom entry files (changed `index` to `.expo/.virtual-metro-entry`). This requires all projects to use `expo/metro-config` as the base config. ([#21643](https://github.com/expo/expo/pull/21643) by [@EvanBacon](https://github.com/EvanBacon))
 
 ### 🐛 Bug fixes
 
-- Change arg in gradle `.execute()` call to null to inherit env variables from user's env ([#21712](https://github.com/expo/expo/pull/21712) by [@phoenixiguess](https://github.com/phoenixiguess))
+- Fixed reload crash when expo-dev-menu is turned off. ([#21279](https://github.com/expo/expo/pull/21279) by [@jayshah123](https://github.com/jayshah123))
+- Fix JS entry file in development builds. ([#21984](https://github.com/expo/expo/pull/21984) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Update the start script to dynamically locate the packager IP from any network interface. ([#21977](https://github.com/expo/expo/pull/21977) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### 💡 Others
+
+- Convert EXManifests iOS implementation to Swift. ([#21298](https://github.com/expo/expo/pull/21298) by [@wschurman](https://github.com/wschurman))
+- Rewrite vendored safe area view using the new modules API. ([#22174](https://github.com/expo/expo/pull/22174) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Migrate iOS native modules to use the new Module API. ([#22263](https://github.com/expo/expo/pull/22263) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### ⚠️ Notices
 
-## 2.1.3 — 2023-02-25
+- Disable the `Remote JS debugger` option on menu when using SDK 49 or above. ([#22010](https://github.com/expo/expo/pull/22010) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### 📚 3rd party library updates
+
+- Update `react-native` to 0.71.7. ([#22253](https://github.com/expo/expo/pull/22253) by [@kudo](https://github.com/kudo))
+
+## 2.2.0 - 2023-04-13
+
+### 🎉 New features
+
+- Added experimental react-devtools integration. ([#21462](https://github.com/expo/expo/pull/21462) by [@kudo](https://github.com/kudo))
+
+## 2.1.4 - 2023-03-20
 
 ### 🐛 Bug fixes
 
-- Fixed `'jsc/JSCRuntime.h' file not found` when using JSC on iOS. ([#21246](https://github.com/expo/expo/pull/21246) by [@lukmccall](https://github.com/lukmccall))
+- Change arg in gradle `.execute()` call to null to inherit env variables from user's env ([#21712](https://github.com/expo/expo/pull/21712) by [@phoenixiguess](https://github.com/phoenixiguess))
 
 ## 2.1.2 — 2023-02-17
 

package/README.md

@@ -1,7 +1,7 @@
 # 📦 expo-dev-menu
 
-Expo/React Native module to add developer menu to Debug builds of your application. This package is intended to be included in your project through [`expo-dev-client`](https://docs.expo.dev/clients/introduction/).
+Expo/React Native module to add developer menu to Debug builds of your application. This package is intended to be included in your project through [`expo-dev-client`](https://docs.expo.dev/home/develop/development-builds/introduction/#what-is-an-expo-dev-client).
 
 ## Documentation
 
-You can find the documentation under [https://docs.expo.dev/clients/introduction](https://docs.expo.dev/clients/introduction).
+You can find more information in the [Expo documentation](https://docs.expo.dev/home/develop/development-builds/introduction).

package/android/build.gradle

@@ -1,67 +1,9 @@
-import groovy.json.JsonSlurper
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '2.2.0'
-
-// reanimated v2
-def reactNativeFilePath = ["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()
-def inputFile = new File(reactNativeFilePath)
-def json = new JsonSlurper().parseText(inputFile.text)
-def reactNativeVersion = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: json.version as String
-def (major, minor, patch) = reactNativeVersion.tokenize('.')
-
-def engine = "jsc"
-
-def getCurrentFlavor() {
-  Gradle gradle = getGradle()
-  String taskRequestName = gradle.getStartParameter().getTaskRequests().toString()
-  Pattern pattern
-
-  if (taskRequestName.contains("assemble")) {
-    pattern = Pattern.compile("assemble(\\w+)(Release|Debug)")
-  } else if (taskRequestName.contains("bundle")) {
-    pattern = Pattern.compile("bundle(\\w+)(Release|Debug)")
-  } else {
-    pattern = Pattern.compile("generate(\\w+)(Release|Debug)")
-  }
-  Matcher matcher = pattern.matcher(taskRequestName)
-
-  if (matcher.find()) {
-    return matcher.group(1)
-  }
-  return ""
-}
-
-def replaceSoTaskDebug
-def replaceSoTaskReleaseWithDevMenu
-
-rootProject.getSubprojects().forEach({ project ->
-  if (project.plugins.hasPlugin("com.android.application")) {
-    if ((Integer.parseInt(minor) >= 71 && project.hermesEnabled?.toBoolean()) || project.ext?.react?.enableHermes?.toBoolean()) {
-      engine = "hermes"
-    }
-  }
-})
-
-def reanimatedPath = "../vendored/react-native-reanimated/android"
-def minorCopy = Integer.parseInt(minor)
-def reanimatedFolder = file("${reanimatedPath}/${minorCopy}-${engine}")
-while (!reanimatedFolder.exists()) {
-  minorCopy -= 1
-  reanimatedFolder = file("${reanimatedPath}/${minorCopy}-${engine}")
-  if (minorCopy < 71) {
-    throw new GradleException('No matching aar for react-native-reanimated found. Upgrade react-native to 0.71.x or later in order to use the expo-dev-menu package.')
-  }
-}
-def reanimatedVersion = minorCopy
-
-// end of reanimated v2
+version = '3.0.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -132,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 10
-    versionName '2.2.0'
+    versionName '3.0.0'
   }
   lintOptions {
     abortOnError false
@@ -147,7 +89,6 @@ android {
 
   sourceSets {
     debug {
-      jniLibs.srcDir "$reanimatedPath/$reanimatedVersion-$engine/jni"
       java {
         srcDirs += ['../vendored/react-native-gesture-handler/android/']
         srcDirs += ['../vendored/react-native-safe-area-context/android/']
@@ -196,8 +137,8 @@ dependencies {
   implementation project(':expo-modules-core')
   implementation project(":expo-manifests")
 
-  debugImplementation files("${reanimatedPath}/${minorCopy}-${engine}/classes.jar")
-  releaseWithDevMenuImplementation files("${reanimatedPath}/${minorCopy}-${engine}/classes.jar")
+  implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
+  implementation 'com.google.android.material:material:1.2.1'
 
   implementation project(":expo-dev-menu-interface")
 

package/android/src/debug/java/expo/modules/devmenu/DevMenuActivity.kt

@@ -3,13 +3,18 @@ package expo.modules.devmenu
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
+import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.doOnLayout
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.ReactDelegate
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.ReactRootView
 import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import expo.modules.devmenu.helpers.getPrivateDeclaredFieldValue
 import expo.modules.devmenu.helpers.setPrivateDeclaredFieldValue
 import java.util.*
@@ -64,7 +69,7 @@ class DevMenuActivity : ReactActivity() {
         putBundle("devSettings", DevMenuManager.getDevSettings())
         putBundle("menuPreferences", DevMenuManager.getMenuPreferences())
         putBoolean("isDevice", !isEmulator)
-        putStringArrayList("registeredCallbacks", DevMenuManager.registeredCallbacks)
+        putStringArray("registeredCallbacks", DevMenuManager.registeredCallbacks.map { it.name }.toTypedArray())
       }
 
       override fun createRootView(): ReactRootView {
@@ -107,6 +112,39 @@ class DevMenuActivity : ReactActivity() {
     }
   }
 
+  override fun setContentView(view: View?) {
+    super.setContentView(R.layout.bottom_sheet)
+
+    val mainLayout = findViewById<CoordinatorLayout>(R.id.main_layout)
+    val bottomSheet = findViewById<FrameLayout>(R.id.bottom_sheet)
+    bottomSheet.addView(view)
+
+    BottomSheetBehavior.from(bottomSheet).apply {
+      addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
+        override fun onStateChanged(bottomSheet: View, newState: Int) {
+          if (newState == BottomSheetBehavior.STATE_HIDDEN || newState == BottomSheetBehavior.STATE_COLLAPSED) {
+            DevMenuManager.hideMenu()
+          }
+        }
+
+        override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
+      })
+
+      bottomSheet.doOnLayout {
+        state = BottomSheetBehavior.STATE_HALF_EXPANDED
+      }
+
+      mainLayout.setOnClickListener {
+        state = BottomSheetBehavior.STATE_HIDDEN
+      }
+    }
+  }
+
+  fun closeBottomSheet() {
+    val bottomSheet = findViewById<FrameLayout>(R.id.bottom_sheet)
+    BottomSheetBehavior.from(bottomSheet).state = BottomSheetBehavior.STATE_HIDDEN
+  }
+
   companion object {
     var appWasLoaded = false
     private lateinit var rootView: ReactRootView

package/android/src/debug/java/expo/modules/devmenu/DevMenuHost.kt

@@ -12,8 +12,6 @@ import com.facebook.react.bridge.JavaScriptExecutorFactory
 import com.facebook.react.config.ReactFeatureFlags
 import com.facebook.react.devsupport.DevServerHelper
 import com.facebook.react.shell.MainReactPackage
-import devmenu.com.swmansion.gesturehandler.react.RNGestureHandlerPackage
-import devmenu.com.swmansion.reanimated.ReanimatedPackage
 import devmenu.com.th3rdwave.safeareacontext.SafeAreaContextPackage
 import expo.modules.devmenu.react.DevMenuReactInternalSettings
 import expo.modules.devmenu.react.createNonDebuggableJavaScriptExecutorFactory
@@ -25,15 +23,11 @@ import java.io.InputStreamReader
  * Class that represents react host used by dev menu.
  */
 class DevMenuHost(application: Application) : ReactNativeHost(application) {
-  private lateinit var reaPackage: ReanimatedPackage
 
   override fun getPackages(): List<ReactPackage> {
-    reaPackage = ReanimatedPackage()
     val packages = mutableListOf(
       MainReactPackage(null),
       DevMenuPackage(),
-      RNGestureHandlerPackage(),
-      reaPackage,
       SafeAreaContextPackage()
     )
 
@@ -62,7 +56,6 @@ class DevMenuHost(application: Application) : ReactNativeHost(application) {
 
   override fun createReactInstanceManager(): ReactInstanceManager {
     val reactInstanceManager = super.createReactInstanceManager()
-    reaPackage.instanceManager = reactInstanceManager
 
     if (useDeveloperSupport) {
       // To use a different packager url, we need to replace internal RN objects.

package/android/src/debug/java/expo/modules/devmenu/DevMenuManager.kt

@@ -47,6 +47,8 @@ import kotlinx.coroutines.Dispatchers
 import java.lang.ref.WeakReference
 
 object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
+  data class Callback(val name: String, val shouldCollapse: Boolean)
+
   val metroClient: DevMenuMetroClient by lazy { DevMenuMetroClient() }
   private var fontsWereLoaded = false
 
@@ -286,8 +288,8 @@ object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
 
   // captures any callbacks that are registered via the `registerDevMenuItems` module method
   // it is set and unset by the public facing `DevMenuModule`
-  // when the DevMenuModule instance is unloaded (e.g between app loads) the callback list is reset to an empty array
-  var registeredCallbacks = arrayListOf<String>()
+  // when the DevMenuModule instance is unloaded (e.g between app loads) the callback list is reset to an empty list
+  var registeredCallbacks = mutableListOf<Callback>()
 
   //endregion
 
@@ -359,19 +361,16 @@ object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
     setCurrentScreen(null)
 
     activity.startActivity(Intent(activity, DevMenuActivity::class.java))
-
-    hostReactContext
-      ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      ?.emit("openDevMenu", null)
   }
 
   /**
-   * Sends an event to JS triggering the animation that collapses the dev menu.
+   * Triggers the animation that collapses the dev menu.
    */
   override fun closeMenu() {
-    hostReactContext
-      ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      ?.emit("closeDevMenu", null)
+    val activity = hostActivity as? DevMenuActivity ?: return
+    if (!activity.isDestroyed) {
+      activity.closeBottomSheet()
+    }
   }
 
   override fun hideMenu() {

package/android/src/main/java/expo/modules/devmenu/DevMenuPackage.kt

@@ -1,19 +1,44 @@
 package expo.modules.devmenu
 
+import android.app.Activity
 import android.content.Context
+import android.os.Bundle
+import android.view.KeyEvent
 import android.view.View
+import android.view.ViewGroup
+import com.facebook.react.ReactApplication
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ReactShadowNode
 import com.facebook.react.uimanager.ViewManager
+import expo.modules.core.interfaces.Package
+import expo.modules.core.interfaces.ReactActivityHandler
+import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.devmenu.extensions.DevMenuExtension
 import expo.modules.devmenu.modules.DevMenuInternalModule
 import expo.modules.devmenu.modules.DevMenuModule
 import expo.modules.devmenu.modules.DevMenuPreferences
-import expo.modules.core.interfaces.Package
-import expo.modules.core.interfaces.ReactActivityHandler
-import expo.modules.core.interfaces.ReactActivityLifecycleListener
+import expo.modules.devmenu.react.DevMenuAwareReactActivity
+
+object DevMenuPackageDelegate {
+  @JvmField
+  var enableAutoSetup: Boolean? = null
+
+  internal fun shouldEnableAutoSetup(activityContext: Context?): Boolean {
+    if (enableAutoSetup != null) {
+      // if someone else has set this explicitly, use that value
+      return enableAutoSetup!!
+    }
+    if (activityContext != null && activityContext is DevMenuAwareReactActivity) {
+      // Backwards compatibility -- if the MainActivity is already an instance of
+      // DevMenuAwareReactActivity, we skip auto-setup.
+      return false
+    }
+    return true
+  }
+}
+
 
 class DevMenuPackage : Package, ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
@@ -29,7 +54,39 @@ class DevMenuPackage : Package, ReactPackage {
     return emptyList()
   }
 
-  override fun createReactActivityLifecycleListeners(activityContext: Context?): List<ReactActivityLifecycleListener> = DevMenuPackageDelegate.createReactActivityLifecycleListeners(activityContext)
+  override fun createReactActivityLifecycleListeners(activityContext: Context?): List<ReactActivityLifecycleListener> {
+    if (!DevMenuPackageDelegate.shouldEnableAutoSetup(activityContext) || !BuildConfig.DEBUG) {
+      return emptyList()
+    }
+
+    return listOf(
+      object : ReactActivityLifecycleListener {
+        override fun onCreate(activity: Activity, savedInstanceState: Bundle?) {
+          if (!DevMenuManager.isInitialized()) {
+            DevMenuManager.initializeWithReactNativeHost((activity.application as ReactApplication).reactNativeHost)
+          } else {
+            DevMenuManager.synchronizeDelegate()
+          }
+        }
+      }
+    )
+  }
+
+  override fun createReactActivityHandlers(activityContext: Context?): List<ReactActivityHandler> {
+    if (!DevMenuPackageDelegate.shouldEnableAutoSetup(activityContext) || !BuildConfig.DEBUG) {
+      return emptyList()
+    }
+
+    return listOf(
+      object : ReactActivityHandler {
+        override fun createReactRootViewContainer(activity: Activity): ViewGroup {
+          return DevMenuReactRootViewContainer(activity as Context)
+        }
 
-  override fun createReactActivityHandlers(activityContext: Context?): List<ReactActivityHandler> = DevMenuPackageDelegate.createReactActivityHandlers(activityContext)
+        override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+          return DevMenuManager.onKeyEvent(keyCode, event)
+        }
+      }
+    )
+  }
 }

package/android/src/main/java/expo/modules/devmenu/modules/DevMenuInternalModule.kt

@@ -17,6 +17,9 @@ interface DevMenuInternalMenuControllerModuleInterface {
   @ReactMethod
   fun hideMenu()
 
+  @ReactMethod
+  fun closeMenu()
+
   @ReactMethod
   fun setOnboardingFinished(finished: Boolean)
 

package/android/src/main/java/expo/modules/devmenu/modules/DevMenuModule.kt

@@ -9,27 +9,43 @@ class DevMenuModule(reactContext: ReactApplicationContext) :
 
   private val devMenuManager: DevMenuManager = DevMenuManager
 
-  private fun openMenuOn(screen: String?) {
+  @ReactMethod
+  fun openMenu() {
     reactApplicationContext
       .currentActivity
       ?.run {
-        devMenuManager.openMenu(this, screen)
+        devMenuManager.openMenu(this)
       }
   }
 
   @ReactMethod
-  fun openMenu() {
-    openMenuOn(null)
+  fun closeMenu() {
+    devMenuManager.closeMenu()
+  }
+
+  @ReactMethod
+  fun hideMenu() {
+    devMenuManager.hideMenu()
   }
 
   override fun invalidate() {
-    devMenuManager.registeredCallbacks = arrayListOf<String>()
+    devMenuManager.registeredCallbacks.clear()
     super.invalidate()
   }
 
   @ReactMethod
-  fun addDevMenuCallbacks(names: ReadableArray, promise: Promise) {
-    devMenuManager.registeredCallbacks = names.toArrayList() as ArrayList<String>
+  fun addDevMenuCallbacks(callbacks: ReadableArray, promise: Promise) {
+    val size = callbacks.size()
+    for (i in 0 until size) {
+      val callback = callbacks.getMap(i)
+      val name = callback.getString("name") ?: continue
+      val shouldCollapse = if (callback.hasKey("shouldCollapse")) {
+        callback.getBoolean("shouldCollapse")
+      } else {
+        true
+      }
+      devMenuManager.registeredCallbacks.add(DevMenuManager.Callback(name, shouldCollapse))
+    }
 
     return promise.resolve(null)
   }

package/android/src/main/java/expo/modules/devmenu/modules/internals/DevMenuInternalMenuControllerModule.kt

@@ -28,6 +28,10 @@ class DevMenuInternalMenuControllerModule(private val reactContext: ReactContext
     devMenuManager.hideMenu()
   }
 
+  override fun closeMenu() {
+    devMenuManager.closeMenu()
+  }
+
   override fun setOnboardingFinished(finished: Boolean) {
     devMenuManager.getSettings()?.isOnboardingFinished = finished
   }
@@ -37,7 +41,6 @@ class DevMenuInternalMenuControllerModule(private val reactContext: ReactContext
     val devSupportManager = instanceManager.devSupportManager
     val activity = instanceManager.currentReactContext?.currentActivity ?: return
 
-    devMenuManager.closeMenu()
     activity.runOnUiThread {
       devSupportManager.devSupportEnabled = true
       devSupportManager.showDevOptionsDialog()
@@ -70,11 +73,13 @@ class DevMenuInternalMenuControllerModule(private val reactContext: ReactContext
   }
 
   override fun fireCallback(name: String, promise: Promise) {
-    if (!devMenuManager.registeredCallbacks.contains(name)) {
-      return promise.reject("ERR_DEVMENU_CALLBACK_FAILED", "Callback with name: $name is not registered")
-    }
+    val callback = devMenuManager.registeredCallbacks.firstOrNull { it.name == name }
+      ?: return promise.reject("ERR_DEVMENU_CALLBACK_FAILED", "Callback with name: $name is not registered")
 
     devMenuManager.sendEventToDelegateBridge("registeredCallbackFired", name)
+    if (callback.shouldCollapse) {
+      devMenuManager.closeMenu()
+    }
     return promise.resolve(null)
   }
 }

package/android/src/main/res/layout/bottom_sheet.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="#44000000"
+  android:id="@+id/main_layout"
+  >
+
+  <FrameLayout
+    android:id="@+id/bottom_sheet"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:elevation="4dp"
+    app:behavior_expandedOffset="40dp"
+    app:behavior_fitToContents="false"
+    app:behavior_halfExpandedRatio="0.6"
+    app:behavior_hideable="true"
+    app:behavior_peekHeight="0dp"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+  </FrameLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

package/android/src/release/java/expo/modules/devmenu/DevMenuManager.kt

@@ -24,7 +24,9 @@ object DevMenuManager : DevMenuManagerInterface {
   var currentManifest: Manifest? = null
   var currentManifestURL: String? = null
 
-  var registeredCallbacks = arrayListOf<String>()
+  data class Callback(val name: String, val shouldCollapse: Boolean)
+
+  var registeredCallbacks = arrayListOf<Callback>()
 
   fun getReactInstanceManager(): ReactInstanceManager? {
     return null

package/app/App.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { View } from 'react-native';
 
 import { AppProviders } from './components/AppProviders';
 import { LoadInitialData } from './components/LoadInitialData';
@@ -24,13 +24,13 @@ export function App({
   registeredCallbacks,
 }: DevMenuInitialProps) {
   return (
-    <GestureHandlerRootView style={{ flex: 1, direction: 'ltr' }}>
+    <View style={{ flex: 1, direction: 'ltr' }}>
       <AppProviders appInfo={appInfo} devSettings={devSettings} menuPreferences={menuPreferences}>
         <LoadInitialData loader={<Splash />}>
           <Main registeredCallbacks={registeredCallbacks} />
           <Onboarding isDevice={isDevice} />
         </LoadInitialData>
       </AppProviders>
-    </GestureHandlerRootView>
+    </View>
   );
 }

package/app/components/AppProviders.tsx

@@ -2,7 +2,6 @@ import { ThemeProvider } from 'expo-dev-client-components';
 import * as React from 'react';
 
 import { AppInfoContextProvider, AppInfoContextProviderProps } from '../hooks/useAppInfo';
-import { BottomSheetProvider } from '../hooks/useBottomSheet';
 import { DevSettingsProviderProps, DevSettingsProvider } from '../hooks/useDevSettings';
 import { MenuPreferencesProvider, MenuPreferencesProviderProps } from '../hooks/useMenuPreferences';
 
@@ -23,9 +22,7 @@ export function AppProviders({
     <DevSettingsProvider devSettings={devSettings}>
       <AppInfoContextProvider appInfo={appInfo}>
         <MenuPreferencesProvider menuPreferences={menuPreferences}>
-          <ThemeProvider themePreference="no-preference">
-            <BottomSheetProvider>{children}</BottomSheetProvider>
-          </ThemeProvider>
+          <ThemeProvider themePreference="no-preference">{children}</ThemeProvider>
         </MenuPreferencesProvider>
       </AppInfoContextProvider>
     </DevSettingsProvider>