Move TranslateOnDeviceProvider

src/App.native.tsx

@@ -19,6 +19,7 @@ import {Provider as HideBottomBarBorderProvider} from '#/lib/hooks/useHideBottom
 import {QueryProvider} from '#/lib/react-query'
 import {s} from '#/lib/styles'
 import {ThemeProvider} from '#/lib/ThemeContext'
+import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {Provider as A11yProvider} from '#/state/a11y'
@@ -179,9 +180,11 @@ function InnerApp() {
                                                           style={s.h100pct}>
                                                           <GlobalGestureEventsProvider>
                                                             <IntentDialogProvider>
-                                                              <TestCtrls />
+                                                              <TranslateOnDeviceProvider>
-                                                              <Shell />
+                                                                <TestCtrls />
-                                                              <ToastOutlet />
+                                                                <Shell />
+                                                                <ToastOutlet />
+                                                              </TranslateOnDeviceProvider>
                                                             </IntentDialogProvider>
                                                           </GlobalGestureEventsProvider>
                                                         </GestureHandlerRootView>

src/App.web.tsx

@@ -10,6 +10,7 @@ import * as Sentry from '@sentry/react-native'
 
 import {QueryProvider} from '#/lib/react-query'
 import {ThemeProvider} from '#/lib/ThemeContext'
+import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {Provider as A11yProvider} from '#/state/a11y'
@@ -154,8 +155,10 @@ function InnerApp() {
                                                         <EmailVerificationProvider>
                                                           <HideBottomBarBorderProvider>
                                                             <IntentDialogProvider>
-                                                              <Shell />
+                                                              <TranslateOnDeviceProvider>
-                                                              <ToastOutlet />
+                                                                <Shell />
+                                                                <ToastOutlet />
+                                                              </TranslateOnDeviceProvider>
                                                             </IntentDialogProvider>
                                                           </HideBottomBarBorderProvider>
                                                         </EmailVerificationProvider>

src/view/shell/index.tsx

@@ -11,7 +11,6 @@ import {useIntentHandler} from '#/lib/hooks/useIntentHandler'
 import {useNotificationsHandler} from '#/lib/hooks/useNotificationHandler'
 import {useNotificationsRegistration} from '#/lib/notifications/notifications'
 import {isStateAtTabRoot} from '#/lib/routes/helpers'
-import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import {useDialogFullyExpandedCountContext} from '#/state/dialogs'
 import {useSession} from '#/state/session'
 import {
@@ -241,9 +240,7 @@ export function Shell() {
             <NoAccessScreen />
           ) : (
             <RoutesContainer>
-              <TranslateOnDeviceProvider>
+              <ShellInner />
-                <ShellInner />
-              </TranslateOnDeviceProvider>
             </RoutesContainer>
           )}
 

src/view/shell/index.web.tsx

@@ -7,7 +7,6 @@ import {RemoveScrollBar} from 'react-remove-scroll-bar'
 
 import {useIntentHandler} from '#/lib/hooks/useIntentHandler'
 import {type NavigationProp} from '#/lib/routes/types'
-import {Provider as TranslateOnDeviceProvider} from '#/lib/translation'
 import {useSession} from '#/state/session'
 import {useIsDrawerOpen, useSetDrawerOpen} from '#/state/shell'
 import {useComposerKeyboardShortcut} from '#/state/shell/composer/useComposerKeyboardShortcut'
@@ -176,9 +175,7 @@ export function Shell() {
             <NoAccessScreen />
           ) : (
             <RoutesContainer>
-              <TranslateOnDeviceProvider>
+              <ShellInner />
-                <ShellInner />
-              </TranslateOnDeviceProvider>
             </RoutesContainer>
           )}