Revert provider stacking changes (#5423)

src/App.native.tsx

@@ -106,15 +106,16 @@ function InnerApp() {
   }, [_])
 
   return (
-    <StatsigProvider
-      // Resets the entire tree below when it changes:
-      key={currentAccount?.did}>
     <Alf theme={theme}>
       <ThemeProvider theme={theme}>
         <Splash isReady={isReady && hasCheckedReferrer}>
           <RootSiblingParent>
             <VideoVolumeProvider>
+              <React.Fragment
+                // Resets the entire tree below when it changes:
+                key={currentAccount?.did}>
                 <QueryProvider currentDid={currentAccount?.did}>
+                  <StatsigProvider>
                     <MessagesProvider>
                       {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
                       <LabelDefsProvider>
@@ -126,7 +127,8 @@ function InnerApp() {
                                   <BackgroundNotificationPreferencesProvider>
                                     <MutedThreadsProvider>
                                       <ProgressGuideProvider>
-                                      <GestureHandlerRootView style={s.h100pct}>
+                                        <GestureHandlerRootView
+                                          style={s.h100pct}>
                                           <TestCtrls />
                                           <Shell />
                                           <NuxDialogs />
@@ -141,13 +143,14 @@ function InnerApp() {
                         </ModerationOptsProvider>
                       </LabelDefsProvider>
                     </MessagesProvider>
+                  </StatsigProvider>
                 </QueryProvider>
+              </React.Fragment>
             </VideoVolumeProvider>
           </RootSiblingParent>
         </Splash>
       </ThemeProvider>
     </Alf>
-    </StatsigProvider>
   )
 }
 

src/App.web.tsx

@@ -96,15 +96,16 @@ function InnerApp() {
 
   return (
     <KeyboardProvider enabled={false}>
-      <StatsigProvider
-        // Resets the entire tree below when it changes:
-        key={currentAccount?.did}>
       <Alf theme={theme}>
         <ThemeProvider theme={theme}>
           <RootSiblingParent>
             <VideoVolumeProvider>
               <ActiveVideoProvider>
+                <React.Fragment
+                  // Resets the entire tree below when it changes:
+                  key={currentAccount?.did}>
                   <QueryProvider currentDid={currentAccount?.did}>
+                    <StatsigProvider>
                       <MessagesProvider>
                         {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
                         <LabelDefsProvider>
@@ -130,14 +131,15 @@ function InnerApp() {
                           </ModerationOptsProvider>
                         </LabelDefsProvider>
                       </MessagesProvider>
+                    </StatsigProvider>
                   </QueryProvider>
                   <ToastContainer />
+                </React.Fragment>
               </ActiveVideoProvider>
             </VideoVolumeProvider>
           </RootSiblingParent>
         </ThemeProvider>
       </Alf>
-      </StatsigProvider>
     </KeyboardProvider>
   )
 }