diff --git a/src/features/reports/hooks/useCongregationCard.tsx b/src/features/reports/hooks/useCongregationCard.tsx index 6d6f4e609d..ae7d71b778 100644 --- a/src/features/reports/hooks/useCongregationCard.tsx +++ b/src/features/reports/hooks/useCongregationCard.tsx @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import { useRecoilValue } from 'recoil'; import { useAppTranslation } from '@hooks/index'; import { S21CardData, S21CardMonthData } from '@definition/report'; -import { createArrayFromMonths, currentReportMonth } from '@utils/date'; +import { createArrayFromMonths, currentServiceYear } from '@utils/date'; import { JWLangState, monthNamesState } from '@states/app'; import useReportMonthly from './useReportMonthly'; @@ -17,11 +17,11 @@ const useCongregationCard = () => { const years = useMemo(() => { const result: string[] = []; - const currentMonth = currentReportMonth(); - const year = currentMonth.split('/')[0]; - const prevYear = String(+year - 1).toString(); - result.push(prevYear, year); + const currentYear = currentServiceYear(); + const prevYear = String(+currentYear - 1).toString(); + + result.push(prevYear, currentYear); return result; }, []); diff --git a/src/views/reports/S21/shared/TableHeader.tsx b/src/views/reports/S21/shared/TableHeader.tsx index b79cd5d8b2..b694e165bf 100644 --- a/src/views/reports/S21/shared/TableHeader.tsx +++ b/src/views/reports/S21/shared/TableHeader.tsx @@ -11,7 +11,7 @@ const TableHeader = ({ data }: S21Type) => { - {t('tr_serviceYear')} + {t('tr_serviceYear').replaceAll('-', '-\u000A')} {data.year}