upgrade work

This commit is contained in:
Hailey
2024-09-16 10:36:08 -07:00
parent e0036952af
commit d275d0ac01
3 changed files with 57 additions and 58 deletions
+3 -3
View File
@@ -180,20 +180,20 @@
"react-native-image-crop-picker": "0.41.2", "react-native-image-crop-picker": "0.41.2",
"react-native-ios-context-menu": "^1.15.3", "react-native-ios-context-menu": "^1.15.3",
"react-native-keyboard-controller": "^1.13.4", "react-native-keyboard-controller": "^1.13.4",
"react-native-mmkv": "^3.", "react-native-mmkv": "3.0.2",
"react-native-pager-view": "6.4.1", "react-native-pager-view": "6.4.1",
"react-native-picker-select": "^9.1.3", "react-native-picker-select": "^9.1.3",
"react-native-progress": "bluesky-social/react-native-progress", "react-native-progress": "bluesky-social/react-native-progress",
"react-native-qrcode-styled": "^0.3.2", "react-native-qrcode-styled": "^0.3.2",
"react-native-reanimated": "^3.15.2", "react-native-reanimated": "^3.15.2",
"react-native-root-siblings": "^4.1.1", "react-native-root-siblings": "^5.0.1",
"react-native-safe-area-context": "^4.11.0", "react-native-safe-area-context": "^4.11.0",
"react-native-screens": "~3.34.0", "react-native-screens": "~3.34.0",
"react-native-svg": "^15.6.0", "react-native-svg": "^15.6.0",
"react-native-uitextview": "^1.3.0", "react-native-uitextview": "^1.3.0",
"react-native-url-polyfill": "^1.3.0", "react-native-url-polyfill": "^1.3.0",
"react-native-uuid": "^2.0.2", "react-native-uuid": "^2.0.2",
"react-native-view-shot": "^3.8.0", "react-native-view-shot": "^4.0.0-alpha.3",
"react-native-web": "~0.19.12", "react-native-web": "~0.19.12",
"react-native-web-webview": "^1.0.2", "react-native-web-webview": "^1.0.2",
"react-native-webview": "13.12.2", "react-native-webview": "13.12.2",
+45 -46
View File
@@ -10,7 +10,7 @@ import {
initialWindowMetrics, initialWindowMetrics,
SafeAreaProvider, SafeAreaProvider,
} from 'react-native-safe-area-context' } from 'react-native-safe-area-context'
import * as SplashScreen from 'expo-splash-screen' // import * as SplashScreen from 'expo-splash-screen'
import {msg} from '@lingui/macro' import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react' import {useLingui} from '@lingui/react'
@@ -61,20 +61,20 @@ import {NuxDialogs} from '#/components/dialogs/nuxs'
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
import {Provider as PortalProvider} from '#/components/Portal' import {Provider as PortalProvider} from '#/components/Portal'
import {Splash} from '#/Splash' // import {Splash} from '#/Splash'
import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider' import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
SplashScreen.preventAutoHideAsync() // SplashScreen.preventAutoHideAsync()
function InnerApp() { function InnerApp() {
const [isReady, setIsReady] = React.useState(false) const [_isReady, setIsReady] = React.useState(false)
const {currentAccount} = useSession() const {currentAccount} = useSession()
const {resumeSession} = useSessionApi() const {resumeSession} = useSessionApi()
const theme = useColorModeTheme() const theme = useColorModeTheme()
const {_} = useLingui() const {_} = useLingui()
useIntentHandler() useIntentHandler()
const hasCheckedReferrer = useStarterPackEntry() useStarterPackEntry()
// init // init
useEffect(() => { useEffect(() => {
@@ -108,47 +108,46 @@ function InnerApp() {
return ( return (
<Alf theme={theme}> <Alf theme={theme}>
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<Splash isReady={isReady && hasCheckedReferrer}> {/*<Splash isReady={isReady && hasCheckedReferrer}>*/}
<RootSiblingParent> <RootSiblingParent>
<VideoVolumeProvider> <VideoVolumeProvider>
<React.Fragment <React.Fragment
// Resets the entire tree below when it changes: // Resets the entire tree below when it changes:
key={currentAccount?.did}> key={currentAccount?.did}>
<QueryProvider currentDid={currentAccount?.did}> <QueryProvider currentDid={currentAccount?.did}>
<StatsigProvider> <StatsigProvider>
<MessagesProvider> <MessagesProvider>
{/* LabelDefsProvider MUST come before ModerationOptsProvider */} {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
<LabelDefsProvider> <LabelDefsProvider>
<ModerationOptsProvider> <ModerationOptsProvider>
<LoggedOutViewProvider> <LoggedOutViewProvider>
<SelectedFeedProvider> <SelectedFeedProvider>
<HiddenRepliesProvider> <HiddenRepliesProvider>
<UnreadNotifsProvider> <UnreadNotifsProvider>
<BackgroundNotificationPreferencesProvider> <BackgroundNotificationPreferencesProvider>
<MutedThreadsProvider> <MutedThreadsProvider>
<ProgressGuideProvider> <ProgressGuideProvider>
<GestureHandlerRootView <GestureHandlerRootView style={s.h100pct}>
style={s.h100pct}> <TestCtrls />
<TestCtrls /> <Shell />
<Shell /> <NuxDialogs />
<NuxDialogs /> </GestureHandlerRootView>
</GestureHandlerRootView> </ProgressGuideProvider>
</ProgressGuideProvider> </MutedThreadsProvider>
</MutedThreadsProvider> </BackgroundNotificationPreferencesProvider>
</BackgroundNotificationPreferencesProvider> </UnreadNotifsProvider>
</UnreadNotifsProvider> </HiddenRepliesProvider>
</HiddenRepliesProvider> </SelectedFeedProvider>
</SelectedFeedProvider> </LoggedOutViewProvider>
</LoggedOutViewProvider> </ModerationOptsProvider>
</ModerationOptsProvider> </LabelDefsProvider>
</LabelDefsProvider> </MessagesProvider>
</MessagesProvider> </StatsigProvider>
</StatsigProvider> </QueryProvider>
</QueryProvider> </React.Fragment>
</React.Fragment> </VideoVolumeProvider>
</VideoVolumeProvider> </RootSiblingParent>
</RootSiblingParent> {/*</Splash>*/}
</Splash>
</ThemeProvider> </ThemeProvider>
</Alf> </Alf>
) )
+9 -9
View File
@@ -19298,7 +19298,7 @@ react-native-keyboard-controller@^1.13.4:
resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.13.4.tgz#0f85ac2a1b594fd65283d98cb044f331ab598ec5" resolved "https://registry.yarnpkg.com/react-native-keyboard-controller/-/react-native-keyboard-controller-1.13.4.tgz#0f85ac2a1b594fd65283d98cb044f331ab598ec5"
integrity sha512-80unzD4S+ybgYOluhdeV4zV62ejg6Jt0l5iw7PuA1y3aM1a1+5tS2WoHLNk8605oDaGcVLGNMNF0Qv4GWe97Bg== integrity sha512-80unzD4S+ybgYOluhdeV4zV62ejg6Jt0l5iw7PuA1y3aM1a1+5tS2WoHLNk8605oDaGcVLGNMNF0Qv4GWe97Bg==
react-native-mmkv@^3.: react-native-mmkv@3.0.2:
version "3.0.2" version "3.0.2"
resolved "https://registry.yarnpkg.com/react-native-mmkv/-/react-native-mmkv-3.0.2.tgz#c6376678d33d51a5ace3285c8bbcb5cb613c2741" resolved "https://registry.yarnpkg.com/react-native-mmkv/-/react-native-mmkv-3.0.2.tgz#c6376678d33d51a5ace3285c8bbcb5cb613c2741"
integrity sha512-zd+n5qLDy8Ptcj+ZIVa/pkGgL13X/8xFId3o4Ec9TpQVjM3BJaIszNc8jo6UF7dtndtVcvLDoBWBkkYmkpdTYA== integrity sha512-zd+n5qLDy8Ptcj+ZIVa/pkGgL13X/8xFId3o4Ec9TpQVjM3BJaIszNc8jo6UF7dtndtVcvLDoBWBkkYmkpdTYA==
@@ -19347,10 +19347,10 @@ react-native-reanimated@^3.15.2:
convert-source-map "^2.0.0" convert-source-map "^2.0.0"
invariant "^2.2.4" invariant "^2.2.4"
react-native-root-siblings@^4.1.1: react-native-root-siblings@^5.0.1:
version "4.1.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/react-native-root-siblings/-/react-native-root-siblings-4.1.1.tgz#b7742db7634a87f507eb99a5fd699c4f10c46ab0" resolved "https://registry.yarnpkg.com/react-native-root-siblings/-/react-native-root-siblings-5.0.1.tgz#97e050e5155228f65810fb1c466ff8e769c5272c"
integrity sha512-sdmLElNs5PDWqmZmj4/aNH4anyxreaPm61c4ZkRiR8SO/GzLg6KjAbb0e17RmMdnBdD0AIQbS38h/l55YKN4ZA== integrity sha512-Ay3k/fBj6ReUkWX5WNS+oEAcgPLEGOK8n7K/L7D85mf3xvd8rm/b4spsv26E4HlFzluVx5HKbxEt9cl0wQ1u3g==
react-native-safe-area-context@^4.11.0: react-native-safe-area-context@^4.11.0:
version "4.11.0" version "4.11.0"
@@ -19391,10 +19391,10 @@ react-native-uuid@^2.0.2:
resolved "https://registry.yarnpkg.com/react-native-uuid/-/react-native-uuid-2.0.2.tgz#3da192e342ef35ee95a7def676ab41c1256dfd66" resolved "https://registry.yarnpkg.com/react-native-uuid/-/react-native-uuid-2.0.2.tgz#3da192e342ef35ee95a7def676ab41c1256dfd66"
integrity sha512-5ypj/hV58P+6VREdjkW0EudSibsH3WdqDERoHKnD9syFWjF+NfRWWrJb2sa3LIwI5zpzMvUiabs+DX40WHpEMw== integrity sha512-5ypj/hV58P+6VREdjkW0EudSibsH3WdqDERoHKnD9syFWjF+NfRWWrJb2sa3LIwI5zpzMvUiabs+DX40WHpEMw==
react-native-view-shot@^3.8.0: react-native-view-shot@^4.0.0-alpha.3:
version "3.8.0" version "4.0.0-alpha.3"
resolved "https://registry.yarnpkg.com/react-native-view-shot/-/react-native-view-shot-3.8.0.tgz#1aa1905f0e79428ca32bf80c16fd4abc719c600b" resolved "https://registry.yarnpkg.com/react-native-view-shot/-/react-native-view-shot-4.0.0-alpha.3.tgz#f119291b40c92f54a31642ca5f64de9dac0b4746"
integrity sha512-4cU8SOhMn3YQIrskh+5Q8VvVRxQOu8/s1M9NAL4z5BY1Rm0HXMWkQJ4N0XsZ42+Yca+y86ISF3LC5qdLPvPuiA== integrity sha512-o0KVgC6XZqWmLUKVc4q6Ev1QW1kA4g/TF45wj8CgYS13wJuWYJ+nPGCHT9C2jvX/L65mtTollKXp2L8hbDnelg==
dependencies: dependencies:
html2canvas "^1.4.1" html2canvas "^1.4.1"