fix type error

This commit is contained in:
Hailey
2024-06-13 18:19:12 -07:00
parent 3650a329aa
commit 5b8bdab0e1
3 changed files with 6 additions and 10 deletions
@@ -34,7 +34,7 @@ export function LandingScreen({
setScreenState: (state: LoggedOutScreenState) => void setScreenState: (state: LoggedOutScreenState) => void
}) { }) {
const usedStarterPack = useUsedStarterPack() const usedStarterPack = useUsedStarterPack()
const atUri = new AtUri(usedStarterPack!.uri) const atUri = new AtUri(usedStarterPack?.uri ?? '')
const {hostname: name, rkey} = atUri const {hostname: name, rkey} = atUri
const { const {
+2 -6
View File
@@ -18,7 +18,6 @@ import {
} from '#/state/shell/logged-out' } from '#/state/shell/logged-out'
import {useSetMinimalShellMode} from '#/state/shell/minimal-mode' import {useSetMinimalShellMode} from '#/state/shell/minimal-mode'
import {NavigationProp} from 'lib/routes/types' import {NavigationProp} from 'lib/routes/types'
import {useUsedStarterPack} from 'state/preferences/starter-pack'
import {ErrorBoundary} from '#/view/com/util/ErrorBoundary' import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
import {Text} from '#/view/com/util/text/Text' import {Text} from '#/view/com/util/text/Text'
import {Login} from '#/screens/Login' import {Login} from '#/screens/Login'
@@ -40,13 +39,14 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
const pal = usePalette('default') const pal = usePalette('default')
const setMinimalShellMode = useSetMinimalShellMode() const setMinimalShellMode = useSetMinimalShellMode()
const {screen} = useAnalytics() const {screen} = useAnalytics()
const usedStarterPack = useUsedStarterPack()
const {requestedAccountSwitchTo} = useLoggedOutView() const {requestedAccountSwitchTo} = useLoggedOutView()
const [screenState, setScreenState] = React.useState<ScreenState>( const [screenState, setScreenState] = React.useState<ScreenState>(
requestedAccountSwitchTo requestedAccountSwitchTo
? requestedAccountSwitchTo === 'new' ? requestedAccountSwitchTo === 'new'
? ScreenState.S_CreateAccount ? ScreenState.S_CreateAccount
: ScreenState.S_Login : ScreenState.S_Login
: requestedAccountSwitchTo === 'starterpack'
? ScreenState.S_StarterPack
: ScreenState.S_LoginOrCreateAccount, : ScreenState.S_LoginOrCreateAccount,
) )
const {isMobile} = useWebMediaQueries() const {isMobile} = useWebMediaQueries()
@@ -59,10 +59,6 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
setMinimalShellMode(true) setMinimalShellMode(true)
}, [screen, setMinimalShellMode]) }, [screen, setMinimalShellMode])
React.useEffect(() => {
setScreenState(ScreenState.S_StarterPack)
}, [usedStarterPack?.uri])
const onPressDismiss = React.useCallback(() => { const onPressDismiss = React.useCallback(() => {
if (onDismiss) { if (onDismiss) {
onDismiss() onDismiss()
+3 -3
View File
@@ -41,14 +41,14 @@ export function HomeScreen(props: Props) {
const {data: pinnedFeedInfos, isLoading: isPinnedFeedsLoading} = const {data: pinnedFeedInfos, isLoading: isPinnedFeedsLoading} =
usePinnedFeedsInfos() usePinnedFeedsInfos()
const usedStarterPack = useUsedStarterPack() const usedStarterPack = useUsedStarterPack()
const setUsedStarterPack = useSetUsedStarterPack() const {setShowLoggedOut, requestSwitchToAccount} = useLoggedOutViewControls()
const {setShowLoggedOut} = useLoggedOutViewControls()
React.useEffect(() => { React.useEffect(() => {
if (usedStarterPack && !usedStarterPack.initialFeed) { if (usedStarterPack && !usedStarterPack.initialFeed) {
setShowLoggedOut(true) setShowLoggedOut(true)
requestSwitchToAccount('starterpack')
} }
}, [usedStarterPack, setUsedStarterPack, setShowLoggedOut]) }, [usedStarterPack, setShowLoggedOut, requestSwitchToAccount])
if (preferences && pinnedFeedInfos && !isPinnedFeedsLoading) { if (preferences && pinnedFeedInfos && !isPinnedFeedsLoading) {
return ( return (