From 5b8bdab0e148e2e4e19a26a87ee7f083511507d3 Mon Sep 17 00:00:00 2001 From: Hailey Date: Thu, 13 Jun 2024 18:19:12 -0700 Subject: [PATCH] fix type error --- src/screens/StarterPack/StarterPackLandingScreen.tsx | 2 +- src/view/com/auth/LoggedOut.tsx | 8 ++------ src/view/screens/Home.tsx | 6 +++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/screens/StarterPack/StarterPackLandingScreen.tsx b/src/screens/StarterPack/StarterPackLandingScreen.tsx index ef4ee3fedc..bfaf3d066e 100644 --- a/src/screens/StarterPack/StarterPackLandingScreen.tsx +++ b/src/screens/StarterPack/StarterPackLandingScreen.tsx @@ -34,7 +34,7 @@ export function LandingScreen({ setScreenState: (state: LoggedOutScreenState) => void }) { const usedStarterPack = useUsedStarterPack() - const atUri = new AtUri(usedStarterPack!.uri) + const atUri = new AtUri(usedStarterPack?.uri ?? '') const {hostname: name, rkey} = atUri const { diff --git a/src/view/com/auth/LoggedOut.tsx b/src/view/com/auth/LoggedOut.tsx index 041f7ca15d..bf725be889 100644 --- a/src/view/com/auth/LoggedOut.tsx +++ b/src/view/com/auth/LoggedOut.tsx @@ -18,7 +18,6 @@ import { } from '#/state/shell/logged-out' import {useSetMinimalShellMode} from '#/state/shell/minimal-mode' import {NavigationProp} from 'lib/routes/types' -import {useUsedStarterPack} from 'state/preferences/starter-pack' import {ErrorBoundary} from '#/view/com/util/ErrorBoundary' import {Text} from '#/view/com/util/text/Text' import {Login} from '#/screens/Login' @@ -40,13 +39,14 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) { const pal = usePalette('default') const setMinimalShellMode = useSetMinimalShellMode() const {screen} = useAnalytics() - const usedStarterPack = useUsedStarterPack() const {requestedAccountSwitchTo} = useLoggedOutView() const [screenState, setScreenState] = React.useState( requestedAccountSwitchTo ? requestedAccountSwitchTo === 'new' ? ScreenState.S_CreateAccount : ScreenState.S_Login + : requestedAccountSwitchTo === 'starterpack' + ? ScreenState.S_StarterPack : ScreenState.S_LoginOrCreateAccount, ) const {isMobile} = useWebMediaQueries() @@ -59,10 +59,6 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) { setMinimalShellMode(true) }, [screen, setMinimalShellMode]) - React.useEffect(() => { - setScreenState(ScreenState.S_StarterPack) - }, [usedStarterPack?.uri]) - const onPressDismiss = React.useCallback(() => { if (onDismiss) { onDismiss() diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx index cdf2be65ea..c7e61aacd8 100644 --- a/src/view/screens/Home.tsx +++ b/src/view/screens/Home.tsx @@ -41,14 +41,14 @@ export function HomeScreen(props: Props) { const {data: pinnedFeedInfos, isLoading: isPinnedFeedsLoading} = usePinnedFeedsInfos() const usedStarterPack = useUsedStarterPack() - const setUsedStarterPack = useSetUsedStarterPack() - const {setShowLoggedOut} = useLoggedOutViewControls() + const {setShowLoggedOut, requestSwitchToAccount} = useLoggedOutViewControls() React.useEffect(() => { if (usedStarterPack && !usedStarterPack.initialFeed) { setShowLoggedOut(true) + requestSwitchToAccount('starterpack') } - }, [usedStarterPack, setUsedStarterPack, setShowLoggedOut]) + }, [usedStarterPack, setShowLoggedOut, requestSwitchToAccount]) if (preferences && pinnedFeedInfos && !isPinnedFeedsLoading) { return (