quilling.dev
An ATproto social media client -- with an independent Appview.
Revert provider stacking changes (#5423)
authored by
Eric Bailey
and committed by
GitHub
24adcb48
8fde02fa
+84
-79
+43
-40
src/App.native.tsx
+43
-40
src/App.native.tsx
···
106
106
}, [_])
107
107
108
108
return (
109
-
<StatsigProvider
110
-
// Resets the entire tree below when it changes:
111
-
key={currentAccount?.did}>
112
-
<Alf theme={theme}>
113
-
<ThemeProvider theme={theme}>
114
-
<Splash isReady={isReady && hasCheckedReferrer}>
115
-
<RootSiblingParent>
116
-
<VideoVolumeProvider>
109
+
<Alf theme={theme}>
110
+
<ThemeProvider theme={theme}>
111
+
<Splash isReady={isReady && hasCheckedReferrer}>
112
+
<RootSiblingParent>
113
+
<VideoVolumeProvider>
114
+
<React.Fragment
115
+
// Resets the entire tree below when it changes:
116
+
key={currentAccount?.did}>
117
117
<QueryProvider currentDid={currentAccount?.did}>
118
-
<MessagesProvider>
119
-
{/* LabelDefsProvider MUST come before ModerationOptsProvider */}
120
-
<LabelDefsProvider>
121
-
<ModerationOptsProvider>
122
-
<LoggedOutViewProvider>
123
-
<SelectedFeedProvider>
124
-
<HiddenRepliesProvider>
125
-
<UnreadNotifsProvider>
126
-
<BackgroundNotificationPreferencesProvider>
127
-
<MutedThreadsProvider>
128
-
<ProgressGuideProvider>
129
-
<GestureHandlerRootView style={s.h100pct}>
130
-
<TestCtrls />
131
-
<Shell />
132
-
<NuxDialogs />
133
-
</GestureHandlerRootView>
134
-
</ProgressGuideProvider>
135
-
</MutedThreadsProvider>
136
-
</BackgroundNotificationPreferencesProvider>
137
-
</UnreadNotifsProvider>
138
-
</HiddenRepliesProvider>
139
-
</SelectedFeedProvider>
140
-
</LoggedOutViewProvider>
141
-
</ModerationOptsProvider>
142
-
</LabelDefsProvider>
143
-
</MessagesProvider>
118
+
<StatsigProvider>
119
+
<MessagesProvider>
120
+
{/* LabelDefsProvider MUST come before ModerationOptsProvider */}
121
+
<LabelDefsProvider>
122
+
<ModerationOptsProvider>
123
+
<LoggedOutViewProvider>
124
+
<SelectedFeedProvider>
125
+
<HiddenRepliesProvider>
126
+
<UnreadNotifsProvider>
127
+
<BackgroundNotificationPreferencesProvider>
128
+
<MutedThreadsProvider>
129
+
<ProgressGuideProvider>
130
+
<GestureHandlerRootView
131
+
style={s.h100pct}>
132
+
<TestCtrls />
133
+
<Shell />
134
+
<NuxDialogs />
135
+
</GestureHandlerRootView>
136
+
</ProgressGuideProvider>
137
+
</MutedThreadsProvider>
138
+
</BackgroundNotificationPreferencesProvider>
139
+
</UnreadNotifsProvider>
140
+
</HiddenRepliesProvider>
141
+
</SelectedFeedProvider>
142
+
</LoggedOutViewProvider>
143
+
</ModerationOptsProvider>
144
+
</LabelDefsProvider>
145
+
</MessagesProvider>
146
+
</StatsigProvider>
144
147
</QueryProvider>
145
-
</VideoVolumeProvider>
146
-
</RootSiblingParent>
147
-
</Splash>
148
-
</ThemeProvider>
149
-
</Alf>
150
-
</StatsigProvider>
148
+
</React.Fragment>
149
+
</VideoVolumeProvider>
150
+
</RootSiblingParent>
151
+
</Splash>
152
+
</ThemeProvider>
153
+
</Alf>
151
154
)
152
155
}
153
156
+41
-39
src/App.web.tsx
+41
-39
src/App.web.tsx
···
96
96
97
97
return (
98
98
<KeyboardProvider enabled={false}>
99
-
<StatsigProvider
100
-
// Resets the entire tree below when it changes:
101
-
key={currentAccount?.did}>
102
-
<Alf theme={theme}>
103
-
<ThemeProvider theme={theme}>
104
-
<RootSiblingParent>
105
-
<VideoVolumeProvider>
106
-
<ActiveVideoProvider>
99
+
<Alf theme={theme}>
100
+
<ThemeProvider theme={theme}>
101
+
<RootSiblingParent>
102
+
<VideoVolumeProvider>
103
+
<ActiveVideoProvider>
104
+
<React.Fragment
105
+
// Resets the entire tree below when it changes:
106
+
key={currentAccount?.did}>
107
107
<QueryProvider currentDid={currentAccount?.did}>
108
-
<MessagesProvider>
109
-
{/* LabelDefsProvider MUST come before ModerationOptsProvider */}
110
-
<LabelDefsProvider>
111
-
<ModerationOptsProvider>
112
-
<LoggedOutViewProvider>
113
-
<SelectedFeedProvider>
114
-
<HiddenRepliesProvider>
115
-
<UnreadNotifsProvider>
116
-
<BackgroundNotificationPreferencesProvider>
117
-
<MutedThreadsProvider>
118
-
<SafeAreaProvider>
119
-
<ProgressGuideProvider>
120
-
<Shell />
121
-
<NuxDialogs />
122
-
</ProgressGuideProvider>
123
-
</SafeAreaProvider>
124
-
</MutedThreadsProvider>
125
-
</BackgroundNotificationPreferencesProvider>
126
-
</UnreadNotifsProvider>
127
-
</HiddenRepliesProvider>
128
-
</SelectedFeedProvider>
129
-
</LoggedOutViewProvider>
130
-
</ModerationOptsProvider>
131
-
</LabelDefsProvider>
132
-
</MessagesProvider>
108
+
<StatsigProvider>
109
+
<MessagesProvider>
110
+
{/* LabelDefsProvider MUST come before ModerationOptsProvider */}
111
+
<LabelDefsProvider>
112
+
<ModerationOptsProvider>
113
+
<LoggedOutViewProvider>
114
+
<SelectedFeedProvider>
115
+
<HiddenRepliesProvider>
116
+
<UnreadNotifsProvider>
117
+
<BackgroundNotificationPreferencesProvider>
118
+
<MutedThreadsProvider>
119
+
<SafeAreaProvider>
120
+
<ProgressGuideProvider>
121
+
<Shell />
122
+
<NuxDialogs />
123
+
</ProgressGuideProvider>
124
+
</SafeAreaProvider>
125
+
</MutedThreadsProvider>
126
+
</BackgroundNotificationPreferencesProvider>
127
+
</UnreadNotifsProvider>
128
+
</HiddenRepliesProvider>
129
+
</SelectedFeedProvider>
130
+
</LoggedOutViewProvider>
131
+
</ModerationOptsProvider>
132
+
</LabelDefsProvider>
133
+
</MessagesProvider>
134
+
</StatsigProvider>
133
135
</QueryProvider>
134
136
<ToastContainer />
135
-
</ActiveVideoProvider>
136
-
</VideoVolumeProvider>
137
-
</RootSiblingParent>
138
-
</ThemeProvider>
139
-
</Alf>
140
-
</StatsigProvider>
137
+
</React.Fragment>
138
+
</ActiveVideoProvider>
139
+
</VideoVolumeProvider>
140
+
</RootSiblingParent>
141
+
</ThemeProvider>
142
+
</Alf>
141
143
</KeyboardProvider>
142
144
)
143
145
}