피드작성이 안떠요 (#638)

sopt-makers · Dec 9, 2023 · 18d38d0 · 18d38d0
1 parent 08bbe9e
commit 18d38d0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/api/user/index.ts b/src/api/user/index.ts
@@ -54,5 +54,5 @@ export const fetchMyProfile = async () => {
 };
 
 export const fetchMeetingListOfUserAttend = async () => {
-  return api.get<PromiseResponse<GroupInfo[]>>('/user/v2/meeting/all');
+  return api.get<GroupInfo[]>('/user/v2/meeting/all');
 };
diff --git a/src/components/feed/Modal/FeedCreateWithSelectMeetingModal.tsx b/src/components/feed/Modal/FeedCreateWithSelectMeetingModal.tsx
@@ -83,7 +83,7 @@ function FeedCreateWithSelectMeetingModal({ isModalOpened, handleModalClose }: C
           {!isFetchAttendMeetingLoading && (
             <FeedFormPresentation
               userId={Number(me?.orgId)}
-              attendGroupsInfo={attendMeetingList?.data.data}
+              attendGroupsInfo={attendMeetingList?.data}
               title="피드 작성"
               handleDeleteImage={handleDeleteImage}
               handleModalClose={handleModalClose}

diff --git a/src/components/modal/FloatingButtonModal.tsx b/src/components/modal/FloatingButtonModal.tsx
@@ -10,20 +10,32 @@ import FeedIcon from '../../../public/assets/svg/floating_button_feed_icon.svg';
 import GroupIcon from '../../../public/assets/svg/floating_button_group_icon.svg';
 import NoJoinedGroupModal from './NoJoinedGroupModal';
 
-const FloatingButtonModal = (props: { isActive: boolean }) => {
-  const { isActive } = props;
+const FloatingButtonModal = (props: { isActive: boolean; handleOptionClose: () => void }) => {
+  const { isActive, handleOptionClose } = props;
   const router = useRouter();
   const overlay = useOverlay();
   const { data: me } = useQueryMyProfile();
   const queryClient = useQueryClient();
   const { mutate: fetchUserAttendMeetingListMutate } = useMutation(fetchMeetingListOfUserAttend, {
     onSuccess: data => {
       queryClient.setQueryData(['fetchMeetingList', 'all'], data);
-      if (data.data.data.length === 0) {
-        overlay.open(({ isOpen, close }) => <NoJoinedGroupModal isModalOpened={isOpen} handleModalClose={close} />);
+      if (data.data.length === 0) {
+        overlay.open(({ isOpen, close }) => (
+          <NoJoinedGroupModal
+            isModalOpened={isOpen}
+            handleModalClose={() => {
+              close(), handleOptionClose();
+            }}
+          />
+        ));
       } else {
         overlay.open(({ isOpen, close }) => (
-          <FeedCreateWithSelectMeetingModal isModalOpened={isOpen} handleModalClose={close} />
+          <FeedCreateWithSelectMeetingModal
+            isModalOpened={isOpen}
+            handleModalClose={() => {
+              close(), handleOptionClose();
+            }}
+          />
         ));
       }
     },

diff --git a/src/components/page/postList/FloatingButton/index.tsx b/src/components/page/postList/FloatingButton/index.tsx
@@ -30,7 +30,7 @@ function FloatingButton() {
         <OptionOpenButton isActive={isActive} onClick={handleButtonClick}>
           <Icon isActive={isActive} />
         </OptionOpenButton>
-        <FloatingButtonModal isActive={isActive} />
+        <FloatingButtonModal isActive={isActive} handleOptionClose={handleOptionClose} />
       </Container>
     </>
   );