Merge pull request #141 from boostcampwm-2021/fix/modal-fix

모달 관련 상태 수정
boostcampwm-2021 · Nov 25, 2021 · a1a2e06 · a1a2e06
2 parents b0eca89 + acf693c
commit a1a2e06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/frontend/src/components/Main/ChannelModal/QuitChannelModal .tsx b/frontend/src/components/Main/ChannelModal/QuitChannelModal .tsx
@@ -143,7 +143,7 @@ const CloseIcon = styled(Close)`
 `;
 
 function QuitChannelModal(): JSX.Element {
-  const { rightClickedChannelId, rightClickedChannelName, setIsQuitChannelModalOpen, getServerChannelList } =
+  const { rightClickedChannelId, rightClickedChannelName, setIsModalOpen, getServerChannelList } =
     useContext(MainStoreContext);
   const [selectedChannelName, setSelectedChannelName] = useState<string>('');
 
@@ -152,7 +152,7 @@ function QuitChannelModal(): JSX.Element {
       method: 'DELETE',
     });
     getServerChannelList();
-    setIsQuitChannelModalOpen(false);
+    setIsModalOpen(false);
   };
 
   useEffect(() => {
@@ -164,7 +164,7 @@ function QuitChannelModal(): JSX.Element {
       <ModalInnerBox>
         <ModalHeader>
           <ModalTitle>채널 나가기</ModalTitle>
-          <ModalCloseButton onClick={() => setIsQuitChannelModalOpen(false)}>
+          <ModalCloseButton onClick={() => setIsModalOpen(false)}>
             <CloseIcon />
           </ModalCloseButton>
         </ModalHeader>
@@ -175,7 +175,7 @@ function QuitChannelModal(): JSX.Element {
         </ModalDescription>
         <ModalButtonContainer>
           <SubmitButton onClick={onClickSubmitButton}>확인</SubmitButton>
-          <CancelButton onClick={() => setIsQuitChannelModalOpen(false)}>취소</CancelButton>
+          <CancelButton onClick={() => setIsModalOpen(false)}>취소</CancelButton>
         </ModalButtonContainer>
       </ModalInnerBox>
     </Container>

diff --git a/frontend/src/components/Main/ChannelModal/UpdateChannelModal.tsx b/frontend/src/components/Main/ChannelModal/UpdateChannelModal.tsx
@@ -155,8 +155,7 @@ function UpdateChannelModal(): JSX.Element {
     watch,
     formState: { errors },
   } = useForm<UpdateModalForm>();
-  const { selectedServer, rightClickedChannelId, setIsUpdateChannelModalOpen, getServerChannelList } =
-    useContext(MainStoreContext);
+  const { selectedServer, rightClickedChannelId, setIsModalOpen, getServerChannelList } = useContext(MainStoreContext);
   const [isButtonActive, setIsButtonActive] = useState<boolean>(false);
 
   const onSubmitUpdateChannelModal = async (data: { name: string; description: string }) => {
@@ -173,7 +172,7 @@ function UpdateChannelModal(): JSX.Element {
       }),
     });
     getServerChannelList();
-    setIsUpdateChannelModalOpen(false);
+    setIsModalOpen(false);
   };
 
   const setSelectedChannelData = async () => {
@@ -200,7 +199,7 @@ function UpdateChannelModal(): JSX.Element {
       <ModalInnerBox>
         <ModalHeader>
           <ModalTitle>채널 수정</ModalTitle>
-          <ModalCloseButton onClick={() => setIsUpdateChannelModalOpen(false)}>
+          <ModalCloseButton onClick={() => setIsModalOpen(false)}>
             <CloseIcon />
           </ModalCloseButton>
         </ModalHeader>