diff --git a/packages/frontend/src/pages/PeriodDetails/components/CreateAttestationsDialog.tsx b/packages/frontend/src/pages/PeriodDetails/components/CreateAttestationsDialog.tsx index c49964e9f..eb90de5c0 100644 --- a/packages/frontend/src/pages/PeriodDetails/components/CreateAttestationsDialog.tsx +++ b/packages/frontend/src/pages/PeriodDetails/components/CreateAttestationsDialog.tsx @@ -1,6 +1,5 @@ import { useEffect, useState } from 'react'; import { useParams } from 'react-router-dom'; -import { useRecoilValue } from 'recoil'; import { Parser } from '@json2csv/plainjs'; import { Dialog } from '@headlessui/react'; @@ -9,11 +8,6 @@ import { faReceipt, faTimes } from '@fortawesome/free-solid-svg-icons'; import { Button } from '@/components/ui/Button'; import { useSafe } from '../../../model/safe/hooks/useSafe'; import { - getPeriodDatesConfig, - PeriodDates, -} from '../../../model/report/util/get-period-dates-config'; -import { - AllPeriods, PeriodPageParams, useUpdatePeriod, } from '../../../model/periods/periods'; @@ -33,7 +27,6 @@ export function CreateAttestationsDialog({ }: CreateAttestationsDialogProps): JSX.Element | null { // Hooks const { periodId } = useParams(); - const periods = useRecoilValue(AllPeriods); const { owners, threshold } = useSafe(); const { createAttestationsTransaction, safeTransactionState } = useEas(); @@ -41,17 +34,11 @@ export function CreateAttestationsDialog({ const { updatePeriod } = useUpdatePeriod(); // Local state - const [periodDates, setPeriodDates] = useState(); const [attestationReportData, setAttestationReportData] = useState(); const [attestationCsv, setAttestationCsv] = useState(); // Effects - function loadPeriodDates(): void { - if (!periods) return; - setPeriodDates(getPeriodDatesConfig(periods, periodId)); - } - function saveTransactionHash(): void { if ( !safeTransactionState?.txHash || @@ -86,7 +73,6 @@ export function CreateAttestationsDialog({ setAttestationCsv(csv); } - useEffect(loadPeriodDates, [periods, periodId]); useEffect(saveTransactionHash, [ safeTransactionState?.txHash, safeTransactionState?.status, @@ -96,8 +82,6 @@ export function CreateAttestationsDialog({ ]); useEffect(createAttestationCsv, [attestationReportData, periodId]); - if (!periodDates) return null; - return (
@@ -120,7 +104,6 @@ export function CreateAttestationsDialog({
{ if (!result) return; diff --git a/packages/frontend/src/pages/PeriodDetails/components/GenerateAttestationsData.tsx b/packages/frontend/src/pages/PeriodDetails/components/GenerateAttestationsData.tsx index d4fc70713..885ec4063 100644 --- a/packages/frontend/src/pages/PeriodDetails/components/GenerateAttestationsData.tsx +++ b/packages/frontend/src/pages/PeriodDetails/components/GenerateAttestationsData.tsx @@ -6,29 +6,29 @@ import { import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { useEffect, useState } from 'react'; import { useReport } from '../../../model/report/hooks/use-report.hook'; -import { PeriodDates } from '../../../model/report/util/get-period-dates-config'; import { useReportRunReturn } from '../../../model/report/types/use-report-run-return.type'; import { objectToQs } from '../../../utils/querystring'; import { Link } from 'react-router-dom'; +import { useRecoilValue } from 'recoil'; +import { SinglePeriod } from '../../../model/periods/periods'; type GenerateAttestationsDataProps = { periodId: string; - periodDates: PeriodDates; manifestUrl: string; done: (result: useReportRunReturn | undefined) => void; }; export function GenerateAttestationsData({ periodId, - periodDates, manifestUrl, done, }: GenerateAttestationsDataProps): JSX.Element { + const period = useRecoilValue(SinglePeriod(periodId)); const report = useReport({ manifestUrl, periodId, - startDate: periodDates.startDate, - endDate: periodDates.endDate, + startDate: period?.startDate, + endDate: period?.endDate, }); const [data, setData] = useState(undefined); @@ -60,8 +60,8 @@ export function GenerateAttestationsData({ const reportUrl = `/reports/run?${objectToQs({ manifestUrl, - startDate: periodDates.startDate, - endDate: periodDates.endDate, + startDate: period?.startDate || '', + endDate: period?.endDate || '', })}`; return (