Skip to content

Commit cd6be3c

Browse files
authored
Merge pull request #219 from FE13-Part4-Team2/refactor/#218/header-component
[refactor] 헤더 컴포넌트 - 소속 팀 없을 경우 고장나던 오류 수정
2 parents 3ee5ba4 + c50ae7e commit cd6be3c

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

src/app/(team)/join-team/page.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,20 @@ import { useRouter } from 'next/navigation';
55
import { ROUTES } from '@/constants/routes';
66
import JoinTeamForm from '@/app/(team)/_components/JoinTeamForm';
77
import { postGroupInvitation } from '@/lib/apis/group';
8-
import { useMemberships } from '@/hooks/useMemberships';
98
import { INVITATION_ERROR_MAP } from '@/utils/errorMap';
9+
import { useQuery } from '@tanstack/react-query';
10+
import { getUser } from '@/lib/apis/user';
1011

1112
const jwtRegex = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+$/;
1213

1314
export default function JoinTeamPage() {
1415
const router = useRouter();
15-
const { memberships } = useMemberships(true);
16+
17+
const { data: currentUser } = useQuery({
18+
queryKey: ['currentUser'],
19+
queryFn: () => getUser({}),
20+
enabled: true,
21+
});
1622

1723
const [link, setLink] = useState('');
1824
const [error, setError] = useState<string>();
@@ -27,7 +33,8 @@ export default function JoinTeamPage() {
2733
setError('유효한 링크가 아닙니다.');
2834
return;
2935
}
30-
const email = memberships[0]?.userEmail;
36+
const email = currentUser?.email;
37+
3138
if (!email) {
3239
setError('사용자 정보를 불러올 수 없습니다.');
3340
return;

src/components/common/Header/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default function Header() {
4242
if (!fetchedUser) throw new Error('유저 정보를 가져오지 못했습니다');
4343
return fetchedUser;
4444
},
45-
enabled: isLogin && Boolean(selectedGroup),
45+
enabled: isLogin,
4646
});
4747

4848
const handleLogout = () => {

0 commit comments

Comments
 (0)