From 8b70735ba2ed13fc2def4fb988af239b61ce2ee3 Mon Sep 17 00:00:00 2001
From: Jiyoung Kim <kimm.jeongs@gmail.com>
Date: Sat, 30 Jul 2022 18:26:37 +0900
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=84=A4=EB=AC=B8=ED=95=98=EB=9F=AC?=
 =?UTF-8?q?=EA=B0=80=EA=B8=B0=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/domain/matching/buttons/NoneButton.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/domain/matching/buttons/NoneButton.tsx b/src/components/domain/matching/buttons/NoneButton.tsx
index e45d7f6..dd65c65 100644
--- a/src/components/domain/matching/buttons/NoneButton.tsx
+++ b/src/components/domain/matching/buttons/NoneButton.tsx
@@ -1,9 +1,12 @@
 import { Button } from '@/components/base';
 import React from 'react';
+import Path from '@/router/Path';
+import { useNavigate } from 'react-router-dom';
 
 function NoneButton() {
+  const navigate = useNavigate();
   const handleClick = () => {
-    console.log('asd');
+    navigate(Path.TypeOfMeetingSurvey);
   };
   return (
     <Button onClick={handleClick} size="medium" variant={'default'}>

From 2cf799b1f0e6bac7af9f19944bb021f01888f478 Mon Sep 17 00:00:00 2001
From: choisohyun <sohyun4283@naver.com>
Date: Sat, 30 Jul 2022 18:29:28 +0900
Subject: [PATCH 2/4] fix: overflow scroll -> auto

---
 src/components/domain/survey/SurveyTemplate.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/domain/survey/SurveyTemplate.tsx b/src/components/domain/survey/SurveyTemplate.tsx
index c0fbda8..cf6a51a 100644
--- a/src/components/domain/survey/SurveyTemplate.tsx
+++ b/src/components/domain/survey/SurveyTemplate.tsx
@@ -78,7 +78,7 @@ export const Logo = styled(Link)`
 `;
 
 const ContentsWrapper = styled.div`
-  overflow: scroll;
+  overflow: auto;
   height: calc(100% - 56px - 117px - 38px - 20px);
 `;
 

From e314995dee5c63dd64c8434e7c8902afef5f7b43 Mon Sep 17 00:00:00 2001
From: Jiyoung Kim <kimm.jeongs@gmail.com>
Date: Sat, 30 Jul 2022 18:30:01 +0900
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EC=B9=B4=ED=86=A1=20=EB=AC=B8?=
 =?UTF-8?q?=EA=B5=AC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/domain/matching/WaitingBox.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/domain/matching/WaitingBox.tsx b/src/components/domain/matching/WaitingBox.tsx
index 30925ea..5935067 100644
--- a/src/components/domain/matching/WaitingBox.tsx
+++ b/src/components/domain/matching/WaitingBox.tsx
@@ -9,7 +9,7 @@ function WaitingBox() {
       <StringEle>
         매칭은 <strong>매일밤 10시</strong>에 이루어집니다.
         <br />
-        매칭이 되면 카톡과 이메일로 링크를 보내드릴게요.
+        매칭이 되면 이메일로 링크를 보내드릴게요.
       </StringEle>
     </>
   );

From 8cd4e2e5b39861ec7db588e32426e05180ac94c1 Mon Sep 17 00:00:00 2001
From: Jiyoung Kim <kimm.jeongs@gmail.com>
Date: Sat, 30 Jul 2022 18:41:21 +0900
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=EB=8B=A4=EC=8B=9C=20=EB=A7=A4?=
 =?UTF-8?q?=EC=B9=AD=20=EB=AA=A8=EB=8B=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/Modal.tsx                 |  1 +
 .../domain/matching/buttons/EndButton.tsx     | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/base/Modal.tsx b/src/components/base/Modal.tsx
index 1d26ce4..0980e5d 100644
--- a/src/components/base/Modal.tsx
+++ b/src/components/base/Modal.tsx
@@ -93,6 +93,7 @@ const ModalInner = styled.div<IModalInnerProps>`
   height: ${({ height }) => height}px;
   border-radius: 4px;
   animation: ${({ isClose }) => (isClose ? transitions.popOut : transitions.popIn)} 0.2s ease-in-out;
+  word-break: keep-all;
 `;
 
 const ModalTitle = styled.h2`
diff --git a/src/components/domain/matching/buttons/EndButton.tsx b/src/components/domain/matching/buttons/EndButton.tsx
index b289e3b..9141008 100644
--- a/src/components/domain/matching/buttons/EndButton.tsx
+++ b/src/components/domain/matching/buttons/EndButton.tsx
@@ -3,7 +3,7 @@ import { useToggle } from '@/hooks/common';
 import { postReMatchMeetingSurvey } from '@/lib/api/meeting';
 import { postReMatchDatingSurvey } from '@/lib/api/dating';
 import { useLocation } from 'react-router-dom';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Status } from '@/pages/MatchingPage';
 
 interface EndButtonProps {
@@ -12,12 +12,18 @@ interface EndButtonProps {
 
 function EndButton({ handleStatus }: EndButtonProps) {
   const location = useLocation();
+  const [isModal, onToggleModal] = useToggle();
   const [isErrorModal, onToggleErrorModal] = useToggle();
   const [errorMessage, setErrorMessage] = useState('에러가 발생했습니다😭 다시한번 시도해 주세요!');
+  const [isConfirm, setConfirm] = useState(false);
 
   const handleClick = async () => {
-    const matchMeeting = location.pathname.includes('meeting');
+    onToggleModal();
+  };
+
+  const handleRematch = async () => {
     try {
+      const matchMeeting = location.pathname.includes('meeting');
       matchMeeting ? await postReMatchMeetingSurvey() : await postReMatchDatingSurvey();
       handleStatus('waiting');
     } catch (e) {
@@ -26,11 +32,29 @@ function EndButton({ handleStatus }: EndButtonProps) {
       onToggleErrorModal();
     }
   };
+
+  useEffect(() => {
+    if (isConfirm) {
+      handleRematch();
+    }
+  }, [isConfirm]);
+
   return (
     <>
       <Button onClick={handleClick} size="medium">
         다시 매칭하기
       </Button>
+      {isModal && (
+        <Modal
+          width={200}
+          height={140}
+          bottonName="확인"
+          title="다시 매칭하시겠습니까?"
+          text="　이전 설문 내용을 토대로　　다시 매칭해드립니다"
+          onToggleModal={onToggleModal}
+          onClick={() => setConfirm(true)}
+        />
+      )}
       {isErrorModal && (
         <Modal
           width={200}