From a2c635a49f4e46740fadef1a1829ce7867d627ab Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Tue, 18 Jun 2024 18:57:54 -0700
Subject: [PATCH] move provider to the right place

---
 src/App.native.tsx              | 27 +++++++++++++++------------
 src/App.web.tsx                 | 25 ++++++++++++++-----------
 src/state/preferences/index.tsx |  9 +++------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/App.native.tsx b/src/App.native.tsx
index c2152cd628..c382ad18da 100644
--- a/src/App.native.tsx
+++ b/src/App.native.tsx
@@ -45,6 +45,7 @@ import {readLastActiveAccount} from '#/state/session/util'
 import {Provider as ShellStateProvider} from '#/state/shell'
 import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
+import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import {TestCtrls} from '#/view/com/testing/TestCtrls'
 import * as Toast from '#/view/com/util/Toast'
 import {Shell} from '#/view/shell'
@@ -111,18 +112,20 @@ function InnerApp() {
                       <LabelDefsProvider>
                         <ModerationOptsProvider>
                           <LoggedOutViewProvider>
-                            <SelectedFeedProvider>
-                              <UnreadNotifsProvider>
-                                <BackgroundNotificationPreferencesProvider>
-                                  <MutedThreadsProvider>
-                                    <GestureHandlerRootView style={s.h100pct}>
-                                      <TestCtrls />
-                                      <Shell />
-                                    </GestureHandlerRootView>
-                                  </MutedThreadsProvider>
-                                </BackgroundNotificationPreferencesProvider>
-                              </UnreadNotifsProvider>
-                            </SelectedFeedProvider>
+                            <StarterPackProvider>
+                              <SelectedFeedProvider>
+                                <UnreadNotifsProvider>
+                                  <BackgroundNotificationPreferencesProvider>
+                                    <MutedThreadsProvider>
+                                      <GestureHandlerRootView style={s.h100pct}>
+                                        <TestCtrls />
+                                        <Shell />
+                                      </GestureHandlerRootView>
+                                    </MutedThreadsProvider>
+                                  </BackgroundNotificationPreferencesProvider>
+                                </UnreadNotifsProvider>
+                              </SelectedFeedProvider>
+                            </StarterPackProvider>
                           </LoggedOutViewProvider>
                         </ModerationOptsProvider>
                       </LabelDefsProvider>
diff --git a/src/App.web.tsx b/src/App.web.tsx
index f75ec10c6a..cc3e8aa3fb 100644
--- a/src/App.web.tsx
+++ b/src/App.web.tsx
@@ -34,6 +34,7 @@ import {readLastActiveAccount} from '#/state/session/util'
 import {Provider as ShellStateProvider} from '#/state/shell'
 import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
+import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
 import * as Toast from '#/view/com/util/Toast'
 import {ToastContainer} from '#/view/com/util/Toast.web'
 import {Shell} from '#/view/shell/index'
@@ -95,17 +96,19 @@ function InnerApp() {
                     <LabelDefsProvider>
                       <ModerationOptsProvider>
                         <LoggedOutViewProvider>
-                          <SelectedFeedProvider>
-                            <UnreadNotifsProvider>
-                              <BackgroundNotificationPreferencesProvider>
-                                <MutedThreadsProvider>
-                                  <SafeAreaProvider>
-                                    <Shell />
-                                  </SafeAreaProvider>
-                                </MutedThreadsProvider>
-                              </BackgroundNotificationPreferencesProvider>
-                            </UnreadNotifsProvider>
-                          </SelectedFeedProvider>
+                          <StarterPackProvider>
+                            <SelectedFeedProvider>
+                              <UnreadNotifsProvider>
+                                <BackgroundNotificationPreferencesProvider>
+                                  <MutedThreadsProvider>
+                                    <SafeAreaProvider>
+                                      <Shell />
+                                    </SafeAreaProvider>
+                                  </MutedThreadsProvider>
+                                </BackgroundNotificationPreferencesProvider>
+                              </UnreadNotifsProvider>
+                            </SelectedFeedProvider>
+                          </StarterPackProvider>
                         </LoggedOutViewProvider>
                       </ModerationOptsProvider>
                     </LabelDefsProvider>
diff --git a/src/state/preferences/index.tsx b/src/state/preferences/index.tsx
index 72ed0067bc..90b5a7525f 100644
--- a/src/state/preferences/index.tsx
+++ b/src/state/preferences/index.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import {Provider as StarterPackProvider} from '../shell/starter-pack'
 import {Provider as AltTextRequiredProvider} from './alt-text-required'
 import {Provider as AutoplayProvider} from './autoplay'
 import {Provider as DisableHapticsProvider} from './disable-haptics'
@@ -35,11 +34,9 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
               <DisableHapticsProvider>
                 <AutoplayProvider>
                   <KawaiiProvider>
-                    <StarterPackProvider>
-                      <UsedStarterPacksProvider>
-                        {children}
-                      </UsedStarterPacksProvider>
-                    </StarterPackProvider>
+                    <UsedStarterPacksProvider>
+                      {children}
+                    </UsedStarterPacksProvider>
                   </KawaiiProvider>
                 </AutoplayProvider>
               </DisableHapticsProvider>