acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin' into eric/fix-self-mention

Browse Source 
* origin:
  Fix root sibling context issue (#1902)
This commit is contained in:
Eric Bailey
2023-11-14 13:56:34 -06:00
parent 0e79c38dfd 00f8c8b06d
commit 97e548e869
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.native.tsx
+9 -8
View File
@@ -74,18 +74,19 @@ const InnerApp = observer(function AppImpl() {
return ( return (
<ThemeProvider theme={colorMode}> <ThemeProvider theme={colorMode}>
<RootSiblingParent> <analytics.Provider>
<analytics.Provider> <RootStoreProvider value={rootStore}>
<RootStoreProvider value={rootStore}> <I18nProvider i18n={i18n}>
<I18nProvider i18n={i18n}> {/* All components should be within this provider */}
<RootSiblingParent>
<GestureHandlerRootView style={s.h100pct}> <GestureHandlerRootView style={s.h100pct}>
<TestCtrls /> <TestCtrls />
<Shell /> <Shell />
</GestureHandlerRootView> </GestureHandlerRootView>
</I18nProvider> </RootSiblingParent>
</RootStoreProvider> </I18nProvider>
</analytics.Provider> </RootStoreProvider>
</RootSiblingParent> </analytics.Provider>
</ThemeProvider> </ThemeProvider>
) )
}) })
src/App.web.tsx
+10 -9
View File
@@ -62,18 +62,19 @@ const InnerApp = observer(function AppImpl() {
return ( return (
<ThemeProvider theme={colorMode}> <ThemeProvider theme={colorMode}>
<RootSiblingParent> <analytics.Provider>
<analytics.Provider> <RootStoreProvider value={rootStore}>
<RootStoreProvider value={rootStore}> <I18nProvider i18n={i18n}>
<I18nProvider i18n={i18n}> {/* All components should be within this provider */}
<RootSiblingParent>
<SafeAreaProvider> <SafeAreaProvider>
<Shell /> <Shell />
</SafeAreaProvider> </SafeAreaProvider>
</I18nProvider> </RootSiblingParent>
<ToastContainer /> </I18nProvider>
</RootStoreProvider> <ToastContainer />
</analytics.Provider> </RootStoreProvider>
</RootSiblingParent> </analytics.Provider>
</ThemeProvider> </ThemeProvider>
) )
}) })