diff options
| author | Eric Bailey <git@esb.lol> | 2023-11-14 12:46:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 10:46:37 -0800 |
| commit | 00f8c8b06d2f789c38c5c3416ec195072bbfd450 (patch) | |
| tree | 4ca2e3e61609f813777b7c40d0d4d5b908e4e98c /src | |
| parent | 0a26e78dcbbf48dad5daae73b210e236d706b22c (diff) | |
| download | voidsky-00f8c8b06d2f789c38c5c3416ec195072bbfd450.tar.zst | |
Fix root sibling context issue (#1902)
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.native.tsx | 17 | ||||
| -rw-r--r-- | src/App.web.tsx | 19 |
2 files changed, 19 insertions, 17 deletions
diff --git a/src/App.native.tsx b/src/App.native.tsx index e976fce4f..5c4918f91 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -74,18 +74,19 @@ const InnerApp = observer(function AppImpl() { return ( <ThemeProvider theme={colorMode}> - <RootSiblingParent> - <analytics.Provider> - <RootStoreProvider value={rootStore}> - <I18nProvider i18n={i18n}> + <analytics.Provider> + <RootStoreProvider value={rootStore}> + <I18nProvider i18n={i18n}> + {/* All components should be within this provider */} + <RootSiblingParent> <GestureHandlerRootView style={s.h100pct}> <TestCtrls /> <Shell /> </GestureHandlerRootView> - </I18nProvider> - </RootStoreProvider> - </analytics.Provider> - </RootSiblingParent> + </RootSiblingParent> + </I18nProvider> + </RootStoreProvider> + </analytics.Provider> </ThemeProvider> ) }) diff --git a/src/App.web.tsx b/src/App.web.tsx index 5967fb751..7bb6cb256 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -62,18 +62,19 @@ const InnerApp = observer(function AppImpl() { return ( <ThemeProvider theme={colorMode}> - <RootSiblingParent> - <analytics.Provider> - <RootStoreProvider value={rootStore}> - <I18nProvider i18n={i18n}> + <analytics.Provider> + <RootStoreProvider value={rootStore}> + <I18nProvider i18n={i18n}> + {/* All components should be within this provider */} + <RootSiblingParent> <SafeAreaProvider> <Shell /> </SafeAreaProvider> - </I18nProvider> - <ToastContainer /> - </RootStoreProvider> - </analytics.Provider> - </RootSiblingParent> + </RootSiblingParent> + </I18nProvider> + <ToastContainer /> + </RootStoreProvider> + </analytics.Provider> </ThemeProvider> ) }) |