From 00f8c8b06d2f789c38c5c3416ec195072bbfd450 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Tue, 14 Nov 2023 12:46:37 -0600
Subject: [PATCH] Fix root sibling context issue (#1902)

---
 src/App.native.tsx | 17 +++++++++--------
 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 e976fce4..5c4918f9 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 5967fb75..7bb6cb25 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>
   )
 })