diff --git a/src/entities/vat-return/ui/filter/list-filter.tsx b/src/entities/vat-return/ui/filter/list-filter.tsx index e4f8f2f..fe8dbc3 100644 --- a/src/entities/vat-return/ui/filter/list-filter.tsx +++ b/src/entities/vat-return/ui/filter/list-filter.tsx @@ -48,8 +48,6 @@ export const ListFilter = ({ const [filterReceiptType, setFIlterReceiptType] = useState(receiptType); const [filterTargetType, setFilterTargetType] = useState(targetType); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const onClickToClose = () => { setFilterOn(false); }; diff --git a/src/shared/ui/calendar/nice-calendar-month.tsx b/src/shared/ui/calendar/nice-calendar-month.tsx index e9488d1..a7155bc 100644 --- a/src/shared/ui/calendar/nice-calendar-month.tsx +++ b/src/shared/ui/calendar/nice-calendar-month.tsx @@ -44,19 +44,19 @@ const NiceCalendarMonth = ({ if(calendarType === CalendarType.Start){ setMinMonth(undefined); if(!!endMonth){ - setMaxMonth(new Date(endMonth)); + setMaxMonth(new Date(moment(endMonth+'01').format('YYYY.MM.DD'))); } setValueYear(startMonth?.substring(0, 4)); } else if(calendarType === CalendarType.End){ if(!!startMonth){ - setMinMonth(new Date(startMonth)); + setMinMonth(new Date(moment(startMonth+'01').format('YYYY.MM.DD'))); } setMaxMonth(new Date()); setValueYear(endMonth?.substring(0, 4)); } else if(calendarType === CalendarType.Single){ - setValueYear(singleMonth?.substring(0,4)); + setValueYear(singleMonth?.substring(0, 4)); } }; @@ -128,7 +128,7 @@ const CalendarWrapper = styled.div` position: absolute; width: 100%; height: 100%; - top: 0; + top: 100px; left: 0; `;