diff --git a/packages/web-domains/src/home/common/components/BottomSheet/BottomSheet.styles.ts b/packages/web-domains/src/home/common/components/BottomSheet/BottomSheet.styles.ts index daaf351e..0a82b482 100644 --- a/packages/web-domains/src/home/common/components/BottomSheet/BottomSheet.styles.ts +++ b/packages/web-domains/src/home/common/components/BottomSheet/BottomSheet.styles.ts @@ -33,6 +33,6 @@ export const ContentWrapperCss = css({ transition: 'transform 0.2s ease', height: 'calc(100% - 54px)', backgroundColor: `${colors.grey200}`, - padding: '8px 0', - overflow: 'auto', + padding: '8px 0 40px', + overflow: 'hidden', }); diff --git a/packages/web-domains/src/home/common/hooks/useSetCurrentMeeting.ts b/packages/web-domains/src/home/common/hooks/useSetCurrentMeeting.ts index 65192436..740ba886 100644 --- a/packages/web-domains/src/home/common/hooks/useSetCurrentMeeting.ts +++ b/packages/web-domains/src/home/common/hooks/useSetCurrentMeeting.ts @@ -37,25 +37,21 @@ export const useSetCurrentMeeting = () => { } } }; - useEffect(() => { - if (currentMeeting) { - setCurrentMeeting(null); - } - }, []); useEffect(() => { - if (!currentMeeting) { - const lastVisitedMeeting = getCurrentMeeting(meetingInfo); - - try { - if (lastVisitedMeeting) { - mutateAsync({ meetingId: lastVisitedMeeting.meetingId }); - } - } catch (error) { - console.log(error); + const lastVisitedMeeting = getCurrentMeeting(meetingInfo); + try { + if (lastVisitedMeeting) { + mutateAsync({ meetingId: lastVisitedMeeting.meetingId }); } setCurrentMeeting(lastVisitedMeeting); + } catch (error) { + console.log(error); } + + return () => { + setCurrentMeeting(null); + }; }, [meetingInfo]); return { diff --git a/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx b/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx index 435235f2..4c5c41c8 100644 --- a/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx +++ b/packages/web-domains/src/home/features/gather-member/services/useGatherMemberProfileListService.tsx @@ -6,7 +6,6 @@ import { getWebDomain } from '@/common'; import { generateInviteLink } from '@/common/utils/generateInviteLink'; import { getKeywordRegex } from '@/common/utils/getKeywordRegex'; import { useGetInviteCode } from '@/home/common/apis/queries/useGetInviteCode'; -import { useGetMyInfo } from '@/home/common/apis/queries/useGetMyInfo'; import { MemberType } from '@/home/common/apis/schema/useGetProgressingQuestionQuery.type'; import { HomeAtoms } from '@/home/common/atoms/home.atom'; @@ -19,11 +18,6 @@ export const useGatherMemberProfileListService = () => { const [gatherMemberList, setGatherMemberList] = useState([]); const meetingId = currentMeeting?.meetingId; - const { data: myInfo } = useGetMyInfo({ - params: { meetingId: meetingId! }, - options: { enabled: !!meetingId }, - }); - const { data } = useGetGatherMemberList({ params: { meetingId: meetingId! }, options: { @@ -59,10 +53,10 @@ export const useGatherMemberProfileListService = () => { }; useEffect(() => { - if (data?.contents && myInfo) { + if (data?.contents) { setGatherMemberList(data?.contents); } - }, [data, myInfo]); + }, [data]); useEffect(() => { let filter;