diff options
| author | dan <dan.abramov@gmail.com> | 2024-05-03 16:36:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 16:36:58 +0100 |
| commit | 85b34418ef31247f8d88bdb08248a149192c5b46 (patch) | |
| tree | a4fbf0346f2609c90153a57be87f16a76f47c1d1 /src/App.native.tsx | |
| parent | aeed4786db28e9efcf41ed81ab06c108fa8e3fc0 (diff) | |
| download | voidsky-85b34418ef31247f8d88bdb08248a149192c5b46.tar.zst | |
Don't clear toasts when changing users (#3843)
* Move ThemeProvider to the top * Move RootSiblingParent above the remounted part * Move ToastContainer outside the remounted part * Remove setTimeout around toasts * Consistently handle dropped session
Diffstat (limited to 'src/App.native.tsx')
| -rw-r--r-- | src/App.native.tsx | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/src/App.native.tsx b/src/App.native.tsx index dc1ccda6d..b60d024d5 100644 --- a/src/App.native.tsx +++ b/src/App.native.tsx @@ -89,38 +89,37 @@ function InnerApp() { return ( <SafeAreaProvider initialMetrics={initialWindowMetrics}> <Alf theme={theme}> - <Splash isReady={isReady}> - <React.Fragment - // Resets the entire tree below when it changes: - key={currentAccount?.did}> - <QueryProvider currentDid={currentAccount?.did}> - <PushNotificationsListener> - <StatsigProvider> - {/* LabelDefsProvider MUST come before ModerationOptsProvider */} - <LabelDefsProvider> - <ModerationOptsProvider> - <LoggedOutViewProvider> - <SelectedFeedProvider> - <UnreadNotifsProvider> - <ThemeProvider theme={theme}> - {/* All components should be within this provider */} - <RootSiblingParent> + <ThemeProvider theme={theme}> + <Splash isReady={isReady}> + <RootSiblingParent> + <React.Fragment + // Resets the entire tree below when it changes: + key={currentAccount?.did}> + <QueryProvider currentDid={currentAccount?.did}> + <PushNotificationsListener> + <StatsigProvider> + {/* LabelDefsProvider MUST come before ModerationOptsProvider */} + <LabelDefsProvider> + <ModerationOptsProvider> + <LoggedOutViewProvider> + <SelectedFeedProvider> + <UnreadNotifsProvider> <GestureHandlerRootView style={s.h100pct}> <TestCtrls /> <Shell /> </GestureHandlerRootView> - </RootSiblingParent> - </ThemeProvider> - </UnreadNotifsProvider> - </SelectedFeedProvider> - </LoggedOutViewProvider> - </ModerationOptsProvider> - </LabelDefsProvider> - </StatsigProvider> - </PushNotificationsListener> - </QueryProvider> - </React.Fragment> - </Splash> + </UnreadNotifsProvider> + </SelectedFeedProvider> + </LoggedOutViewProvider> + </ModerationOptsProvider> + </LabelDefsProvider> + </StatsigProvider> + </PushNotificationsListener> + </QueryProvider> + </React.Fragment> + </RootSiblingParent> + </Splash> + </ThemeProvider> </Alf> </SafeAreaProvider> ) |