u

code/allapp/allapp-rn/src/app/_layout.tsx

@@ -1,19 +1,19 @@
 import type { ErrorBoundaryProps } from 'expo-router'
-import { ToastProvider } from '@gluestack-ui/core/toast/creator'
 import { useFonts } from 'expo-font'
 import { Stack, usePathname } from 'expo-router'
 import * as SplashScreen from 'expo-splash-screen'
 import { StatusBar } from 'expo-status-bar'
 import { useEffect } from 'react'
+import { Modal, View } from 'react-native'
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { KeyboardProvider } from 'react-native-keyboard-controller'
 import { MenuProvider } from 'react-native-popup-menu'
+import { Toaster } from 'sonner-native'
 import { AButton } from '@/components/common/ao'
 import EmptyState from '@/components/common/EmptyStatus'
 import { GluestackUIProvider } from '@/components/ui/gluestack-ui-provider'
 import { useAppStore } from '@/store/app'
 import { useNavStore } from '@/store/navigation'
-import { ToastProviderWrapper } from '@/utils/toast'
 import '@/styles/global.css'
 import 'react-native-reanimated'
 
@@ -64,36 +64,31 @@ export default function RootLayout() {
   }, [fontsLoaded])
 
   return (
-    <MenuProvider>
-      <KeyboardProvider>
-        <GluestackUIProvider>
-          <ToastProvider>
-            <ToastProviderWrapper>
-              <GestureHandlerRootView>
-                <Stack
-                  screenOptions={{
-                    headerTitleAlign: 'center',
-                    animation: 'slide_from_right',
-                    contentStyle: {
-                      backgroundColor: '#fff',
-                    },
-                  }}
-                >
-                  <Stack.Screen
-                    name="(tabs)"
-                    options={{
-                      headerShown: false,
-                    }}
-                  />
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <MenuProvider>
+        <KeyboardProvider>
+          <GluestackUIProvider>
+            <Stack
+              screenOptions={{
+                headerTitleAlign: 'center',
+                animation: 'slide_from_right',
+                contentStyle: {
+                  backgroundColor: '#fff',
+                },
+              }}
+            >
+              <Stack.Screen
+                name="(tabs)"
+                options={{ headerShown: false }}
+              />
+              <Stack.Screen name="+not-found" />
+            </Stack>
 
-                  <Stack.Screen name="+not-found" />
-                </Stack>
-                <StatusBar style="auto" />
-              </GestureHandlerRootView>
-            </ToastProviderWrapper>
-          </ToastProvider>
-        </GluestackUIProvider>
-      </KeyboardProvider>
-    </MenuProvider>
+            <StatusBar style="auto" />
+          </GluestackUIProvider>
+        </KeyboardProvider>
+      </MenuProvider>
+      <Toaster />
+    </GestureHandlerRootView>
   )
 }