Merge pull request #196 from SCBJ-7/feature/#188-fix-cancel

[#188] action 조건문 추가
SCBJ-7 · Jan 25, 2024 · b997d51 · b997d51
2 parents 1550e85 + 7e83d72
commit b997d51
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/src/pages/paymentPage/Payment.tsx b/src/pages/paymentPage/Payment.tsx
@@ -52,30 +52,31 @@ const Payment = ({ action }: PaymentProps) => {
   useEffect(() => {
     if (action === "ready") {
       paymentSuccessQuery();
+
+      if (isSuccess) {
+        navigate(`/payment/${successData.paymentHistoryId}/success`);
+      }
+
+      if (isError && isAxiosError(error)) {
+        if (error.response?.status === 409) {
+          setErrorMessage("이미 판매완료된 상품입니다.");
+        } else {
+          setErrorMessage(
+            error.response?.data.message || "오류가 발생했습니다.",
+          );
+        }
+        setIsModalOpen(true);
+      }
     }
 
     if (action === "cancel") {
       paymentCancelQuery();
       setErrorMessage("결제가 취소되었습니다.");
       setIsModalOpen(true);
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [action]);
-
-  useEffect(() => {
-    if (isSuccess) {
-      navigate(`/payment/${successData.paymentHistoryId}/success`);
-    }
 
-    if (isError && isAxiosError(error)) {
-      if (error.response?.status === 409) {
-        setErrorMessage("이미 판매완료된 상품입니다.");
-      } else {
-        setErrorMessage(error.response?.data.message || "오류가 발생했습니다.");
-      }
-      setIsModalOpen(true);
-    }
-  }, [isSuccess, isError, error, navigate, productId]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [action, error, isError, isSuccess]);
 
   const closeModal = () => {
     setIsModalOpen(false);