Merge pull request TEAM-BEAT#461 from TEAM-BEAT/fix/TEAM-BEAT#459/Boo…

…kCancelButton [Fix/TEAM-BEAT#459] 비회원 예매 취소 반영 수정
imddoy · Dec 25, 2024 · d157bc0 · d157bc0
2 parents 225bcee + 3c729e6
commit d157bc0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/constants/bookingStatus.ts b/src/constants/bookingStatus.ts
@@ -1,9 +1,9 @@
 export const bookingStatusText = {
-  CHECKING_PAYMENT: "입금 확인 예정",
+  CHECKING_PAYMENT: "입금 확인 중",
   BOOKING_CONFIRMED: "입금 완료",
   BOOKING_CANCELLED: "취소 완료",
-  BOOKING_DELETED: "예매 삭제",
-  REFUND_REQUESTED: "취소 요청",
+  BOOKING_DELETED: "취소 완료",
+  REFUND_REQUESTED: "환불 요청",
 };
 
 export type bookingStatusTypes = keyof typeof bookingStatusText;

diff --git a/src/pages/cancel/Cancel.styled.ts b/src/pages/cancel/Cancel.styled.ts
@@ -5,7 +5,7 @@ export const CancelLayout = styled.main`
   display: flex;
   flex-direction: column;
   width: 100%;
-  padding: 1.6rem 2.4rem;
+  padding: 1.6rem 2.4rem calc(1.6rem + 5.6rem + 1.2rem);
 `;
 
 export const PerformWrapper = styled.section`

diff --git a/src/pages/cancel/Cancel.tsx b/src/pages/cancel/Cancel.tsx
@@ -22,11 +22,7 @@ const Cancel = () => {
   const { setHeader } = useHeader();
   const { openAlert } = useModal();
   const { state } = useLocation();
-  const { confirmCancelAction } = useCancelBooking(
-    state?.bookerName,
-    state?.number,
-    state?.password
-  );
+  const { confirmCancelAction } = useCancelBooking(state?.name, state?.phone, state?.password);
   const navigate = useNavigate();
   const [isDeposit, setIsDeposit] = useState<boolean | null>(null);
   const [bankOpen, setBankOpen] = useState(false);

diff --git a/src/pages/lookup/Lookup.tsx b/src/pages/lookup/Lookup.tsx
@@ -68,8 +68,8 @@ const Lookup = () => {
   };
 
   useEffect(() => {
-    if (state?.name && state?.phone && state?.password && !cachedData && !isFetching) {
-      // 비회원 데이터가 캐시에 없을 경우 새로 가져옴
+    if (state?.name && state?.phone && state?.password && !isFetching) {
+      // 비회원 데이터 새로 가져옴
       fetchBookingList(state).finally(() => {
         setIsFetching(false);
         setCachedData(getCachedBookingList(state.name, state.phone, state.password));