fix: 채팅방 로더 제거

Author: H-sooyeon

dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.mrbag484p7g"
+    "revision": "0.1ds33gcjjgg"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

src/components/molecules/ChatRoomBannerItem.tsx

@@ -5,7 +5,6 @@ import { useNavigate } from 'react-router-dom';
 import { useEffect, useState } from 'react';
 import BackBar from './BackBar';
 import { walkingStatus } from '../../apis/walking';
-import Spinner from '../atoms/Spinner';
 
 type ChatRoomBannerProps = {
   userinfo: {
@@ -22,7 +21,6 @@ const ChatRoomBannerItem = ({ userinfo }: ChatRoomBannerProps) => {
   // console.log('userinfo', userinfo);
   const { userImage, name } = userinfo;
   const [status, setStatus] = useState('');
-  const [isgetData, setIsGetData] = useState(false);
   const [intervalId, setIntervalId] = useState<any>();
   // 채팅 목록에서 userId, matchingId, isOwner를 받아온다.
   const navigate = useNavigate();
@@ -32,7 +30,6 @@ const ChatRoomBannerItem = ({ userinfo }: ChatRoomBannerProps) => {
         walkingStatus(userinfo.matchingId)
           .then((res) => {
             setStatus(res.data.response.walkStatusField);
-            setIsGetData(true);
           })
           .catch((_err) => {
             // alert(err.data.response);
@@ -53,7 +50,8 @@ const ChatRoomBannerItem = ({ userinfo }: ChatRoomBannerProps) => {
     };
   }, []);
   const mapbutton = () => {
-    if (userinfo.walkType === 'READY') {
+    // console.log('walkType', userinfo.walkType);
+    if (userinfo.walkType === 'READY' || userinfo.walkType === null) {
       navigate('/walking', {
         state: {
           status: 'READY',
@@ -138,19 +136,15 @@ const ChatRoomBannerItem = ({ userinfo }: ChatRoomBannerProps) => {
         {/* {status ? ( */}
 
         {userinfo.isDogOwner ? (
-          <S.walkingButton disabled={!isgetData}>
-            {isgetData ? (
-              <S.ButtonWrapper>
-                {status === '' ? (
-                  <h1 onClick={walkAck}>산책 허락하기</h1> // ready
-                ) : (
-                  //견주이면서 산책중이거나 산책이끝나면
-                  <h1 onClick={Ownermapbutton}>지도 보기</h1> // active
-                )}
-              </S.ButtonWrapper>
-            ) : (
-              <Spinner />
-            )}
+          <S.walkingButton>
+            <S.ButtonWrapper>
+              {status === '' ? (
+                <h1 onClick={walkAck}>산책 허락하기</h1> // ready
+              ) : (
+                //견주이면서 산책중이거나 산책이끝나면
+                <h1 onClick={Ownermapbutton}>지도 보기</h1> // active
+              )}
+            </S.ButtonWrapper>
           </S.walkingButton>
         ) : (
           //알바생이면서 산책 대기중이면

src/components/molecules/ReviewModal.tsx

@@ -104,7 +104,7 @@ export default function ReviewModal({
       try {
         const response = await getNotReviewed();
         setData(response.data.response.walkStatusDTOS);
-        console.log('미작성리뷰들', response);
+        // console.log('미작성리뷰들', response);
 
         // getNotificationById를 호출하는 Promise 배열을 생성합니다.
         const promises = response.data.response.walkStatusDTOS.map(
@@ -150,7 +150,7 @@ export default function ReviewModal({
       },
     });
   };
-  console.log('data', notiData);
+  // console.log('data', notiData);
 
   return (
     <S.ModalContainer>

src/components/organisms/CurrentWalkingMap.tsx

@@ -90,11 +90,13 @@ const CurrentWalkingMap = () => {
     state?.master || state?.isDogOwner
       ? UserType.DOG_OWNER
       : UserType.PART_TIMER || 'PART_TIMER'; // TODO: user props로 받아오기
+  // console.log('state', state.status);
   const [walkStatus, setWalkStatus] = useState(state.status);
   const buttonInnerText =
-    WalkStatus !== null && walkStatus === WalkStatus.ACTIVATE
+    WalkStatus && walkStatus === WalkStatus.ACTIVATE
       ? '산책 종료하기'
       : '산책 시작하기';
+  // console.log('walkStatus', walkStatus);
 
   const { mutate: mutateWalkingStart } = useMutation({
     mutationFn: walkingStart,