From 3e72943dd08881c081d1692e50b72ffdcba926c2 Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 01:24:10 +0900
Subject: [PATCH 01/10] =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/clothesApi.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/api/clothesApi.js b/src/api/clothesApi.js
index fd38297..84bb390 100644
--- a/src/api/clothesApi.js
+++ b/src/api/clothesApi.js
@@ -386,11 +386,6 @@ export async function filterClothes(keyword = "", styles = [], priceRangeCodes =
   const response = await apiRequestGet(url);
 
   const result = await response.json();
-    isSuccess: result.isSuccess,
-    message: result.message,
-    fullResult: result,
-    clothesListLength: result.result?.clothesList?.length || 0
-  });
 
   if (response.status === 200 && result.isSuccess === true) {
     return result.result; // { clothesList, listSize, totalPage, totalElements, isFirst, isLast }

From 435a34a81959e8da5458fdb048ba8281df06daec Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 01:37:47 +0900
Subject: [PATCH 02/10] =?UTF-8?q?HashRouter=20->=20BrowserRouter=20?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.jsx                     |  6 +++---
 src/pages/auth/AuthStartPage.jsx | 27 +++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main.jsx b/src/main.jsx
index 7ed8a5f..4248dbf 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
-import { HashRouter } from "react-router-dom";
+import { BrowserRouter } from "react-router-dom";
 import { Provider } from "react-redux";
 import App from "./App.jsx";
 import "./styles/global.css";
@@ -13,10 +13,10 @@ setStoreGetter(() => store);
 
 ReactDOM.createRoot(document.getElementById('root')).render(
   <Provider store={store}>
-    <HashRouter>
+    <BrowserRouter>
       <SignupProvider>
         <App />
       </SignupProvider>
-    </HashRouter>
+    </BrowserRouter>
   </Provider>
 );
diff --git a/src/pages/auth/AuthStartPage.jsx b/src/pages/auth/AuthStartPage.jsx
index ba39713..4329808 100644
--- a/src/pages/auth/AuthStartPage.jsx
+++ b/src/pages/auth/AuthStartPage.jsx
@@ -15,8 +15,25 @@ const buildKakaoAuthUrl = () => {
 export default function AuthStartPage() {
   const navigate = useNavigate();
 
-  const handleKakaoLogin = () => {
+  const handleKakaoLogin = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    
+    const REST_API_KEY = import.meta.env.VITE_KAKAO_REST_API_KEY;
+    const REDIRECT_URI = import.meta.env.VITE_KAKAO_REDIRECT_URI;
+    
+    if (!REST_API_KEY || !REDIRECT_URI) {
+      console.error('카카오 로그인 환경 변수가 설정되지 않았습니다.');
+      return;
+    }
+    
     const kakaoAuthUrl = buildKakaoAuthUrl();
+    
+    if (!kakaoAuthUrl || !kakaoAuthUrl.includes('kauth.kakao.com')) {
+      console.error('카카오 인증 URL이 올바르지 않습니다:', kakaoAuthUrl);
+      return;
+    }
+    
     window.location.href = kakaoAuthUrl;
   };
 
@@ -59,7 +76,13 @@ export default function AuthStartPage() {
           className="auth-start__kakao-button"
           onClick={handleKakaoLogin}
         > 
-          <img src={kakaoImage} alt="카카오 로고" className="auth-start__kakao-img" />
+          <img 
+            src={kakaoImage} 
+            alt="카카오 로고" 
+            className="auth-start__kakao-img"
+            draggable={false}
+            onDragStart={(e) => e.preventDefault()}
+          />
         </button>
 
       </div>

From 041cd90c9bb1e2887557b4161562e49077470837 Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 01:45:11 +0900
Subject: [PATCH 03/10] =?UTF-8?q?fix:=EC=B1=84=ED=8C=85=EB=B0=A9=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EC=B1=84=ED=8C=85=20=EB=B9=84?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=20=EB=B0=8F=20=ED=8C=90=EB=A7=A4?=
 =?UTF-8?q?=EC=9E=90=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Chat/ChatRoomPage.jsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Chat/ChatRoomPage.jsx b/src/pages/Chat/ChatRoomPage.jsx
index 6d6abc7..e3a0519 100644
--- a/src/pages/Chat/ChatRoomPage.jsx
+++ b/src/pages/Chat/ChatRoomPage.jsx
@@ -198,8 +198,7 @@ function ChatRoomPage() {
   // tradeStatus에 따른 입력창 비활성화
   // BUYER이고 REQUESTED 상태일 때, 또는 SELLER이고 REQUESTED 상태일 때 비활성화
   const isInputDisabled = 
-    (isBuyer && tradeStatus === "REQUESTED") ||
-    (isSeller && tradeStatus === "REQUESTED") ||
+    tradeStatus === "REQUESTED" || 
     orderStatus === "REQUESTED";
   
   // 구매자 버튼 상태 (BUYER일 때만)
@@ -483,9 +482,9 @@ function ChatRoomPage() {
                 <button
                   type="button"
                   onClick={handleAcceptPurchase}
-                  disabled={tradeStatus !== "REQUESTED"}
+                  disabled={!chatData || tradeStatus !== "REQUESTED"}
                   className={`flex-shrink-0 rounded-lg px-3 py-1.5 text-[14px] font-medium transition-colors ${
-                    tradeStatus === "REQUESTED"
+                    chatData && tradeStatus === "REQUESTED"
                       ? "bg-[var(--main-color)] text-black hover:bg-[#a4ceb5]"
                       : "bg-[var(--color-light-grey)] text-[#999] cursor-not-allowed"
                   }`}

From 6559533ab5be15fea16c48fe936eb7b8424f0427 Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 01:48:01 +0900
Subject: [PATCH 04/10] =?UTF-8?q?=EC=B1=84=ED=8C=85=20=EC=8B=9C=EA=B0=84?=
 =?UTF-8?q?=20=ED=95=9C=EA=B5=AD=20=EC=8B=9C=EA=B0=84=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Chat/ChatRoomPage.jsx |  3 ++-
 src/utils/formatters.js         | 36 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/pages/Chat/ChatRoomPage.jsx b/src/pages/Chat/ChatRoomPage.jsx
index e3a0519..e62a36f 100644
--- a/src/pages/Chat/ChatRoomPage.jsx
+++ b/src/pages/Chat/ChatRoomPage.jsx
@@ -10,6 +10,7 @@ import { useRequireAuth } from "../../hooks/useRequireAuth.js";
 import { getChatRoomMessages } from "../../api/chatApi.js";
 import { getMyPageInfo } from "../../api/memberApi.js";
 import { payOrder, acceptOrder, cancelOrder } from "../../api/orderApi.js";
+import { formatChatTime } from "../../utils/formatters.js";
 import toast from "react-hot-toast";
 
 function ChatRoomPage() {
@@ -549,7 +550,7 @@ function ChatRoomPage() {
                       <p className={`mt-1 text-[11px] ${
                         message.type === "user" ? "text-[#999]" : "text-[#666]"
                       }`}>
-                        {message.timestamp}
+                        {formatChatTime(message.timestamp)}
                       </p>
                     )}
                   </div>
diff --git a/src/utils/formatters.js b/src/utils/formatters.js
index 9871810..5d6a68e 100644
--- a/src/utils/formatters.js
+++ b/src/utils/formatters.js
@@ -48,3 +48,39 @@ export function formatPrice(price) {
   return numPrice.toLocaleString("ko-KR");
 }
 
+/**
+ * 채팅 메시지 시간 포맷팅 유틸리티
+ * 시간을 "오후 2:30" 형식으로 변환 (한국 시간대)
+ * @param {string|Date|null|undefined} dateString - 포맷팅할 날짜 문자열 또는 Date 객체
+ * @returns {string} 포맷팅된 시간 문자열 (예: "오후 2:30")
+ */
+export function formatChatTime(dateString) {
+  if (!dateString) return "";
+
+  let date;
+  if (typeof dateString === 'string') {
+    date = new Date(dateString);
+  } else if (dateString instanceof Date) {
+    date = dateString;
+  } else {
+    return "";
+  }
+
+  // 유효하지 않은 날짜 체크
+  if (isNaN(date.getTime())) {
+    return "";
+  }
+
+  // 한국 시간대로 변환 (Asia/Seoul, UTC+9)
+  // toLocaleString으로 한국 시간대의 시간 정보를 가져옴
+  const options = { 
+    timeZone: "Asia/Seoul",
+    hour: "numeric",
+    minute: "2-digit",
+    hour12: true
+  };
+  
+  // "오전 1:46" 또는 "오후 2:30" 형식으로 자동 변환됨
+  return date.toLocaleString("ko-KR", options);
+}
+

From dc3c15a44e8f109f1d87918d0dcd899cebf2134e Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 02:52:24 +0900
Subject: [PATCH 05/10] =?UTF-8?q?=ED=8C=90=EB=A7=A4=EC=9E=90=20=EC=B1=84?=
 =?UTF-8?q?=ED=8C=85=20=EA=B5=AC=EB=A7=A4=ED=9D=AC=EB=A7=9D=20=EC=88=98?=
 =?UTF-8?q?=EB=9D=BD=20=EB=B2=84=ED=8A=BC=20=EC=98=A4=EB=A5=98=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/chatApi.js              | 10 ++++++++++
 src/api/clothesApi.js           | 30 +++++++++++++++++++++++++++---
 src/pages/Chat/ChatRoomPage.jsx | 22 +++++++++++-----------
 3 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/api/chatApi.js b/src/api/chatApi.js
index c243390..1fc2e39 100644
--- a/src/api/chatApi.js
+++ b/src/api/chatApi.js
@@ -20,6 +20,11 @@ export async function getUserChatRooms(type = "ALL") {
     throw new Error(result.message || "채팅방 정보를 찾을 수 없습니다.");
   }
 
+  if (response.status === 500) {
+    // 서버 에러
+    throw new Error(result.message || "서버 에러가 발생했습니다. 잠시 후 다시 시도해주세요.");
+  }
+
   throw new Error(result.message || `채팅방 목록 조회 실패 (${response.status})`);
 }
 
@@ -46,5 +51,10 @@ export async function getChatRoomMessages(roomId) {
     throw new Error(result.message || "존재하지 않는 채팅방입니다.");
   }
 
+  if (response.status === 500) {
+    // 서버 에러
+    throw new Error(result.message || "서버 에러가 발생했습니다. 잠시 후 다시 시도해주세요.");
+  }
+
   throw new Error(result.message || `채팅 내역 조회 실패 (${response.status})`);
 }
diff --git a/src/api/clothesApi.js b/src/api/clothesApi.js
index 84bb390..a686334 100644
--- a/src/api/clothesApi.js
+++ b/src/api/clothesApi.js
@@ -411,12 +411,24 @@ export async function filterClothes(keyword = "", styles = [], priceRangeCodes =
 export async function deleteClothes(clothesId) {
   const url = `${API_BASE_URL}/api/clothes/${clothesId}`;
   const body = JSON.stringify({ clothesId });
-  
+
   let response = await apiRequestDelete(url, {
     body,
   });
 
-  const result = await response.json();
+  // 403 에러 처리 (응답 본문이 비어있을 수 있음)
+  if (response.status === 403) {
+    throw new Error('삭제 권한이 없는 사용자입니다.');
+  }
+
+  // 응답 본문이 비어있을 수 있으므로 안전하게 파싱
+  let result;
+  const text = await response.text();
+  try {
+    result = text ? JSON.parse(text) : {};
+  } catch {
+    result = {};
+  }
 
   if (result.code === 'MEMBER4001') {
     const store = getStoreInstance()?.();
@@ -451,7 +463,19 @@ export async function deleteClothes(clothesId) {
         body,
       });
 
-      const retryResult = await response.json();
+      // 403 에러 처리
+      if (response.status === 403) {
+        throw new Error('삭제 권한이 없는 사용자입니다.');
+      }
+
+      // 응답 본문이 비어있을 수 있으므로 안전하게 파싱
+      let retryResult;
+      const retryText = await response.text();
+      try {
+        retryResult = retryText ? JSON.parse(retryText) : {};
+      } catch {
+        retryResult = {};
+      }
 
       if (response.status === 200 && retryResult.isSuccess === true) {
         return retryResult.result;
diff --git a/src/pages/Chat/ChatRoomPage.jsx b/src/pages/Chat/ChatRoomPage.jsx
index e62a36f..9ed4915 100644
--- a/src/pages/Chat/ChatRoomPage.jsx
+++ b/src/pages/Chat/ChatRoomPage.jsx
@@ -195,12 +195,12 @@ function ChatRoomPage() {
   
   // tradeStatus 가져오기
   const tradeStatus = chatData?.clothesInfo?.tradeStatus;
+  // orderStatus 가져오기 (chatData에서도 확인)
+  const currentOrderStatus = chatData?.orderStatus || orderStatus;
   
-  // tradeStatus에 따른 입력창 비활성화
-  // BUYER이고 REQUESTED 상태일 때, 또는 SELLER이고 REQUESTED 상태일 때 비활성화
-  const isInputDisabled = 
-    tradeStatus === "REQUESTED" || 
-    orderStatus === "REQUESTED";
+  // orderStatus에 따른 입력창 비활성화
+  // orderStatus가 REQUESTED일 때 비활성화
+  const isInputDisabled = currentOrderStatus === "REQUESTED";
   
   // 구매자 버튼 상태 (BUYER일 때만)
   const getBuyerButtonState = () => {
@@ -208,7 +208,7 @@ function ChatRoomPage() {
     
     const isPaid = chatData?.clothesInfo?.isPaid;
     
-    switch (tradeStatus) {
+    switch (currentOrderStatus) {
       case "REQUESTED":
         return {
           disabled: true,
@@ -467,8 +467,8 @@ function ChatRoomPage() {
                   >
                     결제하기
                   </button>
-                  {/* 구매 취소 버튼 (REQUESTED, MATCHED, SELLING 상태일 때만 표시) */}
-                  {tradeStatus && (tradeStatus === "REQUESTED" || tradeStatus === "MATCHED" || tradeStatus === "SELLING") && (
+                  {/* 구매 취소 버튼 (REQUESTED, MATCHED 상태일 때만 표시) */}
+                  {currentOrderStatus && (currentOrderStatus === "REQUESTED" || currentOrderStatus === "MATCHED") && (
                     <button
                       type="button"
                       onClick={handleCancelOrder}
@@ -483,9 +483,9 @@ function ChatRoomPage() {
                 <button
                   type="button"
                   onClick={handleAcceptPurchase}
-                  disabled={!chatData || tradeStatus !== "REQUESTED"}
+                  disabled={!chatData || currentOrderStatus !== "REQUESTED"}
                   className={`flex-shrink-0 rounded-lg px-3 py-1.5 text-[14px] font-medium transition-colors ${
-                    chatData && tradeStatus === "REQUESTED"
+                    chatData && currentOrderStatus === "REQUESTED"
                       ? "bg-[var(--main-color)] text-black hover:bg-[#a4ceb5]"
                       : "bg-[var(--color-light-grey)] text-[#999] cursor-not-allowed"
                   }`}
@@ -506,7 +506,7 @@ function ChatRoomPage() {
           ) : messages.length === 0 ? (
             <div className="flex h-full items-center justify-center">
               <p className="text-[14px] text-[#9f9f9f]">
-                {isBuyer && tradeStatus === "REQUESTED"
+                {isBuyer && currentOrderStatus === "REQUESTED"
                   ? "판매자가 채팅을 수락하지 않았습니다"
                   : "메시지가 없습니다."}
               </p>

From c8235c904586ded073580af6cd5008ec8a467f4c Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 02:56:55 +0900
Subject: [PATCH 06/10] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EB=A1=9C=EA=B7=B8=20=EC=83=81=EC=84=B8=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Chat/ChatRoomPage.jsx | 107 ++++++++++++++------------------
 1 file changed, 47 insertions(+), 60 deletions(-)

diff --git a/src/pages/Chat/ChatRoomPage.jsx b/src/pages/Chat/ChatRoomPage.jsx
index 9ed4915..68c84c4 100644
--- a/src/pages/Chat/ChatRoomPage.jsx
+++ b/src/pages/Chat/ChatRoomPage.jsx
@@ -52,52 +52,53 @@ function ChatRoomPage() {
     }
   }, [isAuthenticated]);
   
-  // 채팅방 내역 조회
-  useEffect(() => {
+  // 채팅방 내역 조회 함수
+  const fetchChatMessages = async () => {
     if (!roomId || !isAuthenticated) return;
     
-    const fetchChatMessages = async () => {
-      try {
-        setIsLoadingMessages(true);
-        const data = await getChatRoomMessages(Number(roomId));
-        setChatData(data);
-        
-        // 메시지를 senderId와 현재 사용자 ID를 비교하여 타입 변환
-        if (currentUserId && data.messages) {
-          const formattedMessages = data.messages.map((msg) => ({
-            id: msg.messageId,
-            type: msg.senderId === currentUserId ? "user" : "partner",
-            text: msg.content,
-            timestamp: msg.sendTime,
-          }));
-          setMessages(formattedMessages);
-        } else if (data.messages) {
-          // currentUserId가 아직 로드되지 않았으면 일단 메시지만 저장
-          setMessages(data.messages.map((msg) => ({
-            id: msg.messageId,
-            type: "partner", // 임시로 partner로 설정
-            text: msg.content,
-            timestamp: msg.sendTime,
-          })));
-        }
-      } catch (error) {
-        console.error("채팅 내역 조회 실패:", error);
-        const errorMessage = error.message || "채팅 내역을 불러오지 못했습니다.";
-        toast.error(errorMessage);
-        
-        // 404 에러인 경우 채팅 페이지로 이동
-        if (errorMessage.includes("존재하지 않는") || errorMessage.includes("404")) {
-          navigate("/chat");
-          return;
-        }
-        
-        // 나머지 에러는 토스트 메시지만 표시하고 채팅 페이지로 이동
+    try {
+      setIsLoadingMessages(true);
+      const data = await getChatRoomMessages(Number(roomId));
+      setChatData(data);
+      
+      // 메시지를 senderId와 현재 사용자 ID를 비교하여 타입 변환
+      if (currentUserId && data.messages) {
+        const formattedMessages = data.messages.map((msg) => ({
+          id: msg.messageId,
+          type: msg.senderId === currentUserId ? "user" : "partner",
+          text: msg.content,
+          timestamp: msg.sendTime,
+        }));
+        setMessages(formattedMessages);
+      } else if (data.messages) {
+        // currentUserId가 아직 로드되지 않았으면 일단 메시지만 저장
+        setMessages(data.messages.map((msg) => ({
+          id: msg.messageId,
+          type: "partner", // 임시로 partner로 설정
+          text: msg.content,
+          timestamp: msg.sendTime,
+        })));
+      }
+    } catch (error) {
+      console.error("채팅 내역 조회 실패:", error);
+      const errorMessage = error.message || "채팅 내역을 불러오지 못했습니다.";
+      toast.error(errorMessage);
+      
+      // 404 에러인 경우 채팅 페이지로 이동
+      if (errorMessage.includes("존재하지 않는") || errorMessage.includes("404")) {
         navigate("/chat");
-      } finally {
-        setIsLoadingMessages(false);
+        return;
       }
-    };
-    
+      
+      // 나머지 에러는 토스트 메시지만 표시하고 채팅 페이지로 이동
+      navigate("/chat");
+    } finally {
+      setIsLoadingMessages(false);
+    }
+  };
+
+  // 채팅방 내역 조회
+  useEffect(() => {
     fetchChatMessages();
   }, [roomId, isAuthenticated, currentUserId, navigate]);
   
@@ -323,16 +324,9 @@ function ChatRoomPage() {
     try {
       const paymentResult = await payOrder(orderId, usedPoints);
 
-      // 결제 성공 시 chatData 업데이트
+      // 결제 성공 시 채팅방 데이터 다시 가져오기
       if (paymentResult.isPaid) {
-        setChatData((prev) => ({
-          ...prev,
-          clothesInfo: {
-            ...prev.clothesInfo,
-            isPaid: true,
-          },
-        }));
-
+        await fetchChatMessages();
         toast.success("결제가 완료되었습니다.");
       }
     } catch (error) {
@@ -353,16 +347,9 @@ function ChatRoomPage() {
     try {
       const acceptResult = await acceptOrder(orderId);
 
-      // 수락 성공 시 chatData 업데이트 (status를 MATCHED로 변경)
+      // 수락 성공 시 채팅방 데이터 다시 가져오기
       if (acceptResult.status === "MATCHED") {
-        setChatData((prev) => ({
-          ...prev,
-          clothesInfo: {
-            ...prev.clothesInfo,
-            tradeStatus: "MATCHED",
-          },
-        }));
-
+        await fetchChatMessages();
         toast.success("구매 요청을 수락했습니다. 이제 대화할 수 있습니다.");
       }
     } catch (error) {

From b5a9f99a5c54fed23a00834c373ce349ec85e75e Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 03:11:18 +0900
Subject: [PATCH 07/10] =?UTF-8?q?=ED=8C=90=EB=A7=A4=EC=9E=90=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Chat/ChatRoomPage.jsx                  | 5 +++--
 src/pages/MyPage/components/SalesHistoryList.jsx | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Chat/ChatRoomPage.jsx b/src/pages/Chat/ChatRoomPage.jsx
index 68c84c4..61faed8 100644
--- a/src/pages/Chat/ChatRoomPage.jsx
+++ b/src/pages/Chat/ChatRoomPage.jsx
@@ -207,7 +207,8 @@ function ChatRoomPage() {
   const getBuyerButtonState = () => {
     if (!isBuyer) return null;
     
-    const isPaid = chatData?.clothesInfo?.isPaid;
+    // isPaid 확인 (여러 경로에서 확인)
+    const isPaid = chatData?.clothesInfo?.isPaid || chatData?.isPaid;
     
     switch (currentOrderStatus) {
       case "REQUESTED":
@@ -218,7 +219,7 @@ function ChatRoomPage() {
           cursor: "cursor-not-allowed",
         };
       case "MATCHED":
-        // MATCHED 상태에서 isPaid가 true면 비활성화
+        // MATCHED 상태에서 isPaid가 true면 비활성화하고 --main-color 사용
         if (isPaid) {
           return {
             disabled: true,
diff --git a/src/pages/MyPage/components/SalesHistoryList.jsx b/src/pages/MyPage/components/SalesHistoryList.jsx
index 8b0b01a..5eb8d67 100644
--- a/src/pages/MyPage/components/SalesHistoryList.jsx
+++ b/src/pages/MyPage/components/SalesHistoryList.jsx
@@ -121,8 +121,8 @@ function SalesHistoryItem({ order, onRefresh, onShowModal }) {
         </button>
       )}
 
-      {/* 물품 전달 완료 버튼 (매칭확정 상태이고 결제 완료된 경우만 표시) */}
-      {order.status === "MATCHED" && order.isPaid && (
+      {/* 물품 전달 완료 버튼 (매칭확정 상태에서 항상 표시) */}
+      {order.status === "MATCHED" && (
         <button
           type="button"
           onClick={handleConfirm}

From a735ad062d1ff51ece4a9067cccb0c00fdfd562f Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 03:24:02 +0900
Subject: [PATCH 08/10] =?UTF-8?q?=ED=8C=90=EB=A7=A4=EB=82=B4=EC=97=AD-?=
 =?UTF-8?q?=EB=A7=A4=EC=B9=AD=ED=99=95=EC=A0=95=20=EB=B2=84=ED=8A=BC=20UI?=
 =?UTF-8?q?=20=EC=B6=9C=EB=A0=A5=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MyPage/components/SalesHistoryList.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/MyPage/components/SalesHistoryList.jsx b/src/pages/MyPage/components/SalesHistoryList.jsx
index 5eb8d67..d41eb12 100644
--- a/src/pages/MyPage/components/SalesHistoryList.jsx
+++ b/src/pages/MyPage/components/SalesHistoryList.jsx
@@ -25,6 +25,11 @@ import toast from "react-hot-toast";
 function SalesHistoryItem({ order, onRefresh, onShowModal }) {
   const navigate = useNavigate();
   const [isConfirming, setIsConfirming] = useState(false);
+  
+  // 디버깅용 로그
+  console.log("SalesHistoryItem order:", order);
+  console.log("order.status:", order.status);
+  console.log("order.sellerConfirmed:", order.sellerConfirmed);
 
   const handleItemClick = () => {
     if (order?.clothesId) {
@@ -121,8 +126,8 @@ function SalesHistoryItem({ order, onRefresh, onShowModal }) {
         </button>
       )}
 
-      {/* 물품 전달 완료 버튼 (매칭확정 상태에서 항상 표시) */}
-      {order.status === "MATCHED" && (
+      {/* 물품 전달 완료 버튼 (판매중 상태가 아닐 때 항상 표시) */}
+      {order.status !== "ON_SALE" && (
         <button
           type="button"
           onClick={handleConfirm}

From 7325c7bd5b29e1e9ddb35b7664304d157070557c Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 03:27:51 +0900
Subject: [PATCH 09/10] =?UTF-8?q?=ED=8C=90=EB=A7=A4=EC=A2=85=EB=A3=8C=20Ta?=
 =?UTF-8?q?b=20=EC=97=90=EC=84=9C=20=EB=B2=84=ED=8A=BC=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MyPage/components/SalesHistoryList.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/MyPage/components/SalesHistoryList.jsx b/src/pages/MyPage/components/SalesHistoryList.jsx
index d41eb12..5ec8eb5 100644
--- a/src/pages/MyPage/components/SalesHistoryList.jsx
+++ b/src/pages/MyPage/components/SalesHistoryList.jsx
@@ -126,8 +126,8 @@ function SalesHistoryItem({ order, onRefresh, onShowModal }) {
         </button>
       )}
 
-      {/* 물품 전달 완료 버튼 (판매중 상태가 아닐 때 항상 표시) */}
-      {order.status !== "ON_SALE" && (
+      {/* 물품 전달 완료 버튼 (판매중, 판매완료 상태가 아닐 때만 표시) */}
+      {order.status !== "ON_SALE" && order.status !== "COMPLETED" && (
         <button
           type="button"
           onClick={handleConfirm}

From 5f8cdd01e56eb440fcecc95021e79bb80974c7bd Mon Sep 17 00:00:00 2001
From: l2juhan <leejuhan0527@gmail.com>
Date: Fri, 19 Dec 2025 03:37:18 +0900
Subject: [PATCH 10/10] =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20?=
 =?UTF-8?q?=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EC=BD=98=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/category/CategoryResultPage.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/category/CategoryResultPage.jsx b/src/pages/category/CategoryResultPage.jsx
index 23d8332..62a85e7 100644
--- a/src/pages/category/CategoryResultPage.jsx
+++ b/src/pages/category/CategoryResultPage.jsx
@@ -1,6 +1,7 @@
 import { useEffect, useState, useCallback, useRef } from "react";
 import { useLocation, useNavigate, useSearchParams } from "react-router-dom";
 import { useRequireAuth } from "../../hooks/useRequireAuth.js";
+import { MdArrowBackIosNew } from "react-icons/md";
 import { getClothesByCategory } from "../../api/clothesApi.js";
 
 function CategoryResultPage() {
@@ -154,9 +155,9 @@ function CategoryResultPage() {
             <button
               type="button"
               onClick={() => navigate("/category")}
-              className="text-[14px] text-[#111]"
+              className="flex items-center justify-center"
             >
-              &lt; 뒤로
+              <MdArrowBackIosNew className="text-[20px] text-[#333]" />
             </button>
             <div className="flex flex-col items-center flex-1">
               <span className="text-[12px] text-[#9f9f9f]">