diff --git a/src/pages/match/components/match-tab-pannel.tsx b/src/pages/match/components/match-tab-pannel.tsx index 4b4fe3a4..e50ce126 100644 --- a/src/pages/match/components/match-tab-pannel.tsx +++ b/src/pages/match/components/match-tab-pannel.tsx @@ -56,7 +56,7 @@ const MatchTabPanel = ({ cards, filter, onCardClick }: MatchTabPanelProps) => { }; return ( -
+
{filteredCards.length === 0 ? ( { }; const handleGoToMatch = () => { - navigate(ROUTES.MATCH); + const tab = matchType === 'group' ? '그룹' : '1:1'; + navigate(`${ROUTES.MATCH}?tab=${tab}&filter=전체`); }; return ( diff --git a/src/pages/result/components/matching-agree-view.tsx b/src/pages/result/components/matching-agree-view.tsx index 952f0f73..ad1ccbff 100644 --- a/src/pages/result/components/matching-agree-view.tsx +++ b/src/pages/result/components/matching-agree-view.tsx @@ -39,7 +39,12 @@ const MatchingAgreeView = ({ matchId }: MatchingAgreeViewProps) => {

-
); diff --git a/src/pages/result/components/matching-receive-view.tsx b/src/pages/result/components/matching-receive-view.tsx index 69f76561..f262a9a1 100644 --- a/src/pages/result/components/matching-receive-view.tsx +++ b/src/pages/result/components/matching-receive-view.tsx @@ -91,7 +91,7 @@ const MatchingReceiveView = () => {

{MATCHING_HEADER_MESSAGE.description}

-

+

{isGroupMatching ? MATCHING_HEADER_MESSAGE.group.subDescription : MATCHING_HEADER_MESSAGE.single.subDescription} diff --git a/src/pages/result/components/sent-view.tsx b/src/pages/result/components/sent-view.tsx index 21b9a7ba..c7f76705 100644 --- a/src/pages/result/components/sent-view.tsx +++ b/src/pages/result/components/sent-view.tsx @@ -15,7 +15,10 @@ const SentView = ({ isGroupMatching = true }: SentViewProps) => { const navigate = useNavigate(); const handleGoHome = () => navigate(ROUTES.HOME); - const handleGoMatch = () => navigate(ROUTES.MATCH); + const handleGoMatch = () => { + const tab = isGroupMatching ? '그룹' : '1:1'; + navigate(`${ROUTES.MATCH}?tab=${tab}&filter=전체`); + }; return (

diff --git a/src/pages/result/constants/matching-result.ts b/src/pages/result/constants/matching-result.ts index e2d0240d..5c38fb1d 100644 --- a/src/pages/result/constants/matching-result.ts +++ b/src/pages/result/constants/matching-result.ts @@ -2,7 +2,7 @@ export const MATCHING_HEADER_MESSAGE = { description: '매칭 요청이 도착했어요!', group: { subDescription: - '모든 그룹원이 수락하면 그룹원이 돼요. 진행 과정은 ‘매칭 현황’에서 확인할 수 있어요!', + '모든 그룹원이 수락하면 그룹원이 돼요.\n진행 과정은 ‘매칭 현황’에서 확인할 수 있어요!', }, single: { subDescription: '상대의 정보를 확인하고, 매칭을 이어가 보세요.', diff --git a/src/shared/components/button/button/styles/button-variants.ts b/src/shared/components/button/button/styles/button-variants.ts index 92a5e5b2..4e0c7c44 100644 --- a/src/shared/components/button/button/styles/button-variants.ts +++ b/src/shared/components/button/button/styles/button-variants.ts @@ -11,7 +11,7 @@ export const buttonVariants = cva( white: 'bg-white text-gray-700', skyblueBorder: 'bg-main-200 text-main-900 outline outline-main-900', gray2: 'bg-background text-gray-700', - disabled: 'rounded-[0.8rem] bg-gray-100 bg-gray-100 text-gray-400', + disabled: 'rounded-[0.8rem] bg-gray-100 text-gray-400', }, size: { M: 'w-full px-[0.8rem] py-[1.2rem]',