diff --git a/src/apis/instance.request.ts b/src/apis/instance.request.ts index 591cbf1..c91db36 100644 --- a/src/apis/instance.request.ts +++ b/src/apis/instance.request.ts @@ -3,7 +3,7 @@ import returnFetch, { FetchArgs } from 'return-fetch'; import { ENVS } from '@/constants'; import { ServerNotRespondingError } from '@/errors'; -const ABORT_MS = 10000; +const ABORT_MS = 5000; type ErrorType = { code: string; diff --git a/src/app/(auth-required)/leaderboards/Content.tsx b/src/app/(auth-required)/leaderboards/Content.tsx index 29e964b..0aa62d7 100644 --- a/src/app/(auth-required)/leaderboards/Content.tsx +++ b/src/app/(auth-required)/leaderboards/Content.tsx @@ -26,20 +26,18 @@ export const Content = () => { }); const data = useMemo(() => { - const isUserBased = searchParams.based === 'user'; - const isViewBased = searchParams.sort === 'viewCount'; + const isUserBased = searchParams?.based === 'user'; + const isViewBased = searchParams?.sort === 'viewCount'; - const value = (isUserBased ? boards?.users : boards?.posts) as LeaderboardItemType[]; + const value = ((isUserBased ? boards?.users : boards?.posts) || []) as LeaderboardItemType[]; - return ( - value.map(({ username, title, viewDiff, likeDiff, slug }) => ({ - key: isUserBased ? username : title, - username, - url: URLS.VELOG + `/@${username}` + (isUserBased ? '/posts' : `/${slug}`), - value: isViewBased ? viewDiff : likeDiff, - })) || [] - ); - }, [boards, searchParams.based, searchParams.sort]); + return value.map(({ username, title, viewDiff, likeDiff, slug }) => ({ + key: isUserBased ? username : title, + username, + url: URLS.VELOG + `/@${username}` + (isUserBased ? '/posts' : `/${slug}`), + value: isViewBased ? viewDiff : likeDiff, + })); + }, [boards, searchParams?.based, searchParams?.sort]); const handleChange = (param: Partial) => { startHolyLoader(); diff --git a/src/app/(auth-required)/main/Content.tsx b/src/app/(auth-required)/main/Content.tsx index 778af3d..f24b7d4 100644 --- a/src/app/(auth-required)/main/Content.tsx +++ b/src/app/(auth-required)/main/Content.tsx @@ -48,7 +48,7 @@ export const Content = () => { fetchNextPage(); }, [inView]); - const joinedPosts = useMemo(() => posts?.pages.flatMap((i) => i.posts), [posts]); + const joinedPosts = useMemo(() => posts?.pages.flatMap((i) => i.posts) || [], [posts]); return (