Merge pull request #117 from DDD-Community/feat/#58

[feat/#58] 로딩 중 문구가 표시되지 않도록 수정
DDD-Community · Oct 8, 2024 · 48061ca · 48061ca
2 parents 384518c + 00394b4
commit 48061ca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/components/Crew/CrewList.tsx b/src/components/Crew/CrewList.tsx
@@ -210,7 +210,7 @@ const CrewList = (): ReactElement => {
       </div>
 
       {/* list */}
-      {isLoading ? "로딩 중입니다..." : isError ? "데이터를 불러오는데 실패했습니다." : createGroupList(data?.data)}
+      {isError ? "데이터를 불러오는데 실패했습니다." : createGroupList(data?.data)}
     </div>
   )
 }

diff --git a/src/components/Modal/JoinCrewModal.tsx b/src/components/Modal/JoinCrewModal.tsx
@@ -14,7 +14,7 @@ const JoinCrewModal = (props: ModalProps): React.ReactElement => {
   const [joinCode, setJoinCode] = useState<string>("")
   const [isCodeError, setIsCodeError] = useState<boolean>(false)
 
-  const { data, isLoading, isError } = useGetGroup(id)
+  const { data, isError } = useGetGroup(id)
   const joinGroupMutation = useJoinGroup()
 
   const onChangeJoinCode = (e: React.ChangeEvent<HTMLInputElement>): void => {
@@ -75,9 +75,7 @@ const JoinCrewModal = (props: ModalProps): React.ReactElement => {
 
   return (
     <ModalContainer onClose={onClose}>
-      {isLoading ? (
-        "로딩 중입니다."
-      ) : isError ? (
+      {isError ? (
         "데이터를 불러오지 못했습니다."
       ) : (
         <div className="flex w-full flex-col items-center">

diff --git a/src/pages/AnalysisDashboard.tsx b/src/pages/AnalysisDashboard.tsx
@@ -94,7 +94,6 @@ const AnalysisDashboard = () => {
         </div>
       </div>
 
-      {isLoading && <div>로딩 중입니다...</div>}
       {isError && <div>데이터를 불러오는 것에 실패했습니다</div>}
 
       {!isLoading && !isError && todayAnalysis && (
-Original file line number
+Diff line change
@@ Expand Up / @@ -210,7 +210,7 @@ const CrewList = (): ReactElement => { @@
           </div>
           {/* list */}
-          {isLoading ? "로딩 중입니다..." : isError ? "데이터를 불러오는데 실패했습니다." : createGroupList(data?.data)}
+          {isError ? "데이터를 불러오는데 실패했습니다." : createGroupList(data?.data)}
         </div>
       )
     }
@@ Expand Down @@