diff --git a/packages/mobile/src/components/templates/Modal/style.module.scss b/packages/mobile/src/components/templates/Modal/style.module.scss index 63b24dc8d..ab14ceefb 100644 --- a/packages/mobile/src/components/templates/Modal/style.module.scss +++ b/packages/mobile/src/components/templates/Modal/style.module.scss @@ -18,18 +18,17 @@ margin-top: 25px; .cancel { - width: 96px; - height: 40px; - border-radius: 100px; - background-color: $white; - color: $black-40; - border: 0.3px solid $black-40; + width: 120px; + height: 47px; + border-radius: 10px; + background-color: $black-10; + color: $black-80; } .confirm { - width: 96px; - height: 40px; - border-radius: 100px; + width: 120px; + height: 47px; + border-radius: 10px; background-color: $red-50; color: $white; diff --git a/packages/mobile/src/page/Home/Restaurant/Selected/index.tsx b/packages/mobile/src/page/Home/Restaurant/Selected/index.tsx index 5b787f221..022bb09e0 100644 --- a/packages/mobile/src/page/Home/Restaurant/Selected/index.tsx +++ b/packages/mobile/src/page/Home/Restaurant/Selected/index.tsx @@ -29,6 +29,12 @@ const getMealTime = (hour: number) => { return CafeteriaMenu.time.DINNER; }; +const Priority: Record = { + [CafeteriaMenu.time.BREAKFAST]: 1, + [CafeteriaMenu.time.LUNCH]: 2, + [CafeteriaMenu.time.DINNER]: 3, +}; + function Selected(props: Props) { const { today, cafeteriaData, cafeteriaName, onClick, className } = props; const fullDate = today.format("YYYY-MM-DD"); @@ -38,7 +44,7 @@ function Selected(props: Props) { const { data: isHoliday } = useHoliday(fullDate); const { data } = useCafeteriaQuery(cafeteriaData, fullDate); const menuData = data?.find(({ time }) => { - return time === getMealTime(today.hour()); + return Priority[time] >= Priority[getMealTime(today.hour())]; }); if (!data || isHoliday === undefined) return null; @@ -73,7 +79,7 @@ function Selected(props: Props) { {mealPeriod} - +

{menuData.menu}

diff --git a/packages/mobile/src/page/Home/Restaurant/Selector/style.module.scss b/packages/mobile/src/page/Home/Restaurant/Selector/style.module.scss index 612eb2cb2..775290753 100644 --- a/packages/mobile/src/page/Home/Restaurant/Selector/style.module.scss +++ b/packages/mobile/src/page/Home/Restaurant/Selector/style.module.scss @@ -72,13 +72,12 @@ $total-margin-of-top-and-bottom: 220px; .cancel { @include typography(14); position: relative; - width: 96px; - height: 40px; + width: 120px; + height: 47px; margin-bottom: 27px; - color: $black-60; - background-color: $black-0; - border: 1px solid $black-50; - border-radius: 100px; + color: $black-80; + background-color: $black-10; + border-radius: 10px; line-height: 30px; z-index: 1; }