Fix root sibling context issue (#1902)

2023-11-14 12:46:37 -06:00
parent 0a26e78dcb
commit 00f8c8b06d
2 changed files with 19 additions and 17 deletions
@@ -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>
  )
 })