diff options
| -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> ) }) |