Merge branch 'develop'

DSM-PICK · Sep 2, 2024 · ae399b5 · ae399b5
2 parents 0b20e31 + cfa3753
commit ae399b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/app/components/common/list/before/index.tsx b/src/app/components/common/list/before/index.tsx
@@ -69,7 +69,7 @@ const PreviousList: React.FC<getProp> = ({
   }, []);
 
   return (
-    <div className="flex h-fit w-29%">
+    <div className="flex h-fit">
       <div className="relative w-full">
         <div
           className="group whitespace-nowrap gap-4 py-4 px-6 rounded-lg cursor-pointer flex items-center justify-between bg-white w-max"

diff --git a/src/app/components/common/list/before/list/index.tsx b/src/app/components/common/list/before/list/index.tsx
@@ -19,10 +19,6 @@ const BeforeList: React.FC<Prop> = ({
   type,
   date,
 }) => {
-  const TimeSet = () => {
-    return `${date} ${startTime}~${endTime}`;
-  };
-
   return (
     <div className="flex whitespace-nowrap w-full px-4 bg-white rounded-lg">
       <div className=" flex justify-between w-full items-center h-fit py-1">
@@ -31,7 +27,9 @@ const BeforeList: React.FC<Prop> = ({
             {title}
           </div>
           <div className=" text-neutral-300 text-caption3 flex justify-center items-center">
-            {TimeSet()}
+            {type === "APPLICATION"
+              ? `${date} ${startTime}~${endTime}`
+              : `${date} ${startTime}~`}
           </div>
         </div>
         <OutBedge type={type} />