Merge pull request #77 from depromeet/fix/35/retrospect-create

회고 생성 날짜, 모달 버튼 배경 관련 버그 수정
depromeet · Aug 6, 2024 · b2af919 · b2af919
2 parents 03c7ada + 61a9f13
commit b2af919
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/component/common/Modal/FullModal.tsx b/src/component/common/Modal/FullModal.tsx
@@ -29,7 +29,8 @@ export function FullModal({ children }: FullModalProps) {
             height: 100dvh;
             width: 48rem;
             overflow-y: auto;
-            background-color: #fff;
+            --parent-bg-color: #fff;
+            background-color: var(--parent-bg-color);
           `}
         >
           {children}

diff --git a/src/component/retrospectCreate/steps/DueDate.tsx b/src/component/retrospectCreate/steps/DueDate.tsx
@@ -60,13 +60,13 @@ export function DueDate() {
           cursor: pointer;
         `}
       >
-        {!(selectedDate && selectedTime) ? (
+        {!selectedDate ? (
           <Typography color="lightGrey5" variant="B1">
             회고 마감일을 선택해주세요
           </Typography>
         ) : (
           <Typography color="darkGrayText" variant="B1">
-            {`${formatDateToString(selectedDate as Date, ".")} ${selectedTime}`}
+            {`${formatDateToString(selectedDate as Date, ".")} ${selectedTime ?? ""}`}
           </Typography>
         )}
         {/**FIXME - design token */}